nanoc-core 4.12.6 → 4.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49707fbc3c897e11757663c5d79f8b75349b34ac7e110f2609b59c080214b20
-  data.tar.gz: d2b88897dd12e0d4cbedbde6a8fde5bcf61613adceb7214589d6f7b3d8fa90fc
+  metadata.gz: a29a2064140d04c44df1122dc537ca800a3ed7c20bfb740c4009f3b976067ebb
+  data.tar.gz: 6fc3869373babe4c16671b15747d0d3da4b291e4f6434cf1af6e5fbe05c99799
 SHA512:
-  metadata.gz: e9c958ab4f52a499a95d483dbea86b8e1e2a0fbe41cddd29a46b13b3dd5c2d95924df6b216798c43cf9565be67084ce4cba19da33ffc7f022b61250f839f1141
-  data.tar.gz: 1679adcebcdc5380ceac677ad11460db995cd5b8c0491cb484b69c9ae0b6e98aa1a06fb87f662a6653641020120fde2288c8e75e3f94632b422b0d4858d906ef
+  metadata.gz: bd1fd013b69ae47c40b8a1c5558729314603ceadabdadf3eb7b117b810988a7f7d777d5f3d6dba9f3e4f899763064c073ddd1e808f7d1e0f8aae8d52dc0c1e43
+  data.tar.gz: a11a2202ed08c519e151f097aee47ee16e189a969169fb09ca29162acb99436531007c8c943b6dea892be702454e518376a16253dc9f181069625305e1f09554

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/instrumentor.rb

@@ -4,13 +4,36 @@ module Nanoc
   module Core
     # @api private
     class Instrumentor
+      @enabled = false
+
+      def self.enable
+        if block_given?
+          begin
+            enable
+            yield
+          ensure
+            disable
+          end
+        else
+          @enabled = true
+        end
+      end
+
+      def self.disable
+        @enabled = false
+      end
+
       def self.call(key, *args)
-        stopwatch = DDMetrics::Stopwatch.new
-        stopwatch.start
-        yield
-      ensure
-        stopwatch.stop
-        Nanoc::Core::NotificationCenter.post(key, stopwatch.duration, *args)
+        return yield unless @enabled
+
+        begin
+          stopwatch = DDMetrics::Stopwatch.new
+          stopwatch.start
+          yield
+        ensure
+          stopwatch.stop
+          Nanoc::Core::NotificationCenter.post(key, stopwatch.duration, *args)
+        end
       end
     end
   end

data/lib/nanoc/core/outdatedness_checker.rb

@@ -7,9 +7,7 @@ module Nanoc
     # @api private
     class OutdatednessChecker
       class Basic
-        prepend MemoWise
-
-        # include Nanoc::Core::ContractsSupport
+        include Nanoc::Core::ContractsSupport
 
         Rules = Nanoc::Core::OutdatednessRules
 
@@ -46,62 +44,63 @@ module Nanoc
             Rules::LayoutCollectionExtended,
           ].freeze
 
-        # C_OBJ_MAYBE_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection]
+        C_OBJ_MAYBE_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection]
 
-        # contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Core::ItemRepRepo] => C::Any
+        contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Core::ItemRepRepo] => C::Any
         def initialize(outdatedness_checker:, reps:)
           @outdatedness_checker = outdatedness_checker
           @reps = reps
+
+          # Memoize
+          @_outdatedness_status_for = {}
         end
 
-        # contract C_OBJ_MAYBE_REP => C::Maybe[Nanoc::Core::OutdatednessStatus]
+        contract C_OBJ_MAYBE_REP => C::Maybe[Nanoc::Core::OutdatednessStatus]
         def outdatedness_status_for(obj)
-          case obj
-          when Nanoc::Core::ItemRep
-            apply_rules(RULES_FOR_ITEM_REP, obj)
-          when Nanoc::Core::Item
-            apply_rules_multi(RULES_FOR_ITEM_REP, @reps[obj])
-          when Nanoc::Core::Layout
-            apply_rules(RULES_FOR_LAYOUT, obj)
-          when Nanoc::Core::Configuration
-            apply_rules(RULES_FOR_CONFIG, obj)
-          when Nanoc::Core::ItemCollection
-            apply_rules(RULES_FOR_ITEM_COLLECTION, obj)
-          when Nanoc::Core::LayoutCollection
-            apply_rules(RULES_FOR_LAYOUT_COLLECTION, obj)
-          else
-            raise Nanoc::Core::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
-          end
+          @_outdatedness_status_for[obj] ||=
+            case obj
+            when Nanoc::Core::ItemRep
+              apply_rules(RULES_FOR_ITEM_REP, obj)
+            when Nanoc::Core::Item
+              apply_rules_multi(RULES_FOR_ITEM_REP, @reps[obj])
+            when Nanoc::Core::Layout
+              apply_rules(RULES_FOR_LAYOUT, obj)
+            when Nanoc::Core::Configuration
+              apply_rules(RULES_FOR_CONFIG, obj)
+            when Nanoc::Core::ItemCollection
+              apply_rules(RULES_FOR_ITEM_COLLECTION, obj)
+            when Nanoc::Core::LayoutCollection
+              apply_rules(RULES_FOR_LAYOUT_COLLECTION, obj)
+            else
+              raise Nanoc::Core::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
+            end
         end
-        memo_wise :outdatedness_status_for
 
         private
 
-        # contract C::ArrayOf[Class], C_OBJ_MAYBE_REP, Nanoc::Core::OutdatednessStatus => C::Maybe[Nanoc::Core::OutdatednessStatus]
+        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
 
-        # contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[Nanoc::Core::OutdatednessStatus]
+        contract C::ArrayOf[Class], C::ArrayOf[C_OBJ_MAYBE_REP] => C::Maybe[Nanoc::Core::OutdatednessStatus]
         def apply_rules_multi(rules, objs)
           objs.inject(Nanoc::Core::OutdatednessStatus.new) { |acc, elem| apply_rules(rules, elem, acc) }
         end
       end
 
-      prepend MemoWise
-
-      # include Nanoc::Core::ContractsSupport
+      include Nanoc::Core::ContractsSupport
 
       attr_reader :checksum_store
       attr_reader :checksums
@@ -112,11 +111,11 @@ module Nanoc
 
       Reasons = Nanoc::Core::OutdatednessReasons
 
-      # C_OBJ = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection]
-      # C_ITEM_OR_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep]
-      # C_ACTION_SEQUENCES = C::HashOf[C_OBJ => Nanoc::Core::ActionSequence]
+      C_OBJ = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep, Nanoc::Core::Configuration, Nanoc::Core::Layout, Nanoc::Core::ItemCollection]
+      C_ITEM_OR_REP = C::Or[Nanoc::Core::Item, Nanoc::Core::ItemRep]
+      C_ACTION_SEQUENCES = C::HashOf[C_OBJ => Nanoc::Core::ActionSequence]
 
-      # contract C::KeywordArgs[site: Nanoc::Core::Site, checksum_store: Nanoc::Core::ChecksumStore, checksums: Nanoc::Core::ChecksumCollection, dependency_store: Nanoc::Core::DependencyStore, action_sequence_store: Nanoc::Core::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Core::ItemRepRepo] => C::Any
+      contract C::KeywordArgs[site: Nanoc::Core::Site, checksum_store: Nanoc::Core::ChecksumStore, checksums: Nanoc::Core::ChecksumCollection, dependency_store: Nanoc::Core::DependencyStore, action_sequence_store: Nanoc::Core::ActionSequenceStore, action_sequences: C_ACTION_SEQUENCES, reps: Nanoc::Core::ItemRepRepo] => C::Any
       def initialize(site:, checksum_store:, checksums:, dependency_store:, action_sequence_store:, action_sequences:, reps:)
         @site = site
         @checksum_store = checksum_store
@@ -133,12 +132,12 @@ module Nanoc
         @action_sequences.fetch(rep)
       end
 
-      # contract C_OBJ => C::Bool
+      contract C_OBJ => C::Bool
       def outdated?(obj)
         outdatedness_reasons_for(obj).any?
       end
 
-      # contract C_OBJ => C::IterOf[Reasons::Generic]
+      contract C_OBJ => C::IterOf[Reasons::Generic]
       def outdatedness_reasons_for(obj)
         reasons = basic.outdatedness_status_for(obj).reasons
         if reasons.any?
@@ -152,12 +151,12 @@ module Nanoc
 
       private
 
-      # contract C::None => Basic
+      contract C::None => Basic
       def basic
         @_basic ||= Basic.new(outdatedness_checker: self, reps: @reps)
       end
 
-      # contract C_OBJ, Hamster::Set => C::Bool
+      contract C_OBJ, Hamster::Set => C::Bool
       def outdated_due_to_dependencies?(obj, processed = Hamster::Set.new)
         # Convert from rep to item if necessary
         obj = obj.item if obj.is_a?(Nanoc::Core::ItemRep)
@@ -189,7 +188,7 @@ module Nanoc
         is_outdated
       end
 
-      # contract Nanoc::Core::Dependency => C::Bool
+      contract Nanoc::Core::Dependency => C::Bool
       def dependency_causes_outdatedness?(dependency)
         return true if dependency.from.nil?
 

data/lib/nanoc/core/outdatedness_rules/not_written.rb

@@ -6,11 +6,31 @@ module Nanoc
       class NotWritten < Nanoc::Core::OutdatednessRule
         affects_props :raw_content, :attributes, :compiled_content, :path
 
-        def apply(obj, _outdatedness_checker)
-          if obj.raw_paths.values.flatten.compact.any? { |fn| !File.file?(fn) }
+        def apply(obj, outdatedness_checker)
+          if obj.raw_paths.values.flatten.compact.any? { |fn| !exist?(fn, outdatedness_checker) }
             Nanoc::Core::OutdatednessReasons::NotWritten
           end
         end
+
+        private
+
+        def exist?(fn, outdatedness_checker)
+          all(outdatedness_checker).include?(fn)
+        end
+
+        def all(outdatedness_checker)
+          # NOTE: Cached per outdatedness checker, so that unrelated invocations
+          # later on don’t reuse an old cache.
+
+          @all ||= {}
+          @all[outdatedness_checker] ||= Set.new(
+            Dir.glob("#{site_root(outdatedness_checker)}/**/*", File::FNM_DOTMATCH),
+          )
+        end
+
+        def site_root(outdatedness_checker)
+          outdatedness_checker.site.config.output_dir
+        end
       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/store.rb

@@ -81,7 +81,7 @@ module Nanoc
         return unless File.file?(filename)
 
         begin
-          pstore.transaction do
+          pstore.transaction(true) do
             return if pstore[:version] != version
 
             self.data = pstore[:data]

data/lib/nanoc/core/temp_filename_factory.rb

@@ -42,9 +42,8 @@ module Nanoc
       # @return [void]
       def cleanup(prefix)
         path = File.join(@root_dir, prefix)
-        if File.exist?(path)
-          FileUtils.rm_rf(path)
-        end
+
+        FileUtils.rm_rf(path)
 
         @counts.delete(prefix)
 

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.6'
+    VERSION = '4.12.8'
   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.8
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-10-03 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.22
 signing_key:
 specification_version: 4
 summary: Core of Nanoc