nanoc 4.6.2 → 4.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5ae7fdab33a2274afd361558045fdac7c5c2f9
-  data.tar.gz: 636a45cd39ba85dc37c2fc6abbb43af2e6e98e16
+  metadata.gz: 2be981505c54e8c257e032a6bd08d7be8be95135
+  data.tar.gz: db527143c17a425809740641b4344b225c35fc43
 SHA512:
-  metadata.gz: 98f9a4d6fb54b47bdee2a1c4bef5f7fc141daa1d63d28048076596ce5b88959b5522d1000898873256e46b06b4693f9049bad09809e198110b0ec755c43bfd54
-  data.tar.gz: bec451e9af2fa9782c224df87f53629e6e4a3d9dc715d7cc145ce467c813bf33d221adf6a540b063e8ad7a0febf13dcee0a4f619ac096305e2ce60edb038e693
+  metadata.gz: f1b3ed7df2c66ed6eab2b67081b1b828942fa5ce474e85d2c088dc6b439ccffbf36a1cedad89fef84334b2e5033ce561a98e1bc48b5f94f176358a9b913d1426
+  data.tar.gz: ad5c1d8f749f3b10f8167f4faa45a41cbcc18ba64ca2ad73220a4afc49f606399349de87d05599d462d4eebf819f5ead745e3c9c42883ba3b71bf2c2038b54e0

data/Gemfile.lock

@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.6.2)
+    nanoc (4.6.3)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)

data/NEWS.md

@@ -1,5 +1,13 @@
 # Nanoc news
 
+## 4.6.3 (2017-03-05)
+
+Fixes:
+
+* Fixed `Errno::ENOENT` crash (#1094, #1109)
+* Fixed undefined method `#reverse_each` crash (#1107, #1108)
+* Fixed compilation speed issue introduced in 4.6.2 (#1106)
+
 ## 4.6.2 (2017-03-04)
 
 Fixes:

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

@@ -12,7 +12,7 @@ module Nanoc::Int
     contract C::Or[Hash, C::Named['Nanoc::Int::Configuration']], C::IterOf[C::RespondTo[:identifier]] => C::Any
     def initialize(config, objects = [])
       @config = config
-      @objects = objects
+      @objects = Hamster::Vector.new(objects)
     end
 
     def self.from(enum, config)
@@ -43,7 +43,7 @@ module Nanoc::Int
 
     contract C::None => C::ArrayOf[C::RespondTo[:identifier]]
     def to_a
-      @objects
+      @objects.to_a
     end
 
     contract C::None => C::Bool
@@ -52,7 +52,7 @@ module Nanoc::Int
     end
 
     def add(obj)
-      self.class.new(@config, @objects + [obj])
+      self.class.new(@config, @objects.add(obj))
     end
 
     def reject(&block)

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

@@ -8,13 +8,17 @@ module Nanoc::Int
     end
 
     def items
-      objs = @data_sources.flat_map(&:items)
-      @_items ||= Nanoc::Int::IdentifiableCollection.from(objs, @config)
+      @_items ||= begin
+        objs = @data_sources.flat_map(&:items)
+        Nanoc::Int::IdentifiableCollection.from(objs, @config)
+      end
     end
 
     def layouts
-      objs = @data_sources.flat_map(&:layouts)
-      @_layouts ||= Nanoc::Int::IdentifiableCollection.from(objs, @config)
+      @_layouts ||= begin
+        objs = @data_sources.flat_map(&:layouts)
+        Nanoc::Int::IdentifiableCollection.from(objs, @config)
+      end
     end
   end
 end

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

@@ -26,7 +26,12 @@ module Nanoc::Int::Compiler::Phases
 
     contract Nanoc::Int::ItemRep, C::KeywordArgs[is_outdated: C::Bool] => C::Bool
     def can_reuse_content_for_rep?(rep, is_outdated:)
-      !is_outdated && !@compiled_content_cache[rep].nil?
+      if is_outdated
+        false
+      else
+        cache = @compiled_content_cache[rep]
+        cache ? cache.none? { |_snapshot_name, content| content.binary? } : false
+      end
     end
   end
 end

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

@@ -447,6 +447,7 @@ module Nanoc::CLI::Commands
     end
 
     def teardown_listeners
+      return unless @listeners
       @listeners.reverse_each(&:stop_safely)
     end
 

data/lib/nanoc/version.rb

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

data/spec/nanoc/base/services/compiler/phases/cache_spec.rb

@@ -69,12 +69,12 @@ describe Nanoc::Int::Compiler::Phases::Cache do
     context 'not outdated' do
       let(:is_outdated) { false }
 
-      context 'cached compiled content available' do
+      context 'textual cached compiled content available' do
         before do
           compiled_content_cache[rep] = { last: Nanoc::Int::TextualContent.new('cached') }
         end
 
-        it 'reuses content from cache' do
+        it 'writes content to cache' do
           expect { subject }
             .to change { snapshot_repo.get(rep, :last) }
             .from(nil)
@@ -99,6 +99,41 @@ describe Nanoc::Int::Compiler::Phases::Cache do
         end
       end
 
+      context 'binary cached compiled content available' do
+        let(:binary_content) { 'b1n4ry' }
+        let(:binary_filename) { Tempfile.open('test') { |fn| fn << binary_content }.path }
+
+        before do
+          compiled_content_cache[rep] = { last: Nanoc::Int::BinaryContent.new(binary_filename) }
+        end
+
+        it 'writes content to cache' do
+          expect { subject }
+            .to change { snapshot_repo.get(rep, :last) }
+            .from(nil)
+            .to(some_textual_content('wrapped content'))
+        end
+
+        it 'marks rep as compiled' do
+          expect { subject }
+            .to change { rep.compiled? }
+            .from(false)
+            .to(true)
+        end
+
+        it 'changes compiled content cache' do
+          expect { subject }
+            .to change { compiled_content_cache[rep] }
+            .from(last: some_binary_content(binary_content))
+            .to(last: some_textual_content('wrapped content'))
+        end
+
+        it 'does not send notification' do
+          expect(Nanoc::Int::NotificationCenter).not_to receive(:post).with(:cached_content_used, rep)
+          subject
+        end
+      end
+
       context 'no cached compiled content available' do
         include_examples 'calls wrapped'
       end

data/spec/nanoc/regressions/gh_1094_spec.rb

@@ -0,0 +1,22 @@
+describe 'GH-1094', site: true, stdio: true do
+  before do
+    File.write('content/a.dat', 'foo')
+    File.write('content/index.html', '<%= @items["/*.dat"].compiled_content %>')
+
+    File.write('Rules', <<EOS)
+  compile '/**/*.html' do
+    filter :erb
+    write item.identifier.to_s
+  end
+
+  passthrough '/**/*.dat'
+EOS
+  end
+
+  it 'raises CannotGetCompiledContentOfBinaryItem twice' do
+    2.times do
+      expect { Nanoc::CLI.run(%w(compile)) }
+        .to raise_wrapped_error(an_instance_of(Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem))
+    end
+  end
+end

data/spec/nanoc/regressions/gh_1107_spec.rb

@@ -0,0 +1,13 @@
+describe 'GH-1107', site: true, stdio: true do
+  before do
+    File.write('Rules', <<EOS)
+  compile '/**/*.html' do
+    garbage(data/**/*)
+  end
+EOS
+  end
+
+  it 'raises the proper exception' do
+    expect { Nanoc::CLI.run(%w(compile --verbose)) }.to raise_error(SyntaxError)
+  end
+end

data/spec/spec_helper.rb

@@ -174,6 +174,32 @@ RSpec::Matchers.define :yield_from_fiber do |expected|
   end
 end
 
+RSpec::Matchers.define :raise_wrapped_error do |expected|
+  supports_block_expectations
+
+  include RSpec::Matchers::Composable
+
+  match do |actual|
+    begin
+      actual.call
+    rescue Nanoc::Int::Errors::CompilationError => e
+      values_match?(expected, e.unwrap)
+    end
+  end
+
+  description do
+    "raise wrapped error #{expected.inspect}"
+  end
+
+  failure_message do |_actual|
+    "expected that proc would raise wrapped error #{expected.inspect}"
+  end
+
+  failure_message_when_negated do |_actual|
+    "expected that proc would not raise wrapped error #{expected.inspect}"
+  end
+end
+
 RSpec::Matchers.define :be_some_textual_content do |expected|
   include RSpec::Matchers::Composable
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.6.3
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -442,9 +442,11 @@ files:
 - spec/nanoc/regressions/gh_1082c_spec.rb
 - spec/nanoc/regressions/gh_1082d_spec.rb
 - spec/nanoc/regressions/gh_1093_spec.rb
+- spec/nanoc/regressions/gh_1094_spec.rb
 - spec/nanoc/regressions/gh_1097_spec.rb
 - spec/nanoc/regressions/gh_1100_spec.rb
 - spec/nanoc/regressions/gh_1102_spec.rb
+- spec/nanoc/regressions/gh_1107_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb