nanoc 4.7.1 → 4.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3697f07907752b5c0010bbf3fb01e701d6128bba
-  data.tar.gz: 70dfb18ac4973838113380a201ddde4468f2b13b
+  metadata.gz: db20da1ff9f55058bb62c68ac59ec1abd74e5afe
+  data.tar.gz: fc4c46dfd186f22446ad8a39c457fc72fcd93994
 SHA512:
-  metadata.gz: e8810bd89fcd0e3c65f647ec3b99a76454dc2fa35169b5b4e66317f178b260e2e8229686342aee8c83929e7de04b323c98137c8c8b690c7b1259fabed99e2147
-  data.tar.gz: 144aacfa4f5981109e514c8c33cde796598e86ec27c2b6d115ff2c4b497dc25b5d7a5950a071ad4e23dce5c68063b699b3fb42258f6b0f7c31ded9a81c311177
+  metadata.gz: b8f484dac9493470c64172ac234a026f17413a0fe688782426a606396e51b343c866165e24e58a574dfd948a86ea4ae1006114dbb1e495454fa27bd83f468e13
+  data.tar.gz: bc68076395418f75d02e6ece28d8af476423007b63d3badc18238c52c711352f02eab2ca1ec13ea79865154fca17ba15da4b0d2653bf1d32bc261ce615757ae0

data/Gemfile

@@ -49,11 +49,11 @@ group :plugins do
   gem 'mustache', '~> 1.0'
   gem 'nokogiri', '~> 1.6'
   gem 'pandoc-ruby'
-  gem 'pygments.rb', github: 'tmm1/pygments.rb', platforms: [:ruby, :mswin]
+  gem 'pygments.rb', github: 'tmm1/pygments.rb', platforms: %i(ruby mswin)
   gem 'rack'
   gem 'rainpress'
-  gem 'rdiscount', '~> 2.2', platforms: [:ruby, :mswin]
-  gem 'redcarpet', platforms: [:ruby, :mswin]
+  gem 'rdiscount', '~> 2.2', platforms: %i(ruby mswin)
+  gem 'redcarpet', platforms: %i(ruby mswin)
   gem 'RedCloth', platforms: :ruby
   gem 'rouge'
   gem 'rubypants'

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/bbatsov/rubocop.git
-  revision: a047a11633e104d5ee9ca4d2957e4b1cf571f30b
+  revision: 7917f22cb5f1e2ce6c81a1cc07b2b4a14fcd4fa8
   specs:
     rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.7.1)
+    nanoc (4.7.2)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -341,13 +341,13 @@ GEM
     term-ansicolor (1.4.0)
       tins (~> 1.0)
     thor (0.19.4)
-    tilt (2.0.6)
+    tilt (2.0.7)
     timecop (0.8.1)
     tins (1.13.2)
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (3.1.8)
+    uglifier (3.1.9)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.3)
     url (0.3.2)

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.7.2 (2017-03-21)
+
+Fixes:
+
+* Fixed crash when calling `#raw_path` in the Checks file (#1130, #1131)
+
 ## 4.7.1 (2017-03-19)
 
 Fixes:

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task test: [:spec, :test_all, :rubocop]
-task test_ci: [:test, :'coveralls:push']
+task test: %i(spec test_all rubocop)
+task test_ci: %i(test coveralls:push)
 
 task default: :test

data/lib/nanoc/base/memoization.rb

@@ -63,11 +63,14 @@ module Nanoc::Int
           value = object ? object.value : NONE
         end
 
+        counter_label = is_a?(Class) ? "#{self}.#{method_name}" : "#{self.class}##{method_name}"
         if value.equal?(NONE)
+          Nanoc::Int::NotificationCenter.post(:memoization_miss, counter_label)
           send(original_method_name, *args).tap do |r|
             instance_method_cache[args] = Ref::SoftReference.new(Value.new(r))
           end
         else
+          Nanoc::Int::NotificationCenter.post(:memoization_hit, counter_label)
           value
         end
       end

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

@@ -74,17 +74,29 @@ module Nanoc::Int
     end
 
     class AttributesModified < OutdatednessRule
+      extend Nanoc::Int::Memoization
+
+      include Nanoc::Int::ContractsSupport
+
       def reason
         Nanoc::Int::OutdatednessReasons::AttributesModified
       end
 
+      contract C::Or[Nanoc::Int::ItemRep, Nanoc::Int::Item, Nanoc::Int::Layout], C::Named['Nanoc::Int::OutdatednessChecker'] => C::Bool
       def apply(obj, outdatedness_checker)
-        obj = obj.item if obj.is_a?(Nanoc::Int::ItemRep)
-
-        ch_old = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
-        ch_new = Nanoc::Int::Checksummer.calc_for_attributes_of(obj)
-        ch_old != ch_new
+        case obj
+        when Nanoc::Int::ItemRep
+          apply(obj.item, outdatedness_checker)
+        when Nanoc::Int::Item, Nanoc::Int::Layout
+          ch_old = outdatedness_checker.checksum_store.attributes_checksum_for(obj)
+          ch_new = Nanoc::Int::Checksummer.calc_for_attributes_of(obj)
+          res = ch_old != ch_new
+          res
+        else
+          raise ArgumentError
+        end
       end
+      memoize :apply
     end
 
     class RulesModified < OutdatednessRule

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

@@ -16,5 +16,9 @@ module Nanoc
 
       content.string
     end
+
+    def raw_path(snapshot: :last)
+      @item_rep.raw_path(snapshot: snapshot)
+    end
   end
 end

data/lib/nanoc/checking/check.rb

@@ -23,7 +23,7 @@ module Nanoc::Checking
       view_context = site.compiler.compilation_context.create_view_context(Nanoc::Int::DependencyTracker::Null.new)
 
       context = {
-        items: Nanoc::ItemCollectionWithRepsView.new(site.items, view_context),
+        items: Nanoc::PostCompileItemCollectionView.new(site.items, view_context),
         layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
         config: Nanoc::ConfigView.new(site.config, view_context),
         output_filenames: output_filenames,

data/lib/nanoc/cli/commands/compile_listeners/timing_recorder.rb

@@ -96,6 +96,14 @@ module Nanoc::CLI::Commands::CompileListeners
 
         @telemetry.summary(:phases).observe(stopwatch.duration, phase_name)
       end
+
+      on(:memoization_miss) do |label|
+        @telemetry.counter(:memoization).increment([label, :miss])
+      end
+
+      on(:memoization_hit) do |label|
+        @telemetry.counter(:memoization).increment([label, :hit])
+      end
     end
 
     # @see Listener#stop
@@ -134,11 +142,32 @@ module Nanoc::CLI::Commands::CompileListeners
       [headers] + rows
     end
 
+    def table_for_memoization
+      headers = %w(memoization hit miss %)
+
+      rows_raw = @telemetry.counter(:memoization).map do |(name, type), counter|
+        { name: name, type: type, count: counter.value }
+      end
+
+      rows = rows_raw.group_by { |r| r[:name] }.map do |name, rows_for_name|
+        rows_by_type = rows_for_name.group_by { |r| r[:type] }
+
+        num_hit = rows_by_type.fetch(:hit, []).fetch(0, {}).fetch(:count, 0)
+        num_miss = rows_by_type.fetch(:miss, []).fetch(0, {}).fetch(:count, 0)
+        pct = num_hit.to_f / (num_hit + num_miss).to_f
+
+        [name, num_hit.to_s, num_miss.to_s, "#{format('%3.1f', pct * 100)}%"]
+      end
+
+      [headers] + rows
+    end
+
     def print_profiling_feedback
       print_table_for_summary(:filters)
       print_table_for_summary(:phases) if Nanoc::CLI.verbosity >= 2
       print_table_for_summary_duration(:stages) if Nanoc::CLI.verbosity >= 2
       print_table_for_summary(:outdatedness_rules) if Nanoc::CLI.verbosity >= 2
+      print_table_for_memoization if Nanoc::CLI.verbosity >= 2
     end
 
     def print_table_for_summary(name)
@@ -155,6 +184,13 @@ module Nanoc::CLI::Commands::CompileListeners
       print_table(table_for_summary_durations(name))
     end
 
+    def print_table_for_memoization
+      return if @telemetry.counter(:memoization).empty?
+
+      puts
+      print_table(table_for_memoization)
+    end
+
     def print_table(table)
       lengths = table.transpose.map { |r| r.map(&:size).max }
 

data/lib/nanoc/cli/commands/show-plugins.rb

@@ -41,7 +41,7 @@ module Nanoc::CLI::Commands
         puts
 
         # Print plugins organised by subtype
-        [:builtin, :custom].each do |type|
+        %i(builtin custom).each do |type|
           # Find relevant plugins
           relevant_plugins = plugins_with_this_superclass[type]
 

data/lib/nanoc/filters/colorize_syntax.rb

@@ -358,7 +358,7 @@ module Nanoc::Filters
 
     protected
 
-    KNOWN_COLORIZERS = [:coderay, :dummy, :pygmentize, :pygmentsrb, :simon_highlight, :rouge].freeze
+    KNOWN_COLORIZERS = %i(coderay dummy pygmentize pygmentsrb simon_highlight rouge).freeze
 
     # Removes the first blank lines and any whitespace at the end.
     def strip(s)

data/lib/nanoc/telemetry/labelled_counter.rb

@@ -12,7 +12,9 @@ module Nanoc::Telemetry
       @counters.fetch(label) { @counters[label] = Counter.new }
     end
 
-    # TODO: add #empty?
+    def empty?
+      @counters.empty?
+    end
 
     def value(label)
       get(label).value
@@ -23,5 +25,9 @@ module Nanoc::Telemetry
         res[label] = counter.value
       end
     end
+
+    def map
+      @counters.map { |(label, counter)| yield(label, counter) }
+    end
   end
 end

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.7.1'.freeze
+  VERSION = '4.7.2'.freeze
 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([: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([: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

@@ -89,7 +89,7 @@ describe Nanoc::Int::Props do
       let(:props) { described_class.new }
       let(:other_props) { props_all }
 
-      it { is_expected.to eql(Set.new([: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
@@ -103,35 +103,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([: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([: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([: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([: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([:raw_content, :attributes, :compiled_content, :path])) }
+      it { is_expected.to eql(Set.new(%i(raw_content attributes compiled_content path))) }
     end
   end
 
@@ -165,12 +165,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([: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([: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/entities/rule_memory_spec.rb

@@ -146,13 +146,13 @@ describe Nanoc::Int::RuleMemory do
 
     example do
       expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-      expect(subject[0].snapshot_names).to eql([:a1, :a2, :a3])
+      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([:b1, :b2, :b3])
+      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)

data/spec/nanoc/base/memoization_spec.rb

@@ -0,0 +1,75 @@
+describe Nanoc::Int::Memoization do
+  class MemoizationSpecSample1
+    extend Nanoc::Int::Memoization
+
+    def initialize(value)
+      @value = value
+    end
+
+    def run(n)
+      @value * 10 + n
+    end
+    memoize :run
+  end
+
+  class MemoizationSpecSample2
+    extend Nanoc::Int::Memoization
+
+    def initialize(value)
+      @value = value
+    end
+
+    def run(n)
+      @value * 100 + n
+    end
+    memoize :run
+  end
+
+  class MemoizationSpecUpcaser
+    extend Nanoc::Int::Memoization
+
+    def run(value)
+      value.upcase
+    end
+    memoize :run
+  end
+
+  example do
+    sample1a = MemoizationSpecSample1.new(10)
+    sample1b = MemoizationSpecSample1.new(15)
+    sample2a = MemoizationSpecSample2.new(20)
+    sample2b = MemoizationSpecSample2.new(25)
+
+    3.times do
+      expect(sample1a.run(5)).to eq(10 * 10 + 5)
+      expect(sample1b.run(7)).to eq(10 * 15 + 7)
+      expect(sample2a.run(5)).to eq(100 * 20 + 5)
+      expect(sample2b.run(7)).to eq(100 * 25 + 7)
+    end
+  end
+
+  it 'supports frozen objects' do
+    sample = MemoizationSpecSample1.new(10)
+    sample.freeze
+    sample.run(5)
+  end
+
+  it 'does not crash on #inspect' do
+    upcaser = MemoizationSpecUpcaser.new
+    10_000.times do |i|
+      upcaser.run("hello world #{i}")
+    end
+
+    GC.start
+    GC.start
+
+    upcaser.inspect
+  end
+
+  it 'sends notifications' do
+    sample = MemoizationSpecSample1.new(10)
+    expect { sample.run(5) }.to send_notification(:memoization_miss, 'MemoizationSpecSample1#run')
+    expect { sample.run(5) }.to send_notification(:memoization_hit, 'MemoizationSpecSample1#run')
+    expect { sample.run(5) }.to send_notification(:memoization_hit, 'MemoizationSpecSample1#run')
+  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 [:e, :d, :c, :b, :a]
-        expect(tentatively_yielded).to eq [: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 [:a, :b, :c, :d, :e]
-        expect(tentatively_yielded).to eq [: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: [:b, :c, :d, :e],
+          a: %i(b c d e),
         }
       end
 
       example do
-        expect(successfully_yielded).to eq [:b, :c, :d, :e, :a]
-        expect(tentatively_yielded).to eq [: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: [:b, :c, :d, :e],
+          a: %i(b c d e),
         }
       end
 
       example do
-        expect(successfully_yielded).to eq [:b, :c, :d, :e, :a]
-        expect(tentatively_yielded).to eq [: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 [:d, :a, :e, :b, :c]
-        expect(tentatively_yielded).to eq [: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/views/post_compile_item_rep_view_spec.rb

@@ -34,6 +34,64 @@ describe Nanoc::PostCompileItemRepView do
     end
   end
 
+  describe '#raw_path' do
+    context 'no args' do
+      subject { view.raw_path }
+
+      it 'does not raise' do
+        subject
+      end
+
+      context 'no path specified' do
+        it { is_expected.to be_nil }
+      end
+
+      context 'path for default snapshot specified' do
+        before do
+          item_rep.raw_paths = { last: ['output/about/index.html'] }
+        end
+
+        it { is_expected.to eql('output/about/index.html') }
+      end
+
+      context 'path specified, but not for default snapshot' do
+        before do
+          item_rep.raw_paths = { pre: ['output/about/index.html'] }
+        end
+
+        it { is_expected.to be_nil }
+      end
+    end
+
+    context 'snapshot arg' do
+      subject { view.raw_path(snapshot: :special) }
+
+      it 'does not raise' do
+        subject
+      end
+
+      context 'no path specified' do
+        it { is_expected.to be_nil }
+      end
+
+      context 'path for default snapshot specified' do
+        before do
+          item_rep.raw_paths = { special: ['output/about/index.html'] }
+        end
+
+        it { is_expected.to eql('output/about/index.html') }
+      end
+
+      context 'path specified, but not for default snapshot' do
+        before do
+          item_rep.raw_paths = { pre: ['output/about/index.html'] }
+        end
+
+        it { is_expected.to be_nil }
+      end
+    end
+  end
+
   describe '#compiled_content' do
     subject { view.compiled_content }
 

data/spec/nanoc/cli/commands/compile/timing_recorder_spec.rb

@@ -260,4 +260,26 @@ describe Nanoc::CLI::Commands::CompileListeners::TimingRecorder, stdio: true do
     expect(listener.telemetry.summary(:outdatedness_rules).get('CodeSnippetsModified').sum).to eq(4.00)
     expect(listener.telemetry.summary(:outdatedness_rules).get('CodeSnippetsModified').count).to eq(2.00)
   end
+
+  it 'records memoization usage' do
+    Nanoc::Int::NotificationCenter.post(:memoization_hit, 'Foo#bar', rep)
+    Nanoc::Int::NotificationCenter.post(:memoization_miss, 'Foo#bar', rep)
+    Nanoc::Int::NotificationCenter.post(:memoization_miss, 'Foo#bar', rep)
+    Nanoc::Int::NotificationCenter.post(:memoization_miss, 'Foo#bar', rep)
+    Nanoc::Int::NotificationCenter.post(:memoization_miss, 'Foo#bar', rep)
+
+    expect(listener.telemetry.counter(:memoization).get(['Foo#bar', :hit]).value).to eq(1)
+    expect(listener.telemetry.counter(:memoization).get(['Foo#bar', :miss]).value).to eq(4)
+  end
+
+  it 'prints memoization table' do
+    Nanoc::Int::NotificationCenter.post(:memoization_hit, 'Foo#bar', rep)
+    Nanoc::Int::NotificationCenter.post(:memoization_miss, 'Foo#bar', rep)
+    Nanoc::Int::NotificationCenter.post(:memoization_miss, 'Foo#bar', rep)
+    Nanoc::Int::NotificationCenter.post(:memoization_miss, 'Foo#bar', rep)
+    Nanoc::Int::NotificationCenter.post(:memoization_miss, 'Foo#bar', rep)
+
+    expect { listener.stop }
+      .to output(/^\s*Foo#bar │   1      4   20\.0%$/).to_stdout
+  end
 end

data/spec/nanoc/helpers/tagging_spec.rb

@@ -72,7 +72,7 @@ describe Nanoc::Helpers::Tagging, helper: true do
     before do
       ctx.create_item('item 1', { tags: [:foo] }, '/item1.md')
       ctx.create_item('item 2', { tags: [:bar] }, '/item2.md')
-      ctx.create_item('item 3', { tags: [:foo, :bar] }, '/item3.md')
+      ctx.create_item('item 3', { tags: %i(foo bar) }, '/item3.md')
       ctx.create_item('item 4', { tags: nil }, '/item4.md')
       ctx.create_item('item 5', {}, '/item5.md')
     end

data/spec/nanoc/regressions/gh_1130_spec.rb

@@ -0,0 +1,19 @@
+describe 'GH-1130', site: true, stdio: true do
+  before do
+    File.write('content/foo', 'asdf')
+
+    File.write('Rules', <<EOS)
+passthrough '/**/*'
+EOS
+
+    File.write('Checks', <<EOS)
+check :wat do
+  @items.flat_map(&:reps).map(&:raw_path)
+end
+EOS
+  end
+
+  it 'does not raise fiber error' do
+    Nanoc::CLI.run(%w(check wat))
+  end
+end

data/spec/nanoc/rule_dsl/rule_memory_calculator_spec.rb

@@ -67,7 +67,7 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           expect(subject[4].params).to eql({})
 
           expect(subject[5]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[5].snapshot_names).to eql([:post, :last])
+          expect(subject[5].snapshot_names).to eql(%i(post last))
           expect(subject[5].paths).to be_empty
 
           expect(subject.size).to eql(6)
@@ -85,7 +85,7 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_names).to eql([:raw, :last, :pre])
+          expect(subject[0].snapshot_names).to eql(%i(raw last pre))
           expect(subject[0].paths).to be_empty
 
           expect(subject.size).to eql(1)
@@ -107,7 +107,7 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_names).to eql([:raw, :last, :pre])
+          expect(subject[0].snapshot_names).to eql(%i(raw last pre))
           expect(subject[0].paths).to eq(['/foo.md'])
 
           expect(subject.size).to eql(1)
@@ -129,7 +129,7 @@ describe(Nanoc::RuleDSL::RuleMemoryCalculator) do
           subject
 
           expect(subject[0]).to be_a(Nanoc::Int::ProcessingActions::Snapshot)
-          expect(subject[0].snapshot_names).to eql([:raw, :last, :pre])
+          expect(subject[0].snapshot_names).to eql(%i(raw last pre))
           expect(subject[0].paths).to be_empty
 
           expect(subject.size).to eql(1)

data/spec/nanoc/telemetry/labelled_counter_spec.rb

@@ -53,4 +53,40 @@ describe Nanoc::Telemetry::LabelledCounter do
       its(:value) { is_expected.to eq(0) }
     end
   end
+
+  describe '#empty?' do
+    subject { counter.empty? }
+
+    context 'not incremented' do
+      it { is_expected.to be }
+    end
+
+    context 'incremented' do
+      before { counter.increment(:erb) }
+      it { is_expected.not_to be }
+    end
+  end
+
+  describe '#map' do
+    subject { counter.map { |label, counter| [label, counter.value] } }
+
+    context 'not incremented' do
+      it { is_expected.to be_empty }
+    end
+
+    context 'incremented once' do
+      before { counter.increment(:erb) }
+      it { is_expected.to eq [[:erb, 1]] }
+    end
+
+    context 'both incremental multiple times' do
+      before do
+        counter.increment(:erb)
+        counter.increment(:erb)
+        counter.increment(:haml)
+      end
+
+      it { is_expected.to eq [[:erb, 2], [:haml, 1]] }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -245,3 +245,34 @@ end
 
 RSpec::Matchers.alias_matcher :some_textual_content, :be_some_textual_content
 RSpec::Matchers.alias_matcher :some_binary_content, :be_some_binary_content
+
+RSpec::Matchers.define :send_notification do |name, *expected_args|
+  supports_block_expectations
+
+  include RSpec::Matchers::Composable
+
+  match do |actual|
+    @actual_notifications = []
+    Nanoc::Int::NotificationCenter.on(name, self) do |*actual_args|
+      @actual_notifications << actual_args
+    end
+    actual.call
+    @actual_notifications.any? { |c| c == expected_args }
+  end
+
+  description do
+    "send notification #{name.inspect} with args #{expected_args.inspect}"
+  end
+
+  failure_message do |_actual|
+    s = "expected that proc would send notification #{name.inspect} with args #{expected_args.inspect}"
+    if @actual_notifications.any?
+      s << " (received #{@actual_notifications.size} times with other arguments: #{@actual_notifications.map(&:inspect).join(', ')})"
+    end
+    s
+  end
+
+  failure_message_when_negated do |_actual|
+    "expected that proc would not send notification #{name.inspect} with args #{expected_args.inspect}"
+  end
+end

data/test/base/core_ext/array_spec.rb

@@ -12,7 +12,7 @@ describe 'Array#__nanoc_freeze_recursively' do
   include Nanoc::TestHelpers
 
   it 'should prevent first-level elements from being modified' do
-    array = [:a, [:b, :c], :d]
+    array = [:a, %i(b c), :d]
     array.__nanoc_freeze_recursively
 
     assert_raises_frozen_error do
@@ -21,7 +21,7 @@ describe 'Array#__nanoc_freeze_recursively' do
   end
 
   it 'should prevent second-level elements from being modified' do
-    array = [:a, [:b, :c], :d]
+    array = [:a, %i(b c), :d]
     array.__nanoc_freeze_recursively
 
     assert_raises_frozen_error do

data/test/cli/test_cleaning_stream.rb

@@ -20,7 +20,7 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
   end
 
   def test_forward
-    methods = [:write, :<<, :tty?, :tty?, :flush, :tell, :print, :puts, :string, :reopen, :exist?, :exists?, :close]
+    methods = %i(write << tty? tty? flush tell print puts string reopen exist? exists? close)
 
     s = Stream.new
     cs = Nanoc::CLI::CleaningStream.new(s)

data/test/filters/colorize_syntax/test_common.rb

@@ -64,7 +64,7 @@ EOS
         input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
 
         # Run filter
-        [:albino, :pygmentize, :simon_highlight].each do |colorizer|
+        %i(albino pygmentize simon_highlight).each do |colorizer|
           begin
             input = '<pre><code class="language-ruby">puts "foo"</code></pre>'
             filter.setup_and_run(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.2
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -377,6 +377,7 @@ files:
 - spec/nanoc/base/feature_spec.rb
 - spec/nanoc/base/filter_spec.rb
 - spec/nanoc/base/item_rep_writer_spec.rb
+- spec/nanoc/base/memoization_spec.rb
 - spec/nanoc/base/repos/checksum_store_spec.rb
 - spec/nanoc/base/repos/compiled_content_cache_spec.rb
 - spec/nanoc/base/repos/config_loader_spec.rb
@@ -466,6 +467,7 @@ files:
 - 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_1130_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb
@@ -524,7 +526,6 @@ files:
 - test/base/test_item.rb
 - test/base/test_item_array.rb
 - test/base/test_layout.rb
-- test/base/test_memoization.rb
 - test/base/test_notification_center.rb
 - test/base/test_outdatedness_checker.rb
 - test/base/test_site.rb

data/test/base/test_memoization.rb

@@ -1,71 +0,0 @@
-require 'helper'
-
-class Nanoc::Int::MemoizationTest < Nanoc::TestCase
-  class Sample1
-    extend Nanoc::Int::Memoization
-
-    def initialize(value)
-      @value = value
-    end
-
-    def run(n)
-      @value * 10 + n
-    end
-    memoize :run
-  end
-
-  class Sample2
-    extend Nanoc::Int::Memoization
-
-    def initialize(value)
-      @value = value
-    end
-
-    def run(n)
-      @value * 100 + n
-    end
-    memoize :run
-  end
-
-  class Upcaser
-    extend Nanoc::Int::Memoization
-
-    def run(value)
-      value.upcase
-    end
-    memoize :run
-  end
-
-  def test_normal
-    sample1a = Sample1.new(10)
-    sample1b = Sample1.new(15)
-    sample2a = Sample2.new(20)
-    sample2b = Sample2.new(25)
-
-    3.times do
-      assert_equal 10 * 10 + 5,  sample1a.run(5)
-      assert_equal 10 * 15 + 7,  sample1b.run(7)
-      assert_equal 100 * 20 + 5, sample2a.run(5)
-      assert_equal 100 * 25 + 7, sample2b.run(7)
-    end
-  end
-
-  def test_frozen
-    sample = Sample1.new(10)
-    sample.freeze
-    sample.run(5)
-  end
-
-  def test_weak_inspect
-    upcaser = Upcaser.new
-    10_000.times do |i|
-      upcaser.run("hello world #{i}")
-    end
-
-    GC.start
-    GC.start
-
-    # Should not raise
-    upcaser.inspect
-  end
-end