hirb 0.3.1 → 0.3.2

data/test/resizer_test.rb

@@ -1,61 +1,62 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class Hirb::Helpers::Table
-  class ResizerTest < Test::Unit::TestCase
-    def table(options)
-      @table = Hirb::Helpers::Table.new [options[:field_lengths].keys.inject({}) {|t,e| t[e] = '1'; t}]
-      @table.field_lengths = options[:field_lengths]
-      @table.width = options[:width]
-      @table.max_fields = options[:max_fields] if options[:max_fields]
+describe "Resizer" do
+  def table(options)
+    @table = Helpers::Table.new [options[:field_lengths].keys.inject({}) {|t,e| t[e] = '1'; t}]
+    @table.field_lengths = options[:field_lengths]
+    @table.width = options[:width]
+    @table.max_fields = options[:max_fields] if options[:max_fields]
+    @width, @field_lengths = @table.width, @table.field_lengths
+    @table
+  end
+
+  it "resize ensures columns total doesn't exceed max width" do
+    table :field_lengths=>{:f1=>135, :f2=>45, :f3=>4, :f4=>55}, :width=>195
+    Helpers::Table::Resizer.resize!(@table)
+    @field_lengths.values.inject {|a,e| a+=e}.should <= @width
+  end
+
+  it "resize sets columns by relative lengths" do
+    table :field_lengths=>{:a=>30, :b=>30, :c=>40}, :width=>60
+    Helpers::Table::Resizer.resize!(@table)
+    @field_lengths.values.inject {|a,e| a+=e}.should <= @width
+    @field_lengths.values.uniq.size.should.not == 1
+  end
+
+  it "resize sets all columns roughly equal when adusting long fields don't work" do
+    table :field_lengths=>{:field1=>10, :field2=>15, :field3=>100}, :width=>20
+    Helpers::Table::Resizer.resize!(@table)
+    @field_lengths.values.inject {|a,e| a+=e}.should <= @width
+    @field_lengths.values.each {|e| e.should <= 4 }
+  end
+
+  describe "add_extra_width and max_fields" do
+    def table_and_resize(options={})
+      defaults = {:field_lengths=>{:f1=>135, :f2=>30, :f3=>4, :f4=>100}, :width=>195, :max_fields=>{:f1=>80, :f4=>30} }
+      @table = table defaults.merge(options)
+      # repeated from table since instance variables aren't copied b/n contexts
       @width, @field_lengths = @table.width, @table.field_lengths
+      Helpers::Table::Resizer.resize! @table
     end
 
-    test "resize ensures columns total doesn't exceed max width" do
-      table :field_lengths=>{:f1=>135, :f2=>45, :f3=>4, :f4=>55}, :width=>195
-      Resizer.resize!(@table)
-      @field_lengths.values.inject {|a,e| a+=e}.should <= @width
+    it "doesn't add to already maxed out field" do
+      table_and_resize
+      @field_lengths[:f3].should == 4
     end
 
-    test "resize sets columns by relative lengths" do
-      table :field_lengths=>{:a=>30, :b=>30, :c=>40}, :width=>60
-      Resizer.resize!(@table)
-      @field_lengths.values.inject {|a,e| a+=e}.should <= @width
-      @field_lengths.values.uniq.size.should_not == 1
+    it "restricted before adding width" do
+      table_and_resize
+      @field_lengths[:f4].should <= 30
     end
 
-    test "resize sets all columns roughly equal when adusting long fields don't work" do
-      table :field_lengths=>{:field1=>10, :field2=>15, :field3=>100}, :width=>20
-      Resizer.resize!(@table)
-      @field_lengths.values.inject {|a,e| a+=e}.should <= @width
-      @field_lengths.values.each {|e| e.should <= 4 }
+    it "adds to restricted field" do
+      table_and_resize
+      @field_lengths[:f1].should <= 80
     end
 
-    context "add_extra_width and max_fields" do
-      def table_and_resize(options={})
-        defaults = {:field_lengths=>{:f1=>135, :f2=>30, :f3=>4, :f4=>100}, :width=>195, :max_fields=>{:f1=>80, :f4=>30} }
-        table defaults.merge(options)
-        Resizer.resize! @table
-      end
-
-      test "doesn't add to already maxed out field" do
-        table_and_resize
-        @field_lengths[:f3].should == 4
-      end
-
-      test "restricted before adding width" do
-        table_and_resize
-        @field_lengths[:f4].should <= 30
-      end
-
-      test "adds to restricted field" do
-        table_and_resize
-        @field_lengths[:f1].should <= 80
-      end
-
-      test "adds to unrestricted field" do
-        table_and_resize :field_lengths=>{:f1=>135, :f2=>70, :f3=>4, :f4=>100}
-        @field_lengths[:f2].should == 70
-      end
+    it "adds to unrestricted field" do
+      table_and_resize :field_lengths=>{:f1=>135, :f2=>70, :f3=>4, :f4=>100}
+      @field_lengths[:f2].should == 70
     end
   end
 end

data/test/table_test.rb

@@ -1,13 +1,14 @@
+# encoding: UTF-8
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class Hirb::Helpers::TableTest < Test::Unit::TestCase
+describe "Table" do
   def table(*args)
-    Hirb::Helpers::Table.render(*args)
+    Helpers::Table.render(*args)
   end
-  before(:all) { reset_config }
+  before_all { reset_config }
   
-  context "basic table" do
-    test "renders" do
+  describe "basic table" do
+    it "renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | a | b |
@@ -20,7 +21,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>2}, {:a=>3, :b=>4}]).should == expected_table
     end
     
-    test "with no headers renders" do
+    it "with no headers renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | 1 | 2 |
@@ -30,7 +31,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>2}], :headers=>false).should == expected_table
     end
 
-    test "with no headers and nil fields renders" do
+    it "with no headers and nil fields renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | 1 |   |
@@ -40,7 +41,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>nil}], :headers=>false).should == expected_table
     end
 
-    test "with string keys renders" do
+    it "with string keys renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | a | b |
@@ -53,7 +54,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{'a'=>1, 'b'=>2}, {'a'=>3, 'b'=>4}]).should == expected_table
     end
 
-    test "with array only rows renders" do
+    it "with array only rows renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | 0 | 1 |
@@ -66,21 +67,21 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([[1,2], [3,4]]).should == expected_table
     end
 
-    test "with too many fields defaults to vertical table" do
+    it "with too many fields defaults to vertical table" do
       rows = [Array.new(25, "A"* 10)]
-      Hirb::Helpers::VerticalTable.expects(:render).with(rows, anything)
+      Helpers::VerticalTable.expects(:render).with(rows, anything)
       capture_stderr { table(rows)}.should =~ /Error/
     end
 
-    test "with no rows renders" do
+    it "with no rows renders" do
       table([]).should == "0 rows in set"
     end
 
-    test "with invalid rows raises an argumenterror" do
-      assert_raises(ArgumentError) { table(:a=>1) }.message.should =~ /Table must/
+    it "with invalid rows raises an argumenterror" do
+      lambda { table(:a=>1) }.should.raise(ArgumentError).message.should =~ /Table must/
     end
 
-    test "renders utf8" do
+    it "renders utf8" do
       expected_table = <<-TABLE.unindent
       +--------------------+
       | name               |
@@ -95,7 +96,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:name=>"ｱｲｳｴｵｶｷ"}, {:name=>"ｸｹｺｻｼｽｾｿﾀﾁﾂﾃ"}, {:name=>"Tata l'asticote"}, {:name=>"toto létoile PAOLI"}]).should == expected_table
     end
 
-    test "stringifies newlines and tabs and renders" do
+    it "stringifies newlines and tabs and renders" do
       expected_table = <<-TABLE.unindent
       +-----+---+
       | a   | b |
@@ -110,35 +111,34 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       value.should == [{'a'=>"1\n", 'b'=>2}, {'a'=>"3\t", 'b'=>4}]
     end
 
-    test "with a field of only array values renders values comma joined" do
+    it "with a field of only array values renders values comma joined" do
       expected_table = <<-TABLE.unindent
       +----+------+
       | a  | b    |
       +----+------+
-      | 12 | 1, 2 |
+      | 1  | 1, 2 |
       | ok | 3, 4 |
       +----+------+
       2 rows in set
       TABLE
-      # depends on 1.8 Array#to_s
-      table([{:a=>[1,2], :b=>[1,2]}, {:a=>'ok', :b=>[3,4]}]).should == expected_table
+      table([{:a=>1, :b=>[1,2]}, {:a=>'ok', :b=>[3,4]}]).should == expected_table
     end
 
-    test "with filter class default doesn't override explicit filters" do
+    it "with filter class default doesn't override explicit filters" do
       expected_table = <<-TABLE.unindent
       +------+-------+
       | name | value |
       +------+-------+
-      | a    | b1    |
+      | a    | 1     |
       +------+-------+
       1 row in set
       TABLE
-      table([{:name=>'a', :value=>{:b=>1}}], :filters=>{:value=>:to_s}).should == expected_table
+      table([{:name=>'a', :value=>{:b=>1}}], :filters=>{:value=>:size}).should == expected_table
     end
   end
 
-  context "table with" do
-    test "fields option renders" do
+  describe "table with" do
+    it "fields option renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | b | a |
@@ -151,7 +151,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>2}, {:a=>3, :b=>4}], :fields=>[:b, :a]).should == expected_table
     end
     
-    test "fields option and array only rows" do
+    it "fields option and array only rows" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | 0 | 2 |
@@ -163,13 +163,13 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([[1,2,3]], :fields=>[0,2]).should == expected_table
     end
 
-    test "fields and number options copies fields option and does not modify it" do
+    it "fields and number options copies fields option and does not modify it" do
       options = {:fields=>[:f1], :number=>true}
       table([{:f1=>1, :f2=>2}], options)
       options[:fields].should == [:f1]
     end
   
-    test "invalid fields option renders empty columns" do
+    it "invalid fields option renders empty columns" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | b | c |
@@ -182,7 +182,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>2}, {:a=>3, :b=>4}], :fields=>[:b, :c]).should == expected_table
     end
   
-    test "invalid field in max_fields option renders" do
+    it "invalid field in max_fields option renders" do
       expected_table = <<-TABLE.unindent
       +------------+---+
       | a          | b |
@@ -194,7 +194,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> "A" * 50, :b=>2}], :max_fields=>{:a=>10,:c=>10}).should == expected_table
     end
   
-    test "max_fields option with fields less than 3 characters renders" do
+    it "max_fields option with fields less than 3 characters renders" do
       expected_table = <<-TABLE.unindent
       +----+---+
       | a  | b |
@@ -206,7 +206,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> "A" * 50, :b=>2}], :max_fields=>{:a=>2}, :resize=>false).should == expected_table
     end
   
-    test "max_fields option without resize renders" do
+    it "max_fields option without resize renders" do
       expected_table = <<-TABLE.unindent
       +------------+---+
       | a          | b |
@@ -218,7 +218,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> "A" * 50, :b=>2}], :max_fields=>{:a=>10}, :resize=>false).should == expected_table
     end
 
-    test "max_fields option with percentage renders" do
+    it "max_fields option with percentage renders" do
       expected_table = <<-TABLE.unindent
       +------------------+---+
       | a                | b |
@@ -230,7 +230,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> "A" * 50, :b=>2}], :max_fields=>{:a=>'0.15'}).should == expected_table
     end
   
-    test "max_width option renders" do
+    it "max_width option renders" do
       expected_table = <<-TABLE.unindent
       +-----------+---+------------+
       | a         | b | c          |
@@ -242,7 +242,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> "A" * 50, :b=>2, :c=>"C"*10}], :max_width=>30).should == expected_table
     end
 
-    test "resize option false renders full table" do
+    it "resize option false renders full table" do
       expected_table = <<-TABLE.unindent
       +----------------------------------------------------+---+------------+
       | a                                                  | b | c          |
@@ -254,7 +254,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> "A" * 50, :b=>2, :c=>"C"*10}], :resize=>false).should == expected_table
     end
     
-    test "global width renders" do
+    it "global width renders" do
       expected_table = <<-TABLE.unindent
       +-----------+---+------------+
       | a         | b | c          |
@@ -263,13 +263,13 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       +-----------+---+------------+
       1 row in set
       TABLE
-      Hirb::View.load_config
-      Hirb::View.resize(30)
+      View.load_config
+      View.resize(30)
       table([{:a=> "A" * 50, :b=>2, :c=>"C"*10}]).should == expected_table
       reset_config
     end
 
-    test "headers option and headers longer than fields renders" do
+    it "headers option and headers longer than fields renders" do
       expected_table = <<-TABLE.unindent
       +---+---------+---------+
       | a | field B | field C |
@@ -281,7 +281,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> "A", :b=>2, :c=>"C"}], :headers=>{:b=>"field B", :c=>"field C"}).should == expected_table
     end
   
-    test "headers option and headers shortened by max_fields renders" do
+    it "headers option and headers shortened by max_fields renders" do
       expected_table = <<-TABLE.unindent
       +-------+---+
       | fi... | b |
@@ -293,7 +293,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> "A", :b=>2}], :headers=>{:a=>"field A"}, :max_fields=>{:a=>5}, :resize=>false).should == expected_table
     end
     
-    test "headers option as an array renders" do
+    it "headers option as an array renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | A | B |
@@ -306,7 +306,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([[1,2], [3,4]], :headers=>['A', 'B']).should == expected_table
     end
 
-    test "header_filter option renders" do
+    it "header_filter option renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | A | B |
@@ -318,7 +318,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=> 2, :b=>3}], :header_filter=>:capitalize).should == expected_table
     end
 
-    test "filters option renders" do
+    it "filters option renders" do
       expected_table = <<-TABLE.unindent
       +-----------+---+
       | 0         | 1 |
@@ -332,7 +332,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
         1=>[:[], :num]}).should == expected_table
     end
 
-    test "filters option calls Filters method and renders" do
+    it "filters option calls Filters method and renders" do
       module ::Hirb::Helpers::Table::Filters
         def semicolon_join(arr); arr.join('; '); end
       end
@@ -348,7 +348,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([[['some'], %w{unsightly unreadable array}]], :filters=>{1=>:semicolon_join}).should == expected_table
     end
 
-    test "number option renders" do
+    it "number option renders" do
       expected_table = <<-TABLE.unindent
       +--------+---+---+
       | number | 0 | 1 |
@@ -361,7 +361,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([['a','b'], ['c', 'd']], :number=>true).should == expected_table
     end
 
-    test "description option false renders" do
+    it "description option false renders" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | 0 | 1 |
@@ -373,7 +373,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([['a','b'], ['c', 'd']], :description=>false).should == expected_table
     end
 
-    test "vertical option renders vertical table" do
+    it "vertical option renders vertical table" do
       expected_table = <<-TABLE.unindent
       *** 1. row ***
       a: 1
@@ -386,7 +386,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>2}, {:a=>3, :b=>4}], :vertical=>true).should == expected_table
     end
 
-    test "vertical option renders vertical table with newlines" do
+    it "vertical option renders vertical table with newlines" do
       expected_table = <<-TABLE.unindent
       *** 1. row ***
       a: 1
@@ -400,7 +400,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>2}, {:a=>3, :b=>"4\nand one"}], :vertical=>true).should == expected_table
     end
 
-    test "vertical option renders vertical table successively" do
+    it "vertical option renders vertical table successively" do
       expected_table = <<-TABLE.unindent
       *** 1. row ***
       a: 1
@@ -415,7 +415,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>2}, {:a=>3, :b=>4}], options).should == expected_table
     end
 
-    test "hide_empty and vertical options renders" do
+    it "hide_empty and vertical options renders" do
       expected_table = <<-TABLE.unindent
       *** 1. row ***
       b: 2
@@ -426,7 +426,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>'', :b=>2}, {:a=>3, :b=>nil}], :hide_empty=>true, :vertical=>true).should == expected_table
     end
 
-    test "all_fields option renders all fields" do
+    it "all_fields option renders all fields" do
       expected_table = <<-TABLE.unindent
       +---+---+---+
       | a | b | c |
@@ -439,7 +439,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>1, :b=>2}, {:a=>3, :c=>4}], :all_fields=>true).should == expected_table
     end
 
-    test "change_fields option renders" do
+    it "change_fields option renders" do
       expected_table = <<-TABLE.unindent
       +------+-------+
       | name | value |
@@ -453,7 +453,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([[1,2],[2,3]], :change_fields=>['name', 'value']).should == expected_table
     end
 
-    test "change_fields and fields option renders" do
+    it "change_fields and fields option renders" do
       expected_table = <<-TABLE.unindent
       +------+
       | name |
@@ -466,7 +466,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([[1,2],[2,3]], :change_fields=>['name', 'value'], :fields=>['name']).should == expected_table
     end
 
-    test "invalid fields in change_fields options are ignored" do
+    it "invalid fields in change_fields options are ignored" do
       expected_table = <<-TABLE.unindent
       +------+-------+
       | name | value |
@@ -480,7 +480,7 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([[1,2],[2,3]], :change_fields=>['name', 'value','time']).should == expected_table
     end
 
-    test "filter_any option filters any value" do
+    it "filter_any option filters any value" do
       expected_table = <<-TABLE.unindent
       +---------+
       | a       |
@@ -493,29 +493,27 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{:a=>{:b=>1}}, {:a=>2}], :filter_any=>true).should == expected_table
     end
 
-    test "filter_classes option overrides class-wide filter_classes" do
+    it "filter_classes option overrides class-wide filter_classes" do
       expected_table = <<-TABLE.unindent
-      +----+
-      | a  |
-      +----+
-      | b1 |
-      +----+
+      +---+
+      | a |
+      +---+
+      | 1 |
+      +---+
       1 row in set
       TABLE
-      table([{:a=>{:b=>1}}], :filter_classes=>{Hash=>:to_s}).should == expected_table
+      table([{:a=>{:b=>1}}], :filter_classes=>{Hash=>:size}).should == expected_table
     end
   end
 
-  context "table with callbacks" do
-    before(:all) {
-      Hirb::Helpers::Table.send(:define_method, :and_one_callback) do |obj, opt|
+  describe "table with callbacks" do
+    before_all {
+      Helpers::Table.send(:define_method, :and_one_callback) do |obj, opt|
         obj.each {|row| row.each {|k,v| row[k] += opt[:add] } }
         obj
       end
     }
-    after(:all) { Hirb::Helpers::Table.send(:remove_method, :and_one_callback) }
-
-    test "detects and runs them" do
+    it "detects and runs them" do
       expected_table = <<-TABLE.unindent
       +---+---+
       | a | b |
@@ -528,8 +526,8 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       table([{'a'=>1, 'b'=>2}, {'a'=>3, 'b'=>4}], :add=>1).should == expected_table
     end
 
-    test "doesn't run callbacks in delete_callbacks option" do
-      Hirb::Helpers::Table.send(:define_method, :and_two_callback) do |obj, opt|
+    it "doesn't run callbacks in delete_callbacks option" do
+      Helpers::Table.send(:define_method, :and_two_callback) do |obj, opt|
         obj.each {|row| row.each {|k,v| row[k] = row[k] * 2 } }
         obj
       end
@@ -545,7 +543,8 @@ class Hirb::Helpers::TableTest < Test::Unit::TestCase
       TABLE
       table([{'a'=>1, 'b'=>2}, {'a'=>3, 'b'=>4}], :add=>1, :delete_callbacks=>[:and_two]).should == expected_table
 
-      Hirb::Helpers::Table.send(:remove_method, :and_two_callback)
+      Helpers::Table.send(:remove_method, :and_two_callback)
     end
+    after_all { Helpers::Table.send(:remove_method, :and_one_callback) }
   end
 end