nanoc 4.5.2 → 4.5.3

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

@@ -57,7 +57,7 @@ module Nanoc
       when Symbol
         res = @item_reps.find { |ir| ir.name == rep_name }
         res && view_class.new(res, @context)
-      when Fixnum
+      when Integer
         raise ArgumentError, "expected ItemRepCollectionView#[] to be called with a symbol (you likely want `.reps[:default]` rather than `.reps[#{rep_name}]`)"
       else
         raise ArgumentError, 'expected ItemRepCollectionView#[] to be called with a symbol'

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

@@ -43,7 +43,7 @@ module Nanoc
     # @return [String] The content at the given snapshot.
     def compiled_content(snapshot: nil)
       @context.dependency_tracker.bounce(unwrap.item, compiled_content: true)
-      @item_rep.compiled_content(snapshot: snapshot)
+      @context.snapshot_repo.compiled_content(rep: unwrap, snapshot: snapshot)
     end
 
     # Returns the item rep’s path, as used when being linked to. It starts
@@ -75,7 +75,7 @@ module Nanoc
 
     # @api private
     def binary?
-      @item_rep.binary?
+      @context.snapshot_repo.get(unwrap, :last).binary?
     end
 
     def inspect

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

@@ -1,18 +1,20 @@
 module Nanoc
   class PostCompileItemRepView < ::Nanoc::ItemRepView
     def compiled_content(snapshot: nil)
-      if unwrap.binary?
-        raise Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem.new(unwrap)
-      end
-
       snapshot_contents = @context.compilation_context.compiled_content_cache[unwrap]
+
       snapshot_name = snapshot || (snapshot_contents[:pre] ? :pre : :last)
 
-      if snapshot_contents[snapshot_name]
-        snapshot_contents[snapshot_name].string
-      else
+      unless snapshot_contents[snapshot_name]
         raise Nanoc::Int::Errors::NoSuchSnapshot.new(unwrap, snapshot_name)
       end
+
+      content = snapshot_contents[snapshot_name]
+      if content.binary?
+        raise Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem.new(unwrap)
+      end
+
+      content.string
     end
   end
 end

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

@@ -5,12 +5,14 @@ module Nanoc
     attr_reader :items
     attr_reader :dependency_tracker
     attr_reader :compilation_context
+    attr_reader :snapshot_repo
 
-    def initialize(reps:, items:, dependency_tracker:, compilation_context:)
+    def initialize(reps:, items:, dependency_tracker:, compilation_context:, snapshot_repo:)
       @reps = reps
       @items = items
       @dependency_tracker = dependency_tracker
       @compilation_context = compilation_context
+      @snapshot_repo = snapshot_repo
     end
   end
 end

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

@@ -66,8 +66,8 @@ module Nanoc::CLI::Commands
         Nanoc::Int::NotificationCenter.on(:will_write_rep, self) do |rep, path|
           old_contents[rep] = File.file?(path) ? File.read(path) : nil
         end
-        Nanoc::Int::NotificationCenter.on(:rep_written, self) do |rep, path, _is_created, _is_modified|
-          unless rep.binary?
+        Nanoc::Int::NotificationCenter.on(:rep_written, self) do |rep, binary, path, _is_created, _is_modified|
+          unless binary
             new_contents = File.file?(path) ? File.read(path) : nil
             if old_contents[rep] && new_contents
               generate_diff_for(path, old_contents[rep], new_contents)
@@ -326,7 +326,7 @@ module Nanoc::CLI::Commands
           @acc_durations[rep] += Time.now - @start_times[rep]
         end
 
-        Nanoc::Int::NotificationCenter.on(:rep_written, self) do |rep, path, is_created, is_modified|
+        Nanoc::Int::NotificationCenter.on(:rep_written, self) do |rep, _binary, path, is_created, is_modified|
           @acc_durations[rep] += Time.now - @start_times[rep]
           duration = @acc_durations[rep]
 

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

@@ -35,6 +35,7 @@ module Nanoc::CLI::Commands
         items: site.items,
         dependency_tracker: Nanoc::Int::DependencyTracker::Null.new,
         compilation_context: nil,
+        snapshot_repo: nil,
       )
     end
 

data/lib/nanoc/extra/parallel_collection.rb

@@ -7,7 +7,7 @@ module Nanoc::Extra
 
     include Nanoc::Int::ContractsSupport
 
-    contract C::RespondTo[:each], C::KeywordArgs[parallelism: Fixnum] => C::Any
+    contract C::RespondTo[:each], C::KeywordArgs[parallelism: Integer] => C::Any
     def initialize(enum, parallelism: 2)
       @enum = enum
       @parallelism = parallelism

data/lib/nanoc/helpers/capturing.rb

@@ -30,17 +30,19 @@ module Nanoc::Helpers
         content_string = capture(&block)
 
         # Get existing contents and prep for store
-        snapshot_contents = @item.reps[:default].unwrap.snapshot_contents
+        snapshot_repo = @item._context.snapshot_repo
+        rep = @item.reps[:default].unwrap
         capture_name = "__capture_#{name}".to_sym
         old_content_string =
           case existing_behavior
           when :overwrite
             ''
           when :append
-            c = snapshot_contents[capture_name]
+            c = snapshot_repo.get(rep, capture_name)
             c ? c.string : ''
           when :error
-            if snapshot_contents[capture_name] && snapshot_contents[capture_name].string != content_string
+            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"
             else
@@ -52,7 +54,8 @@ module Nanoc::Helpers
           end
 
         # Store
-        snapshot_contents[capture_name] = Nanoc::Int::TextualContent.new(old_content_string + content_string)
+        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 ' \
@@ -74,7 +77,8 @@ module Nanoc::Helpers
           end
         end
 
-        content = rep.snapshot_contents["__capture_#{name}".to_sym]
+        snapshot_repo = @config._context.snapshot_repo
+        content = snapshot_repo.get(rep, "__capture_#{name}".to_sym)
         content ? content.string : nil
       end
     end

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -56,6 +56,7 @@ module Nanoc::RuleDSL
           items: site.items,
           dependency_tracker: dependency_tracker,
           compilation_context: site.compiler.compilation_context,
+          snapshot_repo: nil,
         )
       ctx = new_postprocessor_context(site, view_context)
 
@@ -73,6 +74,7 @@ module Nanoc::RuleDSL
           items: nil,
           dependency_tracker: dependency_tracker,
           compilation_context: nil,
+          snapshot_repo: nil,
         )
 
       Nanoc::Int::Context.new(

data/lib/nanoc/rule_dsl/rule_memory_calculator.rb

@@ -84,6 +84,9 @@ module Nanoc::RuleDSL
       unless rule_memory.snapshot_actions.any? { |sa| sa.snapshot_name == :last }
         executor.snapshot(:last)
       end
+      unless rule_memory.snapshot_actions.any? { |sa| sa.snapshot_name == :pre }
+        executor.snapshot(:pre)
+      end
 
       assign_paths_to_mem(rule_memory, rep: rep)
     end
@@ -125,7 +128,7 @@ module Nanoc::RuleDSL
       return nil if routing_rule.nil?
 
       dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
-      view_context = Nanoc::ViewContext.new(reps: nil, items: nil, dependency_tracker: dependency_tracker, compilation_context: nil)
+      view_context = Nanoc::ViewContext.new(reps: nil, items: nil, dependency_tracker: dependency_tracker, compilation_context: nil, snapshot_repo: nil)
       basic_path = routing_rule.apply_to(rep, executor: nil, site: @site, view_context: view_context)
       if basic_path && !basic_path.start_with?('/')
         raise PathWithoutInitialSlashError.new(rep, basic_path)

data/lib/nanoc/spec.rb

@@ -111,6 +111,10 @@ module Nanoc
         @rule_memory[obj] = memory
       end
 
+      def snapshot_repo
+        view_context.snapshot_repo
+      end
+
       private
 
       def view_context
@@ -118,7 +122,8 @@ module Nanoc
           reps: @reps,
           items: @items,
           dependency_tracker: @dependency_tracker,
-          compilation_context: new_site.compiler.compilation_context,
+          compilation_context: site.compiler.compilation_context,
+          snapshot_repo: site.compiler.compilation_context.snapshot_repo,
         )
       end
 
@@ -150,26 +155,20 @@ module Nanoc
         Nanoc::Int::CompilerLoader.new.load(site, action_provider: new_action_provider)
       end
 
-      def new_site
-        site = Nanoc::Int::Site.new(
-          config: @config,
-          code_snippets: [],
-          items: @items,
-          layouts: @layouts,
-        )
-        site.compiler = new_compiler_for(site)
-        site
+      def site
+        @_site ||= begin
+          site = Nanoc::Int::Site.new(
+            config: @config,
+            code_snippets: [],
+            items: @items,
+            layouts: @layouts,
+          )
+          site.compiler = new_compiler_for(site)
+          site
+        end
       end
 
       def assigns
-        site = Nanoc::Int::Site.new(
-          config: @config,
-          code_snippets: [],
-          items: @items,
-          layouts: @layouts,
-        )
-        site.compiler = new_compiler_for(site)
-
         {
           config: Nanoc::MutableConfigView.new(@config, view_context),
           item_rep: @item_rep ? Nanoc::ItemRepView.new(@item_rep, view_context) : nil,

data/lib/nanoc/version.rb

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

data/spec/nanoc/base/compiler_spec.rb

@@ -96,9 +96,9 @@ describe Nanoc::Int::Compiler do
     end
 
     it 'compiles individual reps' do
-      expect { subject }.to change { rep.snapshot_contents[:last].string }
-        .from('<%= 1 + 2 %>')
-        .to('3')
+      expect { subject }.to change { compiler.snapshot_repo.get(rep, :last) }
+        .from(nil)
+        .to(some_textual_content('3'))
     end
 
     it 'removes the item rep from the outdatedness store' do
@@ -161,9 +161,10 @@ describe Nanoc::Int::Compiler do
     let(:is_outdated) { true }
 
     it 'generates expected output' do
-      expect(rep.snapshot_contents[:last].string).to eql(item.content.string)
-      subject
-      expect(rep.snapshot_contents[:last].string).to eql('3')
+      expect { subject }
+        .to change { compiler.snapshot_repo.get(rep, :last) }
+        .from(nil)
+        .to(some_textual_content('3'))
     end
 
     it 'generates notifications in the proper order' do
@@ -183,14 +184,14 @@ describe Nanoc::Int::Compiler do
       end
 
       it 'generates expected output' do
-        expect(rep.snapshot_contents[:last].string).to eql(item.content.string)
+        expect(compiler.snapshot_repo.get(rep, :last)).to be_nil
 
         expect { stage.send(:compile_rep, rep, is_outdated: true) }
           .to raise_error(Nanoc::Int::Errors::UnmetDependency)
         stage.send(:compile_rep, other_rep, is_outdated: true)
         stage.send(:compile_rep, rep, is_outdated: true)
 
-        expect(rep.snapshot_contents[:last].string).to eql('other=other content')
+        expect(compiler.snapshot_repo.get(rep, :last).string).to eql('other=other content')
       end
 
       it 'generates notifications in the proper order' do

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

@@ -1,226 +1,4 @@
 describe Nanoc::Int::ItemRep do
   let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo.md') }
   let(:rep) { Nanoc::Int::ItemRep.new(item, :giraffe) }
-
-  describe '#compiled_content' do
-    let(:snapshot_name) { raise 'override me' }
-    subject { rep.compiled_content(snapshot: snapshot_name) }
-
-    shared_examples 'a non-moving snapshot with content' do
-      context 'no snapshot def' do
-        it 'raises' do
-          expect { subject }.to raise_error(Nanoc::Int::Errors::NoSuchSnapshot)
-        end
-      end
-
-      context 'snapshot def exists' do
-        before do
-          rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(snapshot_name)]
-          rep.snapshot_contents = { snapshot_name => content }
-        end
-
-        context 'content is textual' do
-          let(:content) { Nanoc::Int::TextualContent.new('hellos') }
-          it { is_expected.to eql('hellos') }
-        end
-
-        context 'content is binary' do
-          before { File.write('donkey.dat', 'binary data') }
-          let(:content) { Nanoc::Int::BinaryContent.new(File.expand_path('donkey.dat')) }
-
-          it 'raises' do
-            expect { subject }.to raise_error(Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem)
-          end
-        end
-      end
-    end
-
-    shared_examples 'a non-moving snapshot' do
-      include_examples 'a non-moving snapshot with content'
-
-      context 'snapshot def exists, but not content' do
-        before do
-          rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(snapshot_name)]
-          rep.snapshot_contents = {}
-        end
-
-        it 'errors' do
-          expect { subject }.to yield_from_fiber(an_instance_of(Nanoc::Int::Errors::UnmetDependency))
-        end
-      end
-    end
-
-    shared_examples 'snapshot :last' do
-      context 'no snapshot def' do
-        it 'errors' do
-          expect { subject }.to raise_error(Nanoc::Int::Errors::NoSuchSnapshot)
-        end
-      end
-
-      context 'snapshot exists' do
-        context 'snapshot is not final' do
-          before do
-            rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(snapshot_name)]
-          end
-
-          context 'snapshot content does not exist' do
-            before do
-              rep.snapshot_contents = {}
-            end
-
-            it 'errors' do
-              expect { subject }.to yield_from_fiber(an_instance_of(Nanoc::Int::Errors::UnmetDependency))
-            end
-          end
-
-          context 'snapshot content exists' do
-            context 'content is textual' do
-              before do
-                rep.snapshot_contents[snapshot_name] = Nanoc::Int::TextualContent.new('hellos')
-              end
-
-              context 'not compiled' do
-                before { rep.compiled = false }
-
-                it 'raises' do
-                  expect { subject }.to yield_from_fiber(an_instance_of(Nanoc::Int::Errors::UnmetDependency))
-                end
-              end
-
-              context 'compiled' do
-                before { rep.compiled = true }
-
-                it { is_expected.to eql('hellos') }
-              end
-            end
-
-            context 'content is binary' do
-              before do
-                File.write('donkey.dat', 'binary data')
-                rep.snapshot_contents[snapshot_name] = Nanoc::Int::BinaryContent.new(File.expand_path('donkey.dat'))
-              end
-
-              context 'not compiled' do
-                before { rep.compiled = false }
-
-                it 'raises' do
-                  expect { subject }.to yield_from_fiber(an_instance_of(Nanoc::Int::Errors::UnmetDependency))
-                end
-              end
-
-              context 'compiled' do
-                before { rep.compiled = true }
-
-                it 'raises' do
-                  expect { subject }.to raise_error(Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem)
-                end
-              end
-            end
-          end
-        end
-
-        context 'snapshot is final' do
-          before do
-            rep.snapshot_defs = [Nanoc::Int::SnapshotDef.new(snapshot_name)]
-          end
-
-          context 'snapshot content does not exist' do
-            before do
-              rep.snapshot_contents = {}
-            end
-
-            it 'errors' do
-              expect { subject }.to yield_from_fiber(an_instance_of(Nanoc::Int::Errors::UnmetDependency))
-            end
-          end
-
-          context 'snapshot content exists' do
-            context 'content is textual' do
-              before do
-                rep.snapshot_contents[snapshot_name] = Nanoc::Int::TextualContent.new('hellos')
-              end
-
-              context 'not compiled' do
-                before { rep.compiled = false }
-
-                it 'errors' do
-                  expect { subject }.to yield_from_fiber(an_instance_of(Nanoc::Int::Errors::UnmetDependency))
-                end
-              end
-
-              context 'compiled' do
-                before { rep.compiled = true }
-
-                it { is_expected.to eql('hellos') }
-              end
-            end
-
-            context 'content is binary' do
-              before do
-                File.write('donkey.dat', 'binary data')
-                rep.snapshot_contents[snapshot_name] = Nanoc::Int::BinaryContent.new(File.expand_path('donkey.dat'))
-              end
-
-              context 'not compiled' do
-                before { rep.compiled = false }
-
-                it 'raises' do
-                  expect { subject }.to yield_from_fiber(an_instance_of(Nanoc::Int::Errors::UnmetDependency))
-                end
-              end
-
-              context 'compiled' do
-                before { rep.compiled = true }
-
-                it 'raises' do
-                  expect { subject }.to raise_error(Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-
-    context 'snapshot nil' do
-      let(:snapshot_name) { :last }
-      subject { rep.compiled_content(snapshot: nil) }
-      include_examples 'snapshot :last'
-    end
-
-    context 'snapshot not specified' do
-      subject { rep.compiled_content }
-
-      context 'pre exists' do
-        before { rep.snapshot_contents[:pre] = Nanoc::Int::TextualContent.new('omg') }
-        let(:snapshot_name) { :pre }
-        include_examples 'a non-moving snapshot with content'
-      end
-
-      context 'pre does not exist' do
-        let(:snapshot_name) { :last }
-        include_examples 'snapshot :last'
-      end
-    end
-
-    context 'snapshot :pre specified' do
-      let(:snapshot_name) { :pre }
-      include_examples 'a non-moving snapshot'
-    end
-
-    context 'snapshot :post specified' do
-      let(:snapshot_name) { :post }
-      include_examples 'a non-moving snapshot'
-    end
-
-    context 'snapshot :last specified' do
-      let(:snapshot_name) { :last }
-      include_examples 'snapshot :last'
-    end
-
-    context 'snapshot :donkey specified' do
-      let(:snapshot_name) { :donkey }
-      include_examples 'a non-moving snapshot'
-    end
-  end
 end