nanoc 4.6.4 → 4.7.0

data/spec/nanoc/telemetry/labelled_counter_spec.rb

@@ -3,8 +3,8 @@ describe Nanoc::Telemetry::LabelledCounter do
 
   describe 'new counter' do
     it 'starts at 0' do
-      expect(subject.value(filter: :erb)).to eq(0)
-      expect(subject.value(filter: :haml)).to eq(0)
+      expect(subject.value(:erb)).to eq(0)
+      expect(subject.value(:haml)).to eq(0)
     end
 
     it 'has no values' do
@@ -13,43 +13,43 @@ describe Nanoc::Telemetry::LabelledCounter do
   end
 
   describe '#increment' do
-    subject { counter.increment(filter: :erb) }
+    subject { counter.increment(:erb) }
 
     it 'increments the matching value' do
       expect { subject }
-        .to change { counter.value(filter: :erb) }
+        .to change { counter.value(:erb) }
         .from(0)
         .to(1)
     end
 
     it 'does not increment any other value' do
-      expect(counter.value(filter: :haml)).to eq(0)
+      expect(counter.value(:haml)).to eq(0)
       expect { subject }
-        .not_to change { counter.value(filter: :haml) }
+        .not_to change { counter.value(:haml) }
     end
 
     it 'correctly changes #values' do
       expect { subject }
         .to change { counter.values }
         .from({})
-        .to({ filter: :erb } => 1)
+        .to(erb: 1)
     end
   end
 
   describe '#get' do
-    subject { counter.get(filter: :erb) }
+    subject { counter.get(:erb) }
 
     context 'not incremented' do
       its(:value) { is_expected.to eq(0) }
     end
 
     context 'incremented' do
-      before { counter.increment(filter: :erb) }
+      before { counter.increment(:erb) }
       its(:value) { is_expected.to eq(1) }
     end
 
     context 'other incremented' do
-      before { counter.increment(filter: :haml) }
+      before { counter.increment(:haml) }
       its(:value) { is_expected.to eq(0) }
     end
   end

data/spec/nanoc/telemetry/labelled_summary_spec.rb

@@ -1,63 +1,76 @@
 describe Nanoc::Telemetry::LabelledSummary do
   subject(:summary) { described_class.new }
 
-  describe '#labels' do
-    subject { summary.labels }
+  describe '#empty?' do
+    subject { summary.empty? }
 
     context 'empty summary' do
-      it { is_expected.to eq([]) }
+      it { is_expected.to be }
     end
 
     context 'some observations' do
       before do
-        summary.observe(7.2, filter: :erb)
-        summary.observe(5.3, filter: :erb)
-        summary.observe(3.0, filter: :haml)
+        summary.observe(7.2, :erb)
+        summary.observe(5.3, :erb)
+        summary.observe(3.0, :haml)
       end
 
-      it { is_expected.to eq([{ filter: :erb }, { filter: :haml }]) }
+      it { is_expected.not_to be }
     end
   end
 
   describe '#get' do
-    subject { summary.get(filter: :erb) }
+    subject { summary.get(:erb) }
 
     context 'empty summary' do
       its(:count) { is_expected.to eq(0) }
     end
 
     context 'one observation with that label' do
-      before { summary.observe(0.1, filter: :erb) }
+      before { summary.observe(0.1, :erb) }
       its(:count) { is_expected.to eq(1) }
     end
 
     context 'one observation with a different label' do
-      before { summary.observe(0.1, filter: :haml) }
+      before { summary.observe(0.1, :haml) }
       its(:count) { is_expected.to eq(0) }
     end
   end
 
+  describe '#map' do
+    before do
+      subject.observe(2.1, :erb)
+      subject.observe(4.1, :erb)
+      subject.observe(5.3, :haml)
+    end
+
+    it 'yields label and summary' do
+      res = subject.map { |label, summary| [label, summary.avg.round(3)] }
+      expect(res).to eql([[:erb, 3.1], [:haml, 5.3]])
+    end
+  end
+
   describe '#quantile' do
     before do
-      subject.observe(2.1, filter: :erb)
-      subject.observe(4.1, filter: :erb)
-      subject.observe(5.3, filter: :haml)
+      subject.observe(2.1, :erb)
+      subject.observe(4.1, :erb)
+      subject.observe(5.3, :haml)
     end
 
     it 'has proper quantiles for :erb' do
-      expect(subject.quantile(0.00, filter: :erb)).to be_within(0.000001).of(2.1)
-      expect(subject.quantile(0.25, filter: :erb)).to be_within(0.000001).of(2.6)
-      expect(subject.quantile(0.50, filter: :erb)).to be_within(0.000001).of(3.1)
-      expect(subject.quantile(0.90, filter: :erb)).to be_within(0.000001).of(3.9)
-      expect(subject.quantile(0.99, filter: :erb)).to be_within(0.000001).of(4.08)
+      expect(subject.quantile(0.00, :erb)).to be_within(0.000001).of(2.1)
+      expect(subject.quantile(0.25, :erb)).to be_within(0.000001).of(2.6)
+      expect(subject.quantile(0.50, :erb)).to be_within(0.000001).of(3.1)
+      expect(subject.quantile(0.90, :erb)).to be_within(0.000001).of(3.9)
+      expect(subject.quantile(0.99, :erb)).to be_within(0.000001).of(4.08)
     end
 
     it 'has proper quantiles for :erb' do
-      expect(subject.quantile(0.00, filter: :haml)).to be_within(0.000001).of(5.3)
-      expect(subject.quantile(0.25, filter: :haml)).to be_within(0.000001).of(5.3)
-      expect(subject.quantile(0.50, filter: :haml)).to be_within(0.000001).of(5.3)
-      expect(subject.quantile(0.90, filter: :haml)).to be_within(0.000001).of(5.3)
-      expect(subject.quantile(0.99, filter: :haml)).to be_within(0.000001).of(5.3)
+      expect(subject.quantile(0.00, :haml)).to be_within(0.000001).of(5.3)
+      expect(subject.quantile(0.25, :haml)).to be_within(0.000001).of(5.3)
+      expect(subject.quantile(0.50, :haml)).to be_within(0.000001).of(5.3)
+      expect(subject.quantile(0.90, :haml)).to be_within(0.000001).of(5.3)
+      expect(subject.quantile(0.99, :haml)).to be_within(0.000001).of(5.3)
     end
   end
 end

data/spec/nanoc/telemetry/stopwatch_spec.rb

@@ -1,6 +1,8 @@
 describe Nanoc::Telemetry::Stopwatch do
   subject(:stopwatch) { described_class.new }
 
+  after { Timecop.return }
+
   it 'is zero by default' do
     expect(stopwatch.duration).to eq(0.0)
   end

data/spec/nanoc/telemetry_spec.rb

@@ -3,24 +3,24 @@ describe Nanoc::Telemetry do
 
   example do
     expect(subject.counter(:filters).values).to eq({})
-    expect(subject.counter(:filters).get(identifier: :erb).value).to eq(0)
-    expect(subject.counter(:filters).value(identifier: :erb)).to eq(0)
+    expect(subject.counter(:filters).get(:erb).value).to eq(0)
+    expect(subject.counter(:filters).value(:erb)).to eq(0)
 
-    subject.counter(:filters).increment(identifier: :erb)
-    expect(subject.counter(:filters).values).to eq({ identifier: :erb } => 1)
-    expect(subject.counter(:filters).get(identifier: :erb).value).to eq(1)
-    expect(subject.counter(:filters).value(identifier: :erb)).to eq(1)
+    subject.counter(:filters).increment(:erb)
+    expect(subject.counter(:filters).values).to eq(erb: 1)
+    expect(subject.counter(:filters).get(:erb).value).to eq(1)
+    expect(subject.counter(:filters).value(:erb)).to eq(1)
   end
 
   example do
-    subject.summary(:filters).observe(0.1, identifier: :erb)
-    expect(subject.summary(:filters).quantile(0.0, identifier: :erb)).to be_within(0.00001).of(0.1)
-    expect(subject.summary(:filters).quantile(0.5, identifier: :erb)).to be_within(0.00001).of(0.1)
-    expect(subject.summary(:filters).quantile(1.0, identifier: :erb)).to be_within(0.00001).of(0.1)
+    subject.summary(:filters).observe(0.1, :erb)
+    expect(subject.summary(:filters).quantile(0.0, :erb)).to be_within(0.00001).of(0.1)
+    expect(subject.summary(:filters).quantile(0.5, :erb)).to be_within(0.00001).of(0.1)
+    expect(subject.summary(:filters).quantile(1.0, :erb)).to be_within(0.00001).of(0.1)
 
-    subject.summary(:filters).observe(1.1, identifier: :erb)
-    expect(subject.summary(:filters).quantile(0.0, identifier: :erb)).to be_within(0.00001).of(0.1)
-    expect(subject.summary(:filters).quantile(0.5, identifier: :erb)).to be_within(0.00001).of(0.6)
-    expect(subject.summary(:filters).quantile(1.0, identifier: :erb)).to be_within(0.00001).of(1.1)
+    subject.summary(:filters).observe(1.1, :erb)
+    expect(subject.summary(:filters).quantile(0.0, :erb)).to be_within(0.00001).of(0.1)
+    expect(subject.summary(:filters).quantile(0.5, :erb)).to be_within(0.00001).of(0.6)
+    expect(subject.summary(:filters).quantile(1.0, :erb)).to be_within(0.00001).of(1.1)
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'simplecov'
 SimpleCov.start
 
+require 'codecov'
+SimpleCov.formatter = SimpleCov::Formatter::Codecov
+
 require 'nanoc'
 require 'nanoc/cli'
 require 'nanoc/spec'

data/test/base/test_compiler.rb

@@ -1,44 +1,6 @@
 require 'helper'
 
 class Nanoc::Int::CompilerTest < Nanoc::TestCase
-  def new_compiler(site = nil)
-    site ||= Nanoc::Int::Site.new(
-      config: nil,
-      code_snippets: [],
-      data_source: Nanoc::Int::InMemDataSource.new([], []),
-    )
-
-    reps = Nanoc::Int::ItemRepRepo.new
-
-    action_provider = Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
-
-    objects = site.items.to_a + site.layouts.to_a
-
-    params = {
-      compiled_content_cache: Nanoc::Int::CompiledContentCache.new(items: site.items),
-      checksum_store: Nanoc::Int::ChecksumStore.new(site: site, objects: objects),
-      rule_memory_store: Nanoc::Int::RuleMemoryStore.new,
-      dependency_store: Nanoc::Int::DependencyStore.new(
-        site.items.to_a + site.layouts.to_a,
-      ),
-      action_provider: action_provider,
-      reps: reps,
-      outdatedness_store: Nanoc::Int::OutdatednessStore.new(site: site, reps: reps),
-    }
-
-    params[:outdatedness_checker] =
-      Nanoc::Int::OutdatednessChecker.new(
-        site: site,
-        checksum_store: params[:checksum_store],
-        dependency_store: params[:dependency_store],
-        rule_memory_store: params[:rule_memory_store],
-        action_provider: action_provider,
-        reps: reps,
-      )
-
-    Nanoc::Int::Compiler.new(site, params)
-  end
-
   def test_compile_rep_should_write_proper_snapshots_real
     with_site do |site|
       File.write('content/moo.txt', '<%= 1 %> <%%= 2 %> <%%%= 3 %>')

data/test/checking/checks/test_html.rb

@@ -4,10 +4,6 @@ class Nanoc::Checking::Checks::HTMLTest < Nanoc::TestCase
   def test_run_ok
     require 'w3c_validators'
 
-    if ::W3CValidators::VERSION =~ /\A1\.3|1\.3\.1\z/
-      skip 'broken (see https://github.com/w3c-validators/w3c_validators/issues/25)'
-    end
-
     VCR.use_cassette('html_run_ok') do
       with_site do |site|
         # Create files

data/test/filters/test_erubi.rb

@@ -0,0 +1,73 @@
+require 'helper'
+
+class Nanoc::Filters::ErubiTest < Nanoc::TestCase
+  def test_filter_with_instance_variable
+    if_have 'erubi' do
+      # Create filter
+      filter = ::Nanoc::Filters::Erubi.new(location: 'a cheap motel')
+
+      # Run filter
+      result = filter.setup_and_run('<%= "I was hiding in #{@location}." %>')
+      assert_equal('I was hiding in a cheap motel.', result)
+    end
+  end
+
+  def test_filter_with_instance_method
+    if_have 'erubi' do
+      # Create filter
+      filter = ::Nanoc::Filters::Erubi.new(location: 'a cheap motel')
+
+      # Run filter
+      result = filter.setup_and_run('<%= "I was hiding in #{location}." %>')
+      assert_equal('I was hiding in a cheap motel.', result)
+    end
+  end
+
+  def test_filter_error
+    if_have 'erubi' do
+      # Create filter
+      filter = ::Nanoc::Filters::Erubi.new
+
+      # Run filter
+      raised = false
+      begin
+        filter.setup_and_run('<%= this isn\'t really ruby so it\'ll break, muahaha %>')
+      rescue SyntaxError => e
+        assert_match 'syntax error', e.message
+        raised = true
+      end
+      assert raised
+    end
+  end
+
+  def test_filter_with_yield
+    if_have 'erubi' do
+      # Create filter
+      filter = ::Nanoc::Filters::Erubi.new(content: 'a cheap motel')
+
+      # Run filter
+      result = filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
+      assert_equal('I was hiding in a cheap motel.', result)
+    end
+  end
+
+  def test_filter_with_yield_without_content
+    if_have 'erubi' do
+      # Create filter
+      filter = ::Nanoc::Filters::Erubi.new(location: 'a cheap motel')
+
+      # Run filter
+      assert_raises LocalJumpError do
+        filter.setup_and_run('<%= "I was hiding in #{yield}." %>')
+      end
+    end
+  end
+
+  def test_filter_with_erbout
+    if_have 'erubi' do
+      filter = ::Nanoc::Filters::Erubi.new
+      result = filter.setup_and_run('stuff<% _erbout << _erbout %>')
+      assert_equal 'stuffstuff', result
+    end
+  end
+end

data/test/fixtures/vcr_cassettes/html_run_ok.yml

@@ -2,16 +2,13 @@
 http_interactions:
 - request:
     method: post
-    uri: https://validator.w3.org/check
+    uri: https://validator.nu/?out=json&parser=html&showsource=yes
     body:
       encoding: UTF-8
-      string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
-        name=\"output\"\r\n\r\nsoap12\r\n--349832898984244898448024464570528145\r\nContent-Disposition:
-        form-data; name=\"uploaded_file\"; filename=\"output/blah.html\"\r\nContent-Type:
-        text/html\r\n\r\n<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title>Hello</title></head><body><h1>Hi!</h1></body>\r\n--349832898984244898448024464570528145--\r\n"
+      string: <!DOCTYPE html><html><head><meta charset="utf-8"><title>Hello</title></head><body><h1>Hi!</h1></body>
     headers:
       Content-Type:
-      - multipart/form-data; boundary=349832898984244898448024464570528145
+      - text/html; charset=utf-8
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       Accept:
@@ -20,105 +17,37 @@ http_interactions:
       - Ruby
   response:
     status:
-      code: 307
-      message: Temporary Redirect
+      code: 200
+      message: OK
     headers:
-      Date:
-      - Sat, 17 Dec 2016 08:36:04 GMT
       Server:
-      - Apache/2.4.10 (Debian)
-      Location:
-      - https://validator.w3.org/nu/#file
+      - nginx/1.11.10
+      Date:
+      - Fri, 10 Mar 2017 20:24:28 GMT
+      Content-Type:
+      - application/json; charset=utf-8
       Transfer-Encoding:
       - chunked
-      Strict-Transport-Security:
-      - max-age=15552015; preload
-      Public-Key-Pins:
-      - pin-sha256="cN0QSpPIkuwpT6iP2YjEo1bEwGpH/yiUn6yhdy+HNto="; pin-sha256="WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV+nNm1r4=";
-        pin-sha256="LrKdTxZLRTvyHM4/atX2nquX9BeHRZMCxg3cf4rhc2I="; max-age=864000
-      X-Frame-Options:
-      - deny
-      X-Xss-Protection:
-      - 1; mode=block
-    body:
-      encoding: UTF-8
-      string: "Status: 302 Found\r\nLocation: https://validator.w3.org/nu/?doc=output%2Fblah.html\r\n\r\nContent-Type:
-        application/soap+xml; charset=UTF-8\nX-W3C-Validator-Recursion: 1\nX-W3C-Validator-Status:
-        Valid\nX-W3C-Validator-Errors: 0\nX-W3C-Validator-Warnings: 1\n\n<?xml version=\"1.0\"
-        encoding=\"UTF-8\"?>\n<env:Envelope xmlns:env=\"http://www.w3.org/2003/05/soap-envelope\">\n<env:Body>\n<m:markupvalidationresponse
-        env:encodingStyle=\"http://www.w3.org/2003/05/soap-encoding\" xmlns:m=\"http://www.w3.org/2005/10/markup-validator\">\n
-        \   \n    <m:uri>output/blah.html</m:uri>\n    <m:checkedby>http://validator.w3.org/</m:checkedby>\n
-        \   <m:doctype>HTML5</m:doctype>\n    <m:charset>utf-8</m:charset>\n    <m:validity>true</m:validity>\n
-        \   <m:warnings>\n        <m:warningcount>1</m:warningcount>\n        <m:warninglist>\n
-        \            <m:warning>\n                <m:message>This interface to HTML5
-        document checking is obsolete. Use an interface to https://validator.w3.org/nu/
-        instead.</m:message>\n                <m:messageid>obsolete-interface</m:messageid>\n
-        \               <m:explanation>  <![CDATA[\n                    <div class=\"ve
-        obsolete-interface\">\n                      <p>\n                        The
-        method you used to check this document relies on an obsolete interface\n                        that
-        will become permanently unavailable in the near future.\n                        The
-        currently-supported method is to instead use the W3C Nu Html Checker at\n
-        \                       <a href=\"https://validator.w3.org/nu/\">https://validator.w3.org/nu/</a>.\n
-        \                       See the documentation on the W3C Nu Html Checker's\n
-        \                       <a href=\"https://github.com/validator/validator/wiki/Service:-Input:-GET\">GET
-        interface</a>,\n                        <a href=\"https://github.com/validator/validator/wiki/Service:-Input:-POST-body\">POST
-        interface</a>,\n                        and\n                        <a href=\"https://github.com/validator/validator/wiki/Service:-Common-parameters\">the
-        parameters</a>\n                        that both interfaces provide, such
-        as the\n                        <a href=\"https://github.com/validator/validator/wiki/Output%3A-JSON\">out=json</a>,\n
-        \                       <a href=\"https://github.com/validator/validator/wiki/Output:-XML\">out=xml</a>,\n
-        \                       and\n                        <a href=\"https://github.com/validator/validator/wiki/Output:-GNU\">out=gnu</a>\n
-        \                       parameters/output-formats.\n                      </p>\n
-        \                     <p>\n                        For comments or questions
-        about this message, send mail to\n                        <a href=\"mailto:www-validator@w3.org\">www-validator@w3.org</a>\n
-        \                       or to\n                        <a href=\"https://twitter.com/w3c\">@w3c</a>
-        on twitter.\n                      </p>\n                    </div>\n                  ]]>\n
-        \               </m:explanation>\n                <m:source></m:source>\n
-        \           </m:warning>\n        </m:warninglist>\n    </m:warnings>\n    <m:errors>\n
-        \       <m:errorcount>0</m:errorcount>\n        <m:errorlist>\n\n        </m:errorlist>\n
-        \   </m:errors>\n</m:markupvalidationresponse>\n</env:Body>\n</env:Envelope>\n"
-    http_version: 
-  recorded_at: Sat, 17 Dec 2016 08:36:05 GMT
-- request:
-    method: post
-    uri: https://validator.w3.org/check
-    body:
-      encoding: UTF-8
-      string: "--349832898984244898448024464570528145\r\nContent-Disposition: form-data;
-        name=\"url\"\r\n\r\nhttps://validator.w3.org/nu/#file\r\n--349832898984244898448024464570528145--\r\n"
-    headers:
-      Content-Type:
-      - multipart/form-data; boundary=349832898984244898448024464570528145
+      Connection:
+      - keep-alive
       Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 302
-      message: Found
-    headers:
-      Date:
-      - Sat, 17 Dec 2016 08:36:05 GMT
-      Server:
-      - Apache/2.4.10 (Debian)
-      Location:
-      - http://validator.w3.org/check?uri=https%3A%2F%2Fvalidator.w3.org%2Fnu%2F%23file
-      Content-Length:
-      - '0'
+      - gzip
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - content-type
+      Expires:
+      - Thu, 01 Jan 1970 00:00:00 GMT
+      Cache-Control:
+      - no-cache
       Strict-Transport-Security:
-      - max-age=15552015; preload
-      Public-Key-Pins:
-      - pin-sha256="cN0QSpPIkuwpT6iP2YjEo1bEwGpH/yiUn6yhdy+HNto="; pin-sha256="WGJkyYjx1QMdMe0UqlyOKXtydPDVrk7sl2fV+nNm1r4=";
-        pin-sha256="LrKdTxZLRTvyHM4/atX2nquX9BeHRZMCxg3cf4rhc2I="; max-age=864000
-      X-Frame-Options:
-      - deny
-      X-Xss-Protection:
-      - 1; mode=block
+      - max-age=31536000; includeSubDomains; preload
     body:
       encoding: UTF-8
-      string: ''
+      string: '{"messages":[],"source":{"type":"text/html","encoding":"UTF-8","code":"<!DOCTYPE
+        html><html><head><meta charset=\"utf-8\"><title>Hello</title></head><body><h1>Hi!</h1></body>"}}
+
+'
     http_version: 
-  recorded_at: Sat, 17 Dec 2016 08:36:06 GMT
+  recorded_at: Fri, 10 Mar 2017 20:24:28 GMT
 recorded_with: VCR 3.0.3