nanoc 4.13.5 → 4.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87183d6afcb52a7a0772f5859b5fa1899122a6e8297f4e169b4b544e9ec6211d
-  data.tar.gz: f99716556f847c2e500bca8915446d1dbf470e63bca5229b94402b20b2563dd5
+  metadata.gz: 38ddec3156d6f59a3bb90d3507e79072fccba6a3bcbb29f801929b139601311e
+  data.tar.gz: fddbca13e0b5f6d0dc341897763f1c5ae833dedf3f59766133b6051a2c9c6696
 SHA512:
-  metadata.gz: a7589f3ed5f56ac6655ed563387a63138d9f548bb49ea9dcd873a69b8362fc18650ab0e2c2367c842236112c5f11ee3b8b66fafc324b275c1f2a3a909766332f
-  data.tar.gz: 981703fd7707a83303d9570e77265945522c4d75d02a2a7c41e4fe24643964f7e6dbc430a598d64dad4f945db92a11dc25bee69a3e6abd20c6a47103ea14643f
+  metadata.gz: 2e021cc1d5dea573bb62515faae428b74d91a402c2f42e404a0ae026cc7736e4c18ccf86d07bd8c8f6bcb8722b7f188ead9388c81d33e3322f21cc6138eb7bcb
+  data.tar.gz: 011630401f4a40142cba99cbed78b1b18daf0f61ae83e659b0c3e16ca3d3a6d5c05786bcf4807ed73a9979c0cb65239f06c776eb285adbb3131b11648e0763e5

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 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/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/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.13.5'
+  VERSION = '4.14.0'
 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.0
 platform: ruby
 authors:
 - Denis Defreyne
@@ -49,28 +49,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.5
+        version: 4.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.5
+        version: 4.14.0
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.5
+        version: 4.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.13.5
+        version: 4.14.0
 - !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.0/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: []