nanoc 4.0.0b1 → 4.0.0b2

data/lib/nanoc/filters/rdiscount.rb

@@ -7,7 +7,7 @@ module Nanoc::Filters
 
     # Runs the content through [RDiscount](http://github.com/rtomayko/rdiscount).
     #
-    # @option params [Array] symbol ([]) A list of RDiscount extensions
+    # @option params [Array] :symbol ([]) A list of RDiscount extensions
     #
     # @param [String] content The content to filter
     #

data/lib/nanoc/filters/redcarpet.rb

@@ -40,7 +40,7 @@ module Nanoc::Filters
     #
     #   @option params [Boolean] :with_toc (false) A boolean to request a table
     #     of contents
-
+    #
     #   @return [String] The filtered content
     def run(content, params = {})
       if ::Redcarpet::VERSION > '2'

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current nanoc version.
-  VERSION = '4.0.0b1'
+  VERSION = '4.0.0b2'
 end

data/tasks/test.rake

@@ -36,6 +36,7 @@ end
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = '-r ./spec/spec_helper.rb --color'
+  t.verbose = false
 end
 
 desc 'Alias for test:all + rubocop'

data/test/base/core_ext/array_spec.rb

@@ -8,14 +8,6 @@ describe 'Array#__nanoc_symbolize_keys_recursively' do
   end
 end
 
-describe 'Array#__nanoc_stringify_keys_recursively' do
-  it 'should convert keys to strings' do
-    array_old = [:abc, 'xyz', { :foo  => 'bar', 'baz' => :qux }]
-    array_new = [:abc, 'xyz', { 'foo' => 'bar', 'baz' => :qux }]
-    array_old.__nanoc_stringify_keys_recursively.must_equal array_new
-  end
-end
-
 describe 'Array#__nanoc_freeze_recursively' do
   include Nanoc::TestHelpers
 

data/test/base/core_ext/hash_spec.rb

@@ -14,32 +14,6 @@ describe 'Hash#__nanoc_symbolize_keys_recursively' do
   end
 end
 
-describe 'Hash#__nanoc_stringify_keys_recursively' do
-  it 'should leave strings as strings' do
-    hash_old = { 'foo' => 'bar' }
-    hash_new = { 'foo' => 'bar' }
-    hash_old.__nanoc_stringify_keys_recursively.must_equal hash_new
-  end
-
-  it 'should convert symbols to strings' do
-    hash_old = { foo: 'bar' }
-    hash_new = { 'foo' => 'bar' }
-    hash_old.__nanoc_stringify_keys_recursively.must_equal hash_new
-  end
-
-  it 'should convert integers to strings' do
-    hash_old = { 123   => 'bar' }
-    hash_new = { '123' => 'bar' }
-    hash_old.__nanoc_stringify_keys_recursively.must_equal hash_new
-  end
-
-  it 'should convert nil to an empty string' do
-    hash_old = { nil => 'bar' }
-    hash_new = { ''  => 'bar' }
-    hash_old.__nanoc_stringify_keys_recursively.must_equal hash_new
-  end
-end
-
 describe 'Hash#__nanoc_freeze_recursively' do
   include Nanoc::TestHelpers
 

data/test/base/test_compiler.rb

@@ -306,7 +306,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
       # At this point, even the already compiled items in the previous pass
       # should have their compiled content assigned, so this should work:
-      site.items[0].reps[0].compiled_content
+      site.items['/index.*'].reps[0].compiled_content
     end
   end
 

data/test/base/test_compiler_dsl.rb

@@ -177,10 +177,11 @@ EOS
   def test_passthrough_with_full_identifiers
     with_site do
       File.open('nanoc.yaml', 'w') do |io|
+        io << 'string_pattern_type: legacy' << "\n"
         io << 'data_sources:' << "\n"
         io << '  -' << "\n"
         io << '    type: filesystem_unified' << "\n"
-        io << '    identifier_style: full' << "\n"
+        io << '    identifier_type: full' << "\n"
       end
 
       # Create rules
@@ -266,15 +267,17 @@ EOS
     end
   end
 
-  def test_create_pattern_with_string
+  def test_create_pattern_with_string_with_no_config
     compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
 
-    pattern = compiler_dsl.create_pattern('/foo/*')
-    assert pattern.match?('/foo/a/a/a/a')
+    err = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
+      compiler_dsl.create_pattern('/foo/*')
+    end
+    assert_equal 'Invalid string_pattern_type: ', err.message
   end
 
-  def test_create_pattern_with_string_with_glob_pattern_syntax
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { pattern_syntax: 'glob' })
+  def test_create_pattern_with_string_with_glob_string_pattern_type
+    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { string_pattern_type: 'glob' })
 
     pattern = compiler_dsl.create_pattern('/foo/*')
     assert pattern.match?('/foo/aaaa')
@@ -283,19 +286,19 @@ EOS
   end
 
   def test_create_pattern_with_regex
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, {})
+    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { string_pattern_type: 'glob' })
 
     pattern = compiler_dsl.create_pattern(%r<\A/foo/a*/>)
     assert pattern.match?('/foo/aaaa/')
   end
 
-  def test_create_pattern_with_string_with_unknown_pattern_syntax
-    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { pattern_syntax: 'donkey' })
+  def test_create_pattern_with_string_with_unknown_string_pattern_type
+    compiler_dsl = Nanoc::Int::CompilerDSL.new(nil, { string_pattern_type: 'donkey' })
 
     err = assert_raises(Nanoc::Int::Errors::GenericTrivial) do
       compiler_dsl.create_pattern('/foo/*')
     end
-    assert_equal 'Invalid pattern_syntax: donkey', err.message
+    assert_equal 'Invalid string_pattern_type: donkey', err.message
   end
 
   def test_identifier_to_regex_without_wildcards

data/test/base/test_item.rb

@@ -8,12 +8,6 @@ class Nanoc::Int::ItemTest < Nanoc::TestCase
     assert_equal 'xyz', item.attributes[:abc]
   end
 
-  def test_initialize_with_unclean_identifier
-    item = Nanoc::Int::Item.new('foo', {}, '/foo')
-
-    assert_equal '/foo/', item.identifier.to_s
-  end
-
   def test_reference
     item = Nanoc::Int::Item.new(
       'content',

data/test/base/test_item_array.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
-class Nanoc::Int::ItemArrayTest < Nanoc::TestCase
+class Nanoc::Int::IdentifiableCollectionTest < Nanoc::TestCase
   def setup
     super
 
     @one = Nanoc::Int::Item.new('Item One', {}, '/one/')
     @two = Nanoc::Int::Item.new('Item Two', {}, '/two/')
 
-    @items = Nanoc::Int::ItemArray.new({})
+    @items = Nanoc::Int::IdentifiableCollection.new({})
     @items << @one
     @items << @two
   end
@@ -26,26 +26,8 @@ class Nanoc::Int::ItemArrayTest < Nanoc::TestCase
     assert_equal @one, @items.find { |i| i.identifier == '/one/' }
   end
 
-  def test_brackets_and_slice_and_at_with_index
-    assert_equal @one, @items[0]
-    assert_equal @one, @items.slice(0)
-    assert_equal @one, @items.at(0)
-
-    assert_equal @two, @items[1]
-    assert_equal @two, @items.slice(1)
-    assert_equal @two, @items.at(1)
-
-    assert_nil @items[2]
-    assert_nil @items.slice(2)
-    assert_nil @items.at(2)
-
-    assert_equal @two, @items[-1]
-    assert_equal @two, @items.slice(-1)
-    assert_equal @two, @items.at(-1)
-  end
-
   def test_brackets_with_glob
-    @items = Nanoc::Int::ItemArray.new({ pattern_syntax: 'glob' })
+    @items = Nanoc::Int::IdentifiableCollection.new({ string_pattern_type: 'glob' })
     @items << @one
     @items << @two
 
@@ -53,297 +35,47 @@ class Nanoc::Int::ItemArrayTest < Nanoc::TestCase
     assert_equal @two, @items['/*wo/']
   end
 
-  def test_brackets_and_slice_with_range
-    assert_equal [@one, @two], @items[0..1]
-    assert_equal [@one, @two], @items[0, 2]
-
-    assert_equal [@one, @two], @items.slice(0..1)
-    assert_equal [@one, @two], @items.slice(0, 2)
-  end
-
-  def test_brackets_and_slice_and_at_with_identifier
+  def test_brackets_with_identifier
     assert_equal @one, @items['/one/']
-    assert_equal @one, @items.slice('/one/')
-    assert_equal @one, @items.at('/one/')
-
     assert_equal @two, @items['/two/']
-    assert_equal @two, @items.slice('/two/')
-    assert_equal @two, @items.at('/two/')
-
     assert_nil @items['/max-payne/']
-    assert_nil @items.slice('/max-payne/')
-    assert_nil @items.at('/max-payne/')
   end
 
-  def test_brackets_and_slice_and_at_with_malformed_identifier
+  def test_brackets_with_malformed_identifier
     assert_nil @items['one/']
-    assert_nil @items.slice('one/')
-    assert_nil @items.at('one/')
-
     assert_nil @items['/one']
-    assert_nil @items.slice('/one')
-    assert_nil @items.at('/one')
-
     assert_nil @items['one']
-    assert_nil @items.slice('one')
-    assert_nil @items.at('one')
-
     assert_nil @items['//one/']
-    assert_nil @items.slice('//one/')
-    assert_nil @items.at('//one/')
   end
 
-  def test_brackets_and_slice_and_at_frozen
+  def test_brackets_frozen
     @items.freeze
 
     assert_equal @one, @items['/one/']
-    assert_equal @one, @items.slice('/one/')
-    assert_equal @one, @items.at('/one/')
-
     assert_nil @items['/tenthousand/']
-    assert_nil @items.slice('/tenthousand/')
-    assert_nil @items.at('/tenthousand/')
   end
 
   def test_regex
     foo = Nanoc::Int::Item.new('Item Foo', {}, '/foo/')
     @items << foo
 
-    assert_equal [@one], @items[/n/]
-    assert_equal [@two, foo], @items[%r{o/}]
+    assert_equal @one, @items[/n/]
+    assert_equal @two, @items[%r{o/}] # not foo
   end
 
   def test_less_than_less_than
-    assert_nil @items[2]
     assert_nil @items['/foo/']
 
     foo = Nanoc::Int::Item.new('Item Foo', {}, '/foo/')
     @items << foo
 
-    assert_equal foo, @items[2]
     assert_equal foo, @items['/foo/']
   end
 
-  def test_assign
-    assert_raises(TypeError) do
-      @items['/blah/'] = Nanoc::Int::Item.new('Item blah', {}, '/blah/')
-    end
-
-    new_item =  Nanoc::Int::Item.new('New Item One', {}, '/one-new/')
-    @items[0] = new_item
-
-    assert_equal new_item, @items[0]
-    assert_equal new_item, @items['/one-new/']
-    assert_nil @items['/one/']
-  end
-
-  def test_assign_frozen
-    @items.freeze
-
-    new_item = Nanoc::Int::Item.new('New Item One', {}, '/one-new/')
-
-    assert_raises_frozen_error do
-      @items[0] = new_item
-    end
-  end
-
-  def test_clear
-    @items.clear
-
-    assert_nil @items[0]
-    assert_nil @items[1]
-    assert_nil @items[2]
-
-    assert_nil @items['/one/']
-    assert_nil @items['/two/']
-  end
-
-  def test_collect_bang
-    @items.collect! do |i|
-      Nanoc::Int::Item.new("New #{i.raw_content}", {}, "/new#{i.identifier}")
-    end
-
-    assert_nil @items['/one/']
-    assert_nil @items['/two/']
-
-    assert_equal 'New Item One', @items[0].raw_content
-    assert_equal 'New Item One', @items['/new/one/'].raw_content
-
-    assert_equal 'New Item Two', @items[1].raw_content
-    assert_equal 'New Item Two', @items['/new/two/'].raw_content
-  end
-
-  def test_collect_bang_frozen
-    @items.freeze
-
-    assert_raises_frozen_error do
-      @items.collect! do |i|
-        Nanoc::Int::Item.new("New #{i.raw_content}", {}, "/new#{i.identifier}")
-      end
-    end
-  end
-
   def test_concat
     new_item = Nanoc::Int::Item.new('New item', {}, '/new/')
     @items.concat([new_item])
 
-    assert_equal new_item, @items[2]
     assert_equal new_item, @items['/new/']
   end
-
-  def test_delete
-    assert_equal @two, @items[1]
-    assert_equal @two, @items['/two/']
-
-    @items.delete(@two)
-
-    assert_nil @items[1]
-    assert_nil @items['/two/']
-  end
-
-  def test_delete_at
-    assert_equal @two, @items[1]
-    assert_equal @two, @items['/two/']
-
-    @items.delete_at(1)
-
-    assert_nil @items[1]
-    assert_nil @items['/two/']
-  end
-
-  def test_delete_if
-    assert_equal @two, @items[1]
-    assert_equal @two, @items['/two/']
-
-    @items.delete_if { |i| i.identifier == '/two/' }
-
-    assert_nil @items[1]
-    assert_nil @items['/two/']
-  end
-
-  def test_fill_all
-    @items.fill { |i| Nanoc::Int::Item.new("Item #{i}", {}, "/new/#{i}/") }
-
-    assert_nil @items['/one/']
-    assert_nil @items['/two/']
-
-    assert_equal 'Item 0', @items[0].raw_content
-    assert_equal 'Item 0', @items['/new/0/'].raw_content
-    assert_equal 'Item 1', @items[1].raw_content
-    assert_equal 'Item 1', @items['/new/1/'].raw_content
-  end
-
-  def test_fill_range
-    @items.fill(1..-1) { |i| Nanoc::Int::Item.new("Item #{i}", {}, "/new/#{i}/") }
-
-    assert_equal @one, @items['/one/']
-    assert_nil @items['/two/']
-
-    assert_equal @one, @items[0]
-    assert_equal @one, @items['/one/']
-    assert_equal 'Item 1', @items[1].raw_content
-    assert_equal 'Item 1', @items['/new/1/'].raw_content
-  end
-
-  if [].respond_to?(:keep_if)
-    def test_keep_if
-      assert_equal @two, @items[1]
-      assert_equal @two, @items['/two/']
-
-      @items.keep_if { |i| i.identifier == '/one/' }
-
-      assert_equal @one, @items[0]
-      assert_equal @one, @items['/one/']
-      assert_nil @items[1]
-      assert_nil @items['/two/']
-    end
-  end
-
-  def test_pop
-    @items.pop
-
-    assert_equal @one, @items[0]
-    assert_equal @one, @items['/one/']
-    assert_nil @items[1]
-    assert_nil @items['/two/']
-  end
-
-  def test_push
-    pushy = Nanoc::Int::Item.new('Pushy', {}, '/pushy/')
-    @items.push(pushy)
-
-    assert_equal @one, @items[0]
-    assert_equal @one, @items['/one/']
-    assert_equal @two, @items[1]
-    assert_equal @two, @items['/two/']
-    assert_equal pushy, @items[2]
-    assert_equal pushy, @items['/pushy/']
-  end
-
-  def test_reject_bang
-    assert_equal @two, @items[1]
-    assert_equal @two, @items['/two/']
-
-    @items.reject! { |i| i.identifier == '/two/' }
-
-    assert_nil @items[1]
-    assert_nil @items['/two/']
-  end
-
-  def test_replace
-    max  = Nanoc::Int::Item.new('Max', {}, '/max/')
-    mona = Nanoc::Int::Item.new('Mona', {}, '/mona/')
-
-    @items.replace([max, mona])
-
-    assert_nil @items['/one/']
-    assert_nil @items['/two/']
-
-    assert_equal max, @items[0]
-    assert_equal max, @items['/max/']
-    assert_equal mona, @items[1]
-    assert_equal mona, @items['/mona/']
-  end
-
-  if [].respond_to?(:select!)
-    def test_select_bang
-      assert_equal @two, @items[1]
-      assert_equal @two, @items['/two/']
-
-      @items.select! { |i| i.identifier == '/two/' }
-
-      assert_nil @items[1]
-      assert_nil @items['/one/']
-    end
-  end
-
-  def test_shift
-    @items.shift
-
-    assert_equal @two, @items[0]
-    assert_equal @two, @items['/two/']
-    assert_nil @items['/one/']
-    assert_nil @items[1]
-  end
-
-  def test_slice_bang
-    @items.slice!(1)
-
-    assert_equal @one, @items[0]
-    assert_equal @one, @items['/one/']
-    assert_nil @items[1]
-    assert_nil @items['/two/']
-  end
-
-  def test_unshift
-    unshifty = Nanoc::Int::Item.new('Unshifty', {}, '/unshifty/')
-    @items.unshift(unshifty)
-
-    assert_equal unshifty, @items[0]
-    assert_equal unshifty, @items['/unshifty/']
-    assert_equal @one, @items[1]
-    assert_equal @one, @items['/one/']
-    assert_equal @two, @items[2]
-    assert_equal @two, @items['/two/']
-  end
 end