active_report 5.2.3 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adc93d81b62487eb830eb1dc170d85e0190744c35fdaadabb7c0b7e90b83993a
-  data.tar.gz: b1c554539e5acf746f1161e7d39540f2965100b958acf47713552f39b2b24806
+  metadata.gz: 2e93417de22977ce483ce4ebddcdfcf72831e853d76136b98ea029c162752796
+  data.tar.gz: f9da1cd2c6aeaf86b848adc2a7042dc5f1a584e6d4bfc5467db57e378427c96a
 SHA512:
-  metadata.gz: 4b7b98e29de827fcf9659983b290710ecdd08befc61480916f57e0dc2f90e7c17ac50e9269a3165a6a618a486863ca8bffa02b39c768e4c15493feac19d43c1e
-  data.tar.gz: 935db432412bca80fab78186cb9a945dc9d90b682b1d638ef3246d942848684d0266276b11645c86c3acacec48244ad708eb4f6ccd3bbd66e4ad96c9d831ee0f
+  metadata.gz: f8665373ecedda065531a06d42ea6af146fcc463e8e05d5b286d0bf1d66228d223215f6811f0fa00bf2bcd8cd58f863e451c75cdc9a5121b819462aabfc6c63c
+  data.tar.gz: b0ec658eb4f68416100c0bdd242e16c44b16b090ace5d74bff7fbdfb3b1be2a622c3bcec9d9b02824a0d5946ecea3f8d4887b8d4443e716cf92680abbf99d1a8

data/.reek

@@ -15,6 +15,8 @@ InstanceVariableAssumption:
   enabled: false
 LongParameterList:
   enabled: false
+ManualDispatch:
+  enabled: false
 NestedIterators:
   max_allowed_nesting: 2
 NilCheck:

data/lib/active_report/base.rb

@@ -9,7 +9,7 @@ class ActiveReport::Base
     @opts = opts
 
     %i[except only].each { |key| @opts[key] = munge(@opts[key]) }
-    @opts[:options] ||= csv_options
+    { batch_size: 1_000, options: csv_options }.each { |key, val| @opts[key] ||= val }
   end
 
   def csv_options
@@ -45,6 +45,16 @@ class ActiveReport::Base
 
   private
 
+  def active_record_table_object?(object)
+    return if object.nil?
+    !object.respond_to?(:table_name)
+  end
+
+  def active_record_table_class?(object)
+    return if object.nil? || object.is_a?(ActiveRecord::Relation)
+    object.respond_to?(:table_name)
+  end
+
   def encode_to_utf8(line)
     line.map do |chr|
       next if chr.nil?

data/lib/active_report/record.rb

@@ -7,11 +7,10 @@ require 'json'
 
 class ActiveReport::Record < ActiveReport::Base
 
-  # rubocop:disable Metrics/PerceivedComplexity
   def export
     %i[except only].each { |key| @opts[key] = @opts[key].map(&:to_s) }
 
-    if !@data.is_a?(ActiveRecord::Relation) && @data.try(:superclass) == ActiveRecord::Base
+    if active_record_table_class?(@data)
       @opts[:headers] = (@opts[:headers] || humanize_values(@data.column_names))
 
       @opts[:stream] ? export_stream : export_csv
@@ -25,10 +24,9 @@ class ActiveReport::Record < ActiveReport::Base
       ActiveReport::Hash.export(@data, @opts)
     end
   end
-  # rubocop:enable Metrics/PerceivedComplexity
 
   def import
-    if @opts[:model].nil? || (@opts[:model].superclass != ActiveRecord::Base)
+    if active_record_table_object?(@opts[:model])
       raise ArgumentError,
             'Model must be an ActiveRecord::Base object.'
     end
@@ -59,7 +57,10 @@ class ActiveReport::Record < ActiveReport::Base
     CSV.generate(@opts[:options]) do |csv|
       csv << @opts[:headers]
 
-      @data.find_each do |row|
+      @data.find_each(start: @opts[:start],
+                      finish: @opts[:finish],
+                      batch_size: @opts[:batch_size],
+                      error_on_ignore: @opts[:error_on_ignore]) do |row|
         csv << filter_values(row.attributes)
       end
     end
@@ -69,7 +70,10 @@ class ActiveReport::Record < ActiveReport::Base
     Enumerator.new do |csv|
       csv << CSV.generate_line(@opts[:headers])
 
-      @data.find_each do |row|
+      @data.find_each(start: @opts[:start],
+                      finish: @opts[:finish],
+                      batch_size: @opts[:batch_size],
+                      error_on_ignore: @opts[:error_on_ignore]) do |row|
         csv << CSV.generate_line(filter_values(row.attributes))
       end
     end

data/lib/active_report/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_report
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.2.4
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord