nanoc-core 4.12.7 → 4.12.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fb5a347a2a973a7c42b1f85746b5267b43c588bf627c4f813c09c3a23b8e7eb
-  data.tar.gz: f03ba79aea51348eca0a83c80e3bef8a5853da59981205939b7d417588dd3678
+  metadata.gz: 835f6e4a74f07183143caa0c2d27f304fa5a712c3231dddc2dd28974f714b117
+  data.tar.gz: 71331c08284b2f0da1b6410c8a5c17230efa1606640c1ca7e8724fb97e037951
 SHA512:
-  metadata.gz: '0211852d5d7069d0dec63609db20a2cf533ba167e71ab08e195e333abea2cb17ecce34b05c4c65cd0be84c1726389caae8f02313188641a980e1aa6622f47619'
-  data.tar.gz: d3f7d023ce5855b2e2b67c2e49132b60aaec1f8cc71bf7163b2d1a2492304fccf932a2252e0ea1546c4694a83168395195dae444c530ad641c37d5f45e0a9673
+  metadata.gz: 1c3b6430105aab73a5e9efff550b3519bd3e19cf99cb9b70f7a3b42916fd48becc091ea7325740673936373650e0d2950f986e507128aa1a7156f0e95bbb1520
+  data.tar.gz: 24ef14012f2ed47f9dd77f885601c395b58fb4d50fb61afa2196fedeecac2571d3702ad87f0e7d80d8806a07b6712364774cf6012650595f4a0cae072e85353e

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,7 +110,7 @@ module Nanoc
       contract C::None => C::Bool
       def raw_content?
         case @raw_content
-        when Enumerable
+        when Set
           @raw_content.any?
         else
           @raw_content
@@ -73,7 +120,7 @@ module Nanoc
       contract C::None => C::Bool
       def attributes?
         case @attributes
-        when Enumerable
+        when Set
           @attributes.any?
         else
           @attributes
@@ -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
@@ -116,11 +141,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)
@@ -162,11 +192,12 @@ 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)) || {}
+        props = @graph.props_for(obj2ref(from), obj2ref(to))
 
-        if props.values.any? { |v| v }
-          props
+        if props&.active&.any?
+          props.to_h
         else
           { raw_content: true, attributes: true, compiled_content: true, path: true }
         end
@@ -174,7 +205,7 @@ module Nanoc
 
       def data
         {
-          edges: @graph.edges,
+          edges: @graph.edges.map { |arr| [arr[0], arr[1], arr[2].to_h] },
           vertices: @graph.vertices,
         }
       end
@@ -193,8 +224,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/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/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,14 +7,13 @@ module Nanoc
     # @api private
     class OutdatednessChecker
       class Basic
-        prepend MemoWise
-
-        # include Nanoc::Core::ContractsSupport
+        include Nanoc::Core::ContractsSupport
 
         Rules = Nanoc::Core::OutdatednessRules
 
         RULES_FOR_ITEM_REP =
           [
+            Rules::ItemAdded,
             Rules::RulesModified,
             Rules::ContentModified,
             Rules::AttributesModified,
@@ -25,6 +24,7 @@ module Nanoc
 
         RULES_FOR_LAYOUT =
           [
+            Rules::LayoutAdded,
             Rules::RulesModified,
             Rules::ContentModified,
             Rules::AttributesModified,
@@ -36,48 +36,41 @@ 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]
+        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, 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
         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)
@@ -93,15 +86,13 @@ module Nanoc
           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 +103,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 +124,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 +143,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,33 +180,113 @@ 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?
-
-        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.any?
+        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)
+
+          # 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
+
+            is_match && is_changed
+          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_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_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/outdatedness_status.rb

@@ -22,6 +22,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/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.7'
+    VERSION = '4.12.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-core
 version: !ruby/object:Gem::Version
-  version: 4.12.7
+  version: 4.12.9
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-06 00:00:00.000000000 Z
+date: 2022-10-08 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.15
+rubygems_version: 3.3.22
 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