nanoc 4.12.14 → 4.12.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a7dcb1ecfec89211b205f72543d5a42590eaf3bf523cdcdf9a6b6df1f5dee6
-  data.tar.gz: 4956cc6f8b8112c94c76d775c0b010c457a231448d26bb7f6e5606428264dbb3
+  metadata.gz: 4262a2b944e9cb6d080f4dba2a5b81cb260e8d81b5d59bacb4c92fc4fa1bb93f
+  data.tar.gz: 07f7c9c67377c86d446f677eca34d1d18ccedf334f701f01d987dd12eddabae7
 SHA512:
-  metadata.gz: 4f735f068cfc0faf6dddd699dc9d858137662a65f336f69f4150a4f67d30ee317c3c50579a65da37774a012661a61684a1701d7ab301c8aebbe1961ef9c85c84
-  data.tar.gz: 0f87a9311a70947105540515a96530c6bd6d2cdfb49011e5ddbe78f43bcfffbb8e7714e99bc491d0e2942ea959a9187f8b3e77c0ca5f530b3a42ffdc19306892
+  metadata.gz: f9e5f15259bbc612cc83d0060c1fab161bac69b86c4c4f14bcf4e0458f1d638091c5aff9baa3d02566aff46c7991c67043bf8c8bed35d67871220a135d439ad5
+  data.tar.gz: b0b3bc7f3b5c72006a1f5cd8d7cf3b55ff34061b2900572c7388f20a1f3019144dd1870eb1f3ec5ceff2979f46be30c2c8ec3a4b3451f1cafa9cb9a497cc9c64

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.12.15 (2023-02-06)
+
+Fixes:
+
+- Fixed an issue which made items always be considered outdated in sites with data sources with a custom `items_root` defined (#1640, #1644)
+
 ## 4.12.14 (2022-12-03)
 
 Fixes:

data/lib/nanoc/data_sources/filesystem/tools.rb

@@ -67,7 +67,7 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
               fn
             else
               all_files_in(absolute_target, extra_files, recursion_limit - 1).map do |sfn|
-                fn + sfn[absolute_target.size..-1]
+                fn + sfn[absolute_target.size..]
               end
             end
           end

data/lib/nanoc/data_sources/filesystem.rb

@@ -151,7 +151,7 @@ module Nanoc::DataSources
     end
 
     def read_proto_document(content_filename, meta_filename, klass)
-      is_binary = content_filename && !@site_config[:text_extensions].include?(File.extname(content_filename)[1..-1])
+      is_binary = content_filename && !@site_config[:text_extensions].include?(File.extname(content_filename)[1..])
 
       if is_binary && klass == Nanoc::Core::Item
         meta = (meta_filename && YAML.safe_load_file(meta_filename, permitted_classes: PERMITTED_YAML_CLASSES)) || {}
@@ -252,7 +252,7 @@ module Nanoc::DataSources
         filename: content_filename,
         content_filename: content_filename,
         meta_filename: meta_filename,
-        extension: content_filename ? ext_of(content_filename)[1..-1] : nil,
+        extension: content_filename ? ext_of(content_filename)[1..] : nil,
         mtime: mtime_of(content_filename, meta_filename),
       }
     end
@@ -263,9 +263,9 @@ module Nanoc::DataSources
 
     def identifier_for(content_filename, meta_filename, dir_name)
       if content_filename
-        identifier_for_filename(content_filename[dir_name.length..-1])
+        identifier_for_filename(content_filename[dir_name.length..])
       elsif meta_filename
-        identifier_for_filename(meta_filename[dir_name.length..-1])
+        identifier_for_filename(meta_filename[dir_name.length..])
       else
         raise 'meta_filename and content_filename are both nil'
       end
@@ -284,15 +284,11 @@ module Nanoc::DataSources
     def mtime_of(content_filename, meta_filename)
       meta_mtime = meta_filename ? File.stat(meta_filename).mtime : nil
       content_mtime = content_filename ? File.stat(content_filename).mtime : nil
-      if meta_mtime && content_mtime
-        meta_mtime > content_mtime ? meta_mtime : content_mtime
-      elsif meta_mtime
-        meta_mtime
-      elsif content_mtime
-        content_mtime
-      else
-        raise 'meta_mtime and content_mtime are both nil'
-      end
+
+      mtime = [meta_mtime, content_mtime].compact.max
+      raise 'meta_mtime and content_mtime are both nil' unless mtime
+
+      mtime
     end
 
     # e.g.
@@ -330,7 +326,7 @@ module Nanoc::DataSources
         all[basename][0] =
           meta_filenames[0] ? 'yaml' : nil
         all[basename][1] =
-          content_filenames.any? ? content_filenames.map { |fn| ext_of(fn)[1..-1] || '' } : [nil]
+          content_filenames.any? ? content_filenames.map { |fn| ext_of(fn)[1..] || '' } : [nil]
       end
 
       all

data/lib/nanoc/extra/link_collector.rb

@@ -50,7 +50,7 @@ module ::Nanoc::Extra
     def external_href?(href)
       return false if internal_href?(href)
 
-      href =~ %r{^(//|[a-z\-]+:)}
+      href =~ %r{^(//|[a-z-]+:)}
     end
 
     def internal_href?(href)

data/lib/nanoc/helpers/capturing.rb

@@ -75,7 +75,7 @@ module Nanoc::Helpers
 
         compiled_content_store = @config._context.compiled_content_store
         content = compiled_content_store.get(rep, "__capture_#{@name}".to_sym)
-        content ? content.string : nil
+        content&.string
       end
     end
 
@@ -155,7 +155,7 @@ module Nanoc::Helpers
       yield
 
       # Get new piece of erbout
-      erbout_addition = erbout[erbout_length..-1]
+      erbout_addition = erbout[erbout_length..]
 
       # Remove addition
       erbout[erbout_length..-1] = +''

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.12.14'
+  VERSION = '4.12.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.12.14
+  version: 4.12.15
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-03 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -64,28 +64,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.14
+        version: 4.12.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.14
+        version: 4.12.15
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.14
+        version: 4.12.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.14
+        version: 4.12.15
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.