nanoc 4.12.3 → 4.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f2b5030c2fc46edeec3c725dfa6264fa32f7afa58531960e355479bbef66821
-  data.tar.gz: 25f70a7eb276e2cf83e984c43d69b3f622298ddf82755f4388671f028a6937e9
+  metadata.gz: 7930f72e16665dbb7ec96deb6430f004a6c67fc948809ee464786910138aa702
+  data.tar.gz: dd34cd1ee0145b4308351885bda5d5a7b9d7b81025d76e0c253e7577e2baf2d4
 SHA512:
-  metadata.gz: 35a0eae0e232086859c07bc620f53d4478558252dd290f2f19d54abbb76f9e3a839af9eb36e1c107ec78bac643e511cab1693d3f98078a063a7c500841ea5a6b
-  data.tar.gz: 88ae09d525cd7a475cc36c48dbfdcba9dfbefafe33e400795cbcbaa17c0dc140447aba434b83c37a0394243856c2a451053f54dcd646cbbf616f9e746f15cffc
+  metadata.gz: 327c9540056f40e9bf62b2f8fab40eb6d0b28c21b255f38350fefc8132732249289368a88aa98c7871298f58c7b289c7fe0cb29413108b2d3f20151adc0f9309
+  data.tar.gz: 05a90540eb2bda0268bb00d82fde2d498e8eb60be6640c19d9ae77a3a630d22ecd7788f80862032b8088aee361766036b6fac9e3690a8aeb56f26e7eb3c07543

data/NEWS.md

@@ -1,5 +1,34 @@
 # Nanoc news
 
+## 4.12.6 (2022-05-28)
+
+Fixes:
+
+- Fixed a crash in `nanc view` when a TUN device is present (#1567) [Sergio Durigan Junior]
+- Fixed a crash when content/ has non-writable binary files (#1576)
+- Fixed inconsistency in allowed YAML classes in metadata (#1574) [Daniel Aleksandersen]
+
+## 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:

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/data_sources/filesystem.rb

@@ -150,7 +150,7 @@ module Nanoc::DataSources
       is_binary = content_filename && !@site_config[:text_extensions].include?(File.extname(content_filename)[1..-1])
 
       if is_binary && klass == Nanoc::Core::Item
-        meta = (meta_filename && YAML.load_file(meta_filename)) || {}
+        meta = (meta_filename && YAML.load_file(meta_filename, permitted_classes: Parser::PERMITTED_YAML_CLASSES)) || {}
 
         ProtoDocument.new(is_binary: true, filename: content_filename, attributes: meta)
       elsif is_binary && klass == Nanoc::Core::Layout

data/lib/nanoc/filters/relativize_paths.rb

@@ -8,7 +8,7 @@ module Nanoc::Filters
     require 'nanoc/helpers/link_to'
     include Nanoc::Helpers::LinkTo
 
-    DDMemoize.activate(self)
+    prepend MemoWise
 
     SELECTORS =
       [
@@ -79,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
@@ -90,6 +90,7 @@ module Nanoc::Filters
         end
       end
     end
+    memo_wise :excludes
 
     def exclude?(path, params)
       # TODO: Use #match? on newer Ruby versions

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.3'
+  VERSION = '4.12.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.12.3
+  version: 4.12.6
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-09 00:00:00.000000000 Z
+date: 2022-05-28 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.3
+        version: 4.12.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.3
+        version: 4.12.6
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.3
+        version: 4.12.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.3
+        version: 4.12.6
 - !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:
@@ -243,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.28
+rubygems_version: 3.3.14
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.