nanoc 4.8.11 → 4.8.12

data/spec/spec_helper.rb

@@ -73,12 +73,6 @@ RSpec.configure do |c|
 
     File.write('Rules', 'passthrough "/**/*"')
   end
-
-  # Set focus if any
-  if ENV.fetch('FOCUS', false)
-    $stdout.puts "Focusing spec on '#{ENV['FOCUS']}'"
-    c.filter_run_including ENV['FOCUS'].to_sym => true
-  end
 end
 
 RSpec::Matchers.define_negated_matcher :not_match, :match

data/test/base/test_compiler.rb

@@ -149,60 +149,6 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     end
   end
 
-  def test_disallow_duplicate_routes
-    # Create site
-    Nanoc::CLI.run %w[create_site bar]
-
-    FileUtils.cd('bar') do
-      # Create routes
-      File.open('Rules', 'w') do |io|
-        io.write "compile '/**/*' do\n"
-        io.write "end\n"
-        io.write "\n"
-        io.write "route '/**/*' do\n"
-        io.write "  '/index.html'\n"
-        io.write "end\n"
-      end
-
-      # Create files
-      File.write('content/foo.html', 'asdf')
-      File.write('content/bar.html', 'asdf')
-
-      # Create site
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      assert_raises(Nanoc::Int::ItemRepRouter::IdenticalRoutesError) do
-        site.compile
-      end
-    end
-  end
-
-  def test_disallow_multiple_snapshots_with_the_same_name
-    # Create site
-    Nanoc::CLI.run %w[create_site bar]
-
-    FileUtils.cd('bar') do
-      # Create routes
-      File.open('Rules', 'w') do |io|
-        io.write "compile '/**/*' do\n"
-        io.write "  snapshot :aaa\n"
-        io.write "  snapshot :aaa\n"
-        io.write "end\n"
-        io.write "\n"
-        io.write "route '/**/*' do\n"
-        io.write "  item.identifier.to_s\n"
-        io.write "end\n"
-        io.write "\n"
-        io.write "layout '/**/*', :erb\n"
-      end
-
-      # Compile
-      site = Nanoc::Int::SiteLoader.new.new_from_cwd
-      assert_raises Nanoc::Int::Errors::CannotCreateMultipleSnapshotsWithSameName do
-        site.compile
-      end
-    end
-  end
-
   def test_include_compiled_content_of_active_item_at_previous_snapshot
     with_site do |_site|
       # Create item

data/test/filters/test_pandoc.rb

@@ -38,9 +38,9 @@ class Nanoc::Filters::PandocTest < Nanoc::TestCase
       filter = ::Nanoc::Filters::Pandoc.new
 
       # Run filter
-      args = [:s, { f: :markdown, to: :html }, 'no-wrap', :toc]
+      args = [:s, { f: :markdown, to: :html }, 'wrap=none', :toc]
       result = filter.setup_and_run("# Heading\n", args: args)
-      assert_match '<div id="TOC">', result
+      assert_match '<nav id="TOC">', result
       assert_match(%r{<h1 id=\"heading\">Heading</h1>\s*}, result)
     end
   end

data/test/helper.rb

@@ -49,13 +49,6 @@ module Nanoc::TestHelpers
     yield
   end
 
-  def if_implemented
-    yield
-  rescue NotImplementedError, NameError
-    skip $ERROR_INFO
-    return
-  end
-
   def with_site(params = {})
     # Build site name
     site_name = params[:name]
@@ -122,13 +115,6 @@ EOS
   end
 
   def setup
-    # Check skipped
-    if ENV['skip']
-      if ENV['skip'].split(',').include?(self.class.to_s)
-        skip 'manually skipped'
-      end
-    end
-
     # Clean up
     GC.start
 
@@ -215,28 +201,6 @@ EOS
     end
   end
 
-  def assert_contains_exactly(expected, actual)
-    assert_equal(
-      expected.size,
-      actual.size,
-      format('Expected %s to be of same size as %s', actual.inspect, expected.inspect),
-    )
-    remaining = actual.dup.to_a
-    expected.each do |e|
-      index = remaining.index(e)
-      remaining.delete_at(index) if index
-    end
-    assert(
-      remaining.empty?,
-      format('Expected %s to contain all the elements of %s', actual.inspect, expected.inspect),
-    )
-  end
-
-  def assert_raises_frozen_error
-    error = assert_raises(RuntimeError, TypeError) { yield }
-    assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, error.message)
-  end
-
   def with_env_vars(hash, &_block)
     orig_env_hash = ENV.to_hash
     hash.each_pair { |k, v| ENV[k] = v }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.11
+  version: 4.8.12
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -123,7 +123,6 @@ extra_rdoc_files:
 files:
 - ".rspec"
 - ".rubocop.yml"
-- Appraisals
 - CODE_OF_CONDUCT.md
 - LICENSE
 - NEWS.md
@@ -390,6 +389,7 @@ files:
 - nanoc.gemspec
 - nanoc.manifest
 - spec/contributors_spec.rb
+- spec/gem_spec.rb
 - spec/manifest_spec.rb
 - spec/nanoc/base/changes_stream_spec.rb
 - spec/nanoc/base/checksummer_spec.rb
@@ -446,6 +446,7 @@ files:
 - spec/nanoc/base/services/executor_spec.rb
 - spec/nanoc/base/services/item_rep_router_spec.rb
 - spec/nanoc/base/services/item_rep_selector_spec.rb
+- spec/nanoc/base/services/notification_center_spec.rb
 - spec/nanoc/base/services/outdatedness_checker_spec.rb
 - spec/nanoc/base/services/outdatedness_rules_spec.rb
 - spec/nanoc/base/services/pruner_spec.rb
@@ -539,6 +540,7 @@ files:
 - spec/nanoc/regressions/gh_1171_spec.rb
 - spec/nanoc/regressions/gh_1185_spec.rb
 - spec/nanoc/regressions/gh_1216_spec.rb
+- spec/nanoc/regressions/gh_1248_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb
@@ -573,6 +575,7 @@ files:
 - spec/nanoc/rule_dsl/action_sequence_calculator_spec.rb
 - spec/nanoc/rule_dsl/recording_executor_spec.rb
 - spec/nanoc/rule_dsl/rule_context_spec.rb
+- spec/nanoc/rule_dsl/rule_spec.rb
 - spec/nanoc/rule_dsl/rules_collection_spec.rb
 - spec/nanoc/spec_spec.rb
 - spec/nanoc/telemetry/counter_spec.rb
@@ -585,11 +588,8 @@ files:
 - spec/regression_filenames_spec.rb
 - spec/spec_helper.rb
 - test/base/test_compiler.rb
-- test/base/test_dependency_tracker.rb
 - test/base/test_filter.rb
-- test/base/test_notification_center.rb
 - test/base/test_site.rb
-- test/base/test_store.rb
 - test/checking/checks/test_css.rb
 - test/checking/checks/test_external_links.rb
 - test/checking/checks/test_html.rb
@@ -659,9 +659,7 @@ files:
 - test/helpers/test_xml_sitemap.rb
 - test/rule_dsl/test_action_provider.rb
 - test/rule_dsl/test_compiler_dsl.rb
-- test/rule_dsl/test_rule.rb
 - test/rule_dsl/test_rules_collection.rb
-- test/test_gem.rb
 homepage: http://nanoc.ws/
 licenses:
 - MIT
@@ -684,7 +682,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.

data/Appraisals

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-appraise 'rouge-1' do
-  group :plugins do
-    gem 'rouge', '~> 1.0'
-  end
-end
-
-appraise 'rouge-2' do
-  group :plugins do
-    gem 'rouge', '~> 2.0'
-  end
-end

data/test/base/test_dependency_tracker.rb

@@ -1,265 +0,0 @@
-# frozen_string_literal: true
-
-require 'helper'
-
-class Nanoc::Int::DependencyTrackerTest < Nanoc::TestCase
-  def test_initialize
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Verify no dependencies yet
-    assert_empty store.objects_causing_outdatedness_of(items.to_a[0])
-    assert_empty store.objects_causing_outdatedness_of(items.to_a[1])
-  end
-
-  def test_record_dependency
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[1])
-
-    # Verify dependencies
-    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
-  end
-
-  def test_record_dependency_no_self
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[0])
-    store.record_dependency(items.to_a[0], items.to_a[1])
-
-    # Verify dependencies
-    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
-  end
-
-  def test_record_dependency_no_doubles
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[1])
-    store.record_dependency(items.to_a[0], items.to_a[1])
-    store.record_dependency(items.to_a[0], items.to_a[1])
-
-    # Verify dependencies
-    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
-  end
-
-  def test_objects_causing_outdatedness_of
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-      Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[1])
-    store.record_dependency(items.to_a[1], items.to_a[2])
-
-    # Verify dependencies
-    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
-  end
-
-  def test_store_graph_and_load_graph_simple
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-      Nanoc::Int::Item.new('c', {}, '/c.md'),
-      Nanoc::Int::Item.new('d', {}, '/d.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[1])
-    store.record_dependency(items.to_a[1], items.to_a[2])
-    store.record_dependency(items.to_a[1], items.to_a[3])
-
-    # Store
-    store.store
-    assert File.file?(store.filename)
-
-    # Re-create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Load
-    store.load
-
-    # Check loaded graph
-    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
-    assert_contains_exactly [items.to_a[2], items.to_a[3]], store.objects_causing_outdatedness_of(items.to_a[1])
-    assert_empty store.objects_causing_outdatedness_of(items.to_a[2])
-    assert_empty store.objects_causing_outdatedness_of(items.to_a[3])
-  end
-
-  def test_store_graph_and_load_graph_with_removed_items
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-      Nanoc::Int::Item.new('c', {}, '/c.md'),
-      Nanoc::Int::Item.new('d', {}, '/d.md'),
-    ])
-
-    # Create new and old lists
-    old_items = Nanoc::Int::ItemCollection.new(config, [items.to_a[0], items.to_a[1], items.to_a[2], items.to_a[3]])
-    new_items = Nanoc::Int::ItemCollection.new(config, [items.to_a[0], items.to_a[1], items.to_a[2]])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(old_items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[1])
-    store.record_dependency(items.to_a[1], items.to_a[2])
-    store.record_dependency(items.to_a[1], items.to_a[3])
-
-    # Store
-    store.store
-    assert File.file?(store.filename)
-
-    # Re-create
-    store = Nanoc::Int::DependencyStore.new(new_items, layouts, config)
-
-    # Load
-    store.load
-
-    # Check loaded graph
-    assert_contains_exactly [items.to_a[1]],       store.objects_causing_outdatedness_of(items.to_a[0])
-    assert_contains_exactly [items.to_a[2], nil],  store.objects_causing_outdatedness_of(items.to_a[1])
-    assert_empty store.objects_causing_outdatedness_of(items.to_a[2])
-  end
-
-  def test_store_graph_with_nils_in_dst
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-      Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[1])
-    store.record_dependency(items.to_a[1], nil)
-
-    # Store
-    store.store
-    assert File.file?(store.filename)
-
-    # Re-create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Load
-    store.load
-
-    # Check loaded graph
-    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
-    assert_contains_exactly [nil], store.objects_causing_outdatedness_of(items.to_a[1])
-  end
-
-  def test_store_graph_with_nils_in_src
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-      Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[1])
-    store.record_dependency(nil, items.to_a[2])
-
-    # Store
-    store.store
-    assert File.file?(store.filename)
-
-    # Re-create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Load
-    store.load
-
-    # Check loaded graph
-    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
-    assert_empty store.objects_causing_outdatedness_of(items.to_a[1])
-  end
-
-  def test_forget_dependencies_for
-    # Mock objects
-    config = Nanoc::Int::Configuration.new.with_defaults
-    layouts = Nanoc::Int::LayoutCollection.new(config)
-    items = Nanoc::Int::ItemCollection.new(config, [
-      Nanoc::Int::Item.new('a', {}, '/a.md'),
-      Nanoc::Int::Item.new('b', {}, '/b.md'),
-      Nanoc::Int::Item.new('c', {}, '/c.md'),
-    ])
-
-    # Create
-    store = Nanoc::Int::DependencyStore.new(items, layouts, config)
-
-    # Record some dependencies
-    store.record_dependency(items.to_a[0], items.to_a[1])
-    store.record_dependency(items.to_a[1], items.to_a[2])
-    assert_contains_exactly [items.to_a[1]], store.objects_causing_outdatedness_of(items.to_a[0])
-
-    # Forget dependencies
-    store.forget_dependencies_for(items.to_a[0])
-    assert_empty store.objects_causing_outdatedness_of(items.to_a[0])
-  end
-end