ruport 0.8.13 → 0.8.14

data/Rakefile

@@ -8,7 +8,7 @@ rescue LoadError
   nil
 end
 
-RUPORT_VERSION = "0.8.13"
+RUPORT_VERSION = "0.8.14"
 
 #Set to true to disable dependency resolution
 LEAN=false

data/lib/ruport/data/record.rb

@@ -87,6 +87,7 @@ module Ruport::Data
         @data[@attributes[index]] = value
       else
         @data[index] = value
+        @attributes << index unless @attributes.include? index
       end
     end
 
@@ -251,6 +252,7 @@ module Ruport::Data
     
     def delete(key)
       @data.delete(key)
+      @attributes.delete(key)
     end
 
 

data/lib/ruport/data/table.rb

@@ -193,7 +193,9 @@ module Ruport::Data
     #
     def +(other)
       raise ArgumentError unless other.column_names == @column_names
-      Table.new(:column_names => @column_names, :data => @data + other.data)
+      self.class.new( :column_names => @column_names, 
+                      :data => @data + other.data,
+                      :record_class => record_class )
     end
   
     
@@ -390,7 +392,8 @@ module Ruport::Data
     #
     # FIXME: loses tags
     def sub_table(columns=column_names,range=nil)      
-       t =Ruport::Data::Table.new(:column_names => columns) 
+       t = self.class.new(:column_names => columns,
+                          :record_class => record_class) 
        if range
          data[range].each { |r| t << r }
        elsif block_given?
@@ -480,7 +483,9 @@ module Ruport::Data
           sort_by(&block)
         end
 
-      table = Table.new(:data => data_array, :column_names => @column_names) 
+      table = self.class.new( :data => data_array, 
+                              :column_names => @column_names,
+                              :record_class => record_class ) 
 
       table.tags = self.tags
       return table
@@ -505,10 +510,15 @@ module Ruport::Data
     #   two = one.dup
     #
     def dup
-      a = self.class.new(:data => @data, :column_names => @column_names)
+      a = self.class.new( :data => @data, 
+                          :column_names => @column_names,
+                          :record_class => record_class )
       a.tags = tags.dup
       return a
     end     
+
+    # NOTE: does not respect tainted status
+    alias_method :clone, :dup
     
     #
     # Uses Ruport's built-in text plugin to render this Table into a String
@@ -522,10 +532,6 @@ module Ruport::Data
     def to_s
       as(:text)
     end     
-                             
-    # NOTE: does not respect tainted status
-    alias_method :clone, :dup
-
 
     # Provides a shortcut for the <tt>as()</tt> method by converting a call to
     # <tt>as(:format_name)</tt> into a call to <tt>to_format_name</tt>

data/lib/ruport.rb

@@ -12,7 +12,7 @@
 
 module Ruport
   
-  VERSION = "0.8.13"
+  VERSION = "0.8.14"
   
   # This method is Ruport's logging and error interface. It can generate 
   # warnings or raise fatal errors, logging +message+ to the file defined by 
@@ -37,8 +37,8 @@ module Ruport
   #                              <tt>log()</tt> (which can be useful for 
   #                              debugging), you can set 
   #                              <tt>Config.debug_mode</tt>.
-  # <b><tt>:exception</tt></b>:: The +Exception+ to throw on failure.  This 
-  #                              defaults to +RunTimeError+.
+  # <b><tt>:raises</tt></b>::    The +Exception+ to throw on failure.  This 
+  #                              defaults to +RuntimeError+.
   # 
   def self.log(message, options={})
     options = {:status => :warn, :output => $stderr}.merge(options)

data/test/test_record.rb

@@ -257,5 +257,29 @@ class TestRecord < Test::Unit::TestCase
     assert_equal 2, a.get(1)
     assert_equal 1, a.get(0)
   end
+  
+  def test_ensure_delete_removes_attribute
+    a = Record.new({"a" => 1, "b" => 2})
+    assert_equal({"a" => 1, "b" => 2}, a.data)
+    assert_equal(["a","b"], a.attributes)
+    
+    a.send(:delete, "a")
+    assert_equal({"b" => 2}, a.data)
+    assert_equal(["b"], a.attributes)
+  end
+  
+  def test_ensure_bracket_equals_updates_attributes
+    a = Record.new({"a" => 1, "b" => 2})
+    assert_equal({"a" => 1, "b" => 2}, a.data)
+    assert_equal(["a","b"], a.attributes)
+    
+    a["b"] = 3
+    assert_equal({"a" => 1, "b" => 3}, a.data)
+    assert_equal(["a","b"], a.attributes)
+
+    a["c"] = 4
+    assert_equal({"a" => 1, "b" => 3, "c" => 4}, a.data)
+    assert_equal(["a","b","c"], a.attributes)
+  end
 
 end

data/test/test_table.rb

@@ -496,8 +496,18 @@ class TestTable < Test::Unit::TestCase
     assert_equal [[1,3,3],[4,6,6]].to_table(%w[a foo c]), a
   end
 
+  def test_ensure_propagate_record_class
+    a = Ruport::Data::Table.new(:record_class => DuckRecord)
+    assert_equal DuckRecord, a.record_class
+
+    b = a.dup
+    assert_equal DuckRecord, b.record_class
+  end
+
 end
 
+class DuckRecord < Ruport::Data::Record; end
+
 class TestTableKernelHack < Test::Unit::TestCase
   
   def test_simple

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruport
 version: !ruby/object:Gem::Version 
-  version: 0.8.13
-date: 2007-04-01 00:00:00 -04:00
+  version: 0.8.14
+date: 2007-04-16 00:00:00 -04:00
 summary: A generalized Ruby report generation and templating engine.
 require_paths: 
 - lib