nanoc 4.12.1 → 4.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e5fe63fbd9c83f6e9cda3917fee02b124812dab948dc0e08517bec14e209e5
-  data.tar.gz: 503710ac47ccea7c3a4c30c2bea8dd566598c5a4369f6412b087f04488d3e9fa
+  metadata.gz: 0e1fc36b38a9ca9529217edb459536688d3b29ff876c438806b83b4cf7f6f8b3
+  data.tar.gz: 528d649a25b7c8612ea168a70c36f68278a313d8ad5d82a22c4426fdd0f88d81
 SHA512:
-  metadata.gz: 89416645ab505a5d48e4a7ed5da24c62f9c69fde586c86a9ad8d01b0c8ee19c24e24c503124c5e943d2cd92587891e9c0a50ed7ba7d1f41d236517567c96710f
-  data.tar.gz: f571bb80982f05073f382d7b54b89c7a4e88054a0e92d0d7dcc56c3a0a9404ca80a6e31df0bbe2811a86341dc51c347e9d8de76d18096ed8c95aa2865537b180
+  metadata.gz: 9d815e3792672ae7d5cdddff184fa120616118b642674565b5194b826e93a05f70fc770ab9f99935b28934e66530899da424a6135e63ad19c171fddb13f97f52
+  data.tar.gz: d0a04cec9ae44a92f0de95ef4cc8647f40f3dfcdf6e09648ef100d71d3a1e51ab7413c7798019971eef9cdc92a5d6e59d95fa8904873d00a81e247f0e24d6882

data/NEWS.md

@@ -1,5 +1,41 @@
 # Nanoc news
 
+## 4.12.5 (2022-01-22)
+
+Fixes:
+
+- Prefer YAML.safe_load over YAML.load (#1566)
+
+Enhancements:
+
+- Added `Time` to the list of permitted classes for YAML (#1565) [Hideaki Nagamine]
+
+## 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:

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, Time].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.safe_load(data, permitted_classes: PERMITTED_YAML_CLASSES) || {}
       rescue => e
         raise Errors::UnparseableMetadata.new(filename, e)
       end

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.1'
+  VERSION = '4.12.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.12.1
+  version: 4.12.5
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -45,6 +45,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,34 +55,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: nanoc-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.1
+        version: 4.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.1
+        version: 4.12.5
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.1
+        version: 4.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.1
+        version: 4.12.5
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -227,7 +233,8 @@ files:
 homepage: https://nanoc.ws/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -236,14 +243,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.15
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.