nanoc 4.7.10 → 4.7.11

data/spec/nanoc/filters/less_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe Nanoc::Filters::Less, site: true, stdio: true, v8: true do
+describe Nanoc::Filters::Less, site: true, stdio: true do
   # These tests are high-level in order to interact well with the compiler. This is important for
   # this :less filter, because of the way it handles fibers.
 

data/spec/nanoc/regressions/gh_1185_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+describe 'GH-1185', site: true, stdio: true do
+  before do
+    File.write('content/foo.html', 'stuff')
+
+    File.write('Rules', <<~EOS)
+      preprocess do
+        @items['/foo.*'].identifier = '/bar.html'
+      end
+
+      compile '/**/*' do
+        filter :erb
+        write ext: 'html'
+      end
+    EOS
+  end
+
+  it 'does not crash' do
+    Nanoc::CLI.run(%w[compile])
+  end
+end

data/spec/nanoc/telemetry/table_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+describe Nanoc::Telemetry::Table do
+  let(:table) { described_class.new(rows) }
+
+  let(:rows) do
+    [
+      %w[name awesomeness],
+      %w[denis high],
+      %w[REDACTED low],
+    ]
+  end
+
+  example do
+    expect(table.to_s).to eq(<<~EOS.rstrip)
+          name │ awesomeness
+      ─────────┼────────────
+         denis │        high
+      REDACTED │         low
+    EOS
+  end
+end

data/spec/spec_helper.rb

@@ -12,10 +12,15 @@ require 'nanoc/spec'
 
 require 'timecop'
 require 'rspec/its'
+require 'fuubar'
 
 Nanoc::CLI.setup
 
 RSpec.configure do |c|
+  c.fuubar_progress_bar_options = {
+    format: '%c/%C |<%b>%i| %p%%',
+  }
+
   c.around(:each) do |example|
     Nanoc::CLI::ErrorHandler.disable
     example.run
@@ -40,12 +45,6 @@ RSpec.configure do |c|
     Nanoc::Int::NotificationCenter.reset
   end
 
-  c.before(:each, v8: true) do
-    if ENV.key?('DISABLE_V8')
-      skip 'V8 specs are disabled (broken on Ruby 2.4)'
-    end
-  end
-
   c.around(:each, stdio: true) do |example|
     orig_stdout = $stdout
     orig_stderr = $stderr

data/test/base/test_item_array.rb

@@ -26,41 +26,6 @@ class Nanoc::Int::IdentifiableCollectionTest < Nanoc::TestCase
     assert_equal @one, @items.find { |i| i.identifier == '/one/' }
   end
 
-  def test_brackets_with_glob
-    @items = Nanoc::Int::IdentifiableCollection.new({ string_pattern_type: 'glob' }, [@one, @two])
-
-    assert_equal @one, @items['/on*/']
-    assert_equal @two, @items['/*wo/']
-  end
-
-  def test_brackets_with_identifier
-    assert_equal @one, @items['/one/']
-    assert_equal @two, @items['/two/']
-    assert_nil @items['/max-payne/']
-  end
-
-  def test_brackets_with_malformed_identifier
-    assert_nil @items['one/']
-    assert_nil @items['/one']
-    assert_nil @items['one']
-    assert_nil @items['//one/']
-  end
-
-  def test_brackets_frozen
-    @items.freeze
-
-    assert_equal @one, @items['/one/']
-    assert_nil @items['/tenthousand/']
-  end
-
-  def test_regex
-    foo = Nanoc::Int::Item.new('Item Foo', {}, '/foo/')
-    @items = Nanoc::Int::IdentifiableCollection.new({}, [@one, @two, foo])
-
-    assert_equal @one, @items[/n/]
-    assert_equal @two, @items[%r{o/}] # not foo
-  end
-
   def test_less_than_less_than
     assert_nil @items['/foo/']
 

data/test/checking/checks/test_external_links.rb

@@ -51,20 +51,6 @@ class Nanoc::Checking::Checks::ExternalLinksTest < Nanoc::TestCase
     end
   end
 
-  def test_fallback_to_get_when_head_is_not_allowed
-    with_site do |site|
-      # Create check
-      check = Nanoc::Checking::Checks::ExternalLinks.create(site)
-      def check.request_url_once(url, req_method = Net::HTTP::Head)
-        Net::HTTPResponse.new('1.1', req_method == Net::HTTP::Head || url.path == '/405' ? '405' : '200', 'okay')
-      end
-
-      # Test
-      assert_nil check.validate('http://127.0.0.1:9204')
-      refute_nil check.validate('http://127.0.0.1:9204/405')
-    end
-  end
-
   def test_path_for_url
     with_site do |site|
       check = Nanoc::Checking::Checks::ExternalLinks.create(site)

data/test/filters/test_coffeescript.rb

@@ -4,8 +4,6 @@ require 'helper'
 
 class Nanoc::Filters::CoffeeScriptTest < Nanoc::TestCase
   def test_filter
-    skip_v8_on_ruby24
-
     if_have 'coffee-script' do
       # Create filter
       filter = ::Nanoc::Filters::CoffeeScript.new

data/test/filters/test_handlebars.rb

@@ -4,8 +4,6 @@ require 'helper'
 
 class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
   def test_filter
-    skip_v8_on_ruby24
-
     if_have 'handlebars' do
       # Create data
       item = Nanoc::Int::Item.new(
@@ -40,8 +38,6 @@ class Nanoc::Filters::HandlebarsTest < Nanoc::TestCase
   end
 
   def test_filter_without_layout
-    skip_v8_on_ruby24
-
     if_have 'handlebars' do
       # Create data
       item = Nanoc::Int::Item.new(

data/test/filters/test_uglify_js.rb

@@ -4,8 +4,6 @@ require 'helper'
 
 class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
   def test_filter
-    skip_v8_on_ruby24
-
     if_have 'uglifier' do
       # Create filter
       filter = ::Nanoc::Filters::UglifyJS.new
@@ -18,8 +16,6 @@ class Nanoc::Filters::UglifyJSTest < Nanoc::TestCase
   end
 
   def test_filter_with_options
-    skip_v8_on_ruby24
-
     if_have 'uglifier' do
       filter = ::Nanoc::Filters::UglifyJS.new
       input = "if(donkey) alert('It is a donkey!');"

data/test/helper.rb

@@ -33,12 +33,6 @@ module Nanoc::TestHelpers
     ENV.key?('DISABLE_NOKOGIRI')
   end
 
-  def skip_v8_on_ruby24
-    if ENV.key?('DISABLE_V8')
-      skip 'V8 specs are disabled (broken on Ruby 2.4)'
-    end
-  end
-
   def if_have(*libs)
     libs.each do |lib|
       if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' && lib == 'nokogiri' && disable_nokogiri?

data/test/helpers/test_blogging.rb

@@ -28,6 +28,24 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
     item
   end
 
+  def setup
+    super
+
+    config = Nanoc::Int::Configuration.new.with_defaults
+    items = Nanoc::Int::IdentifiableCollection.new(config)
+    layouts = Nanoc::Int::IdentifiableCollection.new(config)
+    dep_store = Nanoc::Int::DependencyStore.new(items, layouts)
+    dependency_tracker = Nanoc::Int::DependencyTracker.new(dep_store)
+
+    @view_context = Nanoc::ViewContext.new(
+      reps: :__irrelevant__,
+      items: nil,
+      dependency_tracker: dependency_tracker,
+      compilation_context: :__irrelevant__,
+      snapshot_repo: :__irrelevant_snapshot_repo,
+    )
+  end
+
   def test_atom_feed
     if_have 'builder' do
       # Create items
@@ -51,7 +69,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[2].expects(:compiled_content).with(snapshot: :pre).returns('item 2 content')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -82,7 +101,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[2].expects(:compiled_content).returns('item 2 content')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -113,7 +133,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[2].expects(:compiled_content).returns('item 2 content')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -144,7 +165,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[2].expects(:compiled_content).returns('item 2 content')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -165,7 +187,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_item]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -190,7 +213,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: nil }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: nil })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -215,7 +239,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -240,7 +265,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -270,7 +296,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[0].expects(:compiled_content).returns('item 1 content')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com/' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com/' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -312,7 +339,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_item, mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -339,7 +367,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[2].stubs(:[]).with(:created_at).returns(nil)
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -365,7 +394,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -390,15 +420,15 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
-      @config = Nanoc::ConfigView.new(
+      config_hash =
         {
           author_name: 'Bob',
           author_uri: 'http://example.com/~bob/',
           title: 'My Blog Or Something',
           base_url: 'http://example.com',
-        },
-        nil,
-      )
+        }
+      config = Nanoc::Int::Configuration.new(hash: config_hash)
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -422,7 +452,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].expects(:compiled_content).with(snapshot: :pre).returns('asdf')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -446,7 +477,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       end
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -479,7 +511,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].stubs(:[]).with(:created_at).returns('22-03-2009')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -508,7 +541,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[1].stubs(:[]).with(:created_at).returns('01-01-2014')
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -532,7 +566,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -553,7 +588,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -574,7 +610,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -595,7 +632,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -616,7 +654,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items = [mock_article]
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock
@@ -638,7 +677,8 @@ class Nanoc::Helpers::BloggingTest < Nanoc::TestCase
       @items[0].stubs(:path).returns(nil)
 
       # Mock site
-      @config = Nanoc::ConfigView.new({ base_url: 'http://example.com' }, nil)
+      config = Nanoc::Int::Configuration.new(hash: { base_url: 'http://example.com' })
+      @config = Nanoc::ConfigView.new(config, @view_context)
 
       # Create feed item
       @item = mock