nanoc 4.7.3 → 4.7.4

data/lib/nanoc/base/services/item_rep_builder.rb

@@ -16,11 +16,13 @@ module Nanoc::Int
         end
       end
 
-      Nanoc::Int::ItemRepRouter.new(@reps, @action_provider, @site).run
+      action_sequences = Nanoc::Int::ItemRepRouter.new(@reps, @action_provider, @site).run
 
       @reps.each do |rep|
-        rep.snapshot_defs = @action_provider.snapshots_defs_for(rep)
+        rep.snapshot_defs = action_sequences[rep].snapshots_defs
       end
+
+      action_sequences
     end
   end
 end

data/lib/nanoc/base/services/item_rep_router.rb

@@ -24,6 +24,7 @@ module Nanoc::Int
     end
 
     def run
+      action_sequences = {}
       assigned_paths = {}
       @reps.each do |rep|
         # Sigh. We route reps twice, because the first time, the paths might not have converged
@@ -31,16 +32,20 @@ module Nanoc::Int
         # I can think of. For details, see
         # https://github.com/nanoc/nanoc/pull/1085#issuecomment-280628426.
 
-        @action_provider.paths_for(rep).each do |(snapshot_names, paths)|
+        @action_provider.action_sequence_for(rep).paths.each do |(snapshot_names, paths)|
           route_rep(rep, paths, snapshot_names, {})
         end
 
-        @action_provider.paths_for(rep).each do |(snapshot_names, paths)|
+        mem = @action_provider.action_sequence_for(rep)
+        action_sequences[rep] = mem
+        mem.paths.each do |(snapshot_names, paths)|
           route_rep(rep, paths, snapshot_names, assigned_paths)
         end
 
         # TODO: verify that paths converge
       end
+
+      action_sequences
     end
 
     contract Nanoc::Int::ItemRep, C::IterOf[String], C::IterOf[Symbol], C::HashOf[String => Nanoc::Int::ItemRep] => C::Any

data/lib/nanoc/base/services/outdatedness_checker.rb

@@ -81,26 +81,34 @@ module Nanoc::Int
 
     attr_reader :checksum_store
     attr_reader :dependency_store
-    attr_reader :rule_memory_store
+    attr_reader :action_sequence_store
     attr_reader :action_provider
     attr_reader :site
 
     Reasons = Nanoc::Int::OutdatednessReasons
 
+    C_OBJ = C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout]
+
     # FIXME: Replace C::Any with proper types
-    contract C::KeywordArgs[site: Nanoc::Int::Site, checksum_store: Nanoc::Int::ChecksumStore, dependency_store: Nanoc::Int::DependencyStore, rule_memory_store: Nanoc::Int::RuleMemoryStore, action_provider: C::Any, reps: Nanoc::Int::ItemRepRepo] => C::Any
-    def initialize(site:, checksum_store:, dependency_store:, rule_memory_store:, action_provider:, reps:)
+    contract C::KeywordArgs[site: Nanoc::Int::Site, checksum_store: Nanoc::Int::ChecksumStore, dependency_store: Nanoc::Int::DependencyStore, action_sequence_store: Nanoc::Int::ActionSequenceStore, action_provider: C::Any, reps: Nanoc::Int::ItemRepRepo] => C::Any
+    def initialize(site:, checksum_store:, dependency_store:, action_sequence_store:, action_provider:, reps:)
       @site = site
       @checksum_store = checksum_store
       @dependency_store = dependency_store
-      @rule_memory_store = rule_memory_store
+      @action_sequence_store = action_sequence_store
       @action_provider = action_provider
       @reps = reps
 
       @objects_outdated_due_to_dependencies = {}
     end
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::Bool
+    def action_sequence_for(rep)
+      # TODO: Pass in action_sequences instead
+      @action_provider.action_sequence_for(rep)
+    end
+    memoize :action_sequence_for
+
+    contract C_OBJ, C::Maybe[C::HashOf[C_OBJ => Nanoc::Int::ActionSequence]] => C::Bool
     # Checks whether the given object is outdated and therefore needs to be
     # recompiled.
     #
@@ -108,7 +116,8 @@ module Nanoc::Int
     #   whose outdatedness should be checked.
     #
     # @return [Boolean] true if the object is outdated, false otherwise
-    def outdated?(obj)
+    def outdated?(obj, _action_sequences = nil)
+      # TODO: use action_sequences
       !outdatedness_reason_for(obj).nil?
     end
 
@@ -176,7 +185,21 @@ module Nanoc::Int
       return true if dependency.from.nil?
 
       status = basic.outdatedness_status_for(dependency.from)
-      (status.props.active & dependency.props.active).any?
+
+      active = status.props.active & dependency.props.active
+      if attributes_unaffected?(status, dependency)
+        active.delete(:attributes)
+      end
+
+      active.any?
+    end
+
+    def attributes_unaffected?(status, dependency)
+      attr_reason = status.reasons.find do |r|
+        r.is_a?(Nanoc::Int::OutdatednessReasons::AttributesModified)
+      end
+
+      attr_reason && dependency.props.attributes.is_a?(Enumerable) && (dependency.props.attributes & attr_reason.attributes).empty?
     end
   end
 end

data/lib/nanoc/base/services/outdatedness_rule.rb

@@ -12,7 +12,7 @@ module Nanoc::Int
     end
 
     def apply(_obj, _outdatedness_checker)
-      raise NotImplementedError.new('Nanoc::Int::OutdatednessRule subclasses must implement ##reason, and #apply')
+      raise NotImplementedError.new('Nanoc::Int::OutdatednessRule subclasses must implement #apply')
     end
 
     contract C::None => String
@@ -20,9 +20,12 @@ module Nanoc::Int
       "#{self.class.name}(#{reason})"
     end
 
-    # TODO: remove
-    def reason
-      raise NotImplementedError.new('Nanoc::Int::OutdatednessRule subclasses must implement ##reason, and #apply')
+    def self.affects_props(*names)
+      @affected_props = Set.new(names)
+    end
+
+    def self.affected_props
+      @affected_props
     end
   end
 end

data/lib/nanoc/base/services/outdatedness_rules.rb

@@ -1,166 +1,14 @@
 module Nanoc::Int
   # @api private
   module OutdatednessRules
-    class CodeSnippetsModified < OutdatednessRule
-      extend Nanoc::Int::Memoization
-
-      include Nanoc::Int::ContractsSupport
-
-      def reason
-        Nanoc::Int::OutdatednessReasons::CodeSnippetsModified
-      end
-
-      def apply(_obj, outdatedness_checker)
-        if any_snippets_modified?(outdatedness_checker)
-          Nanoc::Int::OutdatednessReasons::CodeSnippetsModified
-        end
-      end
-
-      private
-
-      def any_snippets_modified?(outdatedness_checker)
-        outdatedness_checker.site.code_snippets.any? do |cs|
-          ch_old = outdatedness_checker.checksum_store[cs]
-          ch_new = Nanoc::Int::Checksummer.calc(cs)
-          ch_old != ch_new
-        end
-      end
-      memoize :any_snippets_modified?
-    end
-
-    class ConfigurationModified < OutdatednessRule
-      extend Nanoc::Int::Memoization
-
-      def reason
-        Nanoc::Int::OutdatednessReasons::ConfigurationModified
-      end
-
-      def apply(_obj, outdatedness_checker)
-        if config_modified?(outdatedness_checker)
-          Nanoc::Int::OutdatednessReasons::ConfigurationModified
-        end
-      end
-
-      private
-
-      def config_modified?(outdatedness_checker)
-        obj = outdatedness_checker.site.config
-        ch_old = outdatedness_checker.checksum_store[obj]
-        ch_new = Nanoc::Int::Checksummer.calc(obj)
-        ch_old != ch_new
-      end
-      memoize :config_modified?
-    end
-
-    class NotWritten < OutdatednessRule
-      def reason
-        Nanoc::Int::OutdatednessReasons::NotWritten
-      end
-
-      def apply(obj, _outdatedness_checker)
-        if obj.raw_paths.values.flatten.compact.any? { |fn| !File.file?(fn) }
-          Nanoc::Int::OutdatednessReasons::NotWritten
-        end
-      end
-    end
-
-    class ContentModified < OutdatednessRule
-      def reason
-        Nanoc::Int::OutdatednessReasons::ContentModified
-      end
-
-      def apply(obj, outdatedness_checker)
-        obj = obj.item if obj.is_a?(Nanoc::Int::ItemRep)
-
-        ch_old = outdatedness_checker.checksum_store.content_checksum_for(obj)
-        ch_new = Nanoc::Int::Checksummer.calc_for_content_of(obj)
-        if ch_old != ch_new
-          Nanoc::Int::OutdatednessReasons::ContentModified
-        end
-      end
-    end
-
-    class AttributesModified < OutdatednessRule
-      extend Nanoc::Int::Memoization
-
-      include Nanoc::Int::ContractsSupport
-
-      def reason
-        Nanoc::Int::OutdatednessReasons::AttributesModified
-      end
-
-      contract C::Or[Nanoc::Int::ItemRep, Nanoc::Int::Item, Nanoc::Int::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
-      def apply(obj, outdatedness_checker)
-        case obj
-        when Nanoc::Int::ItemRep
-          apply(obj.item, outdatedness_checker)
-        when Nanoc::Int::Item, Nanoc::Int::Layout
-          ch_old = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
-          ch_new = Nanoc::Int::Checksummer.calc_for_attributes_of(obj)
-          if ch_old != ch_new
-            Nanoc::Int::OutdatednessReasons::AttributesModified
-          end
-        else
-          raise ArgumentError
-        end
-      end
-      memoize :apply
-    end
-
-    class RulesModified < OutdatednessRule
-      def reason
-        Nanoc::Int::OutdatednessReasons::RulesModified
-      end
-
-      def apply(obj, outdatedness_checker)
-        mem_old = outdatedness_checker.rule_memory_store[obj]
-        mem_new = outdatedness_checker.action_provider.memory_for(obj).serialize
-        unless mem_old.eql?(mem_new)
-          Nanoc::Int::OutdatednessReasons::RulesModified
-        end
-      end
-    end
-
-    class PathsModified < OutdatednessRule
-      def reason
-        Nanoc::Int::OutdatednessReasons::PathsModified
-      end
-
-      def apply(obj, outdatedness_checker)
-        # FIXME: Prefer to not work on serialised version
-
-        mem_old = outdatedness_checker.rule_memory_store[obj]
-        mem_new = outdatedness_checker.action_provider.memory_for(obj).serialize
-        return true if mem_old.nil?
-
-        paths_old = mem_old.select { |pa| pa[0] == :snapshot }
-        paths_new = mem_new.select { |pa| pa[0] == :snapshot }
-
-        if paths_old != paths_new
-          Nanoc::Int::OutdatednessReasons::PathsModified
-        end
-      end
-    end
-
-    class UsesAlwaysOutdatedFilter < OutdatednessRule
-      def reason
-        Nanoc::Int::OutdatednessReasons::UsesAlwaysOutdatedFilter
-      end
-
-      def apply(obj, outdatedness_checker)
-        mem = outdatedness_checker.action_provider.memory_for(obj)
-        if any_always_outdated?(mem)
-          Nanoc::Int::OutdatednessReasons::UsesAlwaysOutdatedFilter
-        end
-      end
-
-      def any_always_outdated?(mem)
-        mem
-          .select { |a| a.is_a?(Nanoc::Int::ProcessingActions::Filter) }
-          .map { |a| Nanoc::Filter.named(a.filter_name) }
-          .compact
-          .any?(&:always_outdated?)
-      end
-    end
   end
 end
+
+require_relative 'outdatedness_rules/attributes_modified'
+require_relative 'outdatedness_rules/code_snippets_modified'
+require_relative 'outdatedness_rules/configuration_modified'
+require_relative 'outdatedness_rules/content_modified'
+require_relative 'outdatedness_rules/not_written'
+require_relative 'outdatedness_rules/paths_modified'
+require_relative 'outdatedness_rules/rules_modified'
+require_relative 'outdatedness_rules/uses_always_outdated_filter'

data/lib/nanoc/base/services/outdatedness_rules/attributes_modified.rb

@@ -0,0 +1,34 @@
+module Nanoc::Int::OutdatednessRules
+  class AttributesModified < Nanoc::Int::OutdatednessRule
+    extend Nanoc::Int::Memoization
+
+    include Nanoc::Int::ContractsSupport
+
+    affects_props :attributes, :compiled_content
+
+    contract C::Or[Nanoc::Int::ItemRep, Nanoc::Int::Item, Nanoc::Int::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
+    def apply(obj, outdatedness_checker)
+      case obj
+      when Nanoc::Int::ItemRep
+        apply(obj.item, outdatedness_checker)
+      when Nanoc::Int::Item, Nanoc::Int::Layout
+        old_checksums = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
+        unless old_checksums
+          return Nanoc::Int::OutdatednessReasons::AttributesModified.new(true)
+        end
+
+        new_checksums = Nanoc::Int::Checksummer.calc_for_each_attribute_of(obj)
+
+        attributes = Set.new(old_checksums.keys) + Set.new(new_checksums.keys)
+        changed_attributes = attributes.reject { |a| old_checksums[a] == new_checksums[a] }
+
+        if changed_attributes.any?
+          Nanoc::Int::OutdatednessReasons::AttributesModified.new(changed_attributes)
+        end
+      else
+        raise ArgumentError
+      end
+    end
+    memoize :apply
+  end
+end

data/lib/nanoc/base/services/outdatedness_rules/code_snippets_modified.rb

@@ -0,0 +1,26 @@
+module Nanoc::Int::OutdatednessRules
+  class CodeSnippetsModified < Nanoc::Int::OutdatednessRule
+    extend Nanoc::Int::Memoization
+
+    include Nanoc::Int::ContractsSupport
+
+    affects_props :raw_content, :attributes, :compiled_content, :path
+
+    def apply(_obj, outdatedness_checker)
+      if any_snippets_modified?(outdatedness_checker)
+        Nanoc::Int::OutdatednessReasons::CodeSnippetsModified
+      end
+    end
+
+    private
+
+    def any_snippets_modified?(outdatedness_checker)
+      outdatedness_checker.site.code_snippets.any? do |cs|
+        ch_old = outdatedness_checker.checksum_store[cs]
+        ch_new = Nanoc::Int::Checksummer.calc(cs)
+        ch_old != ch_new
+      end
+    end
+    memoize :any_snippets_modified?
+  end
+end

data/lib/nanoc/base/services/outdatedness_rules/configuration_modified.rb

@@ -0,0 +1,23 @@
+module Nanoc::Int::OutdatednessRules
+  class ConfigurationModified < Nanoc::Int::OutdatednessRule
+    extend Nanoc::Int::Memoization
+
+    affects_props :raw_content, :attributes, :compiled_content, :path
+
+    def apply(_obj, outdatedness_checker)
+      if config_modified?(outdatedness_checker)
+        Nanoc::Int::OutdatednessReasons::ConfigurationModified
+      end
+    end
+
+    private
+
+    def config_modified?(outdatedness_checker)
+      obj = outdatedness_checker.site.config
+      ch_old = outdatedness_checker.checksum_store[obj]
+      ch_new = Nanoc::Int::Checksummer.calc(obj)
+      ch_old != ch_new
+    end
+    memoize :config_modified?
+  end
+end

data/lib/nanoc/base/services/outdatedness_rules/content_modified.rb

@@ -0,0 +1,15 @@
+module Nanoc::Int::OutdatednessRules
+  class ContentModified < Nanoc::Int::OutdatednessRule
+    affects_props :raw_content, :compiled_content
+
+    def apply(obj, outdatedness_checker)
+      obj = obj.item if obj.is_a?(Nanoc::Int::ItemRep)
+
+      ch_old = outdatedness_checker.checksum_store.content_checksum_for(obj)
+      ch_new = Nanoc::Int::Checksummer.calc_for_content_of(obj)
+      if ch_old != ch_new
+        Nanoc::Int::OutdatednessReasons::ContentModified
+      end
+    end
+  end
+end

data/lib/nanoc/base/services/outdatedness_rules/not_written.rb

@@ -0,0 +1,11 @@
+module Nanoc::Int::OutdatednessRules
+  class NotWritten < Nanoc::Int::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) }
+        Nanoc::Int::OutdatednessReasons::NotWritten
+      end
+    end
+  end
+end

data/lib/nanoc/base/services/outdatedness_rules/paths_modified.rb

@@ -0,0 +1,20 @@
+module Nanoc::Int::OutdatednessRules
+  class PathsModified < Nanoc::Int::OutdatednessRule
+    affects_props :path
+
+    def apply(obj, outdatedness_checker)
+      # FIXME: Prefer to not work on serialised version
+
+      mem_old = outdatedness_checker.action_sequence_store[obj]
+      mem_new = outdatedness_checker.action_sequence_for(obj).serialize
+      return true if mem_old.nil?
+
+      paths_old = mem_old.select { |pa| pa[0] == :snapshot }
+      paths_new = mem_new.select { |pa| pa[0] == :snapshot }
+
+      if paths_old != paths_new
+        Nanoc::Int::OutdatednessReasons::PathsModified
+      end
+    end
+  end
+end