nanoc 4.3.8 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8471fc905ae1f77b95c08da9253b6f4dcf20c85c
-  data.tar.gz: a944c679e283c221ec1c3f67270ceee7805f472a
+  metadata.gz: 25161ec9b45e6f1a49b7eb87b64eeff9a6640b8f
+  data.tar.gz: d4b23a01bbdfc6846fbcf5b1c128c0fcba5b06b3
 SHA512:
-  metadata.gz: 6e5e7d17725da1b15847d97fdead9b4f734c9b0865060124a84e8c8a5e0a832267ebe4575a781daa959657b36cf55b81b2e0b6a49f9e3afd8ba77d0438d4c1af
-  data.tar.gz: 648f66ee103dcf20b6b91f974528b4ce17cdc3f7c2c64de3df45e6377d306e3724f3874689e5706edf515022ec89caa8862901a1373d8b61c2a7bb71696492c0
+  metadata.gz: fd3b4caa69b4e48ae48bfb35f2553a1ff6e88eb722a7056f268aa7138984b7e6114f6cfa40328bd41bf8803b8788fb27a491b5195e00b9bd09876d9af05a6c65
+  data.tar.gz: 868162e517d1711878df3d9027617e55b96be2040e36c14497fcea3a8f8f057c4e69ab7aac0b1947a5c513a002e0d378cd612ad263842b5d53986d95e2be91eb

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.3.8)
+    nanoc (4.4.0)
       cri (~> 2.3)
       hamster (~> 3.0)
       parallel (~> 1.9)

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.4.0 (2015-11-19)
+
+Features:
+
+* Added support for Nanoc environments (#859)
+
 ## 4.3.8 (2016-11-18)
 
 Enhancements:

data/lib/nanoc/base.rb

@@ -1,28 +1,16 @@
-module Nanoc
-  autoload 'Error',                'nanoc/base/error'
-  autoload 'Filter',               'nanoc/base/compilation/filter'
-end
-
 # @api private
 module Nanoc::Int
-  # Load helper classes
-  autoload 'Context',              'nanoc/base/context'
-  autoload 'Checksummer',          'nanoc/base/checksummer'
-  autoload 'DirectedGraph',        'nanoc/base/directed_graph'
-  autoload 'Errors',               'nanoc/base/errors'
-  autoload 'Memoization',          'nanoc/base/memoization'
-  autoload 'PluginRegistry',       'nanoc/base/plugin_registry'
-
-  # Load compilation classes
   autoload 'Compiler',             'nanoc/base/compilation/compiler'
-  autoload 'DependencyTracker',    'nanoc/base/compilation/dependency_tracker'
-  autoload 'ItemRepRepo',          'nanoc/base/compilation/item_rep_repo'
   autoload 'OutdatednessChecker',  'nanoc/base/compilation/outdatedness_checker'
   autoload 'OutdatednessReasons',  'nanoc/base/compilation/outdatedness_reasons'
 end
 
 require_relative 'base/core_ext'
 require_relative 'base/contracts_support'
+require_relative 'base/memoization'
+require_relative 'base/plugin_registry'
+require_relative 'base/error'
+require_relative 'base/errors'
 
 require_relative 'base/entities'
 require_relative 'base/feature'

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

@@ -118,9 +118,7 @@ module Nanoc::Int
       # Calculate checksums
       objects_to_checksum =
         site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
-      objects_to_checksum.each do |obj|
-        checksum_store[obj] = Nanoc::Int::Checksummer.calc(obj)
-      end
+      objects_to_checksum.each { |obj| checksum_store.add(obj) }
 
       # Store
       stores.each(&:store)
@@ -172,7 +170,7 @@ module Nanoc::Int
     # @api private
     def filter_name_and_args_for_layout(layout)
       mem = action_provider.memory_for(layout)
-      if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::RuleMemoryActions::Filter)
+      if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::ProcessingActions::Filter)
         # FIXME: Provide a nicer error message
         raise Nanoc::Int::Errors::Generic, "No rule memory found for #{layout.identifier}"
       end
@@ -246,7 +244,7 @@ module Nanoc::Int
 
             @fibers.delete(rep)
           ensure
-            dependency_tracker.exit(rep.item)
+            dependency_tracker.exit
           end
         end
 
@@ -278,11 +276,11 @@ module Nanoc::Int
 
       action_provider.memory_for(rep).each do |action|
         case action
-        when Nanoc::Int::RuleMemoryActions::Filter
+        when Nanoc::Int::ProcessingActions::Filter
           executor.filter(rep, action.filter_name, action.params)
-        when Nanoc::Int::RuleMemoryActions::Layout
+        when Nanoc::Int::ProcessingActions::Layout
           executor.layout(rep, action.layout_identifier, action.params)
-        when Nanoc::Int::RuleMemoryActions::Snapshot
+        when Nanoc::Int::ProcessingActions::Snapshot
           executor.snapshot(rep, action.snapshot_name, final: action.final?, path: action.path)
         else
           raise "Internal inconsistency: unknown action #{action.inspect}"

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

@@ -5,6 +5,8 @@ module Nanoc::Int
   class OutdatednessChecker
     extend Nanoc::Int::Memoization
 
+    include Nanoc::Int::ContractsSupport
+
     attr_reader :checksum_store
     attr_reader :dependency_store
     attr_reader :rule_memory_store
@@ -31,6 +33,7 @@ module Nanoc::Int
       @objects_outdated_due_to_dependencies = {}
     end
 
+    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.
     #
@@ -42,6 +45,7 @@ module Nanoc::Int
       !outdatedness_reason_for(obj).nil?
     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.
     #
     # @param [Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout] obj The object
@@ -60,6 +64,7 @@ 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
@@ -73,6 +78,7 @@ module Nanoc::Int
       !basic_outdatedness_reason_for(obj).nil?
     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.
@@ -91,7 +97,8 @@ module Nanoc::Int
 
         # Outdated if checksums are missing or different
         return Reasons::NotEnoughData unless checksums_available?(obj.item)
-        return Reasons::SourceModified unless checksums_identical?(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)
@@ -107,7 +114,7 @@ module Nanoc::Int
         # Not outdated
         nil
       when Nanoc::Int::Item
-        @reps[obj].find { |rep| basic_outdatedness_reason_for(rep) }
+        @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
@@ -115,7 +122,8 @@ module Nanoc::Int
 
         # Outdated if checksums are missing or different
         return Reasons::NotEnoughData unless checksums_available?(obj)
-        return Reasons::SourceModified unless checksums_identical?(obj)
+        return Reasons::ContentModified unless content_checksums_identical?(obj)
+        return Reasons::AttributesModified unless attributes_checksums_identical?(obj)
 
         # Not outdated
         nil
@@ -125,6 +133,7 @@ module Nanoc::Int
     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
@@ -162,6 +171,7 @@ 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
     #
@@ -172,6 +182,7 @@ module Nanoc::Int
     end
     memoize :rule_memory_differs_for
 
+    contract C::Any => String
     # @param obj The object to create a checksum for
     #
     # @return [String] The digest
@@ -180,15 +191,17 @@ module Nanoc::Int
     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)
+      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
@@ -198,6 +211,19 @@ module Nanoc::Int
     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 C::Any => C::Bool
     # @param obj
     #
     # @return [Boolean] true if the old and new checksums for the given object

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

@@ -40,8 +40,12 @@ module Nanoc::Int
       'The rules file has been modified since the last time the site was compiled.',
     )
 
-    SourceModified = Generic.new(
-      'The source file of this item has been modified since the last time the site was compiled.',
+    ContentModified = Generic.new(
+      'The content of this item has been modified since the last time the site was compiled.',
+    )
+
+    AttributesModified = Generic.new(
+      'The attributes of this item have been modified since the last time the site was compiled.',
     )
   end
 end

data/lib/nanoc/base/entities.rb

@@ -1,7 +1,10 @@
+require_relative 'entities/context'
+require_relative 'entities/directed_graph'
+
 require_relative 'entities/identifier'
 require_relative 'entities/content'
-require_relative 'entities/rule_memory_action'
-require_relative 'entities/rule_memory_actions'
+require_relative 'entities/processing_action'
+require_relative 'entities/processing_actions'
 
 require_relative 'entities/code_snippet'
 require_relative 'entities/configuration'

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

@@ -32,7 +32,9 @@ module Nanoc::Int
     #
     # @return [void]
     def load
+      # rubocop:disable Lint/Eval
       eval(@data, TOPLEVEL_BINDING, @filename)
+      # rubocop:enable Lint/Eval
       nil
     end
 

data/lib/nanoc/base/{context.rb → entities/context.rb}

@@ -37,9 +37,11 @@ module Nanoc::Int
     # Returns a binding for this instance.
     #
     # @return [Binding] A binding for this instance
+    # rubocop:disable Style/AccessorMethodName
     def get_binding
       binding
     end
+    # rubocop:enable Style/AccessorMethodName
 
     def include(mod)
       metaclass = class << self; self; end

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

@@ -18,24 +18,41 @@ module Nanoc
       # @return [String, nil]
       attr_accessor :checksum_data
 
+      # @return [String, nil]
+      attr_accessor :content_checksum_data
+
+      # @return [String, nil]
+      attr_accessor :attributes_checksum_data
+
       c_content = C::Or[String, Nanoc::Int::Content]
       c_attributes = C::Or[Hash, Proc]
       c_identifier = C::Or[String, Nanoc::Identifier]
-      c_checksum_data = C::Optional[C::Maybe[String]]
+      c_checksum_data = C::KeywordArgs[
+        checksum_data: C::Optional[C::Maybe[String]],
+        content_checksum_data: C::Optional[C::Maybe[String]],
+        attributes_checksum_data: C::Optional[C::Maybe[String]],
+      ]
 
-      contract c_content, c_attributes, c_identifier, C::KeywordArgs[checksum_data: c_checksum_data] => C::Any
+      contract c_content, c_attributes, c_identifier, c_checksum_data => C::Any
       # @param [String, Nanoc::Int::Content] content
       #
       # @param [Hash, Proc] attributes
       #
       # @param [String, Nanoc::Identifier] identifier
       #
-      # @param [String, nil] checksum_data Used to determine whether the document has changed
-      def initialize(content, attributes, identifier, checksum_data: nil)
+      # @param [String, nil] checksum_data
+      #
+      # @param [String, nil] content_checksum_data
+      #
+      # @param [String, nil] attributes_checksum_data
+      def initialize(content, attributes, identifier, checksum_data: nil, content_checksum_data: nil, attributes_checksum_data: nil)
         @content = Nanoc::Int::Content.create(content)
         @attributes = Nanoc::Int::LazyValue.new(attributes).map(&:__nanoc_symbolize_keys_recursively)
         @identifier = Nanoc::Identifier.from(identifier)
+
         @checksum_data = checksum_data
+        @content_checksum_data = content_checksum_data
+        @attributes_checksum_data = attributes_checksum_data
       end
 
       contract C::None => self

data/lib/nanoc/base/entities/{rule_memory_action.rb → processing_action.rb}

@@ -1,11 +1,11 @@
 module Nanoc::Int
-  class RuleMemoryAction
+  class ProcessingAction
     def serialize
-      raise NotImplementedError.new('Nanoc::RuleMemoryAction subclasses must implement #serialize and #to_s')
+      raise NotImplementedError.new('Nanoc::ProcessingAction subclasses must implement #serialize and #to_s')
     end
 
     def to_s
-      raise NotImplementedError.new('Nanoc::RuleMemoryAction subclasses must implement #serialize and #to_s')
+      raise NotImplementedError.new('Nanoc::ProcessingAction subclasses must implement #serialize and #to_s')
     end
 
     def inspect

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

@@ -0,0 +1,3 @@
+require_relative 'processing_actions/filter'
+require_relative 'processing_actions/layout'
+require_relative 'processing_actions/snapshot'

data/lib/nanoc/base/entities/{rule_memory_actions → processing_actions}/filter.rb

@@ -1,5 +1,5 @@
-module Nanoc::Int::RuleMemoryActions
-  class Filter < Nanoc::Int::RuleMemoryAction
+module Nanoc::Int::ProcessingActions
+  class Filter < Nanoc::Int::ProcessingAction
     # filter :foo
     # filter :foo, params
 

data/lib/nanoc/base/entities/{rule_memory_actions → processing_actions}/layout.rb

@@ -1,5 +1,5 @@
-module Nanoc::Int::RuleMemoryActions
-  class Layout < Nanoc::Int::RuleMemoryAction
+module Nanoc::Int::ProcessingActions
+  class Layout < Nanoc::Int::ProcessingAction
     # layout '/foo.erb'
     # layout '/foo.erb', params
 

data/lib/nanoc/base/entities/{rule_memory_actions → processing_actions}/snapshot.rb

@@ -1,5 +1,5 @@
-module Nanoc::Int::RuleMemoryActions
-  class Snapshot < Nanoc::Int::RuleMemoryAction
+module Nanoc::Int::ProcessingActions
+  class Snapshot < Nanoc::Int::ProcessingAction
     # snapshot :before_layout
     # snapshot :before_layout, final: true
     # snapshot :before_layout, path: '/about.md'

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

@@ -13,38 +13,38 @@ module Nanoc::Int
       @actions.size
     end
 
-    contract Numeric => C::Maybe[Nanoc::Int::RuleMemoryAction]
+    contract Numeric => C::Maybe[Nanoc::Int::ProcessingAction]
     def [](idx)
       @actions[idx]
     end
 
     contract Symbol, Hash => self
     def add_filter(filter_name, params)
-      @actions << Nanoc::Int::RuleMemoryActions::Filter.new(filter_name, params)
+      @actions << Nanoc::Int::ProcessingActions::Filter.new(filter_name, params)
       self
     end
 
     contract String, C::Maybe[Hash] => self
     def add_layout(layout_identifier, params)
-      @actions << Nanoc::Int::RuleMemoryActions::Layout.new(layout_identifier, params)
+      @actions << Nanoc::Int::ProcessingActions::Layout.new(layout_identifier, params)
       self
     end
 
     contract Symbol, C::Bool, C::Maybe[String] => self
     def add_snapshot(snapshot_name, final, path)
       will_add_snapshot(snapshot_name) if final
-      @actions << Nanoc::Int::RuleMemoryActions::Snapshot.new(snapshot_name, final, path)
+      @actions << Nanoc::Int::ProcessingActions::Snapshot.new(snapshot_name, final, path)
       self
     end
 
-    contract C::None => C::ArrayOf[Nanoc::Int::RuleMemoryAction]
+    contract C::None => C::ArrayOf[Nanoc::Int::ProcessingAction]
     def snapshot_actions
-      @actions.select { |a| a.is_a?(Nanoc::Int::RuleMemoryActions::Snapshot) }
+      @actions.select { |a| a.is_a?(Nanoc::Int::ProcessingActions::Snapshot) }
     end
 
     contract C::None => C::Bool
     def any_layouts?
-      @actions.any? { |a| a.is_a?(Nanoc::Int::RuleMemoryActions::Layout) }
+      @actions.any? { |a| a.is_a?(Nanoc::Int::ProcessingActions::Layout) }
     end
 
     # TODO: Add contract
@@ -52,7 +52,7 @@ module Nanoc::Int
       map(&:serialize)
     end
 
-    contract C::Func[Nanoc::Int::RuleMemoryAction => C::Any] => self
+    contract C::Func[Nanoc::Int::ProcessingAction => C::Any] => self
     def each
       @actions.each { |a| yield(a) }
       self

data/lib/nanoc/base/feature.rb

@@ -89,5 +89,4 @@ module Nanoc
   end
 end
 
-Nanoc::Feature.define('profiler', version: '4.3')
-Nanoc::Feature.define('environments', version: '4.3')
+Nanoc::Feature.define('profiler', version: '4.4')

data/lib/nanoc/base/repos.rb

@@ -5,5 +5,6 @@ require_relative 'repos/compiled_content_cache'
 require_relative 'repos/config_loader'
 require_relative 'repos/data_source'
 require_relative 'repos/dependency_store'
+require_relative 'repos/item_rep_repo'
 require_relative 'repos/rule_memory_store'
 require_relative 'repos/site_loader'

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

@@ -4,6 +4,8 @@ module Nanoc::Int
   #
   # @api private
   class ChecksumStore < ::Nanoc::Int::Store
+    include Nanoc::Int::ContractsSupport
+
     # @param [Nanoc::Int::Site] site
     def initialize(site: nil)
       super(Nanoc::Int::Store.tmp_path_for(env_name: (site.config.env_name if site), store_name: 'checksums'), 1)
@@ -13,6 +15,7 @@ module Nanoc::Int
       @checksums = {}
     end
 
+    contract C::Any => C::Maybe[String]
     # Returns the old checksum for the given object. This makes sense for
     # items, layouts and code snippets.
     #
@@ -23,13 +26,24 @@ module Nanoc::Int
       @checksums[obj.reference]
     end
 
-    # Sets the checksum for the given object.
-    #
-    # @param [#reference] obj The object for which to set the checksum
-    #
-    # @param [String] checksum The checksum
-    def []=(obj, checksum)
-      @checksums[obj.reference] = checksum
+    # Calculates and stores the checksum for the given object.
+    def add(obj)
+      if obj.is_a?(Nanoc::Int::Document)
+        @checksums[[obj.reference, :content]] = Nanoc::Int::Checksummer.calc_for_content_of(obj)
+        @checksums[[obj.reference, :attributes]] = Nanoc::Int::Checksummer.calc_for_attributes_of(obj)
+      end
+
+      @checksums[obj.reference] = Nanoc::Int::Checksummer.calc(obj)
+    end
+
+    contract C::Any => C::Maybe[String]
+    def content_checksum_for(obj)
+      @checksums[[obj.reference, :content]]
+    end
+
+    contract C::Any => C::Maybe[String]
+    def attributes_checksum_for(obj)
+      @checksums[[obj.reference, :attributes]]
     end
 
     protected

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

@@ -44,11 +44,7 @@ module Nanoc::Int
         ).with_defaults
 
       # Load environment
-      if Nanoc::Feature.enabled?(Nanoc::Feature::ENVIRONMENTS)
-        config.with_environment
-      else
-        config
-      end
+      config.with_environment
     end
 
     # @api private

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

@@ -140,10 +140,14 @@ module Nanoc
     #
     # @param [Boolean] binary Whether or not this item is binary
     #
-    # @param [String, nil] checksum_data Used to determine whether the item has changed
-    def new_item(content, attributes, identifier, binary: false, checksum_data: nil)
+    # @param [String, nil] checksum_data
+    #
+    # @param [String, nil] content_checksum_data
+    #
+    # @param [String, nil] attributes_checksum_data
+    def new_item(content, attributes, identifier, binary: false, checksum_data: nil, content_checksum_data: nil, attributes_checksum_data: nil)
       content = Nanoc::Int::Content.create(content, binary: binary)
-      Nanoc::Int::Item.new(content, attributes, identifier, checksum_data: checksum_data)
+      Nanoc::Int::Item.new(content, attributes, identifier, checksum_data: checksum_data, content_checksum_data: content_checksum_data, attributes_checksum_data: attributes_checksum_data)
     end
 
     # Creates a new in-memory layout instance. This is intended for use within
@@ -155,9 +159,13 @@ module Nanoc
     #
     # @param [String] identifier This layout's identifier.
     #
-    # @param [String, nil] checksum_data Used to determine whether the layout has changed
-    def new_layout(raw_content, attributes, identifier, checksum_data: nil)
-      Nanoc::Int::Layout.new(raw_content, attributes, identifier, checksum_data: checksum_data)
+    # @param [String, nil] checksum_data
+    #
+    # @param [String, nil] content_checksum_data
+    #
+    # @param [String, nil] attributes_checksum_data
+    def new_layout(raw_content, attributes, identifier, checksum_data: nil, content_checksum_data: nil, attributes_checksum_data: nil)
+      Nanoc::Int::Layout.new(raw_content, attributes, identifier, checksum_data: checksum_data, content_checksum_data: content_checksum_data, attributes_checksum_data: attributes_checksum_data)
     end
   end
 end

data/lib/nanoc/base/services.rb

@@ -1,6 +1,9 @@
 require_relative 'services/action_provider'
+require_relative 'services/checksummer'
 require_relative 'services/compiler_loader'
+require_relative 'services/dependency_tracker'
 require_relative 'services/executor'
+require_relative 'services/filter'
 require_relative 'services/item_rep_builder'
 require_relative 'services/item_rep_router'
 require_relative 'services/item_rep_selector'

data/lib/nanoc/base/{checksummer.rb → services/checksummer.rb}

@@ -44,6 +44,14 @@ module Nanoc::Int
         digest.to_s
       end
 
+      def calc_for_content_of(obj)
+        obj.content_checksum_data || obj.checksum_data || Nanoc::Int::Checksummer.calc(obj.content)
+      end
+
+      def calc_for_attributes_of(obj)
+        obj.attributes_checksum_data || obj.checksum_data || Nanoc::Int::Checksummer.calc(obj.attributes)
+      end
+
       private
 
       def update(obj, digest, visited = Hamster::Set.new)
@@ -181,11 +189,19 @@ module Nanoc::Int
         if obj.checksum_data
           digest.update('checksum_data=' + obj.checksum_data)
         else
-          digest.update('content=')
-          yield(obj.content)
+          if obj.content_checksum_data
+            digest.update('content_checksum_data=' + obj.content_checksum_data)
+          else
+            digest.update('content=')
+            yield(obj.content)
+          end
 
-          digest.update(',attributes=')
-          yield(obj.attributes)
+          if obj.attributes_checksum_data
+            digest.update(',attributes_checksum_data=' + obj.attributes_checksum_data)
+          else
+            digest.update(',attributes=')
+            yield(obj.attributes)
+          end
 
           digest.update(',identifier=')
           yield(obj.identifier)

data/lib/nanoc/base/{compilation → services}/dependency_tracker.rb

@@ -2,12 +2,17 @@ module Nanoc::Int
   # @api private
   class DependencyTracker
     class Null
+      include Nanoc::Int::ContractsSupport
+
+      contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
       def enter(_obj)
       end
 
-      def exit(_obj)
+      contract C::None => C::Any
+      def exit
       end
 
+      contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
       def bounce(_obj)
       end
     end
@@ -29,15 +34,15 @@ module Nanoc::Int
       @stack.push(obj)
     end
 
-    contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
-    def exit(_obj)
+    contract C::None => C::Any
+    def exit
       @stack.pop
     end
 
     contract C::Or[Nanoc::Int::Item, Nanoc::Int::Layout] => C::Any
     def bounce(obj)
       enter(obj)
-      exit(obj)
+      exit
     end
   end
 end

data/lib/nanoc/cli/cleaning_stream.rb

@@ -138,9 +138,11 @@ module Nanoc::CLI
     end
 
     # @see ARGF.set_encoding
+    # rubocop:disable Style/AccessorMethodName
     def set_encoding(*args)
       @stream.set_encoding(*args)
     end
+    # rubocop:enable Style/AccessorMethodName
 
     protected
 

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

@@ -10,10 +10,8 @@ opt :d, :debug, 'enable debugging' do
   Nanoc::CLI.debug = true
 end
 
-if Nanoc::Feature.enabled?(Nanoc::Feature::ENVIRONMENTS)
-  opt :e, :env, 'set environment', argument: :required do |value|
-    ENV.store('NANOC_ENV', value)
-  end
+opt :e, :env, 'set environment', argument: :required do |value|
+  ENV.store('NANOC_ENV', value)
 end
 
 opt :h, :help, 'show the help message and quit' do |_value, cmd|

data/lib/nanoc/cli/commands/view.rb

@@ -44,7 +44,9 @@ module Nanoc::CLI::Commands
         use Rack::ShowExceptions
         use Rack::Lint
         use Rack::Head
-        use Adsf::Rack::IndexFileFinder, root: site.config[:output_dir]
+        use Adsf::Rack::IndexFileFinder,
+            root: site.config[:output_dir],
+            index_filenames: %w(index.html index.xhtml)
         run Rack::File.new(site.config[:output_dir])
       end.to_app
 

data/lib/nanoc/data_sources/filesystem.rb

@@ -76,11 +76,12 @@ module Nanoc::DataSources
 
     class ProtoDocument
       attr_reader :attributes
-      attr_reader :checksum_data
+      attr_reader :content_checksum_data
+      attr_reader :attributes_checksum_data
       attr_reader :is_binary
       alias binary? is_binary
 
-      def initialize(is_binary:, content: nil, filename: nil, attributes:, checksum_data: nil)
+      def initialize(is_binary:, content: nil, filename: nil, attributes:, content_checksum_data: nil, attributes_checksum_data: nil)
         if content.nil? && filename.nil?
           raise ArgumentError, '#initialize needs at least content or filename'
         end
@@ -89,7 +90,8 @@ module Nanoc::DataSources
         @content = content
         @filename = filename
         @attributes = attributes
-        @checksum_data = checksum_data
+        @content_checksum_data = content_checksum_data
+        @attributes_checksum_data = attributes_checksum_data
       end
 
       def content
@@ -125,7 +127,8 @@ module Nanoc::DataSources
           is_binary: false,
           content: parse_result.content,
           attributes: parse_result.attributes,
-          checksum_data: "content=#{parse_result.content},meta=#{parse_result.attributes_data}",
+          content_checksum_data: parse_result.content,
+          attributes_checksum_data: parse_result.attributes_data,
         )
       end
     end
@@ -157,7 +160,13 @@ module Nanoc::DataSources
           attributes = attributes_for(proto_doc, content_filename, meta_filename)
           identifier = identifier_for(content_filename, meta_filename, dir_name)
 
-          res << klass.new(content, attributes, identifier, checksum_data: proto_doc.checksum_data)
+          res << klass.new(
+            content,
+            attributes,
+            identifier,
+            content_checksum_data: proto_doc.content_checksum_data,
+            attributes_checksum_data: proto_doc.attributes_checksum_data,
+          )
         end
       end
 
@@ -358,7 +367,7 @@ module Nanoc::DataSources
     def parse_metadata(data, filename)
       begin
         meta = YAML.load(data) || {}
-      rescue Exception => e
+      rescue => e
         raise "Could not parse YAML for #{filename}: #{e.message}"
       end
 

data/lib/nanoc/extra.rb

@@ -12,6 +12,9 @@ module Nanoc::Extra
 
   # @deprecated
   Deployer = Nanoc::Deploying::Deployer
+
+  # @deprecated
+  Pruner = Nanoc::Pruner
 end
 
 require 'nanoc/extra/core_ext'

data/lib/nanoc/version.rb

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

data/test/base/test_context.rb

@@ -17,7 +17,7 @@ class Nanoc::Int::ContextTest < Nanoc::TestCase
 
   def test_example
     # Parse
-    YARD.parse(LIB_DIR + '/nanoc/base/context.rb')
+    YARD.parse(LIB_DIR + '/nanoc/base/entities/context.rb')
 
     # Run
     assert_examples_correct 'Nanoc::Int::Context#initialize'

data/test/base/test_data_source.rb

@@ -40,6 +40,17 @@ class Nanoc::DataSourceTest < Nanoc::TestCase
     assert_equal 'abcdef', item.checksum_data
   end
 
+  def test_new_item_with_checksums
+    data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
+
+    item = data_source.new_item('stuff', { title: 'Stuff!' }, '/asdf/', content_checksum_data: 'con-cs', attributes_checksum_data: 'attr-cs')
+    assert_equal 'stuff', item.content.string
+    assert_equal 'Stuff!', item.attributes[:title]
+    assert_equal Nanoc::Identifier.new('/asdf/'), item.identifier
+    assert_equal 'con-cs', item.content_checksum_data
+    assert_equal 'attr-cs', item.attributes_checksum_data
+  end
+
   def test_new_layout
     data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
 
@@ -49,4 +60,15 @@ class Nanoc::DataSourceTest < Nanoc::TestCase
     assert_equal Nanoc::Identifier.new('/asdf/'), layout.identifier
     assert_equal 'abcdef', layout.checksum_data
   end
+
+  def test_new_layout_with_checksums
+    data_source = Nanoc::DataSource.new(nil, nil, nil, nil)
+
+    layout = data_source.new_layout('stuff', { title: 'Stuff!' }, '/asdf/', content_checksum_data: 'con-cs', attributes_checksum_data: 'attr-cs')
+    assert_equal 'stuff', layout.content.string
+    assert_equal 'Stuff!', layout.attributes[:title]
+    assert_equal Nanoc::Identifier.new('/asdf/'), layout.identifier
+    assert_equal 'con-cs', layout.content_checksum_data
+    assert_equal 'attr-cs', layout.attributes_checksum_data
+  end
 end

data/test/base/test_dependency_tracker.rb

@@ -1,7 +1,10 @@
 class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
   def test_initialize
     # Mock items
-    items = [mock, mock]
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -13,7 +16,10 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_record_dependency
     # Mock items
-    items = [mock, mock]
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -27,7 +33,10 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_record_dependency_no_self
     # Mock items
-    items = [mock, mock]
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -42,7 +51,10 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_record_dependency_no_doubles
     # Mock items
-    items = [mock, mock]
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -58,7 +70,11 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_objects_causing_outdatedness_of
     # Mock items
-    items = [mock, mock, mock]
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+      Nanoc::Int::Item.new('c', {}, '/c.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -73,7 +89,11 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_objects_outdated_due_to
     # Mock items
-    items = [mock, mock, mock]
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+      Nanoc::Int::Item.new('c', {}, '/c.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -88,12 +108,12 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_store_graph_and_load_graph_simple
     # Mock items
-    items = [mock('0'), mock('1'), mock('2'), mock('3')]
-    items.each { |i| i.stubs(:type).returns(:item) }
-    items[0].stubs(:reference).returns([:item, '/aaa/'])
-    items[1].stubs(:reference).returns([:item, '/bbb/'])
-    items[2].stubs(:reference).returns([:item, '/ccc/'])
-    items[3].stubs(:reference).returns([:item, '/ddd/'])
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+      Nanoc::Int::Item.new('c', {}, '/c.md'),
+      Nanoc::Int::Item.new('d', {}, '/d.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -122,12 +142,12 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_store_graph_and_load_graph_with_removed_items
     # Mock items
-    items = [mock('0'), mock('1'), mock('2'), mock('3')]
-    items.each { |i| i.stubs(:type).returns(:item) }
-    items[0].stubs(:reference).returns([:item, '/aaa/'])
-    items[1].stubs(:reference).returns([:item, '/bbb/'])
-    items[2].stubs(:reference).returns([:item, '/ccc/'])
-    items[3].stubs(:reference).returns([:item, '/ddd/'])
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+      Nanoc::Int::Item.new('c', {}, '/c.md'),
+      Nanoc::Int::Item.new('d', {}, '/d.md'),
+    ]
 
     # Create new and old lists
     old_items = [items[0], items[1], items[2], items[3]]
@@ -159,11 +179,11 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_store_graph_with_nils_in_dst
     # Mock items
-    items = [mock('0'), mock('1'), mock('2')]
-    items.each { |i| i.stubs(:type).returns(:item) }
-    items[0].stubs(:reference).returns([:item, '/aaa/'])
-    items[1].stubs(:reference).returns([:item, '/bbb/'])
-    items[2].stubs(:reference).returns([:item, '/ccc/'])
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+      Nanoc::Int::Item.new('c', {}, '/c.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -189,11 +209,11 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_store_graph_with_nils_in_src
     # Mock items
-    items = [mock('0'), mock('1'), mock('2')]
-    items.each { |i| i.stubs(:type).returns(:item) }
-    items[0].stubs(:reference).returns([:item, '/aaa/'])
-    items[1].stubs(:reference).returns([:item, '/bbb/'])
-    items[2].stubs(:reference).returns([:item, '/ccc/'])
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+      Nanoc::Int::Item.new('c', {}, '/c.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)
@@ -219,7 +239,11 @@ class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
 
   def test_forget_dependencies_for
     # Mock items
-    items = [mock, mock, mock]
+    items = [
+      Nanoc::Int::Item.new('a', {}, '/a.md'),
+      Nanoc::Int::Item.new('b', {}, '/b.md'),
+      Nanoc::Int::Item.new('c', {}, '/c.md'),
+    ]
 
     # Create
     store = Nanoc::Int::DependencyStore.new(items)

data/test/base/test_directed_graph.rb

@@ -279,7 +279,7 @@ class Nanoc::Int::DirectedGraphTest < Nanoc::TestCase
   end
 
   def test_example
-    YARD.parse(LIB_DIR + '/nanoc/base/directed_graph.rb')
+    YARD.parse(LIB_DIR + '/nanoc/base/entities/directed_graph.rb')
     assert_examples_correct 'Nanoc::Int::DirectedGraph'
   end
 end

data/test/base/test_outdatedness_checker.rb

@@ -72,7 +72,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
     end
   end
 
-  def test_outdated_if_item_checksum_is_different
+  def test_outdated_if_item_content_checksum_is_different
     # Compile once
     with_site(name: 'foo') do |site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
@@ -83,7 +83,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
       site.compile
     end
 
-    # Create new item
+    # Update item
     FileUtils.cd('foo') do
       File.open('content/new.html', 'w') { |io| io.write('o hello DIFFERENT!!!') }
     end
@@ -95,7 +95,34 @@ 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 == '/new/' }][0]
-      assert_equal ::Nanoc::Int::OutdatednessReasons::SourceModified, outdatedness_checker.outdatedness_reason_for(rep)
+      assert_equal ::Nanoc::Int::OutdatednessReasons::ContentModified, outdatedness_checker.outdatedness_reason_for(rep)
+    end
+  end
+
+  def test_outdated_if_item_attributes_checksum_is_different
+    # Compile once
+    with_site(name: 'foo') do |site|
+      File.open('content/index.html', 'w') { |io| io.write('o hello') }
+      File.open('content/new.html', 'w') { |io| io.write('o hello too') }
+      File.open('lib/stuff.rb', 'w') { |io| io.write('$foo = 123') }
+
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compile
+    end
+
+    # Update item
+    FileUtils.cd('foo') do
+      File.open('content/new.html', 'w') { |io| io.write("---\ntitle: donkey\n---\no hello too") }
+    end
+
+    # Check
+    with_site(name: 'foo') do |site|
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compiler.build_reps
+      site.compiler.load_stores
+      outdatedness_checker = site.compiler.send :outdatedness_checker
+      rep = site.compiler.reps[site.items.find { |i| i.identifier == '/new/' }][0]
+      assert_equal ::Nanoc::Int::OutdatednessReasons::AttributesModified, outdatedness_checker.outdatedness_reason_for(rep)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.3.8
+  version: 4.4.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -124,25 +124,21 @@ files:
 - bin/nanoc
 - lib/nanoc.rb
 - lib/nanoc/base.rb
-- lib/nanoc/base/checksummer.rb
 - lib/nanoc/base/compilation/compiler.rb
-- lib/nanoc/base/compilation/dependency_tracker.rb
-- lib/nanoc/base/compilation/filter.rb
-- lib/nanoc/base/compilation/item_rep_repo.rb
 - lib/nanoc/base/compilation/outdatedness_checker.rb
 - lib/nanoc/base/compilation/outdatedness_reasons.rb
-- lib/nanoc/base/context.rb
 - lib/nanoc/base/contracts_support.rb
 - lib/nanoc/base/core_ext.rb
 - lib/nanoc/base/core_ext/array.rb
 - lib/nanoc/base/core_ext/hash.rb
 - lib/nanoc/base/core_ext/pathname.rb
 - lib/nanoc/base/core_ext/string.rb
-- lib/nanoc/base/directed_graph.rb
 - lib/nanoc/base/entities.rb
 - lib/nanoc/base/entities/code_snippet.rb
 - lib/nanoc/base/entities/configuration.rb
 - lib/nanoc/base/entities/content.rb
+- lib/nanoc/base/entities/context.rb
+- lib/nanoc/base/entities/directed_graph.rb
 - lib/nanoc/base/entities/document.rb
 - lib/nanoc/base/entities/identifiable_collection.rb
 - lib/nanoc/base/entities/identifier.rb
@@ -151,12 +147,12 @@ files:
 - lib/nanoc/base/entities/layout.rb
 - lib/nanoc/base/entities/lazy_value.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/rule_memory.rb
-- lib/nanoc/base/entities/rule_memory_action.rb
-- lib/nanoc/base/entities/rule_memory_actions.rb
-- lib/nanoc/base/entities/rule_memory_actions/filter.rb
-- lib/nanoc/base/entities/rule_memory_actions/layout.rb
-- lib/nanoc/base/entities/rule_memory_actions/snapshot.rb
 - lib/nanoc/base/entities/site.rb
 - lib/nanoc/base/entities/snapshot_def.rb
 - lib/nanoc/base/error.rb
@@ -170,13 +166,17 @@ files:
 - lib/nanoc/base/repos/config_loader.rb
 - lib/nanoc/base/repos/data_source.rb
 - lib/nanoc/base/repos/dependency_store.rb
+- lib/nanoc/base/repos/item_rep_repo.rb
 - lib/nanoc/base/repos/rule_memory_store.rb
 - lib/nanoc/base/repos/site_loader.rb
 - lib/nanoc/base/repos/store.rb
 - lib/nanoc/base/services.rb
 - lib/nanoc/base/services/action_provider.rb
+- lib/nanoc/base/services/checksummer.rb
 - lib/nanoc/base/services/compiler_loader.rb
+- lib/nanoc/base/services/dependency_tracker.rb
 - lib/nanoc/base/services/executor.rb
+- lib/nanoc/base/services/filter.rb
 - lib/nanoc/base/services/item_rep_builder.rb
 - lib/nanoc/base/services/item_rep_router.rb
 - lib/nanoc/base/services/item_rep_selector.rb

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

@@ -1,3 +0,0 @@
-require_relative 'rule_memory_actions/filter'
-require_relative 'rule_memory_actions/layout'
-require_relative 'rule_memory_actions/snapshot'