tallty_import_export 1.0.24 → 1.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5b4baee923834e5a843ab33b902d60cb200c4706c278793f45626fb1a93182e
-  data.tar.gz: 83feee2c88ef9d40ab6273002bb0764447ed450d9262e97bad4ba0a5781f5f7c
+  metadata.gz: bc0e8d3d68e999a6b3f67fa31dbec4ac510d948ddb391a38ef12e06cd8d2674c
+  data.tar.gz: 0c6751bba32cf9eeed209efa7aef3514cdd64d0c3db4518e717b46336b96e174
 SHA512:
-  metadata.gz: 12c078e974198c3471a9c211a80edaeb7dfe7b1bd8e551320663bb08d9f933d74aa734cdb40c8b1a58175eebff3d98b1676f52c9da4f2c8eb160010cb462139e
-  data.tar.gz: 2fa62a1f0d57499115c734ca854274b354e55e3ad752e0b55c339b8a71668fcff9051062839a4bedce680df721d9629fde9fb59be62904b89b8cd4e037dade56
+  metadata.gz: 79b629e699808fd77b57631abd8fa2cabdc43140d524f9287c0a9ea1c5d5dfdf8fe5013f9d4422d23b7487c88c2154e39f818f2f1d32171be83ab20fb5c3ba92
+  data.tar.gz: 3fcc361eebf3f0ec4cc1d9b10e0d6a5060c3fbb7c22a75841397cb172e24abd77d0d9e0cb2c6a02eec7be1702c6455aa3068a2d08eb184ae1d9f50e593c00574

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tallty_import_export (1.0.22)
+    tallty_import_export (1.0.24)
       activesupport
       caxlsx
       redis
@@ -22,7 +22,7 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    caxlsx (3.1.0)
+    caxlsx (3.1.1)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -32,7 +32,7 @@ GEM
     htmlentities (4.3.4)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    marcel (1.0.1)
+    marcel (1.0.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     nokogiri (1.12.4)
@@ -65,7 +65,7 @@ GEM
     rspec-support (3.10.0)
     ruby-ole (1.2.12.2)
     rubyzip (2.3.2)
-    spreadsheet (1.2.9)
+    spreadsheet (1.3.0)
       ruby-ole
     tallty_duck_record (1.1.3)
       activemodel (>= 5.0)

data/lib/tallty_import_export/export.rb

@@ -89,7 +89,7 @@ module TalltyImportExport
         merge_column_hash = {}
         first_content_row_index = respond_to?(:first_header) ? 2 : 1
 
-        each_method = records.is_a?(Array) ? :each : :each
+        each_method = @each_method || :each
         records.send(each_method).with_index do |record, index|
           row = []
           headers.each_with_index do |header, col_index|
@@ -123,8 +123,13 @@ module TalltyImportExport
       end
     end
 
+    # 地处整体配置信息
+    def export_options
+      {}
+    end
+
     def process_options options = {}
-      options = options.with_indifferent_access
+      options = export_options.merge(options).with_indifferent_access
 
       @row_height ||= options.delete(:row_height) || 25
       @width ||= (options.delete(:width) || 20).to_f
@@ -132,6 +137,7 @@ module TalltyImportExport
       @group_by ||= options.delete(:group_by)
       @group_where = "#{@group_by}_eq" if @group_by.present?
       @headers ||= options.delete(:headers)
+      @each_method ||= options.delete(:each_method)
     end
 
     def with_scope records

data/lib/tallty_import_export/import.rb

@@ -51,7 +51,7 @@ module TalltyImportExport
     end
 
     def process_options options
-      options = options.with_indifferent_access
+      options = import_options.merge(options).with_indifferent_access
       @headers = options.delete(:headers) || import_headers
       @primary_keys = options.delete(:primary_keys) || @headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
       @params = options
@@ -107,6 +107,10 @@ module TalltyImportExport
       @headers ||= import_headers&.with_indifferent_access
     end
 
+    def import_options
+      {}
+    end
+
     def import_headers **args
       @headers || klass.try(:headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers'))
     end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.24"
+  VERSION = "1.0.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: 1.0.25
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip