ruport 0.5.1 → 0.5.2

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruport
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
-date: 2006-09-02 00:00:00 -04:00
+  version: 0.5.2
+date: 2006-09-03 00:00:00 -04:00
 summary: A generalized Ruby report generation and templating engine.
 require_paths: 
 - lib
@@ -29,84 +29,78 @@ post_install_message:
 authors: 
 - Gregory Brown
 files: 
-- examples/sample_invoice_report.rb
 - examples/fieldless_table.rb
 - examples/line_plotter.rb
+- examples/sample_invoice_report.rb
 - examples/text_processors.rb
 - examples/new_plugin.rb
-- examples/long.txt
+- examples/line_graph.rb
 - examples/report.rb
+- examples/long.txt
 - examples/simple_mail.rb
 - examples/template.rb
-- examples/line_graph.rb
 - lib/ruport
 - lib/ruport.rb
 - lib/uport.rb
 - lib/ruport/query
 - lib/ruport/format
-- lib/ruport/rails
 - lib/ruport/data
+- lib/ruport/rails
 - lib/ruport/report
-- lib/ruport/system_extensions.rb.rej
 - lib/ruport/system_extensions.rb
 - lib/ruport/config.rb
 - lib/ruport/query.rb
+- lib/ruport/meta_tools.rb
 - lib/ruport/format.rb
+- lib/ruport/data.rb
 - lib/ruport/mailer.rb
 - lib/ruport/rails.rb
 - lib/ruport/report.rb
-- lib/ruport/data.rb
-- lib/ruport/meta_tools.rb
 - lib/ruport/query/sql_split.rb
-- lib/ruport/format/plugin.rb
-- lib/ruport/format/engine.rb
 - lib/ruport/format/engine
 - lib/ruport/format/plugin
+- lib/ruport/format/plugin.rb
+- lib/ruport/format/engine.rb
 - lib/ruport/format/engine/document.rb
 - lib/ruport/format/engine/graph.rb
-- lib/ruport/format/engine/invoice.rb
 - lib/ruport/format/engine/table.rb
-- lib/ruport/format/plugin/csv_plugin.rb
-- lib/ruport/format/plugin/html_plugin.rb
-- lib/ruport/format/plugin/pdf_plugin.rb
+- lib/ruport/format/engine/invoice.rb
 - lib/ruport/format/plugin/svg_plugin.rb
+- lib/ruport/format/plugin/html_plugin.rb
 - lib/ruport/format/plugin/text_plugin.rb
-- lib/ruport/rails/reportable.rb
-- lib/ruport/data/taggable.rb
-- lib/ruport/data/table.rb
+- lib/ruport/format/plugin/pdf_plugin.rb
+- lib/ruport/format/plugin/csv_plugin.rb
 - lib/ruport/data/collection.rb
 - lib/ruport/data/record.rb
-- lib/ruport/data/set.rb~
-- lib/ruport/data/set.rb.rej
+- lib/ruport/data/taggable.rb
+- lib/ruport/data/table.rb
 - lib/ruport/data/set.rb
+- lib/ruport/rails/reportable.rb
 - lib/ruport/report/invoice.rb
 - test/samples
-- test/_test_database.rb
-- test/test_set.rb.rej
+- test/test_collection.rb
 - test/test_record.rb
-- test/test_set.rb
 - test/test_table.rb
 - test/test_format.rb
-- test/test_config.rb
+- test/test_set.rb
 - test/test_ruport.rb
+- test/_test_database.rb
 - test/test_invoice.rb
 - test/test_plugin.rb
-- test/test_set.rb~
-- test/test_sql_split.rb
 - test/test_graph.rb
-- test/unit.log
 - test/test_meta_tools.rb
-- test/test_mailer.rb
 - test/test_query.rb
+- test/test_config.rb
+- test/test_sql_split.rb
 - test/test_taggable.rb
+- test/test_mailer.rb
+- test/unit.log
 - test/test_report.rb
-- test/test_plugin.rb.rej
 - test/test_format_engine.rb
-- test/test_collection.rb
-- test/samples/stonecodeblog.sql
 - test/samples/ruport_test.sql
 - test/samples/test.yaml
 - test/samples/data.csv
+- test/samples/stonecodeblog.sql
 - test/samples/addressbook.csv
 - test/samples/document.xml
 - test/samples/test.sql
@@ -119,23 +113,23 @@ files:
 - AUTHORS
 - CHANGELOG
 test_files: 
+- test/test_collection.rb
 - test/test_record.rb
-- test/test_set.rb
 - test/test_table.rb
 - test/test_format.rb
-- test/test_config.rb
+- test/test_set.rb
 - test/test_ruport.rb
 - test/test_invoice.rb
 - test/test_plugin.rb
-- test/test_sql_split.rb
 - test/test_graph.rb
 - test/test_meta_tools.rb
-- test/test_mailer.rb
 - test/test_query.rb
+- test/test_config.rb
+- test/test_sql_split.rb
 - test/test_taggable.rb
+- test/test_mailer.rb
 - test/test_report.rb
 - test/test_format_engine.rb
-- test/test_collection.rb
 rdoc_options: 
 - --title
 - Ruport Documentation

data/lib/ruport/data/set.rb.rej

@@ -1,147 +0,0 @@
-***************
-*** 8,27 ****
-  module Ruport::Data
-    class Set < Collection
-      
-      def initialize(options={})
-        @data = ::Set.new
-        options[:data].each {|e| self << e} if options[:data]
-      end
-      
--     def <<(other)
-        case other
-          when Record 
-            @data << other
-          when Array
-            @data << Record.new(other)
-        end
-      end
-      
-      def dup
-       a =  self.class.new(:data=>@data)
-       a.tags = tags.dup
---- 8,42 ----
-  module Ruport::Data
-    class Set < Collection
-      
-+     # Creates a new set containing the elements of options[:data].
-+     #
-+     #   Set.new :data => [%w[one two three] %w[1 2 3] %w[I II III]]
-      def initialize(options={})
-        @data = ::Set.new
-        options[:data].each {|e| self << e} if options[:data]
-      end
-      
-+     # Adds the given object to the set and returns self.
-+     #   set = Set.new :data => [%w[one two three]]
-+     #   set << [5,6,7]
-+     def add(other)
-        case other
-          when Record 
-            @data << other
-          when Array
-            @data << Record.new(other)
-        end
-+       self
-      end
-+     alias_method :<<, :add
-      
-+     # Produces a shallow copy of the set: the same data is referenced by both
-+     # the old and new sets.
-+     #   set = Set.new :data => [%w[one two three]]
-+     #   set2 = set.dup
-+     #   set == set2 => true
-+     #   set << [8,9,10]
-+     #   set == set2 => false
-      def dup
-       a =  self.class.new(:data=>@data)
-       a.tags = tags.dup
-***************
-*** 29,53 ****
-      end
-      alias_method :clone, :dup
-  
-      def ==(other)
-        @data == other.data
-      end
-      
-      def |(other)
-        Set.new :data => (@data | other.data)
-      end
-      alias_method :union, :|
-      
-      def &(other)
-        Set.new :data => (@data & other.data)
-      end
-      alias_method :intersection, :&
-      
--     # Set difference
-      def -(other)
-        Set.new :data => (@data - other.data)
-      end
-      alias_method :difference, :-
-      
-      def_delegators :@data, :each
-    end
---- 44,104 ----
-      end
-      alias_method :clone, :dup
-  
-+     # Equality. Two sets are equal if they contain the same set of objects.
-+     #   s1 = Set.new :data => [[1,2,3]]
-+     #   s2 = Set.new :data => [[1,2,3]]
-+     #   s1 == s2 => true
-      def ==(other)
-        @data == other.data
-      end
-      
-+     # Union. Returns a new set containing the union of the objects contained in
-+     # the two sets.
-+     #   s1 = Set.new :data => [[1,2,3]]
-+     #   s2 = Set.new :data => [[4,5,6]]
-+     #   s3 = s1 | s2
-+     #   s4 = Set.new :data => [[1,2,3], [4,5,6]]
-+     #   s3 == s4 => true
-      def |(other)
-        Set.new :data => (@data | other.data)
-      end
-      alias_method :union, :|
-+     alias_method :+, :|
-      
-+     # Intersection. Returns a new set containing the objects common to the two
-+     # sets.
-+     #   s1 = Set.new :data => [%w[a b c],[1,2,3]]
-+     #   s2 = Set.new :data => [%w[a b c],[4,5,6]]
-+     #   s3 = s1 | s2
-+     #   s4 = Set.new :data => [%w[a b c]]
-+     #   s3 == s4 => true
-      def &(other)
-        Set.new :data => (@data & other.data)
-      end
-      alias_method :intersection, :&
-      
-+     # Difference. Returns a new set containing those objects present in this
-+     # set but not the other.
-+     #   s1 = Set.new :data => [%w[a b c],[1,2,3]]
-+     #   s2 = Set.new :data => [%w[a b c],[4,5,6]]
-+     #   s3 = s1 | s2
-+     #   s4 = Set.new :data => [[1, 2, 3]]
-+     #   s3 == s4 => true
-      def -(other)
-        Set.new :data => (@data - other.data)
-      end
-      alias_method :difference, :-
-+ 
-+     # Exclusion. Returns a new set containing those objects in this set or the
-+     # other set but not in both.
-+     #   s1 = Set.new :data => [%w[a b c],[1,2,3]]
-+     #   s2 = Set.new :data => [%w[a b c],[4,5,6]]
-+     #   s3 = s1 | s2
-+     #   s4 = Set.new :data => [[1, 2, 3],[4,5,6]]
-+     #   s3 == s4 => true
-+     def ^(other)
-+       Set.new :data => (@data ^ other.data)
-+     end
-      
-      def_delegators :@data, :each
-    end

data/lib/ruport/data/set.rb~

@@ -1,73 +0,0 @@
-# The Ruport Data Collections.
-# Authors: Gregory Brown / Dudley Flanders
-#
-# This is Free Software.  For details, see LICENSE and COPYING
-# Copyright 2006 by respective content owners, all rights reserved.
-require 'set'
-
-module Ruport::Data
-  class Set < Collection
-    
-    # Creates a new set containing the elements of options[:data].
-    def initialize(options={})
-      @data = ::Set.new
-      options[:data].each {|e| self << e} if options[:data]
-    end
-    
-    # Adds the given object to the set and returns self.
-    def add(other)
-      case other
-        when Record 
-          @data << other
-        when Array
-          @data << Record.new(other)
-      end
-      self
-    end
-    alias_method :<<, :add
-    
-    # Produces a shallow copy of the set: the same data is referenced by both
-    # the old and new sets.
-    def dup
-     a =  self.class.new(:data=>@data)
-     a.tags = tags.dup
-     return a
-    end
-    alias_method :clone, :dup
-
-    # Equality. Two sets are equal if they contain the same set of objects.
-    def ==(other)
-      @data == other.data
-    end
-    
-    # Union. Returns a new set containing the union of the objects contained in
-    # the two sets.
-    def |(other)
-      Set.new :data => (@data | other.data)
-    end
-    alias_method :union, :|
-    alias_method :+, :|
-    
-    # Intersection. Returns a new set containing the objects common to the two
-    # sets.
-    def &(other)
-      Set.new :data => (@data & other.data)
-    end
-    alias_method :intersection, :&
-    
-    # Difference. Returns a new set containing those objects present in this
-    # set but not the other.
-    def -(other)
-      Set.new :data => (@data - other.data)
-    end
-    alias_method :difference, :-
-
-    # Exclusion. Returns a new set containing those objects in this set or the
-    # other set but not in both.
-    def ^(other)
-      Set.new :data => (@data ^ other.data)
-    end
-    
-    def_delegators :@data, :each
-  end
-end

data/lib/ruport/system_extensions.rb.rej

@@ -1,32 +0,0 @@
-***************
-*** 60,74 ****
-         `stty size`.split.map { |x| x.to_i }.reverse
-        end
-  
--    end
--    
--    def terminal_width
--      terminal_size.first
--    end
-- 
--    def terminal_height
--     terminal_size.last
--    end
-  
-    end
-  end
---- 60,73 ----
-         `stty size`.split.map { |x| x.to_i }.reverse
-        end
-  
-+       def terminal_width
-+         terminal_size.first
-+       end
-  
-+       def terminal_height
-+         terminal_size.last
-+       end
-+       
-+     end
-    end
-  end

data/test/test_plugin.rb.rej

@@ -1,50 +0,0 @@
-***************
-*** 18,53 ****
-      FasterCSV.generate(:col_sep => "\t") { |csv| data.each { |r| csv << r } }
-    end
-  
--   helper(:foo, :engine => :table_engine) { }
--   helper(:bar, :engines => [:table_engine,:invoice_engine]) { }
--   helper(:baz) {}
-- 
-    plugin_name :tsv
--   register_on :table_engine
-- 
--   # wont work, just for helper tests
--   register_on :invoice_engine
--   register_on :document_engine
-    
-  end
-  
-- class TestPlugin < Test::Unit::TestCase
--   def test_helper
--     t = Ruport::Format.table_object :data => [[1,2]], :plugin => :tsv
--     i = Ruport::Format.invoice_object :data => [[1,2]].to_table(%w[a b]), :plugin => :tsv
--     d = Ruport::Format.document_object :data => "foo", :plugin => :tsv
--     assert_nothing_raised { t.foo }
--     assert_nothing_raised { t.bar }
--     assert_nothing_raised { t.baz }
--     assert_nothing_raised { i.bar }
--     assert_nothing_raised { i.baz }
--     assert_nothing_raised { d.baz }
--     assert_raise(NoMethodError) { i.foo }
--     assert_raise(NoMethodError) { d.foo }
--     assert_raise(NoMethodError) { d.bar }
--   end
-- end
-- 
-  class CSVPluginTest < Test::Unit::TestCase
-  
-    def test_basic
---- 18,28 ----
-      FasterCSV.generate(:col_sep => "\t") { |csv| data.each { |r| csv << r } }
-    end
-  
-    plugin_name :tsv
-+   register_on Format::Engine::Table
-    
-  end
-  
-  class CSVPluginTest < Test::Unit::TestCase
-  
-    def test_basic