active_report 5.2.6 → 5.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9e4cbb42e5657ad07cf960f5b6eb511f5a9bf8849a4da2186df559e0d7b834e
-  data.tar.gz: 4f067fb60f4258ac44a45be3467ec20be895c9e0e12278c28df3c6b8a205fa80
+  metadata.gz: 8bde1de5a7f2f2eea8844b30fd811eb3bde0026344bd5c83386995ac0f40d6a8
+  data.tar.gz: 0624ceb3f8ded798a662f235eab1050c26ad4fab3ceac2e01d19f44dbdcf2cab
 SHA512:
-  metadata.gz: 8f0ca6edd0b24691e27a6da356dbc853774225fe92708b8299b9f84970148d7c5fa62565e630d6fb8082a809a2a32248e0ee607a390a426cdc8ecba3c0780588
-  data.tar.gz: 86218db0fe6b563a9b61144502dfd45884f17a47fd902887a766337f7d55b0fceca498ecaf172098b6ad3db3ca159bad1145044c3afae0402204972233f5b5cd
+  metadata.gz: a314a3fd29f83176b240c40c4a0f9c246c34d849e67dd557a3bec6d33d715377b1ed9a5f59b104b4cf5edbc031c76128d43e1207908995d154a9f5e224302c3f
+  data.tar.gz: 2799ed6b5c9e652f9a17b491cbacf1a8f132de1672017cbf120372eed28d799c9333a896e695b591e2174f4d38a0ad8e0255169442572fb334cf81d775f35acf

data/lib/active_report/record.rb

@@ -54,29 +54,35 @@ class ActiveReport::Record < ActiveReport::Base
   private
 
   def export_csv
+    @data = @data.result if @data.is_a?(Ransack::Search)
+
     CSV.generate(@opts[:options]) do |csv|
       csv << @opts[:headers]
-
-      @data.find_each(start: @opts[:start],
-                      finish: @opts[:finish],
-                      batch_size: @opts[:batch_size],
-                      error_on_ignore: @opts[:error_on_ignore]) do |row|
+      @data.find_each(find_each_options) do |row|
         csv << filter_values(row.attributes)
       end
     end
   end
 
   def export_stream
+    @data = @data.result if @data.is_a?(Ransack::Search)
+
     Enumerator.new do |csv|
       csv << CSV.generate_line(@opts[:headers])
 
-      @data.find_each(start: @opts[:start],
-                      finish: @opts[:finish],
-                      batch_size: @opts[:batch_size],
-                      error_on_ignore: @opts[:error_on_ignore]) do |row|
+      @data.find_each(find_each_options) do |row|
         csv << CSV.generate_line(filter_values(row.attributes))
       end
     end
   end
 
+  def find_each_options
+    {
+      start: @opts[:start],
+      finish: @opts[:finish],
+      batch_size: @opts[:batch_size],
+      error_on_ignore: @opts[:error_on_ignore]
+    }
+  end
+
 end

data/lib/active_report/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveReport
-  VERSION ||= '5.2.6'
+  VERSION ||= '5.2.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_report
 version: !ruby/object:Gem::Version
-  version: 5.2.6
+  version: 5.2.7
 platform: ruby
 authors:
 - Juan Gomez