nanoc 4.5.4 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a383a3d98b256b56a7e6590371884c6f189b14dc
-  data.tar.gz: a5564e313aff3b6a2a1fad8eb6378ebb7ea58136
+  metadata.gz: 9c5effeb7d9dc719725af84e69e43fd8114804d9
+  data.tar.gz: '068728706ce3eaa7ca6b05627b23f2c014c9b33e'
 SHA512:
-  metadata.gz: cd7789992a7d9ee85236ab87fc1ce6fcd7a134713a60a86528abce3d28d0700d5b687cb182170e5afcda5dd9eaac5b0d32c3f5a20b44e8671c2b6351c59447c2
-  data.tar.gz: 440ebab06d975006331704bf5d72e775ec65aa668bea50557163f1e3af033e0e27ca9b71347b24f6c79941efb7fb333fa841e82babe8f47d860982fa83ca3582
+  metadata.gz: a7ca4e77db7c096579d28c7af8206505d11fad7c858d87362ceda01087ee39ea8da60cadb2833911e9ed37fe505a68bda39b933bd6bde84ee27a0ec99c84d26e
+  data.tar.gz: db7dcee097e6515ca68ba39ec8a139070b003120c23864dfe20b02f7ab79b7e617be4d6be46cdf0da8808c86b51c9137fdf6e1f5a908a27894aaf27771d67974

data/Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: git://github.com/bbatsov/rubocop.git
-  revision: d2652328e819cc8317e69b883449e71b83dcdffc
+  revision: c500b3c760d334c733af1ce2229a2db65957c875
   specs:
-    rubocop (0.46.0)
+    rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.5.4)
+    nanoc (4.6.0)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -71,7 +71,7 @@ GEM
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.4)
     contracts (0.14.0)
-    coveralls (0.8.17)
+    coveralls (0.8.19)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
@@ -82,7 +82,7 @@ GEM
     cri (2.7.1)
       colored (~> 1.2)
     ddplugin (1.0.0)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     erubis (2.7.0)
     excon (0.54.0)
@@ -127,7 +127,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (1.1.0)
+    fog-aws (1.2.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -172,7 +172,7 @@ GEM
     fog-profitbricks (3.0.0)
       fog-core (~> 1.42)
       fog-json (~> 1.0)
-    fog-rackspace (0.1.3)
+    fog-rackspace (0.1.4)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -206,7 +206,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.6.0)
+    fog-vsphere (1.7.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
@@ -346,8 +346,8 @@ GEM
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.3)
     vcr (3.0.3)
-    w3c_validators (1.3.1)
-      json (~> 2.0)
+    w3c_validators (1.3.2)
+      json (>= 1.8)
       nokogiri (~> 1.6)
     webmock (2.3.2)
       addressable (>= 2.3.6)
@@ -425,4 +425,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.13.7
+   1.14.1

data/NEWS.md

@@ -1,5 +1,17 @@
 # Nanoc news
 
+## 4.6.0 (2017-01-22)
+
+Features:
+
+* Made `#content_for` accept a string as well as a block, to allow setting captured content outside of ERB (#1066, #1073)
+* Added `#raw_content=` to items and layouts during preprocessing (#1057)
+* Added `#snapshot?` to item rep views (#1056)
+
+Enhancements:
+
+* Prevented useless recompilations when switching Nanoc environments (#1070, #1071)
+
 ## 4.5.4 (2017-01-16)
 
 Fixes:

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

@@ -58,7 +58,7 @@ module Nanoc::Int
         DEFAULT_DATA_SOURCE_CONFIG.merge(ds)
       end
 
-      self.class.new(hash: new_wrapped)
+      self.class.new(hash: new_wrapped, env_name: @env_name)
     end
 
     def with_environment
@@ -135,6 +135,18 @@ module Nanoc::Int
       self
     end
 
+    contract C::None => String
+    def output_dir
+      self[:output_dir]
+    end
+
+    contract C::None => C::IterOf[String]
+    def output_dirs
+      envs = @wrapped.fetch(ENVIRONMENTS_CONFIG_KEY, {})
+      res = [output_dir] + envs.values.map { |v| v[:output_dir] }
+      res.uniq.compact
+    end
+
     # Returns an object that can be used for uniquely identifying objects.
     #
     # @return [Object] An unique reference to this object

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

@@ -44,6 +44,11 @@ module Nanoc::Int
       @compiled = false
     end
 
+    contract Symbol => C::Bool
+    def snapshot?(name)
+      snapshot_defs.any? { |sd| sd.name == name }
+    end
+
     contract C::KeywordArgs[snapshot: C::Optional[Symbol]] => C::Maybe[String]
     # Returns the item rep’s raw path. It includes the path to the output
     # directory and the full filename.

data/lib/nanoc/base/feature.rb

@@ -89,4 +89,4 @@ module Nanoc
   end
 end
 
-Nanoc::Feature.define('profiler', version: '4.5')
+Nanoc::Feature.define('profiler', version: '4.6')

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

@@ -10,9 +10,9 @@ module Nanoc::Int
 
     c_obj = C::Or[Nanoc::Int::Item, Nanoc::Int::Layout, Nanoc::Int::Configuration, Nanoc::Int::CodeSnippet]
 
-    contract C::KeywordArgs[objects: C::IterOf[c_obj]] => C::Any
-    def initialize(objects:)
-      super('tmp/checksums', 1)
+    contract C::KeywordArgs[site: C::Maybe[Nanoc::Int::Site], objects: C::IterOf[c_obj]] => C::Any
+    def initialize(site: nil, objects:)
+      super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'checksums'), 1)
 
       @objects = objects
 

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

@@ -6,9 +6,9 @@ module Nanoc::Int
   class CompiledContentCache < ::Nanoc::Int::Store
     include Nanoc::Int::ContractsSupport
 
-    contract C::KeywordArgs[items: C::IterOf[Nanoc::Int::Item]] => C::Any
-    def initialize(items:)
-      super('tmp/compiled_content', 2)
+    contract C::KeywordArgs[site: C::Maybe[Nanoc::Int::Site], items: C::IterOf[Nanoc::Int::Item]] => C::Any
+    def initialize(site: nil, items:)
+      super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'compiled_content'), 2)
 
       @items = items
       @cache = {}

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

@@ -7,8 +7,8 @@ module Nanoc::Int
     attr_accessor :objects
 
     # @param [Array<Nanoc::Int::Item, Nanoc::Int::Layout>] objects
-    def initialize(objects)
-      super('tmp/dependencies', 4)
+    def initialize(objects, site: nil)
+      super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'dependencies'), 4)
 
       @objects = objects
       @new_objects = []

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

@@ -4,8 +4,8 @@ module Nanoc::Int
     include Nanoc::Int::ContractsSupport
 
     contract C::KeywordArgs[site: C::Maybe[Nanoc::Int::Site], reps: Nanoc::Int::ItemRepRepo] => C::Any
-    def initialize(reps:)
-      super('tmp/outdatedness', 1)
+    def initialize(site: nil, reps:)
+      super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'outdatedness'), 1)
 
       @outdated_reps = Set.new
       @all_reps = reps

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

@@ -4,8 +4,8 @@ module Nanoc::Int
   #
   # @api private
   class RuleMemoryStore < ::Nanoc::Int::Store
-    def initialize
-      super('tmp/rule_memory', 1)
+    def initialize(site: nil)
+      super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'rule_memory'), 1)
 
       @rule_memories = {}
     end

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

@@ -36,6 +36,20 @@ module Nanoc::Int
       @version  = version
     end
 
+    # Logic for building tmp path from active environment and store name
+    # @api private
+    contract C::KeywordArgs[site: C::Maybe[Nanoc::Int::Site], store_name: String] => String
+    def self.tmp_path_for(store_name:, site:)
+      # FIXME: disallow site from being nil
+      output_dir = site ? site.config.output_dir : ''
+      File.join(tmp_path_prefix(output_dir), store_name)
+    end
+
+    def self.tmp_path_prefix(output_dir)
+      dir = Digest::SHA1.hexdigest(output_dir)[0..12]
+      File.join('tmp', 'nanoc', dir)
+    end
+
     # @group Loading and storing data
 
     # @return The data that should be written to the disk

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

@@ -347,6 +347,32 @@ module Nanoc::Int
           end
         end
       end
+
+      class Cleanup
+        def initialize(config)
+          @config = config
+        end
+
+        def run
+          cleanup_temps(Nanoc::Filter::TMP_BINARY_ITEMS_DIR)
+          cleanup_temps(Nanoc::Int::ItemRepWriter::TMP_TEXT_ITEMS_DIR)
+          cleanup_unused_stores
+        end
+
+        private
+
+        def cleanup_temps(dir)
+          Nanoc::Int::TempFilenameFactory.instance.cleanup(dir)
+        end
+
+        def cleanup_unused_stores
+          used_paths = @config.output_dirs.map { |d| Nanoc::Int::Store.tmp_path_prefix(d) }
+          all_paths = Dir.glob('tmp/nanoc/*')
+          (all_paths - used_paths).each do |obsolete_path|
+            FileUtils.rm_rf(obsolete_path)
+          end
+        end
+      end
     end
 
     include Nanoc::Int::ContractsSupport
@@ -409,12 +435,7 @@ module Nanoc::Int
       store_output_state
       @action_provider.postprocess(@site, @reps)
     ensure
-      Nanoc::Int::TempFilenameFactory.instance.cleanup(
-        Nanoc::Filter::TMP_BINARY_ITEMS_DIR,
-      )
-      Nanoc::Int::TempFilenameFactory.instance.cleanup(
-        Nanoc::Int::ItemRepWriter::TMP_TEXT_ITEMS_DIR,
-      )
+      cleanup_stage.run
     end
 
     def load_stores
@@ -495,6 +516,10 @@ module Nanoc::Int
       )
     end
 
+    def cleanup_stage
+      @_cleanup_stage ||= Stages::Cleanup.new(site.config)
+    end
+
     def determine_outdatedness
       determine_outdatedness_stage.run do |outdated_items|
         @outdated_items = outdated_items

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

@@ -2,22 +2,22 @@ module Nanoc::Int
   # @api private
   class CompilerLoader
     def load(site, action_provider: nil)
-      rule_memory_store = Nanoc::Int::RuleMemoryStore.new
+      rule_memory_store = Nanoc::Int::RuleMemoryStore.new(site: site)
 
       dependency_store =
-        Nanoc::Int::DependencyStore.new(site.items.to_a + site.layouts.to_a)
+        Nanoc::Int::DependencyStore.new(site.items.to_a + site.layouts.to_a, site: site)
 
       objects = site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
 
       checksum_store =
-        Nanoc::Int::ChecksumStore.new(objects: objects)
+        Nanoc::Int::ChecksumStore.new(site: site, objects: objects)
 
       item_rep_repo = Nanoc::Int::ItemRepRepo.new
 
       action_provider ||= Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
 
       outdatedness_store =
-        Nanoc::Int::OutdatednessStore.new(reps: item_rep_repo)
+        Nanoc::Int::OutdatednessStore.new(site: site, reps: item_rep_repo)
 
       outdatedness_checker =
         Nanoc::Int::OutdatednessChecker.new(
@@ -30,7 +30,10 @@ module Nanoc::Int
         )
 
       compiled_content_cache =
-        Nanoc::Int::CompiledContentCache.new(items: site.items)
+        Nanoc::Int::CompiledContentCache.new(
+          site: site,
+          items: site.items,
+        )
 
       params = {
         compiled_content_cache: compiled_content_cache,

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

@@ -46,6 +46,11 @@ module Nanoc
       @context.snapshot_repo.compiled_content(rep: unwrap, snapshot: snapshot)
     end
 
+    def snapshot?(name)
+      @context.dependency_tracker.bounce(unwrap.item, compiled_content: true)
+      @item_rep.snapshot?(name)
+    end
+
     # Returns the item rep’s path, as used when being linked to. It starts
     # with a slash and it is relative to the output directory. It does not
     # include the path to the output directory. It will not include the

data/lib/nanoc/base/views/mixins/mutable_document_view_mixin.rb

@@ -13,6 +13,10 @@ module Nanoc
       end
     end
 
+    def raw_content=(arg)
+      unwrap.content = Nanoc::Int::Content.create(arg)
+    end
+
     # Sets the value for the given attribute.
     #
     # @param [Symbol] key

data/lib/nanoc/helpers/capturing.rb

@@ -1,30 +1,18 @@
 module Nanoc::Helpers
   # @see http://nanoc.ws/doc/reference/helpers/#capturing
   module Capturing
-    # @overload content_for(name, params = {}, &block)
-    #   @param [Symbol, String] name
-    #   @option params [Symbol] existing
-    #   @return [void]
-    #
-    # @overload content_for(item, name)
-    #   @param [Symbol, String] name
-    #   @return [String]
-    def content_for(*args, &block)
-      if block_given? # Set content
-        # Get args
-        case args.size
-        when 1
-          name = args[0]
-          params = {}
-        when 2
-          name = args[0]
-          params = args[1]
-        else
-          raise ArgumentError, 'expected 1 or 2 argument (the name ' \
-            "of the capture, and optionally params) but got #{args.size} instead"
-        end
-        name = args[0]
-        existing_behavior = params.fetch(:existing, :error)
+    # @api private
+    class SetContent
+      include Nanoc::Helpers::Capturing
+
+      def initialize(name, params, item)
+        @name = name
+        @params = params
+        @item = item
+      end
+
+      def run(&block)
+        existing_behavior = @params.fetch(:existing, :error)
 
         # Capture
         content_string = capture(&block)
@@ -32,7 +20,7 @@ module Nanoc::Helpers
         # Get existing contents and prep for store
         snapshot_repo = @item._context.snapshot_repo
         rep = @item.reps[:default].unwrap
-        capture_name = "__capture_#{name}".to_sym
+        capture_name = "__capture_#{@name}".to_sym
         old_content_string =
           case existing_behavior
           when :overwrite
@@ -44,7 +32,7 @@ module Nanoc::Helpers
             contents = snapshot_repo.get(rep, capture_name)
             if contents && contents.string != content_string
               # FIXME: get proper exception
-              raise "a capture named #{name.inspect} for #{@item.identifier} already exists"
+              raise "a capture named #{@name.inspect} for #{@item.identifier} already exists"
             else
               ''
             end
@@ -56,33 +44,104 @@ module Nanoc::Helpers
         # Store
         new_content = Nanoc::Int::TextualContent.new(old_content_string + content_string)
         snapshot_repo.set(rep, capture_name, new_content)
-      else # Get content
-        if args.size != 2
-          raise ArgumentError, 'expected 2 arguments (the item ' \
-            "and the name of the capture) but got #{args.size} instead"
-        end
-        item = args[0]
-        name = args[1]
+      end
+    end
+
+    # @api private
+    class GetContent
+      def initialize(requested_item, name, item, config)
+        @requested_item = requested_item
+        @name = name
+        @item = item
+        @config = config
+      end
 
-        rep = item.reps[:default].unwrap
+      def run
+        rep = @requested_item.reps[:default].unwrap
 
         # Create dependency
-        if @item.nil? || item != @item.unwrap
+        if @item.nil? || @requested_item != @item.unwrap
           dependency_tracker = @config._context.dependency_tracker
-          dependency_tracker.bounce(item.unwrap, compiled_content: true)
+          dependency_tracker.bounce(@requested_item.unwrap, compiled_content: true)
 
           unless rep.compiled?
             Fiber.yield(Nanoc::Int::Errors::UnmetDependency.new(rep))
-            return content_for(*args, &block)
+            return run
           end
         end
 
         snapshot_repo = @config._context.snapshot_repo
-        content = snapshot_repo.get(rep, "__capture_#{name}".to_sym)
+        content = snapshot_repo.get(rep, "__capture_#{@name}".to_sym)
         content ? content.string : nil
       end
     end
 
+    # @overload content_for(name, &block)
+    #   @param [Symbol, String] name
+    #   @return [void]
+    #
+    # @overload content_for(name, params, &block)
+    #   @param [Symbol, String] name
+    #   @option params [Symbol] existing
+    #   @return [void]
+    #
+    # @overload content_for(name, content)
+    #   @param [Symbol, String] name
+    #   @param [String] content
+    #   @return [void]
+    #
+    # @overload content_for(name, params, content)
+    #   @param [Symbol, String] name
+    #   @param [String] content
+    #   @option params [Symbol] existing
+    #   @return [void]
+    #
+    # @overload content_for(item, name)
+    #   @param [Symbol, String] name
+    #   @return [String]
+    def content_for(*args, &block)
+      if block_given? # Set content
+        name = args[0]
+        params =
+          case args.size
+          when 1
+            {}
+          when 2
+            args[1]
+          else
+            raise ArgumentError, 'expected 1 or 2 argument (the name ' \
+              "of the capture, and optionally params) but got #{args.size} instead"
+          end
+
+        SetContent.new(name, params, @item).run(&block)
+      elsif args.size > 1 && (args.first.is_a?(Symbol) || args.first.is_a?(String)) # Set content
+        name = args[0]
+        content = args.last
+        params =
+          case args.size
+          when 2
+            {}
+          when 3
+            args[1]
+          else
+            raise ArgumentError, 'expected 2 or 3 arguments (the name ' \
+              "of the capture, optionally params, and the content) but got #{args.size} instead"
+          end
+
+        _erbout = '' # rubocop:disable Lint/UnderscorePrefixedVariableName
+        SetContent.new(name, params, @item).run { _erbout << content }
+      else # Get content
+        if args.size != 2
+          raise ArgumentError, 'expected 2 arguments (the item ' \
+            "and the name of the capture) but got #{args.size} instead"
+        end
+        requested_item = args[0]
+        name = args[1]
+
+        GetContent.new(requested_item, name, @item, @config).run
+      end
+    end
+
     # @return [String]
     def capture(&block)
       # Get erbout so far

data/lib/nanoc/version.rb

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

data/spec/nanoc/base/compiler_spec.rb

@@ -20,7 +20,7 @@ describe Nanoc::Int::Compiler do
   let(:reps) { Nanoc::Int::ItemRepRepo.new }
 
   let(:outdatedness_checker) { double(:outdatedness_checker) }
-  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(reps: reps) }
+  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site, reps: reps) }
   let(:action_provider) { double(:action_provider) }
 
   let(:compiled_content_cache) { Nanoc::Int::CompiledContentCache.new(items: items) }

data/spec/nanoc/base/entities/configuration_spec.rb

@@ -16,6 +16,74 @@ describe Nanoc::Int::Configuration do
     end
   end
 
+  describe '#with_defaults' do
+    subject { config.with_defaults }
+
+    context 'no env' do
+      it 'has a default output_dir' do
+        expect(subject[:output_dir]).to eql('output')
+      end
+    end
+
+    context 'env' do
+      let(:config) { described_class.new(hash: hash, env_name: 'giraffes') }
+
+      it 'retains the env name' do
+        expect(subject.env_name).to eql('giraffes')
+      end
+    end
+  end
+
+  describe '#output_dir' do
+    subject { config.with_defaults.output_dir }
+
+    context 'not explicitly defined' do
+      let(:hash) { { foo: 'bar' } }
+      it { is_expected.to eql('output') }
+    end
+
+    context 'explicitly defined, top-level' do
+      let(:hash) { { foo: 'bar', output_dir: 'build' } }
+      it { is_expected.to eql('build') }
+    end
+  end
+
+  describe '#output_dirs' do
+    subject { config.with_defaults.output_dirs }
+
+    let(:hash) do
+      {
+        output_dir: 'output_toplevel',
+        environments: {
+          default: {
+            output_dir: 'output_default',
+          },
+          production: {
+            output_dir: 'output_prod',
+          },
+          staging: {
+            output_dir: 'output_staging',
+          },
+          other: {},
+        },
+      }
+    end
+
+    it 'contains both top-level and default output dir' do
+      expect(subject).to include('output_toplevel')
+      expect(subject).to include('output_default')
+    end
+
+    it 'does not contain nil' do
+      expect(subject).not_to include(nil)
+    end
+
+    it 'contains all other output dirs' do
+      expect(subject).to include('output_staging')
+      expect(subject).to include('output_prod')
+    end
+  end
+
   context 'with environments defined' do
     let(:hash) { { foo: 'bar', environments: { test: { foo: 'test-bar' }, default: { foo: 'default-bar' } } } }
     let(:config) { described_class.new(hash: hash, env_name: env_name).with_environment }

data/spec/nanoc/base/entities/item_rep_spec.rb

@@ -1,4 +1,24 @@
 describe Nanoc::Int::ItemRep do
   let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo.md') }
   let(:rep) { Nanoc::Int::ItemRep.new(item, :giraffe) }
+
+  describe '#snapshot?' do
+    subject { rep.snapshot?(snapshot_name) }
+
+    let(:snapshot_name) { raise 'override me' }
+
+    before do
+      rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(:donkey)]
+    end
+
+    context 'snapshot does not exist' do
+      let(:snapshot_name) { :giraffe }
+      it { is_expected.not_to be }
+    end
+
+    context 'snapshot exists' do
+      let(:snapshot_name) { :donkey }
+      it { is_expected.to be }
+    end
+  end
 end

data/spec/nanoc/base/repos/outdatedness_store_spec.rb

@@ -1,5 +1,5 @@
 describe Nanoc::Int::OutdatednessStore do
-  subject(:store) { described_class.new(reps: reps) }
+  subject(:store) { described_class.new(site: site, reps: reps) }
 
   let(:site) { double(:site) }
   let(:reps) { Nanoc::Int::ItemRepRepo.new }

data/spec/nanoc/base/repos/store_spec.rb

@@ -0,0 +1,53 @@
+describe Nanoc::Int::Store do
+  describe '#tmp_path_for' do
+    context 'passing site' do
+      subject { described_class.tmp_path_for(site: site, store_name: 'giraffes') }
+
+      let(:site) do
+        Nanoc::Int::Site.new(config: config, code_snippets: code_snippets, items: items, layouts: layouts)
+      end
+
+      let(:code_snippets) { [] }
+      let(:items) { [] }
+      let(:layouts) { [] }
+
+      context 'no env specified' do
+        let(:config) { Nanoc::Int::Configuration.new(hash: config_hash).with_defaults.with_environment }
+
+        context 'output dir at root is specified' do
+          let(:config_hash) { { output_dir: 'output-default' } }
+          it { is_expected.to eql('tmp/nanoc/b592240c777c6/giraffes') }
+        end
+
+        context 'output dir in default env is specified' do
+          let(:config_hash) { { environments: { default: { output_dir: 'output-default' } } } }
+          it { is_expected.to eql('tmp/nanoc/b592240c777c6/giraffes') }
+        end
+
+        context 'output dir in other env is specified' do
+          let(:config_hash) { { environments: { production: { output_dir: 'output-production' } } } }
+          it { is_expected.to eql('tmp/nanoc/1029d67644815/giraffes') }
+        end
+      end
+
+      context 'env specified' do
+        let(:config) { Nanoc::Int::Configuration.new(env_name: 'staging', hash: config_hash).with_defaults.with_environment }
+
+        context 'output dir at root is specified' do
+          let(:config_hash) { { output_dir: 'output-default' } }
+          it { is_expected.to eql('tmp/nanoc/b592240c777c6/giraffes') }
+        end
+
+        context 'output dir in given env is specified' do
+          let(:config_hash) { { environments: { staging: { output_dir: 'output-staging' } } } }
+          it { is_expected.to eql('tmp/nanoc/9d274da4d73ba/giraffes') }
+        end
+
+        context 'output dir in other env is specified' do
+          let(:config_hash) { { environments: { production: { output_dir: 'output-production' } } } }
+          it { is_expected.to eql('tmp/nanoc/1029d67644815/giraffes') }
+        end
+      end
+    end
+  end
+end

data/spec/nanoc/base/services/compiler/stages/cleanup_spec.rb

@@ -0,0 +1,22 @@
+describe Nanoc::Int::Compiler::Stages::Cleanup do
+  let(:stage) { described_class.new(config) }
+
+  let(:config) do
+    Nanoc::Int::Configuration.new.with_defaults
+  end
+
+  describe '#run' do
+    subject { stage.run }
+
+    example do
+      FileUtils.mkdir_p('tmp/nanoc/2f0692fb1a1d')
+      FileUtils.mkdir_p('tmp/nanoc/1a2195bfef6c')
+      FileUtils.mkdir_p('tmp/nanoc/1029d67644815')
+
+      expect { subject }
+        .to change { Dir.glob('tmp/nanoc/*').sort }
+        .from(['tmp/nanoc/1029d67644815', 'tmp/nanoc/1a2195bfef6c', 'tmp/nanoc/2f0692fb1a1d'])
+        .to(['tmp/nanoc/1029d67644815'])
+    end
+  end
+end

data/spec/nanoc/base/views/item_rep_view_spec.rb

@@ -137,6 +137,73 @@ describe Nanoc::ItemRepView do
     it { should == described_class.hash ^ Nanoc::Identifier.new('/foo/').hash ^ :jacques.hash }
   end
 
+  describe '#snapshot?' do
+    subject { view.snapshot?(snapshot_name) }
+
+    let(:view) { described_class.new(rep, view_context) }
+
+    let(:rep) do
+      Nanoc::Int::ItemRep.new(item, :default).tap do |ir|
+        ir.compiled = true
+        ir.snapshot_defs = [
+          Nanoc::Int::SnapshotDef.new(:last),
+        ]
+      end
+    end
+
+    let(:item) do
+      Nanoc::Int::Item.new('content', {}, '/asdf.md')
+    end
+
+    let(:snapshot_name) { raise 'override me' }
+
+    before do
+      snapshot_repo.set(rep, :last, Nanoc::Int::TextualContent.new('Hallo'))
+    end
+
+    context 'snapshot exists' do
+      let(:snapshot_name) { :last }
+
+      it 'creates a dependency' do
+        expect { subject }.to change { dependency_store.objects_causing_outdatedness_of(base_item) }.from([]).to([item])
+      end
+
+      it 'creates a dependency with the right props' do
+        subject
+        dep = dependency_store.dependencies_causing_outdatedness_of(base_item)[0]
+
+        expect(dep.props.compiled_content?).to eq(true)
+
+        expect(dep.props.raw_content?).to eq(false)
+        expect(dep.props.attributes?).to eq(false)
+        expect(dep.props.path?).to eq(false)
+      end
+
+      it { is_expected.to be }
+    end
+
+    context 'snapshot does not exist' do
+      let(:snapshot_name) { :donkey }
+
+      it 'creates a dependency' do
+        expect { subject }.to change { dependency_store.objects_causing_outdatedness_of(base_item) }.from([]).to([item])
+      end
+
+      it 'creates a dependency with the right props' do
+        subject
+        dep = dependency_store.dependencies_causing_outdatedness_of(base_item)[0]
+
+        expect(dep.props.compiled_content?).to eq(true)
+
+        expect(dep.props.raw_content?).to eq(false)
+        expect(dep.props.attributes?).to eq(false)
+        expect(dep.props.path?).to eq(false)
+      end
+
+      it { is_expected.not_to be }
+    end
+  end
+
   describe '#compiled_content' do
     subject { view.compiled_content }
 

data/spec/nanoc/base/views/mutable_document_view_spec.rb

@@ -14,6 +14,17 @@ shared_examples 'a mutable document view' do
   let(:dependency_tracker) { Nanoc::Int::DependencyTracker.new(double(:dependency_store)) }
   let(:snapshot_repo) { double(:snapshot_repo) }
 
+  describe '#raw_content=' do
+    let(:document) { entity_class.new('content', {}, '/asdf/') }
+
+    it 'sets raw content' do
+      expect { view.raw_content = 'donkey' }
+        .to change { document.content.string }
+        .from('content')
+        .to('donkey')
+    end
+  end
+
   describe '#[]=' do
     let(:document) { entity_class.new('content', {}, '/asdf/') }
 

data/spec/nanoc/helpers/capturing_spec.rb

@@ -5,68 +5,122 @@ describe Nanoc::Helpers::Capturing, helper: true do
       ctx.create_rep(ctx.item, '/about.html')
     end
 
-    describe 'with name + block' do
+    describe 'setting content' do
       let(:_erbout) { 'existing content' }
 
-      context 'only name given' do
-        subject { helper.content_for(:foo) { _erbout << 'foo' } }
+      let(:params) { raise 'overwrite me' }
 
-        it 'stores snapshot content' do
-          subject
-          expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('foo')
+      let(:contents_enumerator) { %w(foo bar).to_enum }
+
+      shared_examples 'setting content' do
+        context 'only name given' do
+          subject { subject_proc_without_params.call }
+
+          it 'stores snapshot content' do
+            subject
+            expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('foo')
+          end
         end
-      end
 
-      context 'name and params given' do
-        subject { helper.content_for(:foo, params) { _erbout << 'foo' } }
-        let(:params) { raise 'overwrite me' }
+        context 'name and params given' do
+          subject { subject_proc_with_params.call }
+          let(:params) { raise 'overwrite me' }
 
-        context 'no existing behavior specified' do
-          let(:params) { {} }
+          context 'no existing behavior specified' do
+            let(:params) { {} }
 
-          it 'errors after two times' do
-            helper.content_for(:foo, params) { _erbout << 'foo' }
-            expect { helper.content_for(:foo, params) { _erbout << 'bar' } }.to raise_error(RuntimeError)
+            it 'errors after two times' do
+              subject_proc_with_params.call
+              expect { subject_proc_with_params.call }.to raise_error(RuntimeError)
+            end
           end
-        end
 
-        context 'existing behavior is :overwrite' do
-          let(:params) { { existing: :overwrite } }
+          context 'existing behavior is :overwrite' do
+            let(:params) { { existing: :overwrite } }
 
-          it 'overwrites' do
-            helper.content_for(:foo, params) { _erbout << 'foo' }
-            helper.content_for(:foo, params) { _erbout << 'bar' }
-            expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('bar')
+            it 'overwrites' do
+              subject_proc_with_params.call
+              subject_proc_with_params.call
+              expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('bar')
+            end
           end
-        end
 
-        context 'existing behavior is :append' do
-          let(:params) { { existing: :append } }
+          context 'existing behavior is :append' do
+            let(:params) { { existing: :append } }
 
-          it 'appends' do
-            helper.content_for(:foo, params) { _erbout << 'foo' }
-            helper.content_for(:foo, params) { _erbout << 'bar' }
-            expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('foobar')
+            it 'appends' do
+              subject_proc_with_params.call
+              subject_proc_with_params.call
+              expect(ctx.snapshot_repo.get(ctx.item.reps[:default].unwrap, :__capture_foo).string).to eql('foobar')
+            end
           end
-        end
 
-        context 'existing behavior is :error' do
-          let(:params) { { existing: :error } }
+          context 'existing behavior is :error' do
+            let(:params) { { existing: :error } }
 
-          it 'errors after two times' do
-            helper.content_for(:foo, params) { _erbout << 'foo' }
-            expect { helper.content_for(:foo, params) { _erbout << 'bar' } }.to raise_error(RuntimeError)
+            it 'errors after two times' do
+              subject_proc_with_params.call
+              expect { subject_proc_with_params.call }.to raise_error(RuntimeError)
+            end
           end
-        end
 
-        context 'existing behavior is :something else' do
-          let(:params) { { existing: :donkey } }
+          context 'existing behavior is :something else' do
+            let(:params) { { existing: :donkey } }
 
-          it 'errors' do
-            expect { subject }.to raise_error(ArgumentError)
+            it 'errors' do
+              expect { subject }.to raise_error(ArgumentError)
+            end
           end
         end
       end
+
+      context 'symbol name + block' do
+        let(:subject_proc_without_params) do
+          -> { helper.content_for(:foo) { _erbout << contents_enumerator.next } }
+        end
+
+        let(:subject_proc_with_params) do
+          -> { helper.content_for(:foo, params) { _erbout << contents_enumerator.next } }
+        end
+
+        include_examples 'setting content'
+      end
+
+      context 'string name + block' do
+        let(:subject_proc_without_params) do
+          -> { helper.content_for('foo') { _erbout << contents_enumerator.next } }
+        end
+
+        let(:subject_proc_with_params) do
+          -> { helper.content_for('foo', params) { _erbout << contents_enumerator.next } }
+        end
+
+        include_examples 'setting content'
+      end
+
+      context 'symbol name + string' do
+        let(:subject_proc_without_params) do
+          -> { helper.content_for(:foo, contents_enumerator.next) }
+        end
+
+        let(:subject_proc_with_params) do
+          -> { helper.content_for(:foo, params, contents_enumerator.next) }
+        end
+
+        include_examples 'setting content'
+      end
+
+      context 'string name + string' do
+        let(:subject_proc_without_params) do
+          -> { helper.content_for('foo', contents_enumerator.next) }
+        end
+
+        let(:subject_proc_with_params) do
+          -> { helper.content_for('foo', params, contents_enumerator.next) }
+        end
+
+        include_examples 'setting content'
+      end
     end
 
     describe 'with item + name' do
@@ -103,6 +157,21 @@ describe Nanoc::Helpers::Capturing, helper: true do
             expect(ctx.dependency_tracker).to receive(:bounce).with(item.unwrap, compiled_content: true)
             expect { subject }.to raise_error(FiberError)
           end
+
+          it 're-runs when fiber is resumed' do
+            expect(ctx.dependency_tracker).to receive(:bounce).with(item.unwrap, compiled_content: true).twice
+
+            fiber = Fiber.new { subject }
+            expect(fiber.resume).to be_a(Nanoc::Int::Errors::UnmetDependency)
+
+            item.reps[:default].unwrap.compiled = true
+            ctx.snapshot_repo.set(
+              item.reps[:default].unwrap,
+              :__capture_foo,
+              Nanoc::Int::TextualContent.new('content after compilation'),
+            )
+            expect(fiber.resume).to eql('content after compilation')
+          end
         end
 
         context 'other item is compiled' do

data/test/base/test_compiler.rb

@@ -17,14 +17,14 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
     params = {
       compiled_content_cache: Nanoc::Int::CompiledContentCache.new(items: site.items),
-      checksum_store: Nanoc::Int::ChecksumStore.new(objects: objects),
+      checksum_store: Nanoc::Int::ChecksumStore.new(site: site, objects: objects),
       rule_memory_store: Nanoc::Int::RuleMemoryStore.new,
       dependency_store: Nanoc::Int::DependencyStore.new(
         site.items.to_a + site.layouts.to_a,
       ),
       action_provider: action_provider,
       reps: reps,
-      outdatedness_store: Nanoc::Int::OutdatednessStore.new(reps: reps),
+      outdatedness_store: Nanoc::Int::OutdatednessStore.new(site: site, reps: reps),
     }
 
     params[:outdatedness_checker] =

data/test/base/test_outdatedness_checker.rb

@@ -34,7 +34,7 @@ class Nanoc::Int::OutdatednessCheckerTest < Nanoc::TestCase
 
     # Delete checksums
     with_site(name: 'foo') do |_site|
-      FileUtils.rm('tmp/checksums')
+      Dir['tmp/nanoc/*/checksums'].each { |fn| FileUtils.rm(fn) }
     end
 
     # Check

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.5.4
+  version: 4.6.0
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -351,7 +351,9 @@ files:
 - spec/nanoc/base/repos/outdatedness_store_spec.rb
 - spec/nanoc/base/repos/site_loader_spec.rb
 - spec/nanoc/base/repos/snapshot_repo_spec.rb
+- spec/nanoc/base/repos/store_spec.rb
 - spec/nanoc/base/services/compiler/phases/cache_spec.rb
+- spec/nanoc/base/services/compiler/stages/cleanup_spec.rb
 - spec/nanoc/base/services/dependency_tracker_spec.rb
 - spec/nanoc/base/services/executor_spec.rb
 - spec/nanoc/base/services/item_rep_router_spec.rb
@@ -566,7 +568,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.