ruport 1.2.0 → 1.2.1

data/Rakefile

@@ -3,7 +3,7 @@ require "rake/testtask"
 require "rake/gempackagetask"
 #
 
-RUPORT_VERSION = "1.2.0"
+RUPORT_VERSION = "1.2.1"
 
 begin
   require "rubygems"

data/lib/ruport.rb

@@ -12,7 +12,7 @@
 
 module Ruport #:nodoc:#
   
-  VERSION = "1.2.0"   
+  VERSION = "1.2.1"   
   
   class FormatterError < RuntimeError #:nodoc:
   end

data/lib/ruport/acts_as_reportable.rb

@@ -297,6 +297,9 @@ module Ruport
           data_records.first[method.to_s] = send(method)
         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
         
         data_records =

data/test/acts_as_reportable_test.rb

@@ -123,6 +123,14 @@ if Object.const_defined?(:ActiveRecord) && Object.const_defined?(:Mocha)
       expected = [["Player 1"],["Player 2"]].to_table(%w[name])
       assert_equal expected, actual
     end
+    
+    def test_only_option_preserves_column_sort_order
+      column_order = %w[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(column_order)
+      assert_equal expected, actual
+    end
       
     def test_except_option
       actual = Player.report_table(:all, :except => 'personal_trainer_id')
@@ -144,6 +152,22 @@ if Object.const_defined?(:ActiveRecord) && Object.const_defined?(:Mocha)
         ["Player 2", "Trainer 2"]].to_table(%w[name personal_trainer.name])
       assert_equal expected, actual
     end
+    
+    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] } })
+      expected = [["Player 1", "Trainer 1"],
+        ["Player 2", "Trainer 2"]].to_table(%w[name personal_trainer.name])
+      assert_equal expected, actual
+      
+      actual = Player.report_table(:all,
+        :only     => %w[personal_trainer.name name],
+        :include  => { :personal_trainer => { :only => %w[name] } })
+      expected = [["Trainer 1", "Player 1"],
+        ["Trainer 2", "Player 2"]].to_table(%w[personal_trainer.name name])
+      assert_equal expected, actual
+    end
       
     def test_include_has_options
       actual = Team.report_table(:all, :only => 'name',

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: ruport
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2007-08-28 00:00:00 -04:00
+  version: 1.2.1
+date: 2007-09-23 00:00:00 -04:00
 summary: A generalized Ruby report generation and templating engine.
 require_paths: 
 - lib