nanoc 4.12.0 → 4.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12faf42299a1114ebaadbce4c04d117a0f761ec1318e97f1e8d60bde5aa344e
-  data.tar.gz: d5752906600af435f07b247b8db87c07dfeea5660f3060e88d079ed5fd3af115
+  metadata.gz: 437153302bf3976f9e3187df89dec7ef4da2f63a4bafe681adefbe348a06d31d
+  data.tar.gz: 40b66e18acae6aeb83de12c47f9672aac6c2135e536b74f0a06c8fa73acf95f3
 SHA512:
-  metadata.gz: 41cd7d78a20514fe699464378198b959d6583373104c1bf363881eb0507a445170a76b31db1b01acafc0a7878a9c22ee0b50ed3b18d5ced049e24b43c187d603
-  data.tar.gz: 54f9cb7d4b5b0bf0ab2426a48ff3cbce61b2f7823790aafd5397388fb5f0c4a7d9052ba9f9489b927782cb3812d8fa2e6503401692a1544cd86fff85cc54e471
+  metadata.gz: 1210addd31a8f1e795d67bc8371e97f594cb6950374514f1e7a641635816c1923468588e2d63b26f86c12c537bc4b3b4ecee01694acc99f403b787c606518d8a
+  data.tar.gz: 3e1ab8785fffb97d55274196e509aaf1dceda6e080b852e639316eb0fc5e9f86dcbf243bda070dc478452e46fd4a6c70af9e42d36c095cc0570a61a07d5eeec6

data/NEWS.md

@@ -1,5 +1,37 @@
 # Nanoc news
 
+## 4.12.4 (2022-01-15)
+
+Fixes:
+
+- Fixed “can’t be called from trap context” exception (#1559, #1564)
+
+Enhancements:
+
+- Added `Date` to the list of permitted classes for YAML (#1560) [Damien Mathieu]
+- Made Nanoc log the filename when it is not absolute (#1557) [Johnny Willemsen]
+
+## 4.12.3 (2021-10-09)
+
+Fixes:
+
+- Switched ERB to use keyword arguments (#1547, #1550) [Daniel Aleksandersen]
+- Removed use_helper re-definition warning (#1548, #1553) [Daniel Aleksandersen]
+- Fixed issue which could cause items not to be recalculated when removing items in the preprocess block (#1554, #1555)
+- Dropped Nokogumbo in favor of Nokogiri (#1546, #1549) [Daniel Aleksandersen]
+
+## 4.12.2 (2021-05-28)
+
+Enhancements:
+
+- Add support for `video/@poster` to relativize_paths (#1544) [Masayuki Higashino]
+
+## 4.12.1 (2021-04-05)
+
+Enhancements:
+
+- Made Nanoc expand paths containing `~` (home directory) in the filesystem data source configuration (!4, !5, !6)
+
 ## 4.12.0 (2021-02-20)
 
 Features:

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

@@ -4,6 +4,7 @@
 class Nanoc::DataSources::Filesystem
   class Parser
     SEPARATOR = /(-{5}|-{3})/.source
+    PERMITTED_YAML_CLASSES = [Symbol, Date].freeze
 
     class ParseResult
       attr_reader :content
@@ -60,7 +61,7 @@ class Nanoc::DataSources::Filesystem
     # @return [Hash]
     def parse_metadata(data, filename)
       begin
-        meta = YAML.load(data) || {}
+        meta = YAML.load(data, permitted_classes: PERMITTED_YAML_CLASSES) || {}
       rescue => e
         raise Errors::UnparseableMetadata.new(filename, e)
       end

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

@@ -81,6 +81,15 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
       end.compact.flatten
     end
 
+    # Expands the path (including resolving ~ for home directory) and returns
+    # a relative path to the expanded path.
+    def expand_and_relativize_path(path)
+      from = Pathname.new(Dir.getwd)
+      to = Pathname.new(File.expand_path(path))
+
+      to.relative_path_from(from).to_s
+    end
+
     # Returns all files and directories in the given directory and
     # directories below it.
     #

data/lib/nanoc/data_sources/filesystem.rb

@@ -92,14 +92,16 @@ module Nanoc::DataSources
       require 'listen'
 
       Nanoc::Core::ChangesStream.new do |cl|
-        listener =
-          Listen.to(dir) do |_modifieds, _addeds, _deleteds|
-            cl.unknown
-          end
+        if dir
+          listener =
+            Listen.to(File.expand_path(dir)) do |_modifieds, _addeds, _deleteds|
+              cl.unknown
+            end
 
-        listener.start
+          listener.start
 
-        cl.to_stop { listener.stop }
+          cl.to_stop { listener.stop }
+        end
 
         sleep
       end
@@ -182,6 +184,8 @@ module Nanoc::DataSources
 
       return [] if dir_name.nil?
 
+      dir_name = Tools.expand_and_relativize_path(dir_name)
+
       each_content_meta_pair_in(dir_name) do |content_filename, meta_filename|
         proto_doc = read_proto_document(content_filename, meta_filename, klass)
 
@@ -295,6 +299,8 @@ module Nanoc::DataSources
     #     'content/qux' => [ nil,    ['html']       ]
     #   }
     def all_split_files_in(dir_name)
+      dir_name = Tools.expand_and_relativize_path(dir_name)
+
       by_basename =
         all_files_in(dir_name)
         .reject   { |fn| fn =~ /(~|\.orig|\.rej|\.bak)$/ }

data/lib/nanoc/filters/colorize_syntax.rb

@@ -80,7 +80,7 @@ module Nanoc::Filters
         require 'nokogiri'
         Nokogiri::HTML
       when :html5
-        require 'nokogumbo'
+        require 'nokogiri'
         Nokogiri::HTML5
       when :xml, :xhtml
         require 'nokogiri'

data/lib/nanoc/filters/erb.rb

@@ -27,7 +27,7 @@ module Nanoc::Filters
 
       # Get result
       trim_mode = params[:trim_mode]
-      erb = ::ERB.new(content, nil, trim_mode)
+      erb = ::ERB.new(content, trim_mode: trim_mode)
       erb.filename = filename
       erb.result(assigns_binding)
     end

data/lib/nanoc/filters/relativize_paths.rb

@@ -8,13 +8,14 @@ module Nanoc::Filters
     require 'nanoc/helpers/link_to'
     include Nanoc::Helpers::LinkTo
 
-    DDMemoize.activate(self)
+    prepend MemoWise
 
     SELECTORS =
       [
         '*/@href',
         '*/@src',
         'object/@data',
+        'video/@poster',
         'param[@name="movie"]/@value',
         'form/@action',
         'comment()',
@@ -78,7 +79,7 @@ module Nanoc::Filters
       end
     end
 
-    memoized def excludes(params)
+    def excludes(params)
       raw = [params.fetch(:exclude, [])].flatten
       raw.map do |exclusion|
         case exclusion
@@ -89,6 +90,7 @@ module Nanoc::Filters
         end
       end
     end
+    memo_wise :excludes
 
     def exclude?(path, params)
       # TODO: Use #match? on newer Ruby versions
@@ -113,7 +115,7 @@ module Nanoc::Filters
         require 'nokogiri'
         ::Nokogiri::HTML
       when :html5
-        require 'nokogumbo'
+        require 'nokogiri'
         ::Nokogiri::HTML5
       when :xml
         require 'nokogiri'

data/lib/nanoc/rule_dsl/action_sequence_calculator.rb

@@ -2,8 +2,6 @@
 
 module Nanoc::RuleDSL
   class ActionSequenceCalculator
-    DDMemoize.activate(self)
-
     class UnsupportedObjectTypeException < ::Nanoc::Error
       def initialize(obj)
         super("Do not know how to calculate the action sequence for #{obj.inspect}")

data/lib/nanoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.12.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2022-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.4
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.4
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +227,8 @@ files:
 homepage: https://nanoc.ws/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -236,14 +237,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.