nanoc 4.7.5 → 4.7.6

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

@@ -129,42 +129,6 @@ describe Nanoc::Int::ActionSequence do
     end
   end
 
-  describe '#compact_snapshots' do
-    subject { action_sequence.compact_snapshots }
-
-    before do
-      action_sequence.add_snapshot(:a1, nil)
-      action_sequence.add_snapshot(:a2, '/a2.md')
-      action_sequence.add_snapshot(:a3, nil)
-      action_sequence.add_filter(:erb, awesomeness: 'high')
-      action_sequence.add_snapshot(:b1, '/b1.md')
-      action_sequence.add_snapshot(:b2, nil)
-      action_sequence.add_snapshot(:b3, '/b3.md')
-      action_sequence.add_filter(:erb, awesomeness: 'high')
-      action_sequence.add_snapshot(:c, nil)
-    end
-
-    example do
-      expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-      expect(subject[0].snapshot_names).to eql(%i(a1 a2 a3))
-      expect(subject[0].paths).to eql(['/a2.md'])
-
-      expect(subject[1]).to be_a(Nanoc::Int::ProcessingActions::Filter)
-
-      expect(subject[2]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-      expect(subject[2].snapshot_names).to eql(%i(b1 b2 b3))
-      expect(subject[2].paths).to eql(['/b1.md', '/b3.md'])
-
-      expect(subject[3]).to be_a(Nanoc::Int::ProcessingActions::Filter)
-
-      expect(subject[4]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-      expect(subject[4].snapshot_names).to eql([:c])
-      expect(subject[4].paths).to be_empty
-
-      expect(subject.size).to eql(5)
-    end
-  end
-
   describe '#snapshots_defs' do
     subject { action_sequence.snapshots_defs }
 

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

@@ -407,7 +407,7 @@ describe Nanoc::Identifier do
     context 'identifier with multiple extensions' do
       let(:identifier) { described_class.new('/foo.html.md') }
 
-      it { is_expected.to eql(%w(html md)) }
+      it { is_expected.to eql(%w[html md]) }
     end
   end
 

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

@@ -106,7 +106,7 @@ describe Nanoc::Int::OutdatednessStatus do
       let(:status) { described_class.new(props: Nanoc::Int::Props.new(attributes: true)) }
 
       it 'updates props' do
-        expect(subject.props.active).to eql(Set.new(%i(raw_content attributes compiled_content)))
+        expect(subject.props.active).to eql(Set.new(%i[raw_content attributes compiled_content]))
       end
     end
   end

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

@@ -25,7 +25,7 @@ describe Nanoc::Int::ProcessingActions::Snapshot do
 
     context 'with snapshot name' do
       subject { action.update(snapshot_names: [:zebra]) }
-      its(:snapshot_names) { is_expected.to eql(%i(before_layout zebra)) }
+      its(:snapshot_names) { is_expected.to eql(%i[before_layout zebra]) }
       its(:paths) { is_expected.to eql(['/foo.md']) }
     end
 

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

@@ -99,7 +99,7 @@ describe Nanoc::Int::Props do
       let(:props) { described_class.new }
       let(:other_props) { props_all }
 
-      it { is_expected.to eql(Set.new(%i(raw_content attributes compiled_content path))) }
+      it { is_expected.to eql(Set.new(%i[raw_content attributes compiled_content path])) }
     end
 
     context 'some + nothing' do
@@ -113,35 +113,35 @@ describe Nanoc::Int::Props do
       let(:props) { described_class.new(compiled_content: true) }
       let(:other_props) { described_class.new(raw_content: true) }
 
-      it { is_expected.to eql(Set.new(%i(raw_content compiled_content))) }
+      it { is_expected.to eql(Set.new(%i[raw_content compiled_content])) }
     end
 
     context 'some + all' do
       let(:props) { described_class.new(compiled_content: true) }
       let(:other_props) { props_all }
 
-      it { is_expected.to eql(Set.new(%i(raw_content attributes compiled_content path))) }
+      it { is_expected.to eql(Set.new(%i[raw_content attributes compiled_content path])) }
     end
 
     context 'all + nothing' do
       let(:props) { props_all }
       let(:other_props) { described_class.new }
 
-      it { is_expected.to eql(Set.new(%i(raw_content attributes compiled_content path))) }
+      it { is_expected.to eql(Set.new(%i[raw_content attributes compiled_content path])) }
     end
 
     context 'some + all' do
       let(:props) { props_all }
       let(:other_props) { described_class.new(compiled_content: true) }
 
-      it { is_expected.to eql(Set.new(%i(raw_content attributes compiled_content path))) }
+      it { is_expected.to eql(Set.new(%i[raw_content attributes compiled_content path])) }
     end
 
     context 'all + all' do
       let(:props) { props_all }
       let(:other_props) { props_all }
 
-      it { is_expected.to eql(Set.new(%i(raw_content attributes compiled_content path))) }
+      it { is_expected.to eql(Set.new(%i[raw_content attributes compiled_content path])) }
     end
   end
 
@@ -155,11 +155,11 @@ describe Nanoc::Int::Props do
     end
 
     let(:props_attrs_list_a) do
-      described_class.new(attributes: %i(donkey giraffe))
+      described_class.new(attributes: %i[donkey giraffe])
     end
 
     let(:props_attrs_list_b) do
-      described_class.new(attributes: %i(giraffe zebra))
+      described_class.new(attributes: %i[giraffe zebra])
     end
 
     subject { props.merge(other_props).attributes }
@@ -183,7 +183,7 @@ describe Nanoc::Int::Props do
       let(:other_props) { props_attrs_list_a }
 
       it { is_expected.to be_a(Set) }
-      it { is_expected.to match_array(%i(donkey giraffe)) }
+      it { is_expected.to match_array(%i[donkey giraffe]) }
     end
 
     context 'true + false' do
@@ -212,7 +212,7 @@ describe Nanoc::Int::Props do
       let(:other_props) { props_attrs_false }
 
       it { is_expected.to be_a(Set) }
-      it { is_expected.to match_array(%i(donkey giraffe)) }
+      it { is_expected.to match_array(%i[donkey giraffe]) }
     end
 
     context 'list + true' do
@@ -227,7 +227,7 @@ describe Nanoc::Int::Props do
       let(:other_props) { props_attrs_list_b }
 
       it { is_expected.to be_a(Set) }
-      it { is_expected.to match_array(%i(donkey giraffe zebra)) }
+      it { is_expected.to match_array(%i[donkey giraffe zebra]) }
     end
   end
 
@@ -261,12 +261,12 @@ describe Nanoc::Int::Props do
 
     context 'attributes and compiled_content active' do
       let(:props) { described_class.new(attributes: true, compiled_content: true) }
-      it { is_expected.to eql(Set.new(%i(attributes compiled_content))) }
+      it { is_expected.to eql(Set.new(%i[attributes compiled_content])) }
     end
 
     context 'all active' do
       let(:props) { described_class.new(raw_content: true, attributes: true, compiled_content: true, path: true) }
-      it { is_expected.to eql(Set.new(%i(raw_content attributes compiled_content path))) }
+      it { is_expected.to eql(Set.new(%i[raw_content attributes compiled_content path])) }
     end
   end
 

data/spec/nanoc/base/memoization_spec.rb

@@ -34,6 +34,28 @@ describe Nanoc::Int::Memoization do
     memoize :run
   end
 
+  class MemoizationSpecUpcaserInlineSyntax
+    extend Nanoc::Int::Memoization
+
+    memoized def run(value)
+      value.upcase
+    end
+  end
+
+  class MemoizationSpecInlineSyntaxReturn
+    extend Nanoc::Int::Memoization
+
+    class << self
+      attr_reader :sym
+    end
+
+    def self.record(sym)
+      @sym = sym
+    end
+
+    record memoized def run; end
+  end
+
   example do
     sample1a = MemoizationSpecSample1.new(10)
     sample1b = MemoizationSpecSample1.new(15)
@@ -54,6 +76,11 @@ describe Nanoc::Int::Memoization do
     sample.run(5)
   end
 
+  it 'supports memoized def … syntax' do
+    upcaser = MemoizationSpecUpcaserInlineSyntax.new
+    expect(upcaser.run('hi')).to eq('HI')
+  end
+
   it 'does not crash on #inspect' do
     upcaser = MemoizationSpecUpcaser.new
     10_000.times do |i|
@@ -66,6 +93,10 @@ describe Nanoc::Int::Memoization do
     upcaser.inspect
   end
 
+  it 'returns method name' do
+    expect(MemoizationSpecInlineSyntaxReturn.sym).to eq(:run)
+  end
+
   it 'sends notifications' do
     sample = MemoizationSpecSample1.new(10)
     expect { sample.run(5) }.to send_notification(:memoization_miss, 'MemoizationSpecSample1#run')

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

@@ -408,8 +408,8 @@ describe Nanoc::Int::Executor do
     end
 
     let(:action_sequence) do
-      Nanoc::Int::ActionSequence.new(rep).tap do |mem|
-        mem.add_filter(:erb, {})
+      Nanoc::Int::ActionSequence.new(rep).tap do |seq|
+        seq.add_filter(:erb, {})
       end
     end
 

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

@@ -122,8 +122,8 @@ describe Nanoc::Int::ItemRepSelector do
       end
 
       example do
-        expect(successfully_yielded).to eq %i(e d c b a)
-        expect(tentatively_yielded).to eq %i(a b c d e d c b a)
+        expect(successfully_yielded).to eq %i[e d c b a]
+        expect(tentatively_yielded).to eq %i[a b c d e d c b a]
       end
     end
 
@@ -133,21 +133,21 @@ describe Nanoc::Int::ItemRepSelector do
       end
 
       example do
-        expect(successfully_yielded).to eq %i(a b c d e)
-        expect(tentatively_yielded).to eq %i(a b c d e)
+        expect(successfully_yielded).to eq %i[a b c d e]
+        expect(tentatively_yielded).to eq %i[a b c d e]
       end
     end
 
     context 'star dependencies' do
       let(:dependencies) do
         {
-          a: %i(b c d e),
+          a: %i[b c d e],
         }
       end
 
       example do
-        expect(successfully_yielded).to eq %i(b c d e a)
-        expect(tentatively_yielded).to eq %i(a b a c a d a e a)
+        expect(successfully_yielded).to eq %i[b c d e a]
+        expect(tentatively_yielded).to eq %i[a b a c a d a e a]
       end
     end
 
@@ -156,13 +156,13 @@ describe Nanoc::Int::ItemRepSelector do
 
       let(:dependencies) do
         {
-          a: %i(b c d e),
+          a: %i[b c d e],
         }
       end
 
       example do
-        expect(successfully_yielded).to eq %i(b c d e a)
-        expect(tentatively_yielded).to eq %i(a b a c a d a e a)
+        expect(successfully_yielded).to eq %i[b c d e a]
+        expect(tentatively_yielded).to eq %i[a b a c a d a e a]
       end
     end
 
@@ -176,8 +176,8 @@ describe Nanoc::Int::ItemRepSelector do
       end
 
       it 'picks prioritised roots' do
-        expect(successfully_yielded).to eq %i(d a e b c)
-        expect(tentatively_yielded).to eq %i(a d a b e b c)
+        expect(successfully_yielded).to eq %i[d a e b c]
+        expect(tentatively_yielded).to eq %i[a d a b e b c]
       end
     end
   end

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

@@ -31,8 +31,8 @@ describe Nanoc::Int::OutdatednessChecker do
   end
 
   let(:old_action_sequence_for_item_rep) do
-    Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-      mem.add_filter(:erb, {})
+    Nanoc::Int::ActionSequence.new(item_rep).tap do |seq|
+      seq.add_filter(:erb, {})
     end
   end
 
@@ -75,8 +75,8 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'action sequence differs' do
         let(:new_action_sequence_for_item_rep) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-            mem.add_filter(:super_erb, {})
+          Nanoc::Int::ActionSequence.new(item_rep).tap do |seq|
+            seq.add_filter(:super_erb, {})
           end
         end
 
@@ -93,8 +93,8 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'action sequence differs' do
         let(:new_action_sequence_for_item_rep) do
-          Nanoc::Int::ActionSequence.new(item_rep).tap do |mem|
-            mem.add_filter(:super_erb, {})
+          Nanoc::Int::ActionSequence.new(item_rep).tap do |seq|
+            seq.add_filter(:super_erb, {})
           end
         end
 
@@ -124,8 +124,8 @@ describe Nanoc::Int::OutdatednessChecker do
     let(:objects) { [item, other_item] }
 
     let(:old_action_sequence_for_other_item_rep) do
-      Nanoc::Int::ActionSequence.new(other_item_rep).tap do |mem|
-        mem.add_filter(:erb, {})
+      Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
+        seq.add_filter(:erb, {})
       end
     end
 
@@ -253,9 +253,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'path changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |mem|
-            mem.add_filter(:erb, {})
-            mem.add_snapshot(:donkey, '/giraffe.txt')
+          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
+            seq.add_filter(:erb, {})
+            seq.add_snapshot(:donkey, '/giraffe.txt')
           end
         end
 
@@ -297,9 +297,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'path changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |mem|
-            mem.add_filter(:erb, {})
-            mem.add_snapshot(:donkey, '/giraffe.txt')
+          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
+            seq.add_filter(:erb, {})
+            seq.add_snapshot(:donkey, '/giraffe.txt')
           end
         end
 
@@ -330,9 +330,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'path changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |mem|
-            mem.add_filter(:erb, {})
-            mem.add_snapshot(:donkey, '/giraffe.txt')
+          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
+            seq.add_filter(:erb, {})
+            seq.add_snapshot(:donkey, '/giraffe.txt')
           end
         end
 
@@ -357,9 +357,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'path changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |mem|
-            mem.add_filter(:erb, {})
-            mem.add_snapshot(:donkey, '/giraffe.txt')
+          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
+            seq.add_filter(:erb, {})
+            seq.add_snapshot(:donkey, '/giraffe.txt')
           end
         end
 
@@ -390,9 +390,9 @@ describe Nanoc::Int::OutdatednessChecker do
 
       context 'rules changed' do
         let(:new_action_sequence_for_other_item_rep) do
-          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |mem|
-            mem.add_filter(:erb, {})
-            mem.add_filter(:donkey, {})
+          Nanoc::Int::ActionSequence.new(other_item_rep).tap do |seq|
+            seq.add_filter(:erb, {})
+            seq.add_filter(:donkey, {})
           end
         end
 

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

@@ -16,7 +16,7 @@ describe Nanoc::PostCompileItemView do
   shared_examples 'a method that returns modified reps only' do
     it 'returns only modified items' do
       expect(subject.size).to eq(1)
-      expect(subject.map(&:name)).to eq(%i(modded))
+      expect(subject.map(&:name)).to eq(%i[modded])
     end
 
     it 'returns an array' do

data/spec/nanoc/cli/commands/deploy_spec.rb

@@ -82,12 +82,12 @@ describe Nanoc::CLI::Commands::Deploy, site: true, stdio: true do
       end
 
       context '--list-deployers' do
-        let(:command) { %w(deploy --list-deployers) }
+        let(:command) { %w[deploy --list-deployers] }
         include_examples 'lists all deployers'
       end
 
       context '-D' do
-        let(:command) { %w(deploy -D) }
+        let(:command) { %w[deploy -D] }
         include_examples 'lists all deployers'
       end
     end
@@ -131,19 +131,19 @@ describe Nanoc::CLI::Commands::Deploy, site: true, stdio: true do
       end
 
       context '--list' do
-        let(:command) { %w(deploy --list) }
+        let(:command) { %w[deploy --list] }
         include_examples 'lists all deployment configurations'
       end
 
       context '-L' do
-        let(:command) { %w(deploy -L) }
+        let(:command) { %w[deploy -L] }
         include_examples 'lists all deployment configurations'
       end
     end
 
     describe 'deploying' do
       let(:run) { Nanoc::CLI.run(command) }
-      let(:command) { %w(deploy) }
+      let(:command) { %w[deploy] }
 
       before do
         FileUtils.mkdir_p('output')
@@ -302,17 +302,17 @@ describe Nanoc::CLI::Commands::Deploy, site: true, stdio: true do
         end
 
         context 'non-default target, specified as argument' do
-          let(:command) { %w(deploy production) }
+          let(:command) { %w[deploy production] }
           include_examples 'deploy with non-default target'
         end
 
         context 'non-default target, specified as option (--target)' do
-          let(:command) { %w(deploy --target production) }
+          let(:command) { %w[deploy --target production] }
           include_examples 'deploy with non-default target'
         end
 
         context 'multiple targets specified' do
-          let(:command) { %w(deploy --target staging production) }
+          let(:command) { %w[deploy --target staging production] }
 
           it 'errors' do
             expect { run }.to raise_error(