Merge remote-tracking branch 'origin/upstream'

# Conflicts:
#	CONTRIBUTING.md
#	CUSTOMIZE.md
#	FAQ.md
#	INSTALL.md
#	README.md
#	_config.yml
#	_data/citations.yml

Author: dfuchss

Gemfile.lock

@@ -22,31 +22,31 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     base64 (0.3.0)
     bibtex-ruby (6.2.0)
       latex-decode (~> 0.0)
       logger (~> 1.7)
       racc (~> 1.7)
-    bigdecimal (3.3.1)
+    bigdecimal (4.0.1)
     citeproc (1.1.0)
       date
       forwardable
       json
       namae (~> 1.0)
       observer (< 1.0)
       open-uri (< 1.0)
-    citeproc-ruby (2.1.4)
+    citeproc-ruby (2.1.8)
       citeproc (~> 1.0, >= 1.0.9)
       csl (~> 2.0)
       observer (< 1.0)
     classifier-reborn (2.3.0)
       fast-stemmer (~> 1.0)
       matrix (~> 0.4)
     colorator (1.1.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     crass (1.0.6)
     csl (2.2.1)
       forwardable (~> 1.3)
@@ -62,7 +62,7 @@ GEM
       addressable
     cssminify2 (2.1.0)
     csv (3.3.5)
-    date (3.5.0)
+    date (3.5.1)
     deep_merge (1.2.2)
     drb (2.2.3)
     em-websocket (0.5.3)
@@ -75,48 +75,48 @@ GEM
       logger (>= 1.0, < 2)
       loofah (>= 2.3.1, < 3)
       sax-machine (>= 1.0, < 2)
-    ffi (1.17.2-aarch64-linux-gnu)
-    ffi (1.17.2-aarch64-linux-musl)
-    ffi (1.17.2-arm-linux-gnu)
-    ffi (1.17.2-arm-linux-musl)
-    ffi (1.17.2-arm64-darwin)
-    ffi (1.17.2-x86_64-darwin)
-    ffi (1.17.2-x86_64-linux-gnu)
-    ffi (1.17.2-x86_64-linux-musl)
-    forwardable (1.3.3)
+    ffi (1.17.3-aarch64-linux-gnu)
+    ffi (1.17.3-aarch64-linux-musl)
+    ffi (1.17.3-arm-linux-gnu)
+    ffi (1.17.3-arm-linux-musl)
+    ffi (1.17.3-arm64-darwin)
+    ffi (1.17.3-x86_64-darwin)
+    ffi (1.17.3-x86_64-linux-gnu)
+    ffi (1.17.3-x86_64-linux-musl)
+    forwardable (1.4.0)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
-    google-protobuf (4.33.1)
+    google-protobuf (4.33.2)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-aarch64-linux-gnu)
+    google-protobuf (4.33.2-aarch64-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-aarch64-linux-musl)
+    google-protobuf (4.33.2-aarch64-linux-musl)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-arm64-darwin)
+    google-protobuf (4.33.2-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-x86_64-darwin)
+    google-protobuf (4.33.2-x86_64-darwin)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-x86_64-linux-gnu)
+    google-protobuf (4.33.2-x86_64-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.33.1-x86_64-linux-musl)
+    google-protobuf (4.33.2-x86_64-linux-musl)
       bigdecimal
       rake (>= 13)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     htmlcompressor (0.4.0)
-    http_parser.rb (0.8.0)
-    httparty (0.23.2)
+    http_parser.rb (0.8.1)
+    httparty (0.24.0)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     jekyll (4.4.1)
       addressable (~> 2.4)
@@ -162,9 +162,9 @@ GEM
     jekyll-regex-replace (1.1.0)
     jekyll-sass-converter (3.1.0)
       sass-embedded (~> 1.75)
-    jekyll-scholar (7.2.2)
+    jekyll-scholar (7.2.3)
       bibtex-ruby (~> 6.0)
-      citeproc-ruby (>= 2.1.3)
+      citeproc-ruby (>= 2.1.6)
       csl-styles (~> 2.0)
       jekyll (~> 4.0)
     jekyll-sitemap (1.4.0)
@@ -181,7 +181,7 @@ GEM
       gemoji (>= 3, < 5)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0, < 5.0)
-    json (2.16.0)
+    json (2.18.0)
     json-minify (0.0.3)
       json (> 0)
     kramdown (2.5.1)
@@ -194,32 +194,33 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.1)
+    loofah (2.25.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     matrix (0.4.3)
     mercenary (0.4.0)
     mini_mime (1.1.5)
-    minitest (5.26.2)
-    multi_xml (0.7.2)
-      bigdecimal (~> 3.1)
+    minitest (6.0.1)
+      prism (~> 1.5)
+    multi_xml (0.8.0)
+      bigdecimal (>= 3.1, < 5)
     namae (1.2.0)
       racc (~> 1.7)
-    nokogiri (1.18.10-aarch64-linux-gnu)
+    nokogiri (1.19.0-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.10-aarch64-linux-musl)
+    nokogiri (1.19.0-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.10-arm-linux-gnu)
+    nokogiri (1.19.0-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.10-arm-linux-musl)
+    nokogiri (1.19.0-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.18.10-arm64-darwin)
+    nokogiri (1.19.0-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-darwin)
+    nokogiri (1.19.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.19.0-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-musl)
+    nokogiri (1.19.0-x86_64-linux-musl)
       racc (~> 1.4)
     observer (0.1.2)
     open-uri (0.5.0)
@@ -229,47 +230,48 @@ GEM
     ostruct (0.6.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (6.0.2)
+    prism (1.7.0)
+    public_suffix (7.0.0)
     racc (1.8.1)
     rake (13.3.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rexml (3.4.4)
-    rouge (4.6.1)
+    rouge (4.7.0)
     safe_yaml (1.0.5)
-    sass-embedded (1.94.2-aarch64-linux-gnu)
+    sass-embedded (1.97.1-aarch64-linux-gnu)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-aarch64-linux-musl)
+    sass-embedded (1.97.1-aarch64-linux-musl)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-arm-linux-gnueabihf)
+    sass-embedded (1.97.1-arm-linux-gnueabihf)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-arm-linux-musleabihf)
+    sass-embedded (1.97.1-arm-linux-musleabihf)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-arm64-darwin)
+    sass-embedded (1.97.1-arm64-darwin)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-x86_64-darwin)
+    sass-embedded (1.97.1-x86_64-darwin)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-x86_64-linux-gnu)
+    sass-embedded (1.97.1-x86_64-linux-gnu)
       google-protobuf (~> 4.31)
-    sass-embedded (1.94.2-x86_64-linux-musl)
+    sass-embedded (1.97.1-x86_64-linux-musl)
       google-protobuf (~> 4.31)
     sax-machine (1.3.2)
     securerandom (0.4.1)
     set (1.1.2)
     singleton (0.3.0)
-    stringio (3.1.8)
+    stringio (3.2.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     terser (1.2.6)
       execjs (>= 0.3.0, < 3)
-    time (0.4.1)
+    time (0.4.2)
       date
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
     uri (1.1.1)
-    webrick (1.9.1)
+    webrick (1.9.2)
 
 PLATFORMS
   aarch64-linux
@@ -312,4 +314,4 @@ DEPENDENCIES
   ostruct
 
 BUNDLED WITH
-   2.7.2
+  4.0.3

_config.yml

@@ -362,7 +362,7 @@ imagemagick:
     - ".tiff"
     - ".gif"
   output_formats:
-    webp: "-quality 85"
+    webp: "-auto-orient -quality 85"
 
 # Lazy loading images
 #   If you enable lazy loading, all images will add the loading="lazy" attribute.

_plugins/external-posts.rb

@@ -42,11 +42,11 @@ def process_entries(site, src, entries)
           content: e.content,
           summary: e.summary,
           published: e.published
-        })
+        }, src)
       end
     end
 
-    def create_document(site, source_name, url, content)
+    def create_document(site, source_name, url, content, src = {})
       # check if title is composed only of whitespace or foreign characters
       if content[:title].gsub(/[^\w]/, '').strip.empty?
         # use the source name and last url segment as fallback
@@ -67,6 +67,15 @@ def create_document(site, source_name, url, content)
       doc.data['description'] = content[:summary]
       doc.data['date'] = content[:published]
       doc.data['redirect'] = url
+      
+      # Apply default categories and tags from source configuration
+      if src['categories'] && src['categories'].is_a?(Array) && !src['categories'].empty?
+        doc.data['categories'] = src['categories']
+      end
+      if src['tags'] && src['tags'].is_a?(Array) && !src['tags'].empty?
+        doc.data['tags'] = src['tags']
+      end
+      
       doc.content = content[:content]
       site.collections['posts'].docs << doc
     end
@@ -76,7 +85,7 @@ def fetch_from_urls(site, src)
         puts "...fetching #{post['url']}"
         content = fetch_content_from_url(post['url'])
         content[:published] = parse_published_date(post['published_date'])
-        create_document(site, src['name'], post['url'], content)
+        create_document(site, src['name'], post['url'], content, src)
       end
     end
 

_sass/_layout.scss

@@ -19,7 +19,7 @@ body {
 
 body.fixed-top-nav {
   // Add some padding for the nav-bar.
-  padding-top: 56px;
+  padding-top: 57px;
 }
 
 body.sticky-bottom-footer {

docker-compose.yml

@@ -1,7 +1,7 @@
 # this file uses prebuilt image in dockerhub
 services:
   jekyll:
-    image: amirpourmand/al-folio:v0.14.7
+    image: amirpourmand/al-folio:v0.15.0
     build: .
     # uncomment these if you are having this issue with the build:
     # /usr/local/bundle/gems/jekyll-4.3.4/lib/jekyll/site.rb:509:in `initialize': Permission denied @ rb_sysopen - /srv/jekyll/.jekyll-cache/.gitignore (Errno::EACCES)