nanoc 4.14.5 → 4.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 144134bd424ad23220f0bc1527694345b207b175ec38fc884a88cd3906bdaff7
-  data.tar.gz: ca18d0a87e38c71c67659198ee673e0b625a700e8b781000ecf30a59c813feeb
+  metadata.gz: 381f9b78be0bd850ae42b2166d8d12c59d6dca22bdbbecc0638ef3e4569288aa
+  data.tar.gz: 89da1dea5adea2239cde2af78182f593b66e003bc170acb01b309d9ca9e36e5f
 SHA512:
-  metadata.gz: b449b2a07d814c92442810f7e0cba6493b33892804a53319087b4e8e7a4dda7f5942d4854b617db326c2a30870366738e5e4af618c2cce979f01e13c238c2333
-  data.tar.gz: 76515529e1500e63560e13e7b577130d7fda41da81aec542e131ceeb7ce72a37c872cbb3b52b3cb7ae8904b97317b28c1cc0dda4a43bc95552acb34d9657f07a
+  metadata.gz: '0910d3ef0fd6ba12e12cfb6c9feb554e414575898cc34392ad8f311df5d26de7b4f5b59164b79378a8d90e170371e461f8440ce5c9329959baecd6890621520a'
+  data.tar.gz: ea616d1d317bd5ee94693f9c1ffe4f5a469e15e586014f0981ab02205bc7adb957da60d6586d46f0f8b0c26dc17d869cab8c9e7fa91afdb67aef394637c26580

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.14.6 (2025-12-31)
+
+Enhancements:
+
+- Sped up incremental compilation (#1776)
+
 ## 4.14.5 (2025-11-30)
 
 Identical to 4.14.4 but with corrected release notes.

data/lib/nanoc/data_sources/filesystem.rb

@@ -302,7 +302,7 @@ module Nanoc::DataSources
 
       by_basename =
         all_files_in(dir_name)
-        .reject   { |fn| fn =~ /(~|\.orig|\.rej|\.bak)$/ }
+        .grep_v(/(~|\.orig|\.rej|\.bak)$/)
         .group_by { |fn| basename_of(fn) }
 
       all = {}
@@ -364,10 +364,10 @@ module Nanoc::DataSources
       end
 
       regex =
-        if /(^|\/)index(\.[^\/]+)?$/.match?(filename)
-          allow_periods_in_identifiers? ? /\/?(index)?(\.[^\/.]+)?$/ : /\/?index(\.[^\/]+)?$/
+        if %r{(^|/)index(\.[^/]+)?$}.match?(filename)
+          allow_periods_in_identifiers? ? %r{/?(index)?(\.[^/.]+)?$} : %r{/?index(\.[^/]+)?$}
         else
-          allow_periods_in_identifiers? ? /\.[^\/.]+$/ : /\.[^\/]+$/
+          allow_periods_in_identifiers? ? %r{\.[^/.]+$} : %r{\.[^/]+$}
         end
       Nanoc::Core::Identifier.new(filename.sub(regex, ''), type: :legacy)
     end
@@ -393,9 +393,9 @@ module Nanoc::DataSources
     # @return [Regex]
     def extension_regex
       if allow_periods_in_identifiers?
-        /(\.[^\/.]+$)/
+        %r{(\.[^/.]+$)}
       else
-        /(\.[^\/]+$)/
+        %r{(\.[^/]+$)}
       end
     end
 

data/lib/nanoc/filters/colorize_syntax.rb

@@ -56,9 +56,9 @@ module Nanoc::Filters
         has_class = true if language
       else
         # Get language from comment line
-        match = element.inner_text.strip.split[0].match(/^#!([^\/][^\n]*)$/)
+        match = element.inner_text.strip.split[0].match(%r{^#!([^/][^\n]*)$})
         language = match[1] if match
-        element.content = element.content.sub(/^#!([^\/][^\n]*)$\n/, '') if language
+        element.content = element.content.sub(%r{^#!([^/][^\n]*)$\n}, '') if language
       end
 
       language ? ExtractedLanguage.new(language, has_class) : nil

data/lib/nanoc/filters/kramdown.rb

@@ -20,7 +20,7 @@ module Nanoc::Filters
 
       if warning_filters
         r = Regexp.union(warning_filters)
-        warnings = document.warnings.reject { |warning| r =~ warning }
+        warnings = document.warnings.grep_v(r)
       else
         warnings = document.warnings
       end

data/lib/nanoc/filters/relativize_paths.rb

@@ -56,8 +56,8 @@ module Nanoc::Filters
         relativize_html_like(content, params)
       else
         raise 'The relativize_paths needs to know the type of content to ' \
-          'process. Pass a :type to the filter call (:html for HTML, ' \
-          ':xhtml for XHTML, :xml for XML, or :css for CSS).'
+              'process. Pass a :type to the filter call (:html for HTML, ' \
+              ':xhtml for XHTML, :xml for XML, or :css for CSS).'
       end
     end
 
@@ -65,7 +65,7 @@ module Nanoc::Filters
 
     def relativize_css(content, params)
       # FIXME: parse CSS the proper way using csspool or something
-      content.gsub(/url\((['"]?)(\/(?:[^\/].*?)?)\1\)/) do
+      content.gsub(%r{url\((['"]?)(/(?:[^/].*?)?)\1\)}) do
         quote = Regexp.last_match[1]
         path = Regexp.last_match[2]
 
@@ -84,7 +84,7 @@ module Nanoc::Filters
         when Regexp
           exclusion
         when String
-          /\A#{exclusion}(\z|\/)/
+          %r{\A#{exclusion}(\z|/)}
         end
       end
     end
@@ -193,7 +193,7 @@ module Nanoc::Filters
     end
 
     def nokogiri_process_comment(node, doc, selectors, namespaces, klass, type, params)
-      content = node.content.dup.sub(%r{^(\s*\[.+?\]>\s*)(.+?)(\s*<!\[endif\])}m) do |_m|
+      content = node.content.dup.sub(/^(\s*\[.+?\]>\s*)(.+?)(\s*<!\[endif\])/m) do |_m|
         beginning = Regexp.last_match[1]
         body = Regexp.last_match[2]
         ending = Regexp.last_match[3]
@@ -220,7 +220,7 @@ module Nanoc::Filters
 
       if parsed.is_a?(Array)
         parsed.map do |pair|
-          [relative_path_to(pair[:url]), pair[:rest]].join('')
+          [relative_path_to(pair[:url]), pair[:rest]].join
         end.join(',')
       else
         relative_path_to(parsed)
@@ -228,7 +228,7 @@ module Nanoc::Filters
     end
 
     def path_is_relativizable?(path, params)
-      path.match?(/\A\s*\//) && !exclude?(path, params)
+      path.match?(%r{\A\s*/}) && !exclude?(path, params)
     end
   end
 end

data/lib/nanoc/filters/sass.rb

@@ -39,10 +39,17 @@ module Nanoc::Filters
         sourcemap = sourcemap&.to_json(css_uri: css_path)
         encoded = "data:application/json;base64,#{Base64.urlsafe_encode64(sourcemap)}"
         [css.gsub(%r{^/\*#\s+sourceMappingURL=\s*#{sourcemap_path}\s*\*/$}, "/*# sourceMappingURL=#{encoded} */")]
-      else
-        sourcemap = sourcemap&.to_json(css_path:, sourcemap_path:, type: params[:sources_content] ? :inline : :auto)
-        sourcemap = sourcemap&.split("\n")&.reject { |l| l =~ /^\s*"file":\s*"#{filter.object_id}"\s*$/ }&.join("\n")
+      elsif sourcemap
+        sourcemap =
+          sourcemap
+          .to_json(css_path:, sourcemap_path:, type: params[:sources_content] ? :inline : :auto)
+          .split("\n")
+          .grep_v(/^\s*"file":\s*"#{filter.object_id}"\s*$/)
+          .join("\n")
         [css, sourcemap]
+      else
+        [css, nil]
+
       end
     end
   end

data/lib/nanoc/helpers/blogging.rb

@@ -241,7 +241,7 @@ module Nanoc::Helpers
         raise Nanoc::Core::TrivialError.new('Cannot build Atom feed: site configuration has no base_url')
       end
 
-      @item[:feed_url] || @config[:base_url] + @item.path
+      @item[:feed_url] || (@config[:base_url] + @item.path)
     end
 
     # @return [String]

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -112,7 +112,7 @@ module Nanoc::Helpers
       if @item.identifier.legacy?
         prefixes.map { |pr| @items[Nanoc::Core::Identifier.new('/' + pr, type: :legacy)] }
       else
-        ancestral_prefixes = prefixes.reject { |pr| pr =~ /^\/index\./ }[0..-2]
+        ancestral_prefixes = prefixes.grep_v(%r{^/index\.})[0..-2]
         ancestral_items =
           ancestral_prefixes.map do |pr|
             if pr == ''

data/lib/nanoc/helpers/capturing.rb

@@ -20,7 +20,7 @@ module Nanoc::Helpers
         content_string = capture(&)
 
         # Get existing contents and prep for store
-        compiled_content_store = @item._context.compiled_content_store
+        compiled_content_repo = @item._context.compiled_content_repo
         rep = @item.reps[:default]._unwrap
         capture_name = :"__capture_#{@name}"
         old_content_string =
@@ -28,10 +28,10 @@ module Nanoc::Helpers
           when :overwrite
             ''
           when :append
-            c = compiled_content_store.get(rep, capture_name)
+            c = compiled_content_repo.get(rep, capture_name)
             c ? c.string : ''
           when :error
-            contents = compiled_content_store.get(rep, capture_name)
+            contents = compiled_content_repo.get(rep, capture_name)
             if contents && contents.string != content_string
               # FIXME: get proper exception
               raise "a capture named #{@name.inspect} for #{@item.identifier} already exists"
@@ -40,12 +40,12 @@ module Nanoc::Helpers
             end
           else
             raise ArgumentError, 'expected :existing_behavior param to #content_for to be one of ' \
-              ":overwrite, :append, or :error, but #{existing_behavior.inspect} was given"
+                                 ":overwrite, :append, or :error, but #{existing_behavior.inspect} was given"
           end
 
         # Store
         new_content = Nanoc::Core::TextualContent.new(old_content_string + content_string)
-        compiled_content_store.set(rep, capture_name, new_content)
+        compiled_content_repo.set(rep, capture_name, new_content)
       end
     end
 
@@ -59,21 +59,28 @@ module Nanoc::Helpers
       end
 
       def run
-        rep = @requested_item.reps[:default]._unwrap
+        rep_view = @requested_item.reps[:default]
+        rep = rep_view._unwrap
 
         # Create dependency
         if @item.nil? || @requested_item != @item._unwrap
           dependency_tracker = @config._context.dependency_tracker
           dependency_tracker.bounce(@requested_item._unwrap, compiled_content: true)
 
+          unless rep.compiled?
+            rep_view._try_load_from_cache
+          end
+
+          # If the item rep still isn’t compiled by now, then it can’t be loaded
+          # from the cache and needs to compiled as usual.
           unless rep.compiled?
             # FIXME: is :last appropriate?
             raise Nanoc::Core::Errors::UnmetDependency.new(rep, :last)
           end
         end
 
-        compiled_content_store = @config._context.compiled_content_store
-        content = compiled_content_store.get(rep, :"__capture_#{@name}")
+        compiled_content_repo = @config._context.compiled_content_repo
+        content = compiled_content_repo.get(rep, :"__capture_#{@name}")
         content&.string
       end
     end
@@ -112,7 +119,7 @@ module Nanoc::Helpers
             args[1]
           else
             raise ArgumentError, 'expected 1 or 2 argument (the name ' \
-              "of the capture, and optionally params) but got #{args.size} instead"
+                                 "of the capture, and optionally params) but got #{args.size} instead"
           end
 
         SetContent.new(name, params, @item).run(&)
@@ -127,7 +134,7 @@ module Nanoc::Helpers
             args[1]
           else
             raise ArgumentError, 'expected 2 or 3 arguments (the name ' \
-              "of the capture, optionally params, and the content) but got #{args.size} instead"
+                                 "of the capture, optionally params, and the content) but got #{args.size} instead"
           end
 
         _erbout = +'' # rubocop:disable Lint/UnderscorePrefixedVariableName
@@ -135,7 +142,7 @@ module Nanoc::Helpers
       else # Get content
         if args.size != 2
           raise ArgumentError, 'expected 2 arguments (the item ' \
-            "and the name of the capture) but got #{args.size} instead"
+                               "and the name of the capture) but got #{args.size} instead"
         end
         requested_item = args[0]
         name = args[1]

data/lib/nanoc/helpers/child_parent.rb

@@ -7,7 +7,7 @@ module Nanoc::Helpers
       if item.identifier.legacy?
         item.parent
       else
-        path_without_last_component = item.identifier.to_s.sub(/[^\/]+$/, '').chop
+        path_without_last_component = item.identifier.to_s.sub(%r{[^/]+$}, '').chop
         @items[path_without_last_component + '.*']
       end
     end

data/lib/nanoc/helpers/html_escape.rb

@@ -21,7 +21,7 @@ module Nanoc::Helpers
       elsif string
         unless string.is_a? String
           raise ArgumentError, 'The #html_escape or #h function needs either a ' \
-            "string or a block to HTML-escape, but #{string.class} was given"
+                               "string or a block to HTML-escape, but #{string.class} was given"
         end
 
         string
@@ -32,7 +32,7 @@ module Nanoc::Helpers
           .gsub("'", ''')
       else
         raise 'The #html_escape or #h function needs either a ' \
-          'string or a block to HTML-escape, but neither a string nor a block was given'
+              'string or a block to HTML-escape, but neither a string nor a block was given'
       end
     end
 

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -65,7 +65,7 @@ module Nanoc::RuleDSL
           items: site.items,
           dependency_tracker:,
           compilation_context: compiler.compilation_context(reps:),
-          compiled_content_store: Nanoc::Core::CompiledContentStore.new,
+          compiled_content_repo: Nanoc::Core::CompiledContentRepo.new,
         )
       ctx = new_postprocessor_context(site, view_context)
 

data/lib/nanoc/rule_dsl/compiler_dsl.rb

@@ -32,7 +32,7 @@ module Nanoc::RuleDSL
     def preprocess(&block)
       if @rules_collection.preprocessors[rules_filename]
         warn 'WARNING: A preprocess block is already defined. Defining ' \
-          'another preprocess block overrides the previously one.'
+             'another preprocess block overrides the previously one.'
       end
       @rules_collection.preprocessors[rules_filename] = block
     end
@@ -245,7 +245,7 @@ module Nanoc::RuleDSL
     def postprocess(&block)
       if @rules_collection.postprocessors[rules_filename]
         warn 'WARNING: A postprocess block is already defined. Defining ' \
-          'another postprocess block overrides the previously one.'
+             'another postprocess block overrides the previously one.'
       end
       @rules_collection.postprocessors[rules_filename] = block
     end

data/lib/nanoc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.14.5
+  version: 4.14.6
 platform: ruby
 authors:
 - Denis Defreyne
@@ -49,28 +49,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.5
+        version: 4.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.5
+        version: 4.14.6
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.5
+        version: 4.14.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.14.5
+        version: 4.14.6
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/nanoc/nanoc/tree/4.14.5/nanoc
+  source_code_uri: https://github.com/nanoc/nanoc/tree/4.14.6/nanoc
 rdoc_options: []
 require_paths:
 - lib
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.
 test_files: []