ruport 1.7.1 → 1.8.0

data/test/table_test.rb

@@ -25,7 +25,7 @@ class TestTable < Minitest::Test
       assert_equal n, t.column_names
 
       t = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
-      table_from_records = Ruport.Table(t.column_names, :data => t.data)
+      Ruport.Table(t.column_names, :data => t.data)
     end
 
     a = Ruport::Data::Record.new [1,2,3]
@@ -41,14 +41,14 @@ class TestTable < Minitest::Test
       @data = [[1,2,3],[4,5,6],[7,8,9]]
     end
 
-    def specify_filters_should_discard_unmatched_rows
+    should "specify_filters_should_discard_unmatched_rows" do
       table = Ruport::Data::Table.new(:column_names => %w[a b c],
                                       :data => [[1,2,3],[4,5,6],[7,8,9]],
                                       :filters => [ lambda { |r| r.a % 2 == 1 } ] )
       assert_equal Ruport.Table(%w[a b c]) << [1,2,3] << [7,8,9], table
     end
 
-    def specify_filters_should_work_on_csvs
+    should "specify_filters_should_work_on_csvs" do
       only_ids_less_than_3 = lambda { |r| r["id"].to_i < 3 }
       table = Ruport.Table(File.join(TEST_SAMPLES,"addressbook.csv"),
                     :filters => [only_ids_less_than_3])
@@ -58,16 +58,16 @@ class TestTable < Minitest::Test
 
   context "when transforming data" do
 
-    def setup
+    setup do
       @data = [[1,2,3],[4,5,6],[7,8,9]]
     end
 
-    def specify_transforms_should_modify_table_data
+    should "specify_transforms_should_modify_table_data" do
 
      stringify_c = lambda { |r| r.c = r.c.to_s }
      add_two_to_all_int_cols = lambda { |r|
       r.each_with_index do |c,i|
-        if Fixnum === c
+        if Integer === c
           r[i] += 2
         end
       end
@@ -83,7 +83,7 @@ class TestTable < Minitest::Test
 
     end
 
-    def specify_transforms_should_work_on_csvs
+    should "specify_transforms_should_work_on_csvs" do
       ids_to_i = lambda { |r| r["id"] = r["id"].to_i }
       table = Ruport.Table(File.join(TEST_SAMPLES,"addressbook.csv"),
                     :filters => [ids_to_i])
@@ -186,12 +186,12 @@ class TestTable < Minitest::Test
 
   context "when sorting rows" do
 
-    def setup
+    setup do
       @table = Ruport.Table(%w[a b c]) << [1,2,3] << [6,1,8] << [9,1,4]
       @table_with_nils = Ruport.Table(%w[a b c]) << [1,nil,3] << [9,3,4] << [6,1,8]
     end
 
-    def specify_should_sort_in_reverse_order_on_descending
+    should "specify_should_sort_in_reverse_order_on_descending" do
        t = @table.sort_rows_by("a", :order => :descending )
        assert_equal Ruport.Table(%w[a b c]) << [9,1,4] << [6,1,8] << [1,2,3], t
 
@@ -199,7 +199,7 @@ class TestTable < Minitest::Test
        assert_equal Ruport.Table(%w[a b c]) << [6,1,8] << [9,1,4] << [1,2,3], t
     end
 
-    def specify_show_put_rows_with_nil_columns_after_sorted_rows
+    should "specify_show_put_rows_with_nil_columns_after_sorted_rows" do
        # should not effect when using columns that are all populated
        t = @table_with_nils.sort_rows_by("a")
        assert_equal Ruport.Table(%w[a b c]) << [1,nil,3] << [6,1,8] << [9,3,4], t
@@ -211,12 +211,12 @@ class TestTable < Minitest::Test
        assert_equal Ruport.Table(%w[a b c]) << [1,nil,3] << [9,3,4] << [6,1,8], t
     end
 
-    def specify_in_place_sort_should_allow_order_by
+    should "specify_in_place_sort_should_allow_order_by" do
        @table.sort_rows_by!("a", :order => :descending )
        assert_equal Ruport.Table(%w[a b c]) << [9,1,4] << [6,1,8] << [1,2,3], @table
     end
 
-    def specify_sort_rows_by
+    should "specify_sort_rows_by" do
       table = Ruport::Data::Table.new :column_names => %w[a b c]
       table << [1,2,3] << [6,1,8] << [9,1,4]
 
@@ -241,7 +241,7 @@ class TestTable < Minitest::Test
       assert_equal sorted_table_bs, table2.sort_rows_by(:b)
     end
 
-    def specify_sort_rows_by!
+    should "specify_sort_rows_by!" do
       table = Ruport::Data::Table.new :column_names => %w[a b c]
       table << [1,2,3] << [6,1,8] << [9,1,4]
 
@@ -271,32 +271,32 @@ class TestTable < Minitest::Test
   end
 
   context "when adding rows" do
-    def setup
+    setup do
       @columns = %w[a b c]
       @data = [[1,2,3],[4,5,6],[7,8,9]]
       @table = Ruport::Data::Table.new(:column_names => @columns, :data => @data)
       @new_row = [-1,-2,-3]
     end
 
-    def specify_insert_at_the_beginning
+    should "specify_insert_at_the_beginning" do
       @table.add_row(@new_row, :position => 0)
       assert_equal Ruport::Data::Table.new(:column_names => @columns,
           :data => [@new_row] + @data), @table
     end
 
-    def specify_insert_in_the_middle
+    should "specify_insert_in_the_middle" do
       @table.add_row(@new_row, :position => 2)
       assert_equal Ruport::Data::Table.new(:column_names => @columns,
           :data => [[1,2,3],[4,5,6],[-1,-2,-3],[7,8,9]]), @table
     end
 
-    def specify_insert_at_the_end
+    should "specify_insert_at_the_end" do
       @table.add_row(@new_row)
       assert_equal Ruport::Data::Table.new(:column_names => @columns,
           :data => @data + [@new_row]), @table
     end
 
-    def should_return_itself
+    should "return_itself" do
       assert_equal @table.object_id, @table.add_row(@new_row).object_id
     end
   end
@@ -336,7 +336,7 @@ class TestTable < Minitest::Test
     assert_equal %w[a b c], a.column_names
     a.each { |r|
       assert_equal %w[a b c], r.attributes
-      r.a; r.b; r.c 
+      r.a; r.b; r.c
       [r.a,r.b,r.c].each { |i| assert(i.kind_of?(Numeric)) }
     }
     assert_equal %w[d e f], b.column_names
@@ -367,7 +367,7 @@ class TestTable < Minitest::Test
       t << %w[joe loop]
     }
     assert_equal "joe loop", a[0].name
-    a.to_yaml 
+    a.to_yaml
   end
 
   def test_ensure_subtable_works_with_unnamed_tables
@@ -473,7 +473,7 @@ class TestTableFormattingHooks < Minitest::Test
   def test_as_throws_proper_errors
     a = Ruport.Table(%w[a b c], :data => [[1,2,3],[4,5,6]])
     a.as(:csv)
-    a.to_csv 
+    a.to_csv
     assert_raises(Ruport::Controller::UnknownFormatError) { a.as(:nothing) }
     assert_raises(Ruport::Controller::UnknownFormatError) { a.to_nothing }
   end
@@ -693,9 +693,9 @@ class TestTableColumnOperations < Minitest::Test
 
   def test_ensure_renaming_a_missing_column_fails_silently
     a = Ruport.Table(%w[a b c])
-    
+
     a.rename_column("d", "z")
-    
+
   end
 
 end
@@ -719,7 +719,7 @@ class TestTableFromCSV < Minitest::Test
 
     table = Ruport::Data::Table.load( File.join(TEST_SAMPLES,"data.csv"),
       :csv_options => { :headers => true, :header_converters => :symbol }
-      ) do |s,r|
+      ) do |_s,r|
         assert_equal expected.shift, r[:col3]
       end
 
@@ -728,7 +728,7 @@ class TestTableFromCSV < Minitest::Test
     expected = ['c','e']
 
     Ruport::Data::Table.load( File.join(TEST_SAMPLES,"data.csv"),
-                              :records => true ) do |s,r|
+                              :records => true ) do |_s,r|
       assert_equal expected.shift, r.col3
       assert_kind_of Ruport::Data::Record, r
     end
@@ -742,9 +742,9 @@ class TestTableFromCSV < Minitest::Test
 
   # ticket:76
   def test_parse
-    
+
     Ruport::Data::Table.parse("a,b,c\n1,2,3\n")
-    
+
 
     table = Ruport::Data::Table.parse("a,b,c\n1,2,3\n4,5,6\n")
     expected = Ruport.Table(%w[a b c], :data => [%w[1 2 3],%w[4 5 6]])
@@ -791,27 +791,21 @@ class TestTableFromCSV < Minitest::Test
   end
 
   def test_ensure_csv_loading_accepts_table_options
-     a = Ruport.Table(File.join(TEST_SAMPLES,"addressbook.csv"),
-                 :record_class => DuckRecord)
-     a.each { |r| assert_kind_of(DuckRecord,r) }
+    a = Ruport.Table(File.join(TEST_SAMPLES,"addressbook.csv"), :record_class => DuckRecord)
+    a.each { |r| assert_kind_of(DuckRecord,r) }
   end
 
   def test_ensure_table_from_csv_accepts_record_class_in_block_usage
-    a = Ruport.Table(File.join(TEST_SAMPLES,"addressbook.csv"),
-                :record_class => DuckRecord, :records => true) do |s,r|
-       assert_kind_of(DuckRecord,r)
+    Ruport.Table(File.join(TEST_SAMPLES,"addressbook.csv"), :record_class => DuckRecord, :records => true) do |_s,r|
+      assert_kind_of(DuckRecord,r)
     end
   end
-
 end
 
 class TestTableKernelHack < Minitest::Test
-
   def test_simple
-    assert_equal Ruport::Data::Table.new(:column_names => %w[a b c]),
-      Ruport.Table(%w[a b c])
-    assert_equal Ruport::Data::Table.new(:column_names => %w[a b c]),
-      Ruport.Table("a","b","c")
+    assert_equal Ruport::Data::Table.new(:column_names => %w[a b c]), Ruport.Table(%w[a b c])
+    assert_equal Ruport::Data::Table.new(:column_names => %w[a b c]), Ruport.Table("a","b","c")
     assert_equal Ruport::Data::Table.load(
                  File.join(TEST_SAMPLES,"addressbook.csv")),
                  Ruport.Table(File.join(TEST_SAMPLES,"addressbook.csv"))
@@ -863,5 +857,4 @@ class TestTableKernelHack < Minitest::Test
     assert_equal Ruport::Data::Table.new(:column_names => %w[a b c]),
                  Ruport.Table(:column_names => %w[a b c])
   end
-
 end

data/test/template_test.rb

@@ -1,31 +1,31 @@
 #!/usr/bin/env ruby -w
-require File.join(File.expand_path(File.dirname(__FILE__)), "helpers") 
+require File.join(File.expand_path(File.dirname(__FILE__)), "helpers")
 
 class TemplateTest < Minitest::Test
-  
+
   def setup
     @template_class = Ruport::Formatter::Template.dup
   end
-  
+
   def teardown
     Ruport::Formatter::Template.instance_variable_set(:@templates, nil)
   end
-   
+
   def test_template_should_exist
     @template_class.create(:foo)
-    assert_instance_of @template_class, 
+    assert_instance_of @template_class,
                        @template_class[:foo]
-  end  
-  
+  end
+
   def test_template_creation_yields_an_options_object
     @template_class.create(:foo) do |template|
       template.page_format = { :layout     => :landscape,
                                :paper_size => :letter    }
     end
     assert_equal :landscape, @template_class[:foo].page_format[:layout]
-    assert_equal :letter, @template_class[:foo].page_format[:paper_size]     
+    assert_equal :letter, @template_class[:foo].page_format[:paper_size]
   end
-  
+
   def test_create_derived_template
     Ruport::Formatter::Template.create(:foo) do |template|
       template.page_format = { :layout     => :landscape,
@@ -35,14 +35,14 @@ class TemplateTest < Minitest::Test
     assert_equal :landscape,
       Ruport::Formatter::Template[:bar].page_format[:layout]
     assert_equal :letter,
-      Ruport::Formatter::Template[:bar].page_format[:paper_size]     
+      Ruport::Formatter::Template[:bar].page_format[:paper_size]
   end
-  
+
   def test_default_template
     assert_nil Ruport::Formatter::Template.default
     Ruport::Formatter::Template.create(:default)
     assert_equal Ruport::Formatter::Template[:default],
       Ruport::Formatter::Template.default
   end
-  
+
 end

data/test/text_formatter_test.rb

@@ -2,7 +2,7 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "helpers")
 
 class TestRenderTextTable < Minitest::Test
-  
+
   def setup
     Ruport::Formatter::Template.create(:simple) do |format|
       format.table = {
@@ -22,50 +22,50 @@ class TestRenderTextTable < Minitest::Test
 
   def test_basic
     tf = "+-------+\n"
-    
+
     a = Ruport.Table([], :data => [[1,2],[3,4]]).to_text
     assert_equal("#{tf}| 1 | 2 |\n| 3 | 4 |\n#{tf}",a)
 
     a = Ruport.Table(%w[a b], :data => [[1,2],[3,4]]).to_text
     assert_equal("#{tf}| a | b |\n#{tf}| 1 | 2 |\n| 3 | 4 |\n#{tf}", a)
   end
-  
+
   def test_centering
-    tf = "+---------+\n" 
+    tf = "+---------+\n"
 
     a = Ruport.Table([], :data => [[1,2],[300,4]])
     assert_equal( "#{tf}|  1  | 2 |\n| 300 | 4 |\n#{tf}",
                   a.to_text(:alignment => :center) )
 
     tf = "+------------+\n"
-    a.column_names = %w[a bark]     
+    a.column_names = %w[a bark]
     assert_equal("#{tf}|  a  | bark |\n#{tf}|  1  |  2   |\n"+
-                 "| 300 |  4   |\n#{tf}", a.to_text(:alignment => :center) )   
+                 "| 300 |  4   |\n#{tf}", a.to_text(:alignment => :center) )
   end
 
   def test_justified
     tf = "+----------+\n"
     a = Ruport.Table([], :data => [[1,'Z'],[300,'BB']])
-    
+
     # justified alignment can be set explicitly
-    assert_equal "#{tf}|   1 | Z  |\n| 300 | BB |\n#{tf}", 
-                 a.to_text(:alignment => :justified)    
-    
-    # justified alignment is also default             
-    assert_equal "#{tf}|   1 | Z  |\n| 300 | BB |\n#{tf}", a.to_s      
+    assert_equal "#{tf}|   1 | Z  |\n| 300 | BB |\n#{tf}",
+                 a.to_text(:alignment => :justified)
+
+    # justified alignment is also default
+    assert_equal "#{tf}|   1 | Z  |\n| 300 | BB |\n#{tf}", a.to_s
   end
 
-  def test_wrapping  
+  def test_wrapping
     a = Ruport.Table([], :data => [[1,2],[300,4]]).to_text(:table_width => 10)
     assert_equal("+------->>\n|   1 | >>\n| 300 | >>\n+------->>\n",a)
-  end  
-  
+  end
+
   def test_ignore_wrapping
-    a = Ruport.Table([], :data => [[1,2],[300,4]]).to_text(:table_width => 10, 
+    a = Ruport.Table([], :data => [[1,2],[300,4]]).to_text(:table_width => 10,
                                          :ignore_table_width => true )
     assert_equal("+---------+\n|   1 | 2 |\n| 300 | 4 |\n+---------+\n",a)
-  end 
-  
+  end
+
   def test_render_empty_table
     assert_raises(Ruport::FormatterError) { Ruport.Table([]).to_text }
     Ruport.Table(%w[a b c]).to_text
@@ -76,13 +76,13 @@ class TestRenderTextTable < Minitest::Test
                "+-----------+\n"
     assert_equal expected, a
   end
-  
+
   def test_render_with_template
     formatter = Ruport::Formatter::Text.new
     formatter.options = Ruport::Controller::Options.new
     formatter.options.template = :simple
     formatter.apply_template
-    
+
     assert_equal false, formatter.options.show_table_headers
     assert_equal 50, formatter.options.table_width
     assert_equal true, formatter.options.ignore_table_width
@@ -92,7 +92,7 @@ class TestRenderTextTable < Minitest::Test
 
     assert_equal false, formatter.options.show_group_headers
   end
-  
+
   def test_options_hashes_override_template
     opts = nil
     table = Ruport.Table(%w[a b c])
@@ -113,7 +113,7 @@ class TestRenderTextTable < Minitest::Test
     ) do |r|
       opts = r.options
     end
-    
+
     assert_equal true, opts.show_table_headers
     assert_equal 25, opts.table_width
     assert_equal false, opts.ignore_table_width
@@ -138,7 +138,7 @@ class TestRenderTextTable < Minitest::Test
     ) do |r|
       opts = r.options
     end
-    
+
     assert_equal true, opts.show_table_headers
     assert_equal 75, opts.table_width
     assert_equal false, opts.ignore_table_width
@@ -148,7 +148,7 @@ class TestRenderTextTable < Minitest::Test
 
     assert_equal true, opts.show_group_headers
   end
-                                             
+
   # -- BUG TRAPS ------------------------------
 
   def test_should_render_without_column_names
@@ -158,9 +158,9 @@ class TestRenderTextTable < Minitest::Test
                "+-----------+\n"
     assert_equal(expected,a)
   end
-  
+
 end
-    
+
 
 class TestRenderTextRow < Minitest::Test
 
@@ -170,7 +170,7 @@ class TestRenderTextRow < Minitest::Test
   end
 
 end
-        
+
 
 class TestRenderTextGroup < Minitest::Test
 
@@ -196,7 +196,7 @@ class TestRenderTextGroup < Minitest::Test
                                    :data => [ %w[is this more],
                                               %w[interesting red snapper]],
                                    :column_names => %w[i hope so])
-   
+
     actual = Ruport::Controller::Group.render(:text, :data => group,
       :show_table_headers => false )
     expected = "test:\n\n"+
@@ -205,9 +205,9 @@ class TestRenderTextGroup < Minitest::Test
                "| interesting | red  | snapper |\n"+
                "+------------------------------+\n"
     assert_equal(expected, actual)
-  end                                           
-end       
-       
+  end
+end
+
 
 class TestRenderTextGrouping < Minitest::Test
 
@@ -230,8 +230,8 @@ class TestRenderTextGrouping < Minitest::Test
                "+-------------+\n"+
                "| this | more |\n"+
                "+-------------+\n\n"
-    assert_equal(expected, actual)  
-    
+    assert_equal(expected, actual)
+
     actual = grouping.to_s
     assert_equal(expected,actual)
   end
@@ -254,5 +254,5 @@ class TestRenderTextGrouping < Minitest::Test
                "+-------------+\n\n"
     assert_equal(expected, actual)
   end
-  
+
 end

data/util/bench/data/table/bench_column_manip.rb

@@ -1,5 +1,4 @@
 require "ruport"
-require "enumerator"
 require "rubygems"
 require "ruport/util/bench"
 

data/util/bench/data/table/bench_dup.rb

@@ -1,5 +1,4 @@
 require "ruport"
-require "enumerator"
 require "rubygems"
 require "ruport/util/bench"
 include Ruport::Bench

data/util/bench/data/table/bench_init.rb

@@ -1,5 +1,4 @@
 require "ruport"
-require "enumerator"
 require "rubygems"
 require "ruport/util/bench"
 

data/util/bench/data/table/bench_manip.rb

@@ -1,5 +1,4 @@
 require "ruport"
-require "enumerator"
 require "rubygems"
 require "ruport/util/bench"
 

data/util/bench/formatter/bench_csv.rb

@@ -1,5 +1,4 @@
 require "ruport"
-require "enumerator"
 require "rubygems"
 require "ruport/util/bench"
 include Ruport::Bench

data/util/bench/formatter/bench_html.rb

@@ -1,5 +1,4 @@
 require "ruport"
-require "enumerator"
 require "rubygems"
 require "ruport/util/bench"
 include Ruport::Bench

data/util/bench/formatter/bench_pdf.rb

@@ -1,5 +1,4 @@
 require "ruport"
-require "enumerator"
 require "rubygems"
 require "ruport/util/bench"
 include Ruport::Bench

data/util/bench/formatter/bench_text.rb

@@ -1,5 +1,4 @@
 require "ruport"
-require "enumerator"
 require "rubygems"
 require "ruport/util/bench"
 include Ruport::Bench