nanoc 4.4.3 → 4.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 949b7676e2070a525cf434e0157e0423e1f694af
-  data.tar.gz: 2b1c582dd18c89efdec5ba5c8d89803dd938930f
+  metadata.gz: a8f94a3171ddf9ebc26963938e4399d7075b1e5a
+  data.tar.gz: 81f10a1af119995497a8a11ff564ecc0408c3703
 SHA512:
-  metadata.gz: cb85fb348177d808a2bc17d47b33564a4f226d98adbfb08bbbf543ab7a2efc6dc65710f7040b877f47d547a08daa5bad8726b4ab99f5fb9dd2a12ad6d1425179
-  data.tar.gz: 77d463b8d56a22823571ec42d870f044aaf33f8ded0fff69da80ddbaef09c19a9dc4ca163760a4b460a58858ce22d96c4a3a6eb1382f4640d3f2d20d5e7d4697
+  metadata.gz: 78b10318c7b1160ce58257201d03f82295db7cd027bf6cb1e5265c0bbcde0cacbf9907ee140166c51d572c1b8ca1a4c53ed93af8dfafdba3ff37f322b4110cf2
+  data.tar.gz: 67260b141c829d973f341bf469a0fae490232d628265a9e55bc6e89a73a672b8811505702b8c0327694ea6e098db5b8d16462580b920e319ddea141510df3521

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.4.3)
+    nanoc (4.4.4)
       cri (~> 2.3)
       hamster (~> 3.0)
       parallel (~> 1.9)
@@ -51,7 +51,7 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.3)
     contracts (0.14.0)
     coveralls (0.8.17)
       json (>= 1.8, < 3)
@@ -332,7 +332,7 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.2)
     vcr (3.0.3)
-    w3c_validators (1.3)
+    w3c_validators (1.3.1)
       json (~> 2.0)
       nokogiri (~> 1.6)
     webmock (2.3.1)

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.4.4 (2016-12-19)
+
+Enhancements:
+
+* Improved speed of incremental compilations (#1017, #1019, #1024)
+
 ## 4.4.3 (2016-12-17)
 
 Fixes:

data/lib/nanoc.rb

@@ -33,6 +33,7 @@ require 'forwardable'
 require 'pathname'
 require 'pstore'
 require 'set'
+require 'singleton'
 require 'tempfile'
 require 'thread'
 require 'time'

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

@@ -3,6 +3,73 @@ module Nanoc::Int
   #
   # @api private
   class OutdatednessChecker
+    class Basic
+      extend Nanoc::Int::Memoization
+
+      include Nanoc::Int::ContractsSupport
+
+      Rules = Nanoc::Int::OutdatednessRules
+
+      RULES_FOR_ITEM_REP =
+        [
+          Rules::RulesModified,
+          Rules::PathsModified,
+          Rules::ContentModified,
+          Rules::AttributesModified,
+          Rules::NotWritten,
+          Rules::CodeSnippetsModified,
+          Rules::ConfigurationModified,
+        ].freeze
+
+      RULES_FOR_LAYOUT =
+        [
+          Rules::RulesModified,
+          Rules::ContentModified,
+          Rules::AttributesModified,
+        ].freeze
+
+      contract C::KeywordArgs[outdatedness_checker: OutdatednessChecker, reps: Nanoc::Int::ItemRepRepo] => C::Any
+      def initialize(outdatedness_checker:, reps:)
+        @outdatedness_checker = outdatedness_checker
+        @reps = reps
+      end
+
+      contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::Maybe[OutdatednessStatus]
+      def outdatedness_status_for(obj)
+        case obj
+        when Nanoc::Int::ItemRep
+          apply_rules(RULES_FOR_ITEM_REP, obj)
+        when Nanoc::Int::Item
+          apply_rules_multi(RULES_FOR_ITEM_REP, @reps[obj])
+        when Nanoc::Int::Layout
+          apply_rules(RULES_FOR_LAYOUT, obj)
+        else
+          raise "do not know how to check outdatedness of #{obj.inspect}"
+        end
+      end
+      memoize :outdatedness_status_for
+
+      private
+
+      contract C::ArrayOf[Class], C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout], OutdatednessStatus => C::Maybe[OutdatednessStatus]
+      def apply_rules(rules, obj, status = OutdatednessStatus.new)
+        rules.inject(status) do |acc, rule|
+          if !acc.useful_to_apply?(rule)
+            acc
+          elsif rule.instance.apply(obj, @outdatedness_checker)
+            acc.update(rule.instance.reason)
+          else
+            acc
+          end
+        end
+      end
+
+      contract C::ArrayOf[Class], C::ArrayOf[C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout]] => C::Maybe[OutdatednessStatus]
+      def apply_rules_multi(rules, objs)
+        objs.inject(OutdatednessStatus.new) { |acc, elem| apply_rules(rules, elem, acc) }
+      end
+    end
+
     extend Nanoc::Int::Memoization
 
     include Nanoc::Int::ContractsSupport
@@ -10,6 +77,7 @@ module Nanoc::Int
     attr_reader :checksum_store
     attr_reader :dependency_store
     attr_reader :rule_memory_store
+    attr_reader :action_provider
     attr_reader :site
 
     Reasons = Nanoc::Int::OutdatednessReasons
@@ -28,8 +96,6 @@ module Nanoc::Int
       @action_provider = action_provider
       @reps = reps
 
-      @basic_outdatedness_reasons = {}
-      @outdatedness_reasons = {}
       @objects_outdated_due_to_dependencies = {}
     end
 
@@ -64,87 +130,18 @@ module Nanoc::Int
 
     private
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::Bool
-    # Checks whether the given object is outdated and therefore needs to be
-    # recompiled. This method does not take dependencies into account; use
-    # {#outdated?} if you want to include dependencies in the outdatedness
-    # check.
-    #
-    # @param [Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] obj The object
-    #   whose outdatedness should be checked.
-    #
-    # @return [Boolean] true if the object is outdated, false otherwise
-    def basic_outdated?(obj)
-      !basic_outdatedness_reason_for(obj).nil?
+    contract C::None => Basic
+    def basic
+      @_basic ||= Basic.new(outdatedness_checker: self, reps: @reps)
     end
 
     contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::Maybe[Reasons::Generic]
-    # Calculates the reason why the given object is outdated. This method does
-    # not take dependencies into account; use {#outdatedness_reason_for?} if
-    # you want to include dependencies in the outdatedness check.
-    #
-    # @param [Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] obj The object
-    #   whose outdatedness reason should be calculated.
-    #
-    # @return [Reasons::Generic, nil] The reason why the
-    #   given object is outdated, or nil if the object is not outdated.
     def basic_outdatedness_reason_for(obj)
-      case obj
-      when Nanoc::Int::ItemRep
-        # Outdated if rules outdated
-        return Reasons::RulesModified if
-          rule_memory_differs_for(obj)
-
-        # Outdated if checksums are missing or different
-        return Reasons::NotEnoughData unless checksums_available?(obj.item)
-        return Reasons::ContentModified unless content_checksums_identical?(obj.item)
-        return Reasons::AttributesModified unless attributes_checksums_identical?(obj.item)
-
-        # Outdated if compiled file doesn't exist (yet)
-        return Reasons::NotWritten if obj.raw_path && !File.file?(obj.raw_path)
-
-        # Outdated if code snippets outdated
-        return Reasons::CodeSnippetsModified if site.code_snippets.any? do |cs|
-          object_modified?(cs)
-        end
-
-        # Outdated if configuration outdated
-        return Reasons::ConfigurationModified if object_modified?(site.config)
-
-        # Not outdated
-        nil
-      when Nanoc::Int::Item
-        @reps[obj].lazy.map { |rep| basic_outdatedness_reason_for(rep) }.find { |s| s }
-      when Nanoc::Int::Layout
-        # Outdated if rules outdated
-        return Reasons::RulesModified if
-          rule_memory_differs_for(obj)
-
-        # Outdated if checksums are missing or different
-        return Reasons::NotEnoughData unless checksums_available?(obj)
-        return Reasons::ContentModified unless content_checksums_identical?(obj)
-        return Reasons::AttributesModified unless attributes_checksums_identical?(obj)
-
-        # Not outdated
-        nil
-      else
-        raise "do not know how to check outdatedness of #{obj.inspect}"
-      end
+      # FIXME: Stop using this; it is no longer accurate, as there can be >1 reasons
+      basic.outdatedness_status_for(obj).reasons.first
     end
-    memoize :basic_outdatedness_reason_for
 
     contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout], Hamster::Set => C::Bool
-    # Checks whether the given object is outdated due to dependencies.
-    #
-    # @param [Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] obj The object
-    #   whose outdatedness should be checked.
-    #
-    # @param [Set] processed The collection of items that has been visited
-    #   during this outdatedness check. This is used to prevent checks for
-    #   items that (indirectly) depend on their own from looping
-    #   indefinitely. It should not be necessary to pass this a custom value.
-    #
-    # @return [Boolean] true if the object is outdated, false otherwise
     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::Int::ItemRep)
@@ -160,8 +157,10 @@ module Nanoc::Int
       return false if processed.include?(obj)
 
       # Calculate
-      is_outdated = dependency_store.objects_causing_outdatedness_of(obj).any? do |other|
-        other.nil? || basic_outdated?(other) || outdated_due_to_dependencies?(other, processed.merge([obj]))
+      is_outdated = dependency_store.dependencies_causing_outdatedness_of(obj).any? do |dep|
+        dependency_causes_outdatedness?(dep) ||
+          (dep.props.compiled_content? &&
+            outdated_due_to_dependencies?(dep.from, processed.merge([obj])))
       end
 
       # Cache
@@ -171,66 +170,12 @@ module Nanoc::Int
       is_outdated
     end
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::Bool
-    # @param [Nanoc::Int::ItemRep, Nanoc::Int::Layout] obj The layout or item
-    #   representation to check the rule memory for
-    #
-    # @return [Boolean] true if the rule memory for the given item
-    #   represenation has changed, false otherwise
-    def rule_memory_differs_for(obj)
-      !rule_memory_store[obj].eql?(@action_provider.memory_for(obj).serialize)
-    end
-    memoize :rule_memory_differs_for
-
-    contract C::Any => String
-    # @param obj The object to create a checksum for
-    #
-    # @return [String] The digest
-    def calc_checksum(obj)
-      Nanoc::Int::Checksummer.calc(obj)
-    end
-    memoize :calc_checksum
-
-    contract C::Any => C::Bool
-    # @param obj
-    #
-    # @return [Boolean] false if either the new or the old checksum for the
-    #   given object is not available, true if both checksums are available
-    def checksums_available?(obj)
-      checksum_store[obj] && calc_checksum(obj) ? true : false
-    end
-    memoize :checksums_available?
-
-    contract C::Any => C::Bool
-    # @param obj
-    #
-    # @return [Boolean] false if the old and new checksums for the given
-    #   object differ, true if they are identical
-    def checksums_identical?(obj)
-      checksum_store[obj] == calc_checksum(obj)
-    end
-    memoize :checksums_identical?
-
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Bool
-    def content_checksums_identical?(obj)
-      checksum_store.content_checksum_for(obj) == Nanoc::Int::Checksummer.calc_for_content_of(obj)
-    end
-    memoize :content_checksums_identical?
-
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Bool
-    def attributes_checksums_identical?(obj)
-      checksum_store.attributes_checksum_for(obj) == Nanoc::Int::Checksummer.calc_for_attributes_of(obj)
-    end
-    memoize :attributes_checksums_identical?
+    contract Nanoc::Int::Dependency => C::Bool
+    def dependency_causes_outdatedness?(dependency)
+      return true if dependency.from.nil?
 
-    contract C::Any => C::Bool
-    # @param obj
-    #
-    # @return [Boolean] true if the old and new checksums for the given object
-    #   are available and identical, false otherwise
-    def object_modified?(obj)
-      !checksums_available?(obj) || !checksums_identical?(obj)
+      status = basic.outdatedness_status_for(dependency.from)
+      (status.props.active & dependency.props.active).any?
     end
-    memoize :object_modified?
   end
 end

data/lib/nanoc/base/compilation/outdatedness_reasons.rb

@@ -9,43 +9,54 @@ module Nanoc::Int
       # @return [String] A descriptive message for this outdatedness reason
       attr_reader :message
 
+      # @return [Nanoc::Int::Props]
+      attr_reader :props
+
       # @param [String] message The descriptive message for this outdatedness
       #   reason
-      def initialize(message)
+      def initialize(message, props = Nanoc::Int::Props.new)
         @message = message
+        @props = props
       end
     end
 
     CodeSnippetsModified = Generic.new(
       'The code snippets have been modified since the last time the site was compiled.',
+      Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
     )
 
     ConfigurationModified = Generic.new(
       'The site configuration has been modified since the last time the site was compiled.',
+      Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
     )
 
     DependenciesOutdated = Generic.new(
       'This item uses content or attributes that have changed since the last time the site was compiled.',
     )
 
-    NotEnoughData = Generic.new(
-      'Not enough data is present to correctly determine whether the item is outdated.',
-    )
-
     NotWritten = Generic.new(
       'This item representation has not yet been written to the output directory (but it does have a path).',
+      Props.new(raw_content: true, attributes: true, compiled_content: true, path: true),
     )
 
     RulesModified = Generic.new(
       'The rules file has been modified since the last time the site was compiled.',
+      Props.new(compiled_content: true, path: true),
     )
 
     ContentModified = Generic.new(
       'The content of this item has been modified since the last time the site was compiled.',
+      Props.new(raw_content: true, compiled_content: true),
     )
 
     AttributesModified = Generic.new(
       'The attributes of this item have been modified since the last time the site was compiled.',
+      Props.new(attributes: true, compiled_content: true),
+    )
+
+    PathsModified = Generic.new(
+      'One or more output paths of this item have been modified since the last time the site was compiled.',
+      Props.new(path: true),
     )
   end
 end

data/lib/nanoc/base/entities.rb

@@ -15,6 +15,10 @@ require_relative 'entities/item'
 require_relative 'entities/item_rep'
 require_relative 'entities/layout'
 require_relative 'entities/pattern'
+require_relative 'entities/props'
 require_relative 'entities/rule_memory'
 require_relative 'entities/site'
 require_relative 'entities/snapshot_def'
+
+require_relative 'entities/outdatedness_status'
+require_relative 'entities/dependency'

data/lib/nanoc/base/entities/dependency.rb

@@ -0,0 +1,28 @@
+module Nanoc::Int
+  # @api private
+  # A dependency between two items/layouts.
+  class Dependency
+    include Nanoc::Int::ContractsSupport
+
+    contract C::None => C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]]
+    attr_reader :from
+
+    contract C::None => C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]]
+    attr_reader :to
+
+    contract C::None => Nanoc::Int::Props
+    attr_reader :props
+
+    contract C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]], C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]], Nanoc::Int::Props => C::Any
+    def initialize(from, to, props)
+      @from  = from
+      @to    = to
+      @props = props
+    end
+
+    contract C::None => String
+    def inspect
+      "Dependency(#{@from.inspect} -> #{@to.inspect}, #{@props.inspect})"
+    end
+  end
+end

data/lib/nanoc/base/entities/document.rb

@@ -5,7 +5,7 @@ module Nanoc
       include Nanoc::Int::ContractsSupport
 
       # @return [Nanoc::Int::Content]
-      attr_reader :content
+      attr_accessor :content
 
       # @return [Hash]
       def attributes

data/lib/nanoc/base/entities/outdatedness_status.rb

@@ -0,0 +1,23 @@
+module Nanoc::Int
+  # @api private
+  class OutdatednessStatus
+    attr_reader :reasons
+    attr_reader :props
+
+    def initialize(reasons: [], props: Props.new)
+      @reasons = reasons
+      @props = props
+    end
+
+    def useful_to_apply?(rule)
+      (rule.instance.reason.props.active - @props.active).any?
+    end
+
+    def update(reason)
+      self.class.new(
+        reasons: @reasons + [reason],
+        props: @props.merge(reason.props),
+      )
+    end
+  end
+end

data/lib/nanoc/base/entities/props.rb

@@ -0,0 +1,76 @@
+module Nanoc::Int
+  # @api private
+  class Props
+    include Nanoc::Int::ContractsSupport
+
+    contract C::KeywordArgs[raw_content: C::Optional[C::Bool], attributes: C::Optional[C::Bool], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => C::Any
+    def initialize(raw_content: false, attributes: false, compiled_content: false, path: false)
+      @raw_content = raw_content
+      @attributes = attributes
+      @compiled_content = compiled_content
+      @path = path
+    end
+
+    contract C::None => String
+    def inspect
+      ''.tap do |s|
+        s << 'Props('
+        s << (raw_content? ? 'r' : '_')
+        s << (attributes? ? 'a' : '_')
+        s << (compiled_content? ? 'c' : '_')
+        s << (path? ? 'p' : '_')
+        s << ')'
+      end
+    end
+
+    contract C::None => C::Bool
+    def raw_content?
+      @raw_content
+    end
+
+    contract C::None => C::Bool
+    def attributes?
+      @attributes
+    end
+
+    contract C::None => C::Bool
+    def compiled_content?
+      @compiled_content
+    end
+
+    contract C::None => C::Bool
+    def path?
+      @path
+    end
+
+    contract Nanoc::Int::Props => Nanoc::Int::Props
+    def merge(other)
+      Props.new(
+        raw_content: raw_content? || other.raw_content?,
+        attributes: attributes? || other.attributes?,
+        compiled_content: compiled_content? || other.compiled_content?,
+        path: path? || other.path?,
+      )
+    end
+
+    contract C::None => Set
+    def active
+      Set.new.tap do |pr|
+        pr << :raw_content if raw_content?
+        pr << :attributes if attributes?
+        pr << :compiled_content if compiled_content?
+        pr << :path if path?
+      end
+    end
+
+    contract C::None => Hash
+    def to_h
+      {
+        raw_content: raw_content?,
+        attributes: attributes?,
+        compiled_content: compiled_content?,
+        path: path?,
+      }
+    end
+  end
+end

data/lib/nanoc/base/entities/rule_memory.rb

@@ -47,6 +47,13 @@ module Nanoc::Int
       @actions.any? { |a| a.is_a?(Nanoc::Int::ProcessingActions::Layout) }
     end
 
+    contract C::None => Hash
+    def paths
+      snapshot_actions.each_with_object({}) do |action, paths|
+        paths[action.snapshot_name] = action.path
+      end
+    end
+
     # TODO: Add contract
     def serialize
       map(&:serialize)

data/lib/nanoc/base/plugin_registry.rb

@@ -157,7 +157,7 @@ module Nanoc::Int
       res
     end
 
-    # @param [Class] klass
+    # @param [Class] subclass
     #
     # @return [Class]
     #

data/lib/nanoc/base/repos/dependency_store.rb

@@ -1,48 +1,6 @@
 module Nanoc::Int
   # @api private
   class DependencyStore < ::Nanoc::Int::Store
-    # A dependency between two items/layouts.
-    class Dependency
-      include Nanoc::Int::ContractsSupport
-
-      contract C::None => C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]
-      attr_reader :from
-
-      contract C::None => C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]
-      attr_reader :to
-
-      contract C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]], C::Maybe[C::Or[Nanoc::Int::Item, Nanoc::Int::Layout]], C::KeywordArgs[raw_content: C::Optional[C::Bool], attributes: C::Optional[C::Bool], compiled_content: C::Optional[C::Bool], path: C::Optional[C::Bool]] => C::Any
-      def initialize(from, to, raw_content:, attributes:, compiled_content:, path:)
-        @from             = from
-        @to               = to
-
-        @raw_content      = raw_content
-        @attributes       = attributes
-        @compiled_content = compiled_content
-        @path             = path
-      end
-
-      contract C::None => C::Bool
-      def raw_content?
-        @raw_content
-      end
-
-      contract C::None => C::Bool
-      def attributes?
-        @attributes
-      end
-
-      contract C::None => C::Bool
-      def compiled_content?
-        @compiled_content
-      end
-
-      contract C::None => C::Bool
-      def path?
-        @path
-      end
-    end
-
     include Nanoc::Int::ContractsSupport
 
     # @return [Array<Nanoc::Int::Item, Nanoc::Int::Layout>]
@@ -56,18 +14,20 @@ module Nanoc::Int
       @graph   = Nanoc::Int::DirectedGraph.new([nil] + @objects)
     end
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::ArrayOf[Dependency]
+    contract C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] => C::ArrayOf[Nanoc::Int::Dependency]
     def dependencies_causing_outdatedness_of(object)
       objects_causing_outdatedness_of(object).map do |other_object|
-        props = @graph.props_for(other_object, object) || {}
+        props = props_for(other_object, object)
 
-        Dependency.new(
+        Nanoc::Int::Dependency.new(
           other_object,
           object,
-          raw_content: props.fetch(:raw_content, false),
-          attributes: props.fetch(:attributes, false),
-          compiled_content: props.fetch(:compiled_content, false),
-          path: props.fetch(:path, false),
+          Nanoc::Int::Props.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),
+          ),
         )
       end
     end
@@ -123,12 +83,12 @@ module Nanoc::Int
     #
     # @return [void]
     def record_dependency(src, dst, raw_content: false, attributes: false, compiled_content: false, path: false)
-      existing_props = @graph.props_for(dst, src) || {}
-      new_props = { raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path }
-      props = merge_props(existing_props, new_props)
+      existing_props = Nanoc::Int::Props.new(@graph.props_for(dst, src) || {})
+      new_props = Nanoc::Int::Props.new(raw_content: raw_content, attributes: attributes, compiled_content: compiled_content, path: path)
+      props = existing_props.merge(new_props)
 
       # Warning! dst and src are *reversed* here!
-      @graph.add_edge(dst, src, props: props) unless src == dst
+      @graph.add_edge(dst, src, props: props.to_h) unless src == dst
     end
 
     # Empties the list of dependencies for the given object. This is necessary
@@ -146,10 +106,13 @@ module Nanoc::Int
 
     protected
 
-    def merge_props(p1, p2)
-      keys = (p1.keys + p2.keys).uniq
-      keys.each_with_object({}) do |key, memo|
-        memo[key] = p1.fetch(key, false) || p2.fetch(key, false)
+    def props_for(a, b)
+      props = @graph.props_for(a, b) || {}
+
+      if props.values.any? { |v| v }
+        props
+      else
+        { raw_content: true, attributes: true, compiled_content: true, path: true }
       end
     end
 
@@ -179,10 +142,11 @@ module Nanoc::Int
 
       # Record dependency from all items on new items
       new_objects = (@objects - previous_objects)
+      new_props = { raw_content: true, attributes: true, compiled_content: true, path: true }
       new_objects.each do |new_obj|
         @objects.each do |obj|
           next unless obj.is_a?(Nanoc::Int::Item)
-          @graph.add_edge(new_obj, obj)
+          @graph.add_edge(new_obj, obj, props: new_props)
         end
       end
     end

data/lib/nanoc/base/services.rb

@@ -11,3 +11,5 @@ require_relative 'services/item_rep_writer'
 require_relative 'services/notification_center'
 require_relative 'services/pruner'
 require_relative 'services/temp_filename_factory'
+require_relative 'services/outdatedness_rule'
+require_relative 'services/outdatedness_rules'

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

@@ -19,8 +19,8 @@ module Nanoc::Int
       raise NotImplementedError
     end
 
-    def paths_for(_rep)
-      raise NotImplementedError
+    def paths_for(rep)
+      memory_for(rep).paths
     end
   end
 end

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

@@ -129,7 +129,7 @@ module Nanoc
     # Sets up the filter and runs the filter. This method passes its arguments
     # to {#run} unchanged and returns the return value from {#run}.
     #
-    # @see {#run}
+    # @see #run
     #
     # @api private
     def setup_and_run(*args)

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

@@ -0,0 +1,21 @@
+module Nanoc::Int
+  # @api private
+  class OutdatednessRule
+    include Nanoc::Int::ContractsSupport
+    include Singleton
+
+    def apply(_obj, _outdatedness_checker)
+      raise NotImplementedError.new('Nanoc::Int::OutdatednessRule subclasses must implement ##reason, and #apply')
+    end
+
+    contract C::None => String
+    def inspect
+      "#{self.class.name}(#{reason})"
+    end
+
+    # TODO: remove
+    def reason
+      raise NotImplementedError.new('Nanoc::Int::OutdatednessRule subclasses must implement ##reason, and #apply')
+    end
+  end
+end

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

@@ -0,0 +1,121 @@
+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)
+        any_snippets_modified?(outdatedness_checker)
+      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)
+        config_modified?(outdatedness_checker)
+      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)
+        # FIXME: check all paths (for all snapshots)
+        obj.raw_path && !File.file?(obj.raw_path)
+      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)
+        ch_old != ch_new
+      end
+    end
+
+    class AttributesModified < OutdatednessRule
+      def reason
+        Nanoc::Int::OutdatednessReasons::AttributesModified
+      end
+
+      def apply(obj, outdatedness_checker)
+        obj = obj.item if obj.is_a?(Nanoc::Int::ItemRep)
+
+        ch_old = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
+        ch_new = Nanoc::Int::Checksummer.calc_for_attributes_of(obj)
+        ch_old != ch_new
+      end
+    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
+        !mem_old.eql?(mem_new)
+      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 }
+
+        paths_old != paths_new
+      end
+    end
+  end
+end

data/lib/nanoc/cli/commands/show-data.rb

@@ -90,10 +90,10 @@ module Nanoc::CLI::Commands
             end
 
           props = ''
-          props << (dep.raw_content? ? 'r' : '_')
-          props << (dep.attributes? ? 'a' : '_')
-          props << (dep.compiled_content? ? 'c' : '_')
-          props << (dep.path? ? 'p' : '_')
+          props << (dep.props.raw_content? ? 'r' : '_')
+          props << (dep.props.attributes? ? 'a' : '_')
+          props << (dep.props.compiled_content? ? 'c' : '_')
+          props << (dep.props.path? ? 'p' : '_')
 
           if pred
             puts "  [ #{format '%6s', type} ] (#{props}) #{pred.identifier}"

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -40,10 +40,6 @@ module Nanoc::RuleDSL
       @rule_memory_calculator.snapshots_defs_for(rep)
     end
 
-    def paths_for(rep)
-      @rule_memory_calculator.paths_for_rep(rep)
-    end
-
     def preprocess(site)
       ctx = new_preprocessor_context(site)
 

data/lib/nanoc/rule_dsl/rule_memory_calculator.rb

@@ -47,7 +47,6 @@ module Nanoc::RuleDSL
         raise UnsupportedObjectTypeException.new(obj)
       end
     end
-    memoize :[]
 
     # @param [Nanoc::Int::ItemRep] rep The item representation for which to fetch
     #   the list of snapshots
@@ -89,17 +88,6 @@ module Nanoc::RuleDSL
       executor.rule_memory
     end
 
-    # @param [Nanoc::Int::ItemRep] rep The item representation to get the rule
-    #   memory for
-    #
-    # @return [Hash<Symbol, String>] Pairs of snapshot name and path
-    def paths_for_rep(rep)
-      snapshot_actions = new_rule_memory_for_rep(rep).snapshot_actions
-      snapshot_actions.each_with_object({}) do |action, paths|
-        paths[action.snapshot_name] = action.path
-      end
-    end
-
     # @param [Nanoc::Int::Layout] layout
     #
     # @return [Nanoc::Int::RuleMemory]

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.4.3'.freeze
+  VERSION = '4.4.4'.freeze
 end

data/test/base/test_outdatedness_checker.rb

@@ -42,7 +42,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       site.compiler.load_stores
       outdatedness_checker = site.compiler.send :outdatedness_checker
       rep = site.compiler.reps[site.items.find { |i| i.identifier == '/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::NotEnoughData, outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::ContentModified, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 

data/test/checking/checks/test_html.rb

@@ -2,7 +2,7 @@ class Nanoc::Checking::Checks::HTMLTest < Nanoc::TestCase
   def test_run_ok
     require 'w3c_validators'
 
-    if ::W3CValidators::VERSION == '1.3'
+    if ::W3CValidators::VERSION =~ /\A1\.3|1\.3\.1\z/
       skip 'broken (see https://github.com/w3c-validators/w3c_validators/issues/25)'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.4.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -138,6 +138,7 @@ files:
 - lib/nanoc/base/entities/configuration.rb
 - lib/nanoc/base/entities/content.rb
 - lib/nanoc/base/entities/context.rb
+- lib/nanoc/base/entities/dependency.rb
 - lib/nanoc/base/entities/directed_graph.rb
 - lib/nanoc/base/entities/document.rb
 - lib/nanoc/base/entities/identifiable_collection.rb
@@ -146,12 +147,14 @@ files:
 - lib/nanoc/base/entities/item_rep.rb
 - lib/nanoc/base/entities/layout.rb
 - lib/nanoc/base/entities/lazy_value.rb
+- lib/nanoc/base/entities/outdatedness_status.rb
 - lib/nanoc/base/entities/pattern.rb
 - lib/nanoc/base/entities/processing_action.rb
 - lib/nanoc/base/entities/processing_actions.rb
 - lib/nanoc/base/entities/processing_actions/filter.rb
 - lib/nanoc/base/entities/processing_actions/layout.rb
 - lib/nanoc/base/entities/processing_actions/snapshot.rb
+- lib/nanoc/base/entities/props.rb
 - lib/nanoc/base/entities/rule_memory.rb
 - lib/nanoc/base/entities/site.rb
 - lib/nanoc/base/entities/snapshot_def.rb
@@ -182,6 +185,8 @@ files:
 - lib/nanoc/base/services/item_rep_selector.rb
 - lib/nanoc/base/services/item_rep_writer.rb
 - lib/nanoc/base/services/notification_center.rb
+- lib/nanoc/base/services/outdatedness_rule.rb
+- lib/nanoc/base/services/outdatedness_rules.rb
 - lib/nanoc/base/services/pruner.rb
 - lib/nanoc/base/services/temp_filename_factory.rb
 - lib/nanoc/base/views.rb