nanoc 4.13.5 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87183d6afcb52a7a0772f5859b5fa1899122a6e8297f4e169b4b544e9ec6211d
-  data.tar.gz: f99716556f847c2e500bca8915446d1dbf470e63bca5229b94402b20b2563dd5
+  metadata.gz: 923381ebbdbafb7b60b0aa640c118e6983a59113b9e50836459684a31cbb101f
+  data.tar.gz: 7abde9f5c334c6a0a267d2ce5740f77c7f1c81cb53b0198ba123f944ee043352
 SHA512:
-  metadata.gz: a7589f3ed5f56ac6655ed563387a63138d9f548bb49ea9dcd873a69b8362fc18650ab0e2c2367c842236112c5f11ee3b8b66fafc324b275c1f2a3a909766332f
-  data.tar.gz: 981703fd7707a83303d9570e77265945522c4d75d02a2a7c41e4fe24643964f7e6dbc430a598d64dad4f945db92a11dc25bee69a3e6abd20c6a47103ea14643f
+  metadata.gz: e55e39e90ed7b02a65d3beb3c4b5e4d6ad5eb5698a5535411406d405759665f7ec452556b3e074f37303ac74f1b4f56e5951ad6ef802961bb969cacf8492f12e
+  data.tar.gz: 24d045ab848d41bcbba99dcbea0fc140659a2b938d6bea57c1c60267bc4ef31a86c827b6331fc0bd34c1eed5f8747bb25edffc801b9ac980b1a5661dbd7caf1e

data/NEWS.md

@@ -1,5 +1,22 @@
 # Nanoc news
 
+## 4.14.1 (2025-10-30)
+
+Fixes:
+
+- Fixed issue which would cause timings reported `--verbose --verbose` to be inaccurate (#1760, #1761)
+
+Enhancements:
+
+- Improved ERB filter performance through memoization (#1762)
+- Improved performance (#1759, #1758, #1761)
+
+## 4.14.0 (2025-10-18)
+
+Features:
+
+- Added support for TOML in frontmatter (with `+++` separators rather than `---`) and in the configuration file (`nanoc.toml`) (#1757)
+
 ## 4.13.5 (2025-04-21)
 
 Fixes:

data/bin/nanoc

@@ -2,13 +2,6 @@
 # frozen_string_literal: true
 
 require 'nanoc'
-
-begin
-  require 'nanoc-rust'
-  NanocRust.activate!
-rescue LoadError
-end
-
 require 'nanoc/orig_cli'
 
 if File.file?('Gemfile') && !defined?(Bundler)

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

@@ -3,7 +3,7 @@
 # @api private
 class Nanoc::DataSources::Filesystem
   class Parser
-    SEPARATOR = /(-{5}|-{3})/.source
+    SEPARATOR = /(-{5}|-{3}|\+{3})/.source
 
     class ParseResult
       attr_reader :content
@@ -34,7 +34,7 @@ class Nanoc::DataSources::Filesystem
     def parse_with_separate_meta_filename(content_filename, meta_filename)
       content = content_filename ? Tools.read_file(content_filename, config: @config) : ''
       meta_raw = Tools.read_file(meta_filename, config: @config)
-      meta = parse_metadata(meta_raw, meta_filename)
+      meta = parse_metadata(meta_raw, meta_filename, :yaml)
       ParseResult.new(content:, attributes: meta, attributes_data: meta_raw)
     end
 
@@ -42,28 +42,39 @@ class Nanoc::DataSources::Filesystem
     def parse_with_frontmatter(content_filename)
       data = Tools.read_file(content_filename, config: @config)
 
-      unless /\A#{SEPARATOR}\s*$/.match?(data)
+      separator = /\A#{SEPARATOR}\s*$/.match(data)
+      unless separator
         return ParseResult.new(content: data, attributes: {}, attributes_data: '')
       end
 
+      frontmatter_language =
+        case separator[1]
+        when '+++'
+          :toml
+        else
+          :yaml
+        end
+
       pieces = data.split(/^#{SEPARATOR}[ \t]*\r?\n?/, 3)
       if pieces.size < 4
         raise Errors::InvalidFormat.new(content_filename)
       end
 
-      meta = parse_metadata(pieces[2], content_filename)
+      meta = parse_metadata(pieces[2], content_filename, frontmatter_language)
       content = pieces[4].sub(/\A\n/, '')
 
       ParseResult.new(content:, attributes: meta, attributes_data: pieces[2])
     end
 
     # @return [Hash]
-    def parse_metadata(data, filename)
-      begin
-        meta = Nanoc::Core::YamlLoader.load(data) || {}
-      rescue => e
-        raise Errors::UnparseableMetadata.new(filename, e)
-      end
+    def parse_metadata(data, filename, frontmatter_language)
+      loader = Nanoc::Core::StructuredDataLoader.for_language(frontmatter_language)
+      meta =
+        begin
+          loader.load(data) || {}
+        rescue => e
+          raise Errors::UnparseableMetadata.new(filename, e)
+        end
 
       verify_meta(meta, filename)
 

data/lib/nanoc/data_sources/filesystem.rb

@@ -152,6 +152,7 @@ module Nanoc::DataSources
       is_binary = content_filename && !@site_config[:text_extensions].include?(File.extname(content_filename)[1..])
 
       if is_binary && klass == Nanoc::Core::Item
+        # NOTE: TOML support is explicitly not added here, in case there are existing sites with `.toml` files.
         meta = (meta_filename && Nanoc::Core::YamlLoader.load_file(meta_filename)) || {}
 
         ProtoDocument.new(is_binary: true, filename: content_filename, attributes: meta)

data/lib/nanoc/filters/erb.rb

@@ -7,6 +7,12 @@ module Nanoc::Filters
 
     requires 'erb'
 
+    class << self
+      attr_accessor :_erb_cache
+    end
+
+    self._erb_cache = {}
+
     # Runs the content through [ERB](http://ruby-doc.org/stdlib/libdoc/erb/rdoc/classes/ERB.html).
     #
     # @param [String] content The content to filter
@@ -27,9 +33,19 @@ module Nanoc::Filters
 
       # Get result
       trim_mode = params[:trim_mode]
-      erb = ::ERB.new(content, trim_mode:)
-      erb.filename = filename
-      erb.result(assigns_binding)
+      erb_for(content, trim_mode:).result(assigns_binding)
+    end
+
+    private
+
+    def erb_for(content, trim_mode:)
+      cache_key = [content, trim_mode]
+      self.class._erb_cache.fetch(cache_key) do
+        erb = ::ERB.new(content, trim_mode:)
+        erb.filename = filename
+        self.class._erb_cache[cache_key] = erb
+        erb
+      end
     end
   end
 end

data/lib/nanoc/filters/less.rb

@@ -21,10 +21,8 @@ module Nanoc::Filters
 
       # Add filename to load path
       paths = [File.dirname(@item[:content_filename])]
-      on_main_fiber do
-        parser = ::Less::Parser.new(paths:)
-        parser.parse(content).to_css(params)
-      end
+      parser = ::Less::Parser.new(paths:)
+      parser.parse(content).to_css(params)
     end
 
     def imported_filenames_from(content)

data/lib/nanoc/filters/sass.rb

@@ -51,6 +51,7 @@ module Nanoc::Filters
     identifier :sass
 
     include SassCommon
+
     requires(*SassCommon::REQUIRES)
 
     def run(content, params = {})
@@ -62,6 +63,7 @@ module Nanoc::Filters
     identifier :sass_sourcemap
 
     include SassCommon
+
     requires(*SassCommon::REQUIRES)
 
     def run(content, params = {})

data/lib/nanoc/helpers/capturing.rb

@@ -68,8 +68,7 @@ module Nanoc::Helpers
 
           unless rep.compiled?
             # FIXME: is :last appropriate?
-            Fiber.yield(Nanoc::Core::Errors::UnmetDependency.new(rep, :last))
-            return run
+            raise Nanoc::Core::Errors::UnmetDependency.new(rep, :last)
           end
         end
 

data/lib/nanoc/version.rb

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

data/lib/nanoc.rb

@@ -20,7 +20,6 @@ require 'net/http'
 require 'net/https'
 require 'open3'
 require 'pathname'
-require 'set'
 require 'singleton'
 require 'stringio'
 require 'tempfile'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.13.5
+  version: 4.14.1
 platform: ruby
 authors:
 - Denis Defreyne
@@ -49,28 +49,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.5
+        version: 4.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.5
+        version: 4.14.1
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.5
+        version: 4.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.5
+        version: 4.14.1
 - !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.13.5/nanoc
+  source_code_uri: https://github.com/nanoc/nanoc/tree/4.14.1/nanoc
 rdoc_options: []
 require_paths:
 - lib
@@ -226,14 +226,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.2
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.
 test_files: []