nanoc-core 4.12.6 → 4.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49707fbc3c897e11757663c5d79f8b75349b34ac7e110f2609b59c080214b20
-  data.tar.gz: d2b88897dd12e0d4cbedbde6a8fde5bcf61613adceb7214589d6f7b3d8fa90fc
+  metadata.gz: 1fb5a347a2a973a7c42b1f85746b5267b43c588bf627c4f813c09c3a23b8e7eb
+  data.tar.gz: f03ba79aea51348eca0a83c80e3bef8a5853da59981205939b7d417588dd3678
 SHA512:
-  metadata.gz: e9c958ab4f52a499a95d483dbea86b8e1e2a0fbe41cddd29a46b13b3dd5c2d95924df6b216798c43cf9565be67084ce4cba19da33ffc7f022b61250f839f1141
-  data.tar.gz: 1679adcebcdc5380ceac677ad11460db995cd5b8c0491cb484b69c9ae0b6e98aa1a06fb87f662a6653641020120fde2288c8e75e3f94632b422b0d4858d906ef
+  metadata.gz: '0211852d5d7069d0dec63609db20a2cf533ba167e71ab08e195e333abea2cb17ecce34b05c4c65cd0be84c1726389caae8f02313188641a980e1aa6622f47619'
+  data.tar.gz: d3f7d023ce5855b2e2b67c2e49132b60aaec1f8cc71bf7163b2d1a2492304fccf932a2252e0ea1546c4694a83168395195dae444c530ad641c37d5f45e0a9673

data/lib/nanoc/core/action_sequence.rb

@@ -46,16 +46,16 @@ module Nanoc
       end
 
       # contract C::Func[Nanoc::Core::ProcessingAction => C::Any] => self
-      def each
-        @actions.each { |a| yield(a) }
+      def each(&block)
+        @actions.each(&block)
         self
       end
 
       # contract C::Func[Nanoc::Core::ProcessingAction => C::Any] => self
-      def map
+      def map(&block)
         self.class.new(
           @item_rep,
-          actions: @actions.map { |a| yield(a) },
+          actions: @actions.map(&block),
         )
       end
     end

data/lib/nanoc/core/basic_item_rep_view.rb

@@ -33,7 +33,7 @@ module Nanoc
 
       # @see Object#hash
       def hash
-        self.class.hash ^ item.identifier.hash ^ name.hash
+        [self.class, item.identifier, name].hash
       end
 
       # @return [Symbol]

data/lib/nanoc/core/changes_stream.rb

@@ -38,16 +38,16 @@ module Nanoc
         @listener&.to_stop&.call
       end
 
-      def map
-        self.class.new(enum: @enum.map { |e| yield(e) })
+      def map(&block)
+        self.class.new(enum: @enum.map(&block))
       end
 
       def to_enum
         @enum
       end
 
-      def each
-        @enum.each { |e| yield(e) }
+      def each(&block)
+        @enum.each(&block)
         nil
       end
     end

data/lib/nanoc/core/compilation_phases/resume.rb

@@ -10,8 +10,8 @@ module Nanoc
         DONE = Object.new
 
         contract Nanoc::Core::ItemRep, C::KeywordArgs[is_outdated: C::Bool], C::Func[C::None => C::Any] => C::Any
-        def run(rep, is_outdated:)
-          fiber = fiber_for(rep, is_outdated: is_outdated) { yield }
+        def run(rep, is_outdated:, &block)
+          fiber = fiber_for(rep, is_outdated: is_outdated, &block)
           while fiber.alive?
             res = fiber.resume
 

data/lib/nanoc/core/compilation_stages/compile_reps.rb

@@ -84,11 +84,9 @@ module Nanoc
             outdatedness_store: @outdatedness_store,
           )
 
-          notify_phrase = Nanoc::Core::CompilationPhases::Notify.new(
+          Nanoc::Core::CompilationPhases::Notify.new(
             wrapped: mark_done_phase,
           )
-
-          notify_phrase
         end
       end
     end

data/lib/nanoc/core/config_loader.rb

@@ -4,6 +4,8 @@ module Nanoc
   module Core
     # @api private
     class ConfigLoader
+      PERMITTED_YAML_CLASSES = [Symbol, Date, Time].freeze
+
       class NoConfigFileFoundError < ::Nanoc::Core::Error
         def initialize
           super('No configuration file found')
@@ -54,7 +56,7 @@ module Nanoc
       end
 
       def load_file(filename)
-        YAML.load_file(filename)
+        YAML.safe_load_file(filename, permitted_classes: PERMITTED_YAML_CLASSES)
       end
 
       # @api private

data/lib/nanoc/core/configuration.rb

@@ -45,7 +45,7 @@ module Nanoc
       NANOC_ENV_DEFAULT = 'default'
 
       contract C::KeywordArgs[hash: C::Optional[Hash], env_name: C::Maybe[String], dir: C::AbsolutePathString] => C::Any
-      def initialize(hash: {}, dir:, env_name: nil)
+      def initialize(dir:, hash: {}, env_name: nil)
         @env_name = env_name
         @wrapped = hash.__nanoc_symbolize_keys_recursively
         @dir = dir
@@ -136,8 +136,8 @@ module Nanoc
       end
 
       contract C::Func[C::Any, C::Any => C::Any] => self
-      def each
-        @wrapped.each { |k, v| yield(k, v) }
+      def each(&block)
+        @wrapped.each(&block)
         self
       end
 

data/lib/nanoc/core/contracts_support.rb

@@ -6,7 +6,7 @@ module Nanoc
       class Ignorer
         include Singleton
 
-        def method_missing(*_args) # rubocop:disable Style/MethodMissingSuper
+        def method_missing(*_args)
           self
         end
 

data/lib/nanoc/core/document.rb

@@ -107,7 +107,7 @@ module Nanoc
 
       contract C::None => C::Num
       def hash
-        self.class.hash ^ identifier.hash
+        [self.class, identifier].hash
       end
 
       contract C::Any => C::Bool

data/lib/nanoc/core/document_view_mixin.rb

@@ -26,7 +26,7 @@ module Nanoc
 
       # @see Object#hash
       def hash
-        self.class.hash ^ identifier.hash
+        [self.class, identifier].hash
       end
 
       # @return [Nanoc::Core::Identifier]

data/lib/nanoc/core/identifier.rb

@@ -88,7 +88,7 @@ module Nanoc
 
       contract C::None => C::Num
       def hash
-        self.class.hash ^ to_s.hash
+        [self.class, to_s].hash
       end
 
       contract C::Any => C::Maybe[C::Num]
@@ -149,10 +149,10 @@ module Nanoc
 
         extname = File.extname(@string)
 
-        if !extname.empty?
-          @string[0..-extname.size - 1]
-        else
+        if extname.empty?
           @string
+        else
+          @string[0..-extname.size - 1]
         end
       end
 
@@ -171,10 +171,10 @@ module Nanoc
       # The identifier, as string, with all extensions removed
       def without_exts
         extname = exts.join('.')
-        if !extname.empty?
-          @string[0..-extname.size - 2]
-        else
+        if extname.empty?
           @string
+        else
+          @string[0..-extname.size - 2]
         end
       end
 

data/lib/nanoc/core/outdatedness_checker.rb

@@ -80,15 +80,15 @@ module Nanoc
         # contract C::ArrayOf[Class], C_OBJ_MAYBE_REP, Nanoc::Core::OutdatednessStatus => C::Maybe[Nanoc::Core::OutdatednessStatus]
         def apply_rules(rules, obj, status = Nanoc::Core::OutdatednessStatus.new)
           rules.inject(status) do |acc, rule|
-            if !acc.useful_to_apply?(rule)
-              acc
-            else
+            if acc.useful_to_apply?(rule)
               reason = rule.instance.call(obj, @outdatedness_checker)
               if reason
                 acc.update(reason)
               else
                 acc
               end
+            else
+              acc
             end
           end
         end

data/lib/nanoc/core/processing_actions/filter.rb

@@ -26,7 +26,7 @@ module Nanoc
         end
 
         def hash
-          self.class.hash ^ filter_name.hash ^ params.hash
+          [self.class, filter_name, params].hash
         end
 
         def ==(other)

data/lib/nanoc/core/processing_actions/layout.rb

@@ -24,7 +24,7 @@ module Nanoc
         end
 
         def hash
-          self.class.hash ^ layout_identifier.hash ^ params.hash
+          [self.class, layout_identifier, params].hash
         end
 
         def ==(other)

data/lib/nanoc/core/processing_actions/snapshot.rb

@@ -34,7 +34,7 @@ module Nanoc
         end
 
         def hash
-          self.class.hash ^ snapshot_names.hash ^ paths.hash
+          [self.class, snapshot_names, paths].hash
         end
 
         def ==(other)

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.6'
+    VERSION = '4.12.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.6
+  version: 4.12.7
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: slow_enumerator_tools
   requirement: !ruby/object:Gem::Requirement
@@ -294,14 +308,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: Core of Nanoc