Merge pull request #1783 from oruen/optimize-csv-converter

ActiveRecord csv export optimization.
railsadminteam · Oct 24, 2013 · a70b2fe · a70b2fe
2 parents 334965f + 725ab85
commit a70b2fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/rails_admin/support/csv_converter.rb b/lib/rails_admin/support/csv_converter.rb
@@ -40,7 +40,6 @@ def initialize(objects = [], schema = {})
 
     def to_csv(options)
       options ||= {}
-      return '' if @objects.blank?
 
       # encoding shenanigans first
       @encoding_from = UTF8_ENCODINGS.include?(@abstract_model.encoding) ? 'UTF-8' : @abstract_model.encoding
@@ -66,7 +65,8 @@ def to_csv(options)
             end
           end.flatten
         end
-        @objects.each do |o|
+        method = @objects.respond_to?(:find_each) ? :find_each : :each
+        @objects.send(method) do |o|
 
 
           csv << @fields.map do |field|

diff --git a/spec/rails_admin/support/csv_converter_spec.rb b/spec/rails_admin/support/csv_converter_spec.rb
@@ -9,7 +9,8 @@
       end
     end
 
-    objects = [FactoryGirl.create(:player)]
+    FactoryGirl.create :player
+    objects = Player.all
     schema = {:only =>[:number, :name]}
     expect(RailsAdmin::CSVConverter.new(objects, schema).to_csv({})[2]).to match /Number,Name/
   end