acts_as_reportable 1.0.0 → 1.0.1

data/Rakefile

@@ -2,7 +2,7 @@ require "rake/rdoctask"
 require "rake/testtask"
 require "rake/gempackagetask"
 
-AAR_VERSION = "1.0.0"
+AAR_VERSION = "1.0.1"
 
 begin
   require "rubygems"

data/lib/ruport/acts_as_reportable.rb

@@ -167,8 +167,7 @@ module Ruport
         data = data.map {|r| r.reportable_data(:include => includes,
                                :only => only,
                                :except => except,
-                               :methods => methods) }.flatten
-
+                               :methods => methods) }.flatten   
 
         table = Ruport::Data::Table.new(:data => data,
                                         :column_names => aar_columns,
@@ -303,12 +302,16 @@ module Ruport
         end
         
         # Reorder columns to match options[:only]
-        self.class.aar_columns = options[:only] if Array === options[:only]
-        
-        self.class.aar_columns |= data_records.first.keys
+        if Array === options[:only]
+          cols = options[:only].map {|c| c.to_s }
+          self.class.aar_columns = cols
+        end
+                            
+        self.class.aar_columns |= data_records.first.keys  
         
         data_records =
-          add_includes(data_records, options[:include]) if options[:include]
+          add_includes(data_records, options[:include]) if options[:include] 
+          
         data_records
       end
       

data/test/acts_as_reportable_test.rb

@@ -139,6 +139,14 @@ if Object.const_defined?(:ActiveRecord) && Object.const_defined?(:Mocha)
       assert_equal expected, actual
     end
       
+    def test_only_option_allows_symbols
+      column_order = [:name, :personal_trainer_id, :team_id]
+      actual = Player.report_table(:all, :only => column_order)
+      expected = [["Player 1", 1, 1],
+        ["Player 2", 2, 1]].to_table(%w[name personal_trainer_id team_id])
+      assert_equal expected, actual
+    end
+      
     def test_except_option
       actual = Player.report_table(:all, :except => 'personal_trainer_id')
       expected = [[1, "Player 1"],[1, "Player 2"]].to_table(%w[team_id name])
@@ -160,7 +168,7 @@ if Object.const_defined?(:ActiveRecord) && Object.const_defined?(:Mocha)
       assert_equal expected, actual
     end
     
-    def test_column_sorting_works_with_include_option
+    def test_column_sorting_works_with_include_option  
       actual = Player.report_table(:all,
         :only     => %w[name personal_trainer.name],
         :include  => { :personal_trainer => { :only => %w[name] } })

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: acts_as_reportable
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-12-25 00:00:00 -05:00
+  version: 1.0.1
+date: 2008-01-08 00:00:00 -05:00
 summary: ActiveRecord support for Ruby Reports
 require_paths: 
 - lib
@@ -31,8 +31,8 @@ authors:
 files: 
 - lib/ruport
 - lib/ruport/acts_as_reportable.rb
-- test/helpers.rb
 - test/acts_as_reportable_test.rb
+- test/helpers.rb
 - Rakefile
 test_files: 
 - test/acts_as_reportable_test.rb