nanoc-core 4.12.9 → 4.12.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 835f6e4a74f07183143caa0c2d27f304fa5a712c3231dddc2dd28974f714b117
-  data.tar.gz: 71331c08284b2f0da1b6410c8a5c17230efa1606640c1ca7e8724fb97e037951
+  metadata.gz: 3365fa09f4ff20a16df20f260562fca8c64342098ba70b4547dc38580204ea2e
+  data.tar.gz: 132a480e5593d19bb6c1802f6f740e3ed1d081eb88f0178fbde311d9a4e52cc0
 SHA512:
-  metadata.gz: 1c3b6430105aab73a5e9efff550b3519bd3e19cf99cb9b70f7a3b42916fd48becc091ea7325740673936373650e0d2950f986e507128aa1a7156f0e95bbb1520
-  data.tar.gz: 24ef14012f2ed47f9dd77f885601c395b58fb4d50fb61afa2196fedeecac2571d3702ad87f0e7d80d8806a07b6712364774cf6012650595f4a0cae072e85353e
+  metadata.gz: 5c0190dbbad1225882d5b76891e80f45cf5e02238c6f6418071d9e8968e82cdd0263099eb5a71963b179238fb57a86f53ef7f7677592299c61cc6197be6b5dd9
+  data.tar.gz: 13424fbb1cc81c95e471a8ba99f172d24b6f33b1e9220a50773ed32554f5577622db7d63825734b04254e33c624b2d382b16ced1628952f5cee7e6429d96e57a

data/lib/nanoc/core/checksum_collection.rb

@@ -9,6 +9,8 @@ module Nanoc
 
       def initialize(checksums)
         @checksums = checksums
+
+        @_attribute_checksums = {}
       end
 
       contract c_obj => C::Maybe[String]
@@ -23,7 +25,7 @@ module Nanoc
 
       contract c_obj => C::Maybe[C::HashOf[Symbol, String]]
       def attributes_checksum_for(obj)
-        @checksums[[obj.reference, :each_attribute]]
+        @_attribute_checksums[obj] ||= @checksums[[obj.reference, :each_attribute]]
       end
 
       def to_h

data/lib/nanoc/core/checksum_store.rb

@@ -21,6 +21,8 @@ module Nanoc
         @objects = objects
 
         @checksums = {}
+
+        invalidate_memoization
       end
 
       contract c_obj => C::Maybe[String]
@@ -50,7 +52,7 @@ module Nanoc
 
       contract c_obj => C::Maybe[C::HashOf[Symbol, String]]
       def attributes_checksum_for(obj)
-        @checksums[[obj.reference, :each_attribute]]
+        @_attribute_checksums[obj] ||= @checksums[[obj.reference, :each_attribute]]
       end
 
       protected
@@ -60,6 +62,8 @@ module Nanoc
       end
 
       def data=(new_data)
+        invalidate_memoization
+
         references = Set.new(@objects.map(&:reference))
 
         @checksums = {}
@@ -69,6 +73,12 @@ module Nanoc
           end
         end
       end
+
+      private
+
+      def invalidate_memoization
+        @_attribute_checksums = {}
+      end
     end
   end
 end

data/lib/nanoc/core/dependency_props.rb

@@ -111,7 +111,7 @@ module Nanoc
       def raw_content?
         case @raw_content
         when Set
-          @raw_content.any?
+          !@raw_content.empty?
         else
           @raw_content
         end
@@ -121,7 +121,7 @@ module Nanoc
       def attributes?
         case @attributes
         when Set
-          @attributes.any?
+          !@attributes.empty?
         else
           @attributes
         end

data/lib/nanoc/core/dependency_store.rb

@@ -71,12 +71,7 @@ module Nanoc
           Nanoc::Core::Dependency.new(
             other_object,
             object,
-            Nanoc::Core::DependencyProps.new(
-              raw_content: props.fetch(:raw_content, false),
-              attributes: props.fetch(:attributes, false),
-              compiled_content: props.fetch(:compiled_content, false),
-              path: props.fetch(:path, false),
-            ),
+            props,
           )
         end
       end
@@ -192,15 +187,22 @@ module Nanoc
         refs.map { |r| ref2obj(r) }
       end
 
-      # TODO: Return not a Hash, but a DependencyProps instead
       def props_for(from, to)
         props = @graph.props_for(obj2ref(from), obj2ref(to))
-
-        if props&.active&.any?
-          props.to_h
-        else
-          { raw_content: true, attributes: true, compiled_content: true, path: true }
-        end
+        return props if props
+
+        # This is for backwards compatibility, in case there are no dependency
+        # props available yet. Pretend everything is set to `true`; it’ll be
+        # recompiled and correct props will be available in the next run.
+        #
+        # NOTE: This isn’t covered by tests, yet. (Not trivial to test because
+        # it’s not a condition that can arise in the current Nanoc version.)
+        Nanoc::Core::DependencyProps.new(
+          raw_content: true,
+          attributes: true,
+          compiled_content: true,
+          path: true,
+        )
       end
 
       def data

data/lib/nanoc/core/document.rb

@@ -49,6 +49,10 @@ module Nanoc
         @checksum_data = checksum_data
         @content_checksum_data = content_checksum_data
         @attributes_checksum_data = attributes_checksum_data
+
+        # Precalculate for performance
+        @hash = [self.class, identifier].hash
+        reference
       end
 
       # @return [Hash]
@@ -107,7 +111,7 @@ module Nanoc
 
       contract C::None => C::Num
       def hash
-        [self.class, identifier].hash
+        @hash
       end
 
       contract C::Any => C::Bool

data/lib/nanoc/core/item.rb

@@ -4,7 +4,7 @@ module Nanoc
   module Core
     class Item < ::Nanoc::Core::Document
       def reference
-        "item:#{identifier}"
+        @_reference ||= "item:#{identifier}"
       end
     end
   end

data/lib/nanoc/core/layout.rb

@@ -4,7 +4,7 @@ module Nanoc
   module Core
     class Layout < ::Nanoc::Core::Document
       def reference
-        "layout:#{identifier}"
+        @_reference ||= "layout:#{identifier}"
       end
     end
   end

data/lib/nanoc/core/mutable_document_view_mixin.rb

@@ -26,13 +26,7 @@ module Nanoc
       #
       # @see Hash#[]=
       def []=(key, value)
-        disallowed_value_classes = Set.new([
-          Nanoc::Core::Item,
-          Nanoc::Core::Layout,
-          Nanoc::Core::CompilationItemView,
-          Nanoc::Core::LayoutView,
-        ])
-        if disallowed_value_classes.include?(value.class)
+        if disallowed_value_class?(value.class)
           raise DisallowedAttributeValueError.new(value)
         end
 
@@ -55,6 +49,21 @@ module Nanoc
         hash.each { |k, v| _unwrap.set_attribute(k, v) }
         self
       end
+
+      private
+
+      def disallowed_value_class?(klass)
+        # NOTE: We’re explicitly disabling Style/MultipleComparison, because
+        # the suggested alternative (Array#include?) carries a measurable
+        # performance penatly.
+        #
+        # rubocop:disable Style/MultipleComparison
+        klass == Nanoc::Core::Item ||
+          klass == Nanoc::Core::Layout ||
+          klass == Nanoc::Core::CompilationItemView ||
+          klass == Nanoc::Core::LayoutView
+        # rubocop:enable Style/MultipleComparison
+      end
     end
   end
 end

data/lib/nanoc/core/outdatedness_checker.rb

@@ -196,7 +196,7 @@ module Nanoc
           active = status.props.active & dependency.props.active
           active.delete(:attributes) if attributes_unaffected?(status, dependency)
 
-          active.any?
+          !active.empty?
         end
       end
 
@@ -269,23 +269,19 @@ module Nanoc
 
           new_object_checksums = checksums.attributes_checksum_for(object)
 
-          # Ignore any attribute not mentioned in the dependency
-          old_object_checksums = old_object_checksums.select { |k, _v| dep_checksums.key?(k) }
-          new_object_checksums = new_object_checksums.select { |k, _v| dep_checksums.key?(k) }
-
           dep_checksums.any? do |key, dep_value|
             # Get old and new checksum for this particular attribute
             old_value = old_object_checksums[key]
             new_value = new_object_checksums[key]
 
-            # If either the old or new vale match the value in the dependency,
-            # then a potential change is relevant to us, and can cause
-            # outdatedness.
-            is_match = [old_value, new_value].include?(dep_value)
-
-            is_changed = old_value != new_value
+            # If the old and new checksums are identical, then the attribute is
+            # unchanged and can’t cause outdatedness.
+            next false unless old_value != new_value
 
-            is_match && is_changed
+            # We already know that the old value and new value are different.
+            # This attribute will cause outdatedness if either of those
+            # checksums is identical to the one in the prop.
+            old_value == dep_value || new_value == dep_value
           end
         end
       end

data/lib/nanoc/core/outdatedness_rule.rb

@@ -23,11 +23,39 @@ module Nanoc
       end
 
       def self.affects_props(*names)
-        @affected_props = Set.new(names)
+        @affects_raw_content = false
+        @affects_attributes = false
+        @affects_compiled_content = false
+        @affects_path = false
+
+        names.each do |name|
+          case name
+          when :raw_content
+            @affects_raw_content = true
+          when :attributes
+            @affects_attributes = true
+          when :compiled_content
+            @affects_compiled_content = true
+          when :path
+            @affects_path = true
+          end
+        end
+      end
+
+      def self.affects_raw_content?
+        @affects_raw_content
+      end
+
+      def self.affects_attributes?
+        @affects_attributes
+      end
+
+      def self.affects_compiled_content?
+        @affects_compiled_content
       end
 
-      def self.affected_props
-        @affected_props
+      def self.affects_path?
+        @affects_path
       end
     end
   end

data/lib/nanoc/core/outdatedness_status.rb

@@ -13,7 +13,12 @@ module Nanoc
       end
 
       def useful_to_apply?(rule)
-        (rule.affected_props - @props.active).any?
+        return true if rule.affects_raw_content? && !@props.raw_content?
+        return true if rule.affects_attributes? && !@props.attributes?
+        return true if rule.affects_compiled_content? && !@props.compiled_content?
+        return true if rule.affects_path? && !@props.path?
+
+        false
       end
 
       def update(reason)

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.9'
+    VERSION = '4.12.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.9
+  version: 4.12.10
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.24
 signing_key:
 specification_version: 4
 summary: Core of Nanoc