nanoc 4.7.9 → 4.7.10

data/lib/nanoc/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.7.9'.freeze
+  VERSION = '4.7.10'
 end

data/nanoc.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/nanoc/version'
 
 Gem::Specification.new do |s|

data/spec/contributors_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe 'list of contributors in README', chdir: false do
   let(:contributors_in_readme) do
     File.readlines('README.md').last.chomp("\n").split(', ')

data/spec/nanoc/base/checksummer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tempfile'
 
 describe Nanoc::Int::Checksummer::VerboseDigest do

data/spec/nanoc/base/compiler_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Compiler do
   let(:compiler) do
     described_class.new(

data/spec/nanoc/base/directed_graph_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::DirectedGraph do
   subject(:graph) { described_class.new([1, 2, 3]) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ActionSequence do
   let(:action_sequence) { raise 'override me' }
 

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+describe Nanoc::Int::CodeSnippet do
+  subject(:code_snippet) { described_class.new(data, 'lib/foo.rb') }
+
+  describe '#load' do
+    subject { code_snippet.load }
+
+    describe 'calling #include' do
+      let(:data) do
+        <<~EOS
+          module CodeSnippetSpecHelper1
+            def fe345b48e4
+              "fe345b48e4"
+            end
+          end
+
+          include CodeSnippetSpecHelper1
+        EOS
+      end
+
+      it 'makes helper functions available in contexts' do
+        expect { subject }
+          .to change { [Nanoc::Int::Context.new({}).respond_to?(:fe345b48e4), Complex.respond_to?(:fe345b48e4)] }
+          .from([false, false])
+          .to([true, true])
+      end
+    end
+
+    describe 'calling #use_helper' do
+      let(:data) do
+        <<~EOS
+          module CodeSnippetSpecHelper2
+            def e0f0c30b5e
+              "e0f0c30b5e"
+            end
+          end
+
+          use_helper CodeSnippetSpecHelper2
+        EOS
+      end
+
+      it 'makes helper functions available everywhere' do
+        expect { subject }
+          .to change { [Nanoc::Int::Context.new({}).respond_to?(:e0f0c30b5e), Complex.respond_to?(:e0f0c30b5e)] }
+          .from([false, false])
+          .to([true, false])
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Configuration do
   let(:hash) { { foo: 'bar' } }
   let(:config) { described_class.new(hash: hash) }
@@ -84,6 +86,19 @@ describe Nanoc::Int::Configuration do
     end
   end
 
+  describe '#merge' do
+    let(:hash1) { { foo: { bar: 'baz', baz: ['biz'] } } }
+    let(:hash2) { { foo: { bar: :boz, biz: 'buz' } } }
+    let(:config1) { described_class.new(hash: hash1) }
+    let(:config2) { described_class.new(hash: hash2) }
+
+    subject { config1.merge(config2).to_h }
+
+    it 'contains the recursive merge of both configurations' do
+      expect(subject).to include(foo: { bar: :boz, baz: ['biz'], biz: 'buz' })
+    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/content_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Content do
   describe '.create' do
     subject { described_class.create(arg, params) }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 shared_examples 'a document' do
   describe '#initialize' do
     let(:content_arg) { 'Hello world' }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::IdentifiableCollection do
   subject(:identifiable_collection) { described_class.new(config, objects) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Identifier do
   describe '.from' do
     subject { described_class.from(arg) }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ItemRep do
   let(:item) { Nanoc::Int::Item.new('asdf', {}, '/foo.md') }
   let(:rep) { Nanoc::Int::ItemRep.new(item, :giraffe) }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Item do
   it_behaves_like 'a document'
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Layout do
   it_behaves_like 'a document'
 end

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::LazyValue do
   describe '#value' do
-    let(:value_arg) { 'Hello world' }
+    let(:value_arg) { 'Hello world'.dup }
     let(:lazy_value) { described_class.new(value_arg) }
 
     subject { lazy_value.value }

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::OutdatednessStatus do
   let(:status) { described_class.new }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Pattern do
   describe '.from' do
     it 'converts from string' do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ProcessingAction do
   let(:action) { described_class.new }
 

data/spec/nanoc/base/entities/processing_actions/filter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ProcessingActions::Filter do
   let(:action) { described_class.new(:foo, awesome: true) }
 

data/spec/nanoc/base/entities/processing_actions/layout_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ProcessingActions::Layout do
   let(:action) { described_class.new('/foo.erb', awesome: true) }
 

data/spec/nanoc/base/entities/processing_actions/snapshot_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ProcessingActions::Snapshot do
   let(:action) { described_class.new([:before_layout], ['/foo.md']) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Props do
   let(:props) { described_class.new }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Site do
   describe '#freeze' do
     let(:site) do

data/spec/nanoc/base/errors/dependency_cycle_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Errors::DependencyCycle do
   subject(:error) { described_class.new(graph) }
 
@@ -18,13 +20,13 @@ describe Nanoc::Int::Errors::DependencyCycle do
   let(:rep_e) { Nanoc::Int::ItemRep.new(Nanoc::Int::Item.new('e', {}, '/e.md'), :default) }
 
   it 'has an informative error message' do
-    expected = <<EOS
-The site cannot be compiled because there is a dependency cycle:
+    expected = <<~EOS
+      The site cannot be compiled because there is a dependency cycle:
 
-    (1) item /e.md, rep :default, uses compiled content of
-    (2) item /d.md, rep :default, uses compiled content of
-    (3) item /c.md, rep :default, uses compiled content of
-    (4) item /b.md, rep :default, uses compiled content of (1)
+          (1) item /e.md, rep :default, uses compiled content of
+          (2) item /d.md, rep :default, uses compiled content of
+          (3) item /c.md, rep :default, uses compiled content of
+          (4) item /b.md, rep :default, uses compiled content of (1)
 EOS
 
     expect(error.message).to eql(expected)

data/spec/nanoc/base/feature_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Feature do
   describe '.enabled?' do
     subject { described_class.enabled?(feature_name) }
@@ -6,7 +8,7 @@ describe Nanoc::Feature do
 
     before do
       Nanoc::Feature.reset_caches
-      ENV['NANOC_FEATURES'] = ''
+      ENV['NANOC_FEATURES'] = String.new
     end
 
     context 'not set' do
@@ -40,7 +42,7 @@ describe Nanoc::Feature do
 
     before do
       Nanoc::Feature.reset_caches
-      ENV['NANOC_FEATURES'] = ''
+      ENV['NANOC_FEATURES'] = String.new
     end
 
     context 'not set' do

data/spec/nanoc/base/filter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Filter do
   describe '.define' do
     context 'simple filter' do

data/spec/nanoc/base/item_rep_writer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ItemRepWriter do
   describe '#write' do
     let(:raw_path) { 'output/blah.dat' }

data/spec/nanoc/base/memoization_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Memoization do
   class MemoizationSpecSample1
     extend Nanoc::Int::Memoization

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ChecksumStore do
   let(:store) { described_class.new(objects: objects) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::CompiledContentCache do
   let(:cache) { described_class.new(items: items) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ConfigLoader do
   let(:loader) { described_class.new }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::DependencyStore do
   let(:store) { described_class.new(items, layouts) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::OutdatednessStore do
   subject(:store) { described_class.new(site: site, reps: reps) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::SiteLoader do
   let(:loader) { described_class.new }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::SnapshotRepo do
   subject(:repo) { described_class.new }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Store do
   describe '#tmp_path_for' do
     context 'passing site' do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Compiler::Phases::Abstract do
   subject(:phase) do
     described_class.new(wrapped: wrapped)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Compiler::Phases::Cache do
   subject(:phase) do
     described_class.new(

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Compiler::Stages::CalculateChecksums do
   let(:stage) do
     described_class.new(items: items, layouts: layouts, code_snippets: code_snippets, config: config)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Compiler::Stages::Cleanup do
   let(:stage) { described_class.new(config) }
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Compiler::Stages::CompileReps do
   let(:stage) do
     described_class.new(

data/spec/nanoc/base/services/dependency_tracker_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::DependencyTracker do
   let(:tracker) { described_class.new(store) }
 

data/spec/nanoc/base/services/executor_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::Executor do
   let(:executor) { described_class.new(rep, compilation_context, dependency_tracker) }
 

data/spec/nanoc/base/services/item_rep_router_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe(Nanoc::Int::ItemRepRouter) do
   subject(:item_rep_router) { described_class.new(reps, action_provider, site) }
 

data/spec/nanoc/base/services/item_rep_selector_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe Nanoc::Int::ItemRepSelector do
   let(:selector) { described_class.new(reps_for_selector) }