ruport 0.8.10 → 0.8.11

data/Rakefile

@@ -16,28 +16,28 @@ version = File.read(lib)[/^\s*VERSION\s*=\s*(['"])(\d+\.\d+\.d+)['"]/,1]
 task :default => [:test]
 
 Rake::TestTask.new do |test|
-	test.libs << "test"
-	test.test_files = Dir[ "test/test_*.rb" ]
-	test.verbose = true
+  test.libs << "test"
+  test.test_files = Dir[ "test/test_*.rb" ]
+  test.verbose = true
 end
 
 spec = Gem::Specification.new do |spec|
-	spec.name = LEAN ? "lean-ruport" : "ruport"
-	spec.version = "0.8.10"
-	spec.platform = Gem::Platform::RUBY
-	spec.summary = "A generalized Ruby report generation and templating engine."
-	spec.files =  Dir.glob("{examples,lib,test,bin}/**/**/*") +
+  spec.name = LEAN ? "lean-ruport" : "ruport"
+  spec.version = "0.8.11"
+  spec.platform = Gem::Platform::RUBY
+  spec.summary = "A generalized Ruby report generation and templating engine."
+  spec.files =  Dir.glob("{examples,lib,test,bin}/**/**/*") +
                       ["Rakefile", "setup.rb"]
   
   spec.require_path = "lib"
-	
+  
   spec.test_files = Dir[ "test/test_*.rb" ]
   spec.bindir = "bin"
   spec.executables = FileList["rope"]
-	spec.has_rdoc = true
-	spec.extra_rdoc_files = %w{README LICENSE TODO AUTHORS}
-	spec.rdoc_options << '--title' << 'Ruport Documentation' <<
-	                     '--main'  << 'README' << '-q'
+  spec.has_rdoc = true
+  spec.extra_rdoc_files = %w{README LICENSE TODO AUTHORS}
+  spec.rdoc_options << '--title' << 'Ruport Documentation' <<
+                       '--main'  << 'README' << '-q'
   unless LEAN
     spec.add_dependency('fastercsv', '>= 1.1.0')
     spec.add_dependency('RedCloth',  '>= 3.0.3')
@@ -46,11 +46,12 @@ spec = Gem::Specification.new do |spec|
     spec.add_dependency('scruffy', '>= 0.2.2')
     spec.add_dependency('gem_plugin', '>=0.2.2')
   end
+
   spec.author = "Gregory Brown"
-	spec.email = "	gregory.t.brown@gmail.com"
-	spec.rubyforge_project = "ruport"
-	spec.homepage = "http://reporting.stonecode.org"
-	spec.description = <<END_DESC
+  spec.email = "  gregory.t.brown@gmail.com"
+  spec.rubyforge_project = "ruport"
+  spec.homepage = "http://reporting.stonecode.org"
+  spec.description = <<END_DESC
   Ruby Reports is a software library that aims to make the task of reporting
   less tedious and painful. It provides tools for data acquisition,
   database interaction, formatting, and parsing/munging.
@@ -68,8 +69,8 @@ Rake::RDocTask.new do |rdoc|
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-	pkg.need_zip = true
-	pkg.need_tar = true
+  pkg.need_zip = true
+  pkg.need_tar = true
 end
 
 begin

data/lib/ruport.rb

@@ -12,7 +12,7 @@
 
 module Ruport
   
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
   
   # This method is Ruport's logging and error interface. It can generate 
   # warnings or raise fatal errors, logging +message+ to the file defined by 
@@ -81,9 +81,4 @@ require "ruport/format"
 require "ruport/query" 
 require "ruport/mailer"
 require "ruport/layout"
-require "ruport/renderer"
-
-if defined? Gem
-  require "gem_plugin"
-  GemPlugin::Manager.instance.load "ruport" => GemPlugin::INCLUDE
-end
+require "ruport/renderer"

data/lib/ruport/data/groupable.rb

@@ -18,13 +18,13 @@ module Ruport::Data
     #            ['pinky', 3],
     #            ['clyde', 4]].to_table(['name','score'])
     #
-    #   table[0].tag(:winners)
-    #   table[1].tag(:losers)
-    #   table[2].tag(:winners)
-    #   table[3].tag(:losers)
+    #   table[0].tag("grp_winners")
+    #   table[1].tag("grp_losers")
+    #   table[2].tag("grp_winners")
+    #   table[3].tag("grp_losers")
     #
-    #   r = table.group_by_tag
-    #   puts r[:winners]
+    #   r = table.groups
+    #   puts r["winners"]
     #   => +---------------+
     #      | name  | score |
     #      +---------------+
@@ -32,7 +32,7 @@ module Ruport::Data
     #      | pinky |   3   |
     #      +---------------+
     #
-    #   puts r[:losers]  
+    #   puts r["losers"]  
     #   => +----------------+
     #      |  name  | score |
     #      +----------------+
@@ -41,21 +41,24 @@ module Ruport::Data
     #      +----------------+
     #
     def groups
-      #r_tags = map { |r| r.tags }.flatten.uniq
       r_tags = group_names_intern
       tables_hash = Hash.new { |h,k| h[k] = Table(column_names) }
       r_tags.each { |t| 
         tables_hash[t.gsub(/^grp_/,"")] = sub_table { |r| r.tags.include? t }}
       r = Record.new tables_hash, :attributes => group_names
     end  
-    
+   
+    # Gets the names of the groups
     def group_names
        group_names_intern.map { |r| r.gsub(/^grp_/,"") }
     end
     
+    # Gets a subtable of the rows matching the group name
+    #
     def group(tag)
       sub_table { |r| r.tags.include?("grp_#{tag}") }
     end
+
     #
     # Tags each row of the <tt>Table</tt> for which the <tt>block</tt> is not 
     # false with <tt>label</tt>.
@@ -65,10 +68,10 @@ module Ruport::Data
     #            ['blinky',2], 
     #            ['pinky', 3]].to_table(['name','score'])
     #   
-    #   table.create_tag_group(:cool_kids) {|r| r.score > 1}
-    #   groups = table.group_by_tag(:cool_kids)
+    #   table.create_group(:cool_kids) {|r| r.score > 1}
+    #   groups = table.groups
     #   
-    #   puts group[:cool_kids]
+    #   puts groups["cool_kids"]
     #   => +----------------+
     #      |  name  | score |
     #      +----------------+

data/lib/ruport/data/record.rb

@@ -202,6 +202,8 @@ module Ruport::Data
     # Makes a fresh copy of the Record. 
     def dup
       r = Record.new(@data.dup,:attributes => @attributes.dup)
+      r.tags = tags.dup
+      return r
     end
         
     # Provides accessor style methods for attribute access.
@@ -240,7 +242,7 @@ module Ruport::Data
 
 
     def reindex(new_attributes)
-      @attributes.replace(new_attributes)
+      @attributes = new_attributes
     end
   end
 end

data/lib/ruport/data/taggable.rb

@@ -49,11 +49,11 @@ module Ruport::Data
     end
   
     # 
-    # Returns an Array of the object's tags.
+    # Returns an Set of the object's tags.
     #
     # Example:
     #
-    #   taggable_obj.tags #=> [:spiffy, :kind_of_spiffy]
+    #   taggable_obj.tags #=> #<Set: {:spiffy, :kind_of_spiffy}>
     #
     def tags              
       @ruport_tags ||= Set.new

data/lib/ruport/extensions.rb

@@ -0,0 +1,4 @@
+if defined? Gem
+  require "gem_plugin"
+  GemPlugin::Manager.instance.load "ruport" => GemPlugin::INCLUDE
+end

data/test/test_record.rb

@@ -218,13 +218,24 @@ class TestRecord < Test::Unit::TestCase
 
   def test_reindex
     assert_equal %w[a b c d], @record.attributes
-    old_object_id = @record.instance_variable_get(:@attributes).object_id
+    #old_object_id = @record.instance_variable_get(:@attributes).object_id
 
-    @record.send(:reindex, %w[apple banana courier django])
+    @record.send(:reindex, a=%w[apple banana courier django])
     assert_equal %w[apple banana courier django], @record.attributes
 
     new_object_id = @record.instance_variable_get(:@attributes).object_id
-    assert_equal old_object_id, new_object_id
+    assert_equal a.object_id, new_object_id
   end
 
+  def test_ensure_tags_get_duped
+    a = Record.new([1,2,3])
+    a.tag :foo
+    assert a.tags.include?(:foo)
+    b = a.dup
+    assert b.tags.include?(:foo)
+    assert_not_same a.tags, b.tags
+  end
+
+
+
 end

data/test/test_table.rb

@@ -481,6 +481,21 @@ class TestTable < Test::Unit::TestCase
      assert_equal [[1,2,3],[4,5,6],[7,8,9]].to_table,a
   end
 
+  def test_ensure_setting_column_names_later_does_not_break_replace_column
+    a = [[1,2,3],[4,5,6]].to_table(%w[a b c])
+    a.replace_column("b","q") { |r| r.a + r.c }
+    a.column_names = %w[d e f]
+    assert_equal [[1,4,3],[4,10,6]].to_table(%w[d e f]), a
+
+    a = [[1,2,3],[4,5,6]].to_table
+
+    a.column_names = %w[a b c]
+
+    a.replace_column("b","foo") { |r| r.b + 1 }
+
+    assert_equal [[1,3,3],[4,6,6]].to_table(%w[a foo c]), a
+  end
+
 end
 
 class TestTableKernelHack < Test::Unit::TestCase

metadata

@@ -3,12 +3,12 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruport
 version: !ruby/object:Gem::Version 
-  version: 0.8.10
-date: 2007-02-12 00:00:00 -05:00
+  version: 0.8.11
+date: 2007-03-05 00:00:00 -05:00
 summary: A generalized Ruby report generation and templating engine.
 require_paths: 
 - lib
-email: "\tgregory.t.brown@gmail.com"
+email: "  gregory.t.brown@gmail.com"
 homepage: http://reporting.stonecode.org
 rubyforge_project: ruport
 description: Ruby Reports is a software library that aims to make the task of reporting less tedious and painful. It provides tools for data acquisition, database interaction, formatting, and parsing/munging.
@@ -29,128 +29,128 @@ post_install_message:
 authors: 
 - Gregory Brown
 files: 
-- examples/rope_examples
-- examples/invoice_report.rb
-- examples/RWEmerson.jpg
-- examples/line_plotter.rb
 - examples/centered_pdf_text_box.rb
-- examples/line_graph.rb
 - examples/invoice.rb
+- examples/invoice_report.rb
+- examples/line_graph.rb
+- examples/line_plotter.rb
 - examples/pdf_complex_report.rb
 - examples/pdf_table_with_title.rb
-- examples/rope_examples/sales_report
+- examples/rope_examples
+- examples/RWEmerson.jpg
 - examples/rope_examples/itunes
-- examples/rope_examples/sales_report/sql
-- examples/rope_examples/sales_report/test
-- examples/rope_examples/sales_report/output
-- examples/rope_examples/sales_report/log
-- examples/rope_examples/sales_report/config
-- examples/rope_examples/sales_report/lib
-- examples/rope_examples/sales_report/data
-- examples/rope_examples/sales_report/util
-- examples/rope_examples/sales_report/templates
-- examples/rope_examples/sales_report/Rakefile
-- examples/rope_examples/sales_report/README
-- examples/rope_examples/sales_report/test/test_sales.rb
-- examples/rope_examples/sales_report/output/books.pdf
-- examples/rope_examples/sales_report/output/books.txt
-- examples/rope_examples/sales_report/log/ruport.log
-- examples/rope_examples/sales_report/config/ruport_config.rb
-- examples/rope_examples/sales_report/lib/reports
-- examples/rope_examples/sales_report/lib/reports.rb
-- examples/rope_examples/sales_report/lib/helpers.rb
-- examples/rope_examples/sales_report/lib/init.rb
-- examples/rope_examples/sales_report/lib/reports/sales.rb
-- examples/rope_examples/sales_report/util/build
-- examples/rope_examples/sales_report/util/sql_exec
-- examples/rope_examples/itunes/sql
-- examples/rope_examples/itunes/test
-- examples/rope_examples/itunes/output
-- examples/rope_examples/itunes/log
+- examples/rope_examples/sales_report
 - examples/rope_examples/itunes/config
-- examples/rope_examples/itunes/lib
 - examples/rope_examples/itunes/data
-- examples/rope_examples/itunes/util
-- examples/rope_examples/itunes/templates
+- examples/rope_examples/itunes/lib
+- examples/rope_examples/itunes/log
+- examples/rope_examples/itunes/output
 - examples/rope_examples/itunes/Rakefile
 - examples/rope_examples/itunes/README
-- examples/rope_examples/itunes/test/test_playlist.rb
-- examples/rope_examples/itunes/log/ruport.log
+- examples/rope_examples/itunes/sql
+- examples/rope_examples/itunes/templates
+- examples/rope_examples/itunes/test
+- examples/rope_examples/itunes/util
 - examples/rope_examples/itunes/config/ruport_config.rb
-- examples/rope_examples/itunes/lib/reports
-- examples/rope_examples/itunes/lib/reports.rb
+- examples/rope_examples/itunes/data/mix.txt
 - examples/rope_examples/itunes/lib/helpers.rb
 - examples/rope_examples/itunes/lib/init.rb
+- examples/rope_examples/itunes/lib/reports
+- examples/rope_examples/itunes/lib/reports.rb
 - examples/rope_examples/itunes/lib/reports/playlist.rb
-- examples/rope_examples/itunes/data/mix.txt
+- examples/rope_examples/itunes/log/ruport.log
+- examples/rope_examples/itunes/test/test_playlist.rb
 - examples/rope_examples/itunes/util/build
 - examples/rope_examples/itunes/util/sql_exec
+- examples/rope_examples/sales_report/config
+- examples/rope_examples/sales_report/data
+- examples/rope_examples/sales_report/lib
+- examples/rope_examples/sales_report/log
+- examples/rope_examples/sales_report/output
+- examples/rope_examples/sales_report/Rakefile
+- examples/rope_examples/sales_report/README
+- examples/rope_examples/sales_report/sql
+- examples/rope_examples/sales_report/templates
+- examples/rope_examples/sales_report/test
+- examples/rope_examples/sales_report/util
+- examples/rope_examples/sales_report/config/ruport_config.rb
+- examples/rope_examples/sales_report/lib/helpers.rb
+- examples/rope_examples/sales_report/lib/init.rb
+- examples/rope_examples/sales_report/lib/reports
+- examples/rope_examples/sales_report/lib/reports.rb
+- examples/rope_examples/sales_report/lib/reports/sales.rb
+- examples/rope_examples/sales_report/log/ruport.log
+- examples/rope_examples/sales_report/output/books.pdf
+- examples/rope_examples/sales_report/output/books.txt
+- examples/rope_examples/sales_report/test/test_sales.rb
+- examples/rope_examples/sales_report/util/build
+- examples/rope_examples/sales_report/util/sql_exec
 - lib/ruport
 - lib/ruport.rb
 - lib/uport.rb
-- lib/ruport/format
-- lib/ruport/query
-- lib/ruport/renderer
+- lib/ruport/attempt.rb
+- lib/ruport/config.rb
 - lib/ruport/data
-- lib/ruport/report
+- lib/ruport/data.rb
+- lib/ruport/extensions.rb
+- lib/ruport/format
+- lib/ruport/format.rb
+- lib/ruport/generator.rb
 - lib/ruport/layout
 - lib/ruport/layout.rb
-- lib/ruport/attempt.rb
-- lib/ruport/generator.rb
-- lib/ruport/format.rb
+- lib/ruport/mailer.rb
+- lib/ruport/query
 - lib/ruport/query.rb
-- lib/ruport/data.rb
-- lib/ruport/system_extensions.rb
-- lib/ruport/config.rb
+- lib/ruport/renderer
 - lib/ruport/renderer.rb
-- lib/ruport/mailer.rb
+- lib/ruport/report
 - lib/ruport/report.rb
-- lib/ruport/format/plugin.rb
+- lib/ruport/system_extensions.rb
+- lib/ruport/data/groupable.rb
+- lib/ruport/data/record.rb
+- lib/ruport/data/table.rb
+- lib/ruport/data/taggable.rb
+- lib/ruport/format/csv.rb
+- lib/ruport/format/html.rb
 - lib/ruport/format/latex.rb
+- lib/ruport/format/pdf.rb
+- lib/ruport/format/plugin.rb
 - lib/ruport/format/svg.rb
-- lib/ruport/format/xml.rb
-- lib/ruport/format/html.rb
 - lib/ruport/format/text.rb
-- lib/ruport/format/pdf.rb
-- lib/ruport/format/csv.rb
+- lib/ruport/format/xml.rb
+- lib/ruport/layout/component.rb
 - lib/ruport/query/sql_split.rb
 - lib/ruport/renderer/graph.rb
 - lib/ruport/renderer/table.rb
-- lib/ruport/data/record.rb
-- lib/ruport/data/groupable.rb
-- lib/ruport/data/taggable.rb
-- lib/ruport/data/table.rb
 - lib/ruport/report/graph.rb
-- lib/ruport/layout/component.rb
+- test/_test_database.rb
 - test/samples
-- test/test_groupable.rb
-- test/test_record.rb
+- test/test_config.rb
 - test/test_format_text.rb
-- test/test_table.rb
-- test/test_ruport.rb
 - test/test_graph_renderer.rb
-- test/test_table_renderer.rb
-- test/_test_database.rb
+- test/test_groupable.rb
+- test/test_mailer.rb
 - test/test_query.rb
-- test/test_config.rb
-- test/test_taggable.rb
+- test/test_record.rb
 - test/test_renderer.rb
-- test/test_mailer.rb
-- test/test_sql_split.rb
 - test/test_report.rb
-- test/unit.log
-- test/samples/query_test.sql
-- test/samples/test.yaml
-- test/samples/erb_test.sql
+- test/test_ruport.rb
+- test/test_sql_split.rb
+- test/test_table.rb
+- test/test_table_renderer.rb
+- test/test_taggable.rb
+- test/samples/addressbook.csv
 - test/samples/data.csv
-- test/samples/foo.rtxt
 - test/samples/data.tsv
-- test/samples/stonecodeblog.sql
-- test/samples/ruport_test.sql
-- test/samples/addressbook.csv
 - test/samples/dates.csv
 - test/samples/document.xml
+- test/samples/erb_test.sql
+- test/samples/foo.rtxt
+- test/samples/query_test.sql
+- test/samples/ruport_test.sql
+- test/samples/stonecodeblog.sql
 - test/samples/test.sql
+- test/samples/test.yaml
 - bin/rope
 - Rakefile
 - setup.rb
@@ -159,20 +159,20 @@ files:
 - TODO
 - AUTHORS
 test_files: 
-- test/test_groupable.rb
-- test/test_record.rb
+- test/test_config.rb
 - test/test_format_text.rb
-- test/test_table.rb
-- test/test_ruport.rb
 - test/test_graph_renderer.rb
-- test/test_table_renderer.rb
+- test/test_groupable.rb
+- test/test_mailer.rb
 - test/test_query.rb
-- test/test_config.rb
-- test/test_taggable.rb
+- test/test_record.rb
 - test/test_renderer.rb
-- test/test_mailer.rb
-- test/test_sql_split.rb
 - test/test_report.rb
+- test/test_ruport.rb
+- test/test_sql_split.rb
+- test/test_table.rb
+- test/test_table_renderer.rb
+- test/test_taggable.rb
 rdoc_options: 
 - --title
 - Ruport Documentation

data/test/unit.log

@@ -1,7 +0,0 @@
-# Logfile created on Mon Feb 12 21:22:00 -0500 2007 by logger.rb/1.5.2.9
-F, [2007-02-12T21:22:00.244983 #16500] FATAL -- : Missing host for mailer bar
-F, [2007-02-12T21:22:00.246039 #16500] FATAL -- : Missing DSN for source foo!
-F, [2007-02-12T21:22:00.668942 #16500] FATAL -- : no block given!
-W, [2007-02-12T21:22:00.863575 #16500]  WARN -- : Error on attempt # 1: ; retrying
-W, [2007-02-12T21:22:01.865400 #16500]  WARN -- : Error on attempt # 2: ; retrying
-W, [2007-02-12T21:22:03.874022 #16500]  WARN -- : Error on attempt # 1: execution expired; retrying