nanoc-core 4.12.8 → 4.12.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a29a2064140d04c44df1122dc537ca800a3ed7c20bfb740c4009f3b976067ebb
-  data.tar.gz: 6fc3869373babe4c16671b15747d0d3da4b291e4f6434cf1af6e5fbe05c99799
+  metadata.gz: 3365fa09f4ff20a16df20f260562fca8c64342098ba70b4547dc38580204ea2e
+  data.tar.gz: 132a480e5593d19bb6c1802f6f740e3ed1d081eb88f0178fbde311d9a4e52cc0
 SHA512:
-  metadata.gz: bd1fd013b69ae47c40b8a1c5558729314603ceadabdadf3eb7b117b810988a7f7d777d5f3d6dba9f3e4f899763064c073ddd1e808f7d1e0f8aae8d52dc0c1e43
-  data.tar.gz: a11a2202ed08c519e151f097aee47ee16e189a969169fb09ca29162acb99436531007c8c943b6dea892be702454e518376a16253dc9f181069625305e1f09554
+  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/checksummer.rb

@@ -81,7 +81,8 @@ module Nanoc
           # NOTE: Other behaviors are registered elsewhere
           # (search for `define_behavior`).
 
-          define_behavior(Array, ArrayUpdateBehavior)
+          define_behavior(Array, CollectionUpdateBehavior)
+          define_behavior(Set, SetUpdateBehavior)
           define_behavior(FalseClass, NoUpdateBehavior)
           define_behavior(Hash, HashUpdateBehavior)
           define_behavior(NilClass, NoUpdateBehavior)
@@ -96,7 +97,7 @@ module Nanoc
           define_behavior(Nanoc::Core::Configuration, HashUpdateBehavior)
           define_behavior(Nanoc::Core::Context, ContextUpdateBehavior)
           define_behavior(Nanoc::Core::CodeSnippet, DataUpdateBehavior)
-          define_behavior(Nanoc::Core::IdentifiableCollection, ArrayUpdateBehavior)
+          define_behavior(Nanoc::Core::IdentifiableCollection, CollectionUpdateBehavior)
           define_behavior(Nanoc::Core::Identifier, ToSUpdateBehavior)
           define_behavior(Nanoc::Core::Item, DocumentUpdateBehavior)
           define_behavior(Nanoc::Core::ItemRep, ItemRepUpdateBehavior)
@@ -194,7 +195,7 @@ module Nanoc
         end
       end
 
-      class ArrayUpdateBehavior < UpdateBehavior
+      class CollectionUpdateBehavior < UpdateBehavior
         def self.update(obj, digest)
           obj.each do |el|
             yield(el)
@@ -203,6 +204,13 @@ module Nanoc
         end
       end
 
+      class SetUpdateBehavior < CollectionUpdateBehavior
+        def self.update(obj, digest)
+          # Similar to CollectionUpdateBehavior, but sorted for consistency.
+          super(obj.sort { |a, b| (a <=> b) || 0 }, digest)
+        end
+      end
+
       class HashUpdateBehavior < UpdateBehavior
         def self.update(obj, digest)
           obj.each do |key, value|

data/lib/nanoc/core/contracts_support.rb

@@ -25,6 +25,7 @@ module Nanoc
         Maybe       = Ignorer.instance
         None        = Ignorer.instance
         ArrayOf     = Ignorer.instance
+        SetOf       = Ignorer.instance
         Or          = Ignorer.instance
         Func        = Ignorer.instance
         RespondTo   = Ignorer.instance
@@ -96,8 +97,7 @@ module Nanoc
             false
           end
 
-        # FIXME: Do something better with contracts on Ruby 3.x
-        @_contracts_support__should_enable = contracts_loadable && !RUBY_VERSION.start_with?('3') && !ENV.key?('DISABLE_CONTRACTS')
+        @_contracts_support__should_enable = contracts_loadable && !ENV.key?('DISABLE_CONTRACTS')
 
         if @_contracts_support__should_enable
           # FIXME: ugly

data/lib/nanoc/core/dependency_props.rb

@@ -10,9 +10,39 @@ module Nanoc
       attr_reader :raw_content
 
       # TODO: Split raw_content for documents and collections
-      C_RAW_CONTENT = C::Or[C::IterOf[C::Or[String, Regexp]], C::Bool]
-      C_ATTRS = C::Or[C::IterOf[Symbol], C::Bool]
-      contract C::KeywordArgs[raw_content: C::Optional[C_RAW_CONTENT], attributes: C::Optional[C_ATTRS], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => C::Any
+      C_RAW_CONTENT =
+        C::Or[
+          C::SetOf[C::Or[String, Regexp]],
+          C::ArrayOf[C::Or[String, Regexp]],
+          C::Bool
+        ]
+
+      C_ATTR =
+        C::Or[
+          C::SetOf[
+            C::Or[
+              Symbol,          # any value
+              [Symbol, C::Any] # pair (specific value)
+            ],
+          ],
+          C::ArrayOf[
+            C::Or[
+              Symbol,          # any value
+              [Symbol, C::Any] # pair (specific value)
+            ],
+          ],
+          C::Bool
+        ]
+
+      C_ARGS =
+        C::KeywordArgs[
+          raw_content: C::Optional[C_RAW_CONTENT],
+          attributes: C::Optional[C_ATTR],
+          compiled_content: C::Optional[C::Bool],
+          path: C::Optional[C::Bool]
+        ]
+
+      contract C_ARGS => C::Any
       def initialize(raw_content: false, attributes: false, compiled_content: false, path: false)
         @compiled_content = compiled_content
         @path = path
@@ -21,7 +51,7 @@ module Nanoc
           case attributes
           when Set
             attributes
-          when Enumerable
+          when Array
             Set.new(attributes)
           else
             attributes
@@ -31,7 +61,7 @@ module Nanoc
           case raw_content
           when Set
             raw_content
-          when Enumerable
+          when Array
             Set.new(raw_content)
           else
             raw_content
@@ -46,6 +76,23 @@ module Nanoc
           s << (attributes? ? 'a' : '_')
           s << (compiled_content? ? 'c' : '_')
           s << (path? ? 'p' : '_')
+
+          if @raw_content.is_a?(Set)
+            @raw_content.each do |elem|
+              s << '; raw_content('
+              s << elem.inspect
+              s << ')'
+            end
+          end
+
+          if @attributes.is_a?(Set)
+            @attributes.each do |elem|
+              s << '; attr('
+              s << elem.inspect
+              s << ')'
+            end
+          end
+
           s << ')'
         end
       end
@@ -63,8 +110,8 @@ module Nanoc
       contract C::None => C::Bool
       def raw_content?
         case @raw_content
-        when Enumerable
-          @raw_content.any?
+        when Set
+          !@raw_content.empty?
         else
           @raw_content
         end
@@ -73,8 +120,8 @@ module Nanoc
       contract C::None => C::Bool
       def attributes?
         case @attributes
-        when Enumerable
-          @attributes.any?
+        when Set
+          !@attributes.empty?
         else
           @attributes
         end
@@ -136,6 +183,15 @@ module Nanoc
         end
       end
 
+      def attribute_keys
+        case @attributes
+        when Enumerable
+          @attributes.map { |a| a.is_a?(Array) ? a.first : a }
+        else
+          []
+        end
+      end
+
       contract C::None => Hash
       def to_h
         {

data/lib/nanoc/core/dependency_store.rb

@@ -6,11 +6,36 @@ module Nanoc
     class DependencyStore < ::Nanoc::Core::Store
       include Nanoc::Core::ContractsSupport
 
-      C_ATTR = C::Or[C::IterOf[Symbol], C::Bool]
-      C_RAW_CONTENT = C::Or[C::IterOf[C::Or[String, Regexp]], C::Bool]
-      C_KEYWORD_PROPS = C::KeywordArgs[raw_content: C::Optional[C_RAW_CONTENT], attributes: C::Optional[C_ATTR], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]]
+      C_RAW_CONTENT =
+        C::Or[
+          C::ArrayOf[C::Or[String, Regexp]],
+          C::Bool
+        ]
+
+      C_ATTR =
+        C::Or[
+          C::ArrayOf[Symbol],
+          C::HashOf[Symbol => C::Any],
+          C::Bool
+        ]
+
+      C_KEYWORD_PROPS =
+        C::KeywordArgs[
+          raw_content: C::Optional[C_RAW_CONTENT],
+          attributes: C::Optional[C_ATTR],
+          compiled_content: C::Optional[C::Bool],
+          path: C::Optional[C::Bool]
+        ]
+
       C_OBJ_SRC = Nanoc::Core::Item
-      C_OBJ_DST = C::Or[Nanoc::Core::Item, Nanoc::Core::Layout, Nanoc::Core::Configuration, Nanoc::Core::IdentifiableCollection]
+
+      C_OBJ_DST =
+        C::Or[
+          Nanoc::Core::Item,
+          Nanoc::Core::Layout,
+          Nanoc::Core::Configuration,
+          Nanoc::Core::IdentifiableCollection
+        ]
 
       attr_reader :items
       attr_reader :layouts
@@ -46,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
@@ -116,11 +136,16 @@ module Nanoc
         src_ref = obj2ref(src)
         dst_ref = obj2ref(dst)
 
-        existing_props = Nanoc::Core::DependencyProps.new(**(@graph.props_for(dst_ref, src_ref) || {}))
+        # Convert attributes into key-value pairs, if necessary
+        if attributes.is_a?(Hash)
+          attributes = attributes.to_a
+        end
+
+        existing_props = @graph.props_for(dst_ref, src_ref)
         new_props = Nanoc::Core::DependencyProps.new(raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path)
-        props = existing_props.merge(new_props)
+        props = existing_props ? existing_props.merge(new_props) : new_props
 
-        @graph.add_edge(dst_ref, src_ref, props: props.to_h)
+        @graph.add_edge(dst_ref, src_ref, props: props)
       end
 
       def add_vertex_for(obj)
@@ -163,18 +188,26 @@ module Nanoc
       end
 
       def props_for(from, to)
-        props = @graph.props_for(obj2ref(from), obj2ref(to)) || {}
-
-        if props.values.any? { |v| v }
-          props
-        else
-          { raw_content: true, attributes: true, compiled_content: true, path: true }
-        end
+        props = @graph.props_for(obj2ref(from), obj2ref(to))
+        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
         {
-          edges: @graph.edges,
+          edges: @graph.edges.map { |arr| [arr[0], arr[1], arr[2].to_h] },
           vertices: @graph.vertices,
         }
       end
@@ -193,8 +226,11 @@ module Nanoc
         # Load edges
         new_data[:edges].each do |edge|
           from_index, to_index, props = *edge
-          from = from_index && previous_refs[from_index]
-          to   = to_index && previous_refs[to_index]
+
+          from  = from_index && previous_refs[from_index]
+          to    = to_index && previous_refs[to_index]
+          props = Nanoc::Core::DependencyProps.new(**props)
+
           @graph.add_edge(from, to, props: props)
         end
 

data/lib/nanoc/core/dependency_tracker.rb

@@ -16,13 +16,14 @@ module Nanoc
 
       C_RAW_CONTENT =
         C::Or[
-          C::IterOf[C::Or[String, Regexp]],
+          C::ArrayOf[C::Or[String, Regexp]],
           C::Bool
         ]
 
       C_ATTR =
         C::Or[
-          C::IterOf[Symbol],
+          C::ArrayOf[Symbol],
+          C::HashOf[Symbol => C::Any],
           C::Bool
         ]
 

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

@@ -90,3 +90,5 @@ module Nanoc
     end
   end
 end
+
+Nanoc::Core::Feature.define('where', version: '4.12')

data/lib/nanoc/core/identifiable_collection_view.rb

@@ -69,6 +69,34 @@ module Nanoc
         @objects.find_all(arg).map { |i| view_class.new(i, @context) }
       end
 
+      # Finds all objects that have the given attribute key/value pair.
+      #
+      # @example
+      #
+      #     @items.where(kind: 'article')
+      #     @items.where(kind: 'article', year: 2020)
+      #
+      # @return [Enumerable]
+      def where(**hash)
+        unless Nanoc::Core::Feature.enabled?(Nanoc::Core::Feature::WHERE)
+          raise(
+            Nanoc::Core::TrivialError,
+            '#where is experimental, and not yet available unless the corresponding feature flag is turned on. Set the `NANOC_FEATURES` environment variable to `where` to enable its usage. (Alternatively, set the environment variable to `all` to turn on all feature flags.)',
+          )
+        end
+
+        @context.dependency_tracker.bounce(_unwrap, attributes: hash)
+
+        # IDEA: Nanoc could remember (from the previous compilation) how many
+        # times #where is called with a given attribute key, and memoize the
+        # key-to-identifiers list.
+        found_objects = @objects.select do |i|
+          hash.all? { |k, v| i.attributes[k] == v }
+        end
+
+        found_objects.map { |i| view_class.new(i, @context) }
+      end
+
       # @overload [](string)
       #
       #   Finds the object whose identifier matches the given string.

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

@@ -13,6 +13,7 @@ module Nanoc
 
         RULES_FOR_ITEM_REP =
           [
+            Rules::ItemAdded,
             Rules::RulesModified,
             Rules::ContentModified,
             Rules::AttributesModified,
@@ -23,6 +24,7 @@ module Nanoc
 
         RULES_FOR_LAYOUT =
           [
+            Rules::LayoutAdded,
             Rules::RulesModified,
             Rules::ContentModified,
             Rules::AttributesModified,
@@ -34,16 +36,6 @@ module Nanoc
             Rules::AttributesModified,
           ].freeze
 
-        RULES_FOR_ITEM_COLLECTION =
-          [
-            Rules::ItemCollectionExtended,
-          ].freeze
-
-        RULES_FOR_LAYOUT_COLLECTION =
-          [
-            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]
 
         contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Core::ItemRepRepo] => C::Any
@@ -67,10 +59,10 @@ module Nanoc
               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)
+            when Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection
+              # Collections are never outdated. Objects inside them might be,
+              # however.
+              apply_rules([], obj)
             else
               raise Nanoc::Core::Errors::InternalInconsistency, "do not know how to check outdatedness of #{obj.inspect}"
             end
@@ -190,31 +182,107 @@ module Nanoc
 
       contract Nanoc::Core::Dependency => C::Bool
       def dependency_causes_outdatedness?(dependency)
-        return true if dependency.from.nil?
-
-        status = basic.outdatedness_status_for(dependency.from)
+        case dependency.from
+        when nil
+          true
+        when Nanoc::Core::ItemCollection, Nanoc::Core::LayoutCollection
+          all_objects = dependency.from
+
+          raw_content_prop_causes_outdatedness?(all_objects, dependency.props.raw_content) ||
+            attributes_prop_causes_outdatedness?(all_objects, dependency.props.attributes)
+        else
+          status = basic.outdatedness_status_for(dependency.from)
 
-        active = status.props.active & dependency.props.active
-        active.delete(:attributes) if attributes_unaffected?(status, dependency)
-        active.delete(:raw_content) if raw_content_unaffected?(status, dependency)
+          active = status.props.active & dependency.props.active
+          active.delete(:attributes) if attributes_unaffected?(status, dependency)
 
-        active.any?
+          !active.empty?
+        end
       end
 
       def attributes_unaffected?(status, dependency)
         reason = status.reasons.find { |r| r.is_a?(Nanoc::Core::OutdatednessReasons::AttributesModified) }
-        reason && dependency.props.attributes.is_a?(Enumerable) && (dependency.props.attributes & reason.attributes).empty?
+        reason && dependency.props.attribute_keys.any? && (dependency.props.attribute_keys & reason.attributes).empty?
       end
 
-      def raw_content_unaffected?(status, dependency)
-        reason = status.reasons.find { |r| r.is_a?(Nanoc::Core::OutdatednessReasons::DocumentCollectionExtended) }
-        if reason.nil?
-          false
-        elsif !dependency.props.raw_content.is_a?(Enumerable)
-          false
-        else
-          patterns = dependency.props.raw_content.map { |r| Nanoc::Core::Pattern.from(r) }
-          patterns.none? { |pat| reason.objects.any? { |obj| pat.match?(obj.identifier) } }
+      def raw_content_prop_causes_outdatedness?(objects, raw_content_prop)
+        return false unless raw_content_prop
+
+        matching_objects =
+          case raw_content_prop
+          when true
+            # If the `raw_content` dependency prop is `true`, then this is a
+            # dependency on all *objects* (items or layouts).
+            objects
+          when Enumerable
+            # If the `raw_content` dependency prop is a collection, then this
+            # is a dependency on specific objects, given by the patterns.
+            patterns = raw_content_prop.map { |r| Nanoc::Core::Pattern.from(r) }
+            patterns.flat_map { |pat| objects.select { |obj| pat.match?(obj.identifier) } }
+          else
+            raise(
+              Nanoc::Core::Errors::InternalInconsistency,
+              "Unexpected type of raw_content: #{raw_content_prop.inspect}",
+            )
+          end
+
+        # For all objects matching the `raw_content` dependency prop:
+        # If the object is outdated because it is newly added,
+        # then this dependency causes outdatedness.
+        #
+        # Note that these objects might be modified but *not* newly added,
+        # in which case this dependency will *not* cause outdatedness.
+        # However, when the object is used later (e.g. attributes are
+        # accessed), then another dependency will exist that will cause
+        # outdatedness.
+        matching_objects.any? do |obj|
+          status = basic.outdatedness_status_for(obj)
+          status.reasons.any? { |r| Nanoc::Core::OutdatednessReasons::DocumentAdded == r }
+        end
+      end
+
+      def attributes_prop_causes_outdatedness?(objects, attributes_prop)
+        return false unless attributes_prop
+
+        unless attributes_prop.is_a?(Set)
+          raise(
+            Nanoc::Core::Errors::InternalInconsistency,
+            'expected attributes_prop to be a Set',
+          )
+        end
+
+        pairs = attributes_prop.select { |a| a.is_a?(Array) }.to_h
+
+        unless pairs.any?
+          raise(
+            Nanoc::Core::Errors::InternalInconsistency,
+            'expected attributes_prop not to be empty',
+          )
+        end
+
+        dep_checksums = pairs.transform_values { |value| Nanoc::Core::Checksummer.calc(value) }
+
+        objects.any? do |object|
+          # Find old and new attribute checksums for the object
+          old_object_checksums = checksum_store.attributes_checksum_for(object)
+          next false unless old_object_checksums
+
+          new_object_checksums = checksums.attributes_checksum_for(object)
+
+          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 the old and new checksums are identical, then the attribute is
+            # unchanged and can’t cause outdatedness.
+            next false unless old_value != new_value
+
+            # 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
     end

data/lib/nanoc/core/outdatedness_reasons.rb

@@ -18,6 +18,10 @@ module Nanoc
         # @param [String] message The descriptive message for this outdatedness
         #   reason
         def initialize(message, props = Nanoc::Core::DependencyProps.new)
+          # TODO: Replace `DependencyProps` with its own `OutdatednessProps`
+          # type. For `OutdatednessProps`, the only values are true/false;
+          # giving a collection for `raw_content` makes no sense (anymore).
+
           @message = message
           @props = props
         end
@@ -42,30 +46,16 @@ module Nanoc
         Nanoc::Core::DependencyProps.new(compiled_content: true, path: true),
       )
 
+      DocumentAdded = Generic.new(
+        'The item or layout is newly added to the site.',
+        Nanoc::Core::DependencyProps.new, # NOTE: empty props, because they’re not relevant
+      )
+
       ContentModified = Generic.new(
         'The content of this item has been modified since the last time the site was compiled.',
         Nanoc::Core::DependencyProps.new(raw_content: true, compiled_content: true),
       )
 
-      class DocumentCollectionExtended < Generic
-        attr_reader :objects
-
-        def initialize(objects)
-          super(
-            'New items/layouts have been added to the site.',
-            Nanoc::Core::DependencyProps.new(raw_content: true),
-          )
-
-          @objects = objects
-        end
-      end
-
-      class ItemCollectionExtended < DocumentCollectionExtended
-      end
-
-      class LayoutCollectionExtended < DocumentCollectionExtended
-      end
-
       class AttributesModified < Generic
         attr_reader :attributes
 

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_rules/item_added.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    module OutdatednessRules
+      class ItemAdded < Nanoc::Core::OutdatednessRule
+        affects_props :raw_content
+
+        contract Nanoc::Core::ItemRep, C::Named['Nanoc::Core::OutdatednessChecker'] => C::Maybe[Nanoc::Core::OutdatednessReasons::Generic]
+        def apply(obj, outdatedness_checker)
+          if outdatedness_checker.dependency_store.new_items.include?(obj.item)
+            Nanoc::Core::OutdatednessReasons::DocumentAdded
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Nanoc
+  module Core
+    module OutdatednessRules
+      class LayoutAdded < Nanoc::Core::OutdatednessRule
+        affects_props :raw_content
+
+        contract Nanoc::Core::Layout, C::Named['Nanoc::Core::OutdatednessChecker'] => C::Maybe[Nanoc::Core::OutdatednessReasons::Generic]
+        def apply(obj, outdatedness_checker)
+          if outdatedness_checker.dependency_store.new_layouts.include?(obj)
+            Nanoc::Core::OutdatednessReasons::DocumentAdded
+          end
+        end
+      end
+    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)
@@ -22,6 +27,10 @@ module Nanoc
           props: @props.merge(reason.props),
         )
       end
+
+      def inspect
+        "<#{self.class} reasons=#{@reasons.inspect} props=#{@props.inspect}>"
+      end
     end
   end
 end

data/lib/nanoc/core/version.rb

@@ -2,6 +2,6 @@
 
 module Nanoc
   module Core
-    VERSION = '4.12.8'
+    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.8
+  version: 4.12.10
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -261,8 +261,8 @@ files:
 - lib/nanoc/core/outdatedness_rules/attributes_modified.rb
 - lib/nanoc/core/outdatedness_rules/code_snippets_modified.rb
 - lib/nanoc/core/outdatedness_rules/content_modified.rb
-- lib/nanoc/core/outdatedness_rules/item_collection_extended.rb
-- lib/nanoc/core/outdatedness_rules/layout_collection_extended.rb
+- lib/nanoc/core/outdatedness_rules/item_added.rb
+- lib/nanoc/core/outdatedness_rules/layout_added.rb
 - lib/nanoc/core/outdatedness_rules/not_written.rb
 - lib/nanoc/core/outdatedness_rules/rules_modified.rb
 - lib/nanoc/core/outdatedness_rules/uses_always_outdated_filter.rb
@@ -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

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Core
-    module OutdatednessRules
-      class ItemCollectionExtended < Nanoc::Core::OutdatednessRule
-        affects_props :raw_content
-
-        contract Nanoc::Core::ItemCollection, C::Named['Nanoc::Core::OutdatednessChecker'] => C::Maybe[Nanoc::Core::OutdatednessReasons::Generic]
-        def apply(_obj, outdatedness_checker)
-          new_items = outdatedness_checker.dependency_store.new_items
-
-          if new_items.any?
-            Nanoc::Core::OutdatednessReasons::ItemCollectionExtended.new(new_items)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Nanoc
-  module Core
-    module OutdatednessRules
-      class LayoutCollectionExtended < Nanoc::Core::OutdatednessRule
-        affects_props :raw_content
-
-        contract Nanoc::Core::LayoutCollection, C::Named['Nanoc::Core::OutdatednessChecker'] => C::Maybe[Nanoc::Core::OutdatednessReasons::Generic]
-        def apply(_obj, outdatedness_checker)
-          new_layouts = outdatedness_checker.dependency_store.new_layouts
-
-          if new_layouts.any?
-            Nanoc::Core::OutdatednessReasons::LayoutCollectionExtended.new(new_layouts)
-          end
-        end
-      end
-    end
-  end
-end