nanoc 4.11.0 → 4.11.1

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

@@ -1,32 +1,34 @@
 # frozen_string_literal: true
 
-module Nanoc::Int
-  # @api private
-  class OutdatednessRule
-    include Nanoc::Int::ContractsSupport
-    include Singleton
+module Nanoc
+  module Int
+    # @api private
+    class OutdatednessRule
+      include Nanoc::Core::ContractsSupport
+      include Singleton
 
-    def call(obj, outdatedness_checker)
-      Nanoc::Int::Instrumentor.call(:outdatedness_rule_ran, self.class) do
-        apply(obj, outdatedness_checker)
+      def call(obj, outdatedness_checker)
+        Nanoc::Int::Instrumentor.call(:outdatedness_rule_ran, self.class) do
+          apply(obj, outdatedness_checker)
+        end
       end
-    end
 
-    def apply(_obj, _outdatedness_checker)
-      raise NotImplementedError.new('Nanoc::Int::OutdatednessRule subclasses must implement #apply')
-    end
+      def apply(_obj, _outdatedness_checker)
+        raise NotImplementedError.new('Nanoc::Int::OutdatednessRule subclasses must implement #apply')
+      end
 
-    contract C::None => String
-    def inspect
-      "#{self.class.name}(#{reason})"
-    end
+      contract C::None => String
+      def inspect
+        "#{self.class.name}(#{reason})"
+      end
 
-    def self.affects_props(*names)
-      @affected_props = Set.new(names)
-    end
+      def self.affects_props(*names)
+        @affected_props = Set.new(names)
+      end
 
-    def self.affected_props
-      @affected_props
+      def self.affected_props
+        @affected_props
+      end
     end
   end
 end

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

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
-module Nanoc::Int
-  # @api private
-  module OutdatednessRules
+module Nanoc
+  module Int
+    # @api private
+    module OutdatednessRules
+    end
   end
 end
 

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

@@ -1,36 +1,40 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::OutdatednessRules
-  class AttributesModified < Nanoc::Int::OutdatednessRule
-    include Nanoc::Int::ContractsSupport
+module Nanoc
+  module Int
+    module OutdatednessRules
+      class AttributesModified < Nanoc::Int::OutdatednessRule
+        include Nanoc::Core::ContractsSupport
 
-    affects_props :attributes, :compiled_content
+        affects_props :attributes, :compiled_content
 
-    contract C::Or[Nanoc::Int::ItemRep, Nanoc::Int::Item, Nanoc::Int::Configuration, 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, Nanoc::Int::Configuration
-        if outdatedness_checker.checksum_store[obj] == outdatedness_checker.checksums.checksum_for(obj)
-          return nil
-        end
+        contract C::Or[Nanoc::Core::ItemRep, Nanoc::Core::Item, Nanoc::Core::Configuration, Nanoc::Core::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Maybe[Nanoc::Int::OutdatednessReasons::Generic]
+        def apply(obj, outdatedness_checker)
+          case obj
+          when Nanoc::Core::ItemRep
+            apply(obj.item, outdatedness_checker)
+          when Nanoc::Core::Item, Nanoc::Core::Layout, Nanoc::Core::Configuration
+            if outdatedness_checker.checksum_store[obj] == outdatedness_checker.checksums.checksum_for(obj)
+              return nil
+            end
 
-        old_checksums = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
-        unless old_checksums
-          return Nanoc::Int::OutdatednessReasons::AttributesModified.new(true)
-        end
+            old_checksums = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
+            unless old_checksums
+              return Nanoc::Int::OutdatednessReasons::AttributesModified.new(true)
+            end
 
-        new_checksums = outdatedness_checker.checksums.attributes_checksum_for(obj)
+            new_checksums = outdatedness_checker.checksums.attributes_checksum_for(obj)
 
-        attributes = Set.new(old_checksums.keys) + Set.new(new_checksums.keys)
-        changed_attributes = attributes.reject { |a| old_checksums[a] == new_checksums[a] }
+            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)
+            if changed_attributes.any?
+              Nanoc::Int::OutdatednessReasons::AttributesModified.new(changed_attributes)
+            end
+          else
+            raise ArgumentError
+          end
         end
-      else
-        raise ArgumentError
       end
     end
   end

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

@@ -1,26 +1,30 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::OutdatednessRules
-  class CodeSnippetsModified < Nanoc::Int::OutdatednessRule
-    DDMemoize.activate(self)
+module Nanoc
+  module Int
+    module OutdatednessRules
+      class CodeSnippetsModified < Nanoc::Int::OutdatednessRule
+        DDMemoize.activate(self)
 
-    include Nanoc::Int::ContractsSupport
+        include Nanoc::Core::ContractsSupport
 
-    affects_props :raw_content, :attributes, :compiled_content, :path
+        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
+        def apply(_obj, outdatedness_checker)
+          if any_snippets_modified?(outdatedness_checker)
+            Nanoc::Int::OutdatednessReasons::CodeSnippetsModified
+          end
+        end
 
-    private
+        private
 
-    memoized def any_snippets_modified?(outdatedness_checker)
-      outdatedness_checker.site.code_snippets.any? do |cs|
-        ch_old = outdatedness_checker.checksum_store[cs]
-        ch_new = outdatedness_checker.checksums.checksum_for(cs)
-        ch_old != ch_new
+        memoized def any_snippets_modified?(outdatedness_checker)
+          outdatedness_checker.site.code_snippets.any? do |cs|
+            ch_old = outdatedness_checker.checksum_store[cs]
+            ch_new = outdatedness_checker.checksums.checksum_for(cs)
+            ch_old != ch_new
+          end
+        end
       end
     end
   end

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

@@ -1,16 +1,20 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::OutdatednessRules
-  class ContentModified < Nanoc::Int::OutdatednessRule
-    affects_props :raw_content, :compiled_content
+module Nanoc
+  module Int
+    module 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)
+        def apply(obj, outdatedness_checker)
+          obj = obj.item if obj.is_a?(Nanoc::Core::ItemRep)
 
-      ch_old = outdatedness_checker.checksum_store.content_checksum_for(obj)
-      ch_new = outdatedness_checker.checksums.content_checksum_for(obj)
-      if ch_old != ch_new
-        Nanoc::Int::OutdatednessReasons::ContentModified
+          ch_old = outdatedness_checker.checksum_store.content_checksum_for(obj)
+          ch_new = outdatedness_checker.checksums.content_checksum_for(obj)
+          if ch_old != ch_new
+            Nanoc::Int::OutdatednessReasons::ContentModified
+          end
+        end
       end
     end
   end

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

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

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

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

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

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::OutdatednessRules
-  class NotWritten < Nanoc::Int::OutdatednessRule
-    affects_props :raw_content, :attributes, :compiled_content, :path
+module Nanoc
+  module Int
+    module 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
+        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
   end

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

@@ -1,41 +1,45 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::OutdatednessRules
-  class RulesModified < Nanoc::Int::OutdatednessRule
-    affects_props :compiled_content, :path
-
-    def apply(obj, outdatedness_checker)
-      # Check rules of obj itself
-      if rules_modified?(obj, outdatedness_checker)
-        return Nanoc::Int::OutdatednessReasons::RulesModified
+module Nanoc
+  module Int
+    module OutdatednessRules
+      class RulesModified < Nanoc::Int::OutdatednessRule
+        affects_props :compiled_content, :path
+
+        def apply(obj, outdatedness_checker)
+          # Check rules of obj itself
+          if rules_modified?(obj, outdatedness_checker)
+            return Nanoc::Int::OutdatednessReasons::RulesModified
+          end
+
+          # Check rules of layouts used by obj
+          layouts = layouts_touched_by(obj, outdatedness_checker)
+          if layouts.any? { |layout| rules_modified?(layout, outdatedness_checker) }
+            return Nanoc::Int::OutdatednessReasons::RulesModified
+          end
+
+          nil
+        end
+
+        private
+
+        def rules_modified?(obj, outdatedness_checker)
+          seq_old = outdatedness_checker.action_sequence_store[obj]
+          seq_new = outdatedness_checker.action_sequence_for(obj).serialize
+
+          !seq_old.eql?(seq_new)
+        end
+
+        def layouts_touched_by(obj, outdatedness_checker)
+          actions = outdatedness_checker.action_sequence_store[obj]
+          layout_actions = actions.select { |a| a.first == :layout }
+
+          layout_actions.map do |layout_action|
+            layout_pattern = layout_action[1]
+            outdatedness_checker.site.layouts[layout_pattern]
+          end.compact
+        end
       end
-
-      # Check rules of layouts used by obj
-      layouts = layouts_touched_by(obj, outdatedness_checker)
-      if layouts.any? { |layout| rules_modified?(layout, outdatedness_checker) }
-        return Nanoc::Int::OutdatednessReasons::RulesModified
-      end
-
-      nil
-    end
-
-    private
-
-    def rules_modified?(obj, outdatedness_checker)
-      seq_old = outdatedness_checker.action_sequence_store[obj]
-      seq_new = outdatedness_checker.action_sequence_for(obj).serialize
-
-      !seq_old.eql?(seq_new)
-    end
-
-    def layouts_touched_by(obj, outdatedness_checker)
-      actions = outdatedness_checker.action_sequence_store[obj]
-      layout_actions = actions.select { |a| a.first == :layout }
-
-      layout_actions.map do |layout_action|
-        layout_pattern = layout_action[1]
-        outdatedness_checker.site.layouts[layout_pattern]
-      end.compact
     end
   end
 end

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

@@ -1,22 +1,26 @@
 # frozen_string_literal: true
 
-module Nanoc::Int::OutdatednessRules
-  class UsesAlwaysOutdatedFilter < Nanoc::Int::OutdatednessRule
-    affects_props :raw_content, :attributes, :path
+module Nanoc
+  module Int
+    module OutdatednessRules
+      class UsesAlwaysOutdatedFilter < Nanoc::Int::OutdatednessRule
+        affects_props :raw_content, :attributes, :path
 
-    def apply(obj, outdatedness_checker)
-      seq = outdatedness_checker.action_sequence_for(obj)
-      if any_always_outdated?(seq)
-        Nanoc::Int::OutdatednessReasons::UsesAlwaysOutdatedFilter
-      end
-    end
+        def apply(obj, outdatedness_checker)
+          seq = outdatedness_checker.action_sequence_for(obj)
+          if any_always_outdated?(seq)
+            Nanoc::Int::OutdatednessReasons::UsesAlwaysOutdatedFilter
+          end
+        end
 
-    def any_always_outdated?(seq)
-      seq
-        .select { |a| a.is_a?(Nanoc::Int::ProcessingActions::Filter) }
-        .map { |a| Nanoc::Filter.named(a.filter_name) }
-        .compact
-        .any?(&:always_outdated?)
+        def any_always_outdated?(seq)
+          seq
+            .select { |a| a.is_a?(Nanoc::Core::ProcessingActions::Filter) }
+            .map { |a| Nanoc::Filter.named(a.filter_name) }
+            .compact
+            .any?(&:always_outdated?)
+        end
+      end
     end
   end
 end

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

@@ -6,9 +6,9 @@ module Nanoc
   #
   # @api private
   class Pruner
-    include Nanoc::Int::ContractsSupport
+    include Nanoc::Core::ContractsSupport
 
-    # @param [Nanoc::Int::Configuration] config
+    # @param [Nanoc::Core::Configuration] config
     #
     # @param [Nanoc::Int::ItemRepRepo] reps
     #

data/lib/nanoc/base/views.rb

@@ -35,3 +35,10 @@ require_relative 'views/post_compile_item_view'
 require_relative 'views/post_compile_item_collection_view'
 require_relative 'views/post_compile_item_rep_view'
 require_relative 'views/post_compile_item_rep_collection_view'
+
+# TODO: Move this, once the load order is improved (i.e. the checksummer is
+# loded after the views are).
+Nanoc::Core::Checksummer.define_behavior(
+  Nanoc::View,
+  Nanoc::Core::Checksummer::UnwrapUpdateBehavior,
+)

data/lib/nanoc/base/views/basic_item_view.rb

@@ -13,7 +13,7 @@ module Nanoc
         raise Nanoc::Int::Errors::CannotGetParentOrChildrenOfNonLegacyItem.new(_unwrap.identifier)
       end
 
-      children_pattern = Nanoc::Int::Pattern.from(_unwrap.identifier.to_s + '*/')
+      children_pattern = Nanoc::Core::Pattern.from(_unwrap.identifier.to_s + '*/')
       children = @context.items.select { |i| children_pattern.match?(i.identifier) }
 
       children.map { |i| self.class.new(i, @context) }.freeze