nanoc 3.5.0 → 3.6.0

data/test/base/test_compiler_dsl.rb

@@ -124,6 +124,69 @@ EOS
     end
   end
 
+  def test_ignore
+    with_site do
+      # Create rules
+      File.open('Rules', 'w') do |io|
+        io.write <<EOS
+ignore '/lame/'
+
+passthrough '*'
+EOS
+      end
+
+      # Create items
+      assert Dir['content/*'].empty?
+      File.open('content/lame.txt', 'w') do |io|
+        io.write "Hello I am lame"
+      end
+
+      File.open('content/notlame.txt', 'w') do |io|
+        io.write "Hello I am not lame"
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
+
+      # Check paths
+      assert_equal [ 'output/notlame.txt'], Dir['output/*']
+    end
+  end
+
+  def test_ignore_priority
+    with_site do
+      # Create rules
+      File.open('Rules', 'w') do |io|
+        io.write <<EOS
+compile '*' do
+  filter :erb
+end
+
+route '*' do
+  item.identifier + 'index.html'
+end
+
+ignore "/foo/"
+EOS
+      end
+
+      # Create items
+      assert Dir['content/*'].empty?
+      File.open('content/foo.txt', 'w') do |io|
+        io.write "Hello I am <%= 'foo' %>"
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
+
+      # Check paths
+      assert_equal [ 'output/foo' ],            Dir['output/*']
+      assert_equal [ 'output/foo/index.html' ], Dir['output/foo/*']
+    end
+  end
+
   def test_identifier_to_regex_without_wildcards
     # Create compiler DSL
     compiler_dsl = Nanoc::CompilerDSL.new(nil, {})

data/test/base/test_item.rb

@@ -20,14 +20,9 @@ class Nanoc::ItemTest < MiniTest::Unit::TestCase
   def test_frozen_identifier
     item = Nanoc::Item.new("foo", {}, '/foo')
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       item.identifier.chop!
-    rescue => error
-      raised = true
-      assert_match(/(^can't modify frozen [Ss]tring|^unable to modify frozen object$)/, error.message)
     end
-    assert raised, 'Should have raised when trying to modify a frozen string'
   end
 
   def test_lookup
@@ -144,23 +139,13 @@ class Nanoc::ItemTest < MiniTest::Unit::TestCase
     item = Nanoc::Item.new("foo", { :a => { :b => 123 }}, '/foo/')
     item.freeze
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       item[:abc] = '123'
-    rescue => e
-      raised = true
-      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
-    assert raised
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       item[:a][:b] = '456'
-    rescue => e
-      raised = true
-      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
-    assert raised
   end
 
   def test_dump_and_load

data/test/base/test_item_array.rb

@@ -0,0 +1,336 @@
+# encoding: utf-8
+
+class Nanoc::ItemArrayTest < MiniTest::Unit::TestCase
+
+  include Nanoc::TestHelpers
+
+  def setup
+    super
+
+    @one = Nanoc::Item.new('Item One', {}, '/one/')
+    @two = Nanoc::Item.new('Item Two', {}, '/two/')
+
+    @items = Nanoc::ItemArray.new
+    @items << @one
+    @items << @two
+  end
+
+  def test_change_item_identifier
+    assert_equal @one, @items['/one/']
+    assert_nil @items['/foo/']
+
+    @one.identifier = '/foo/'
+
+    assert_nil @items['/one/']
+    assert_equal @one, @items['/foo/']
+  end
+
+  def test_enumerable
+    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_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
+    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
+    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
+    @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_less_than_less_than
+    assert_nil @items[2]
+    assert_nil @items['/foo/']
+
+    foo = Nanoc::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::Item.new('Item blah', {}, '/blah/')
+    end
+
+    new_item =  Nanoc::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::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::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::Item.new("New #{i.raw_content}", {}, "/new#{i.identifier}")
+      end
+    end
+  end
+
+  def test_concat
+    new_item = Nanoc::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::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::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 Array.new.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::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::Item.new("Max", {}, '/max/')
+    mona = Nanoc::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 Array.new.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::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

data/test/base/test_item_rep.rb

@@ -428,14 +428,9 @@ class Nanoc::ItemRepTest < MiniTest::Unit::TestCase
     rep.instance_eval { @filter_class = filter_class }
     def rep.filter_named(name) ; @filter_class ; end
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       rep.filter(:whatever)
-    rescue => e
-      raised = true
-      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
-    assert raised
   end
 
   def test_filter_should_freeze_content
@@ -451,15 +446,10 @@ class Nanoc::ItemRepTest < MiniTest::Unit::TestCase
     rep.instance_eval { @filter_class = filter_class }
     def rep.filter_named(name) ; @filter_class ; end
 
-    raised = false
-    begin
+    assert_raises_frozen_error do
       rep.filter(:erb)
       rep.filter(:whatever)
-    rescue => e
-      raised = true
-      assert_match(/(^can't modify frozen |^unable to modify frozen object$)/, e.message)
     end
-    assert raised
   end
 
   def test_raw_path_should_generate_dependency