tallty_import_export 1.0.33 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27824038474eaaac3d03896f311952b08a41bec424d8a5e360ee8814cf439e02
-  data.tar.gz: b357c47d9b2ac449b58d9bc8c15c524e3ab4cf65342ca7b1df54ef834d48636b
+  metadata.gz: 25de46efb361ea554c4cef13898a6f14ac03e8b56cb5ca7fcbadb72ae40dcfcd
+  data.tar.gz: 0346d65fe26f1c9ee4357aa8b5850a86f9007c5b6da719b8b604a46ef6fe1fea
 SHA512:
-  metadata.gz: 46b8963859ceac6a7cfaaf734aa5a32421f0d8f20800db4eaef6b21aa3a54c4d892ffa5d2f42c31224d50cff958d7acb661777c877f8bb13e790cdb009b9edb2
-  data.tar.gz: 0c8f53e6a57eace206218376aa038f589bedc80fe4e1043ec2a85f238150216a888152942e0a68216d2d80d7b4c191fc845e16b0483b264f35e80c9248109c33
+  metadata.gz: 82b4c135ba29f61e1c1dbd4640b9a8c29639d9ad699474d2a02a11c6db8462269cfe46d9679fc6721258ab2a1b6cbfdc3fb59353de149d21f4cb541b62f206f3
+  data.tar.gz: 54d41b0b50c542827f8350d531aff8dfb80e202b2605cc9dc3cf1d6b49f8764ef7f8b367bf52782a9401c482eb2bd9cf3c684768e73bda935c7c8a8adea5c0cb

data/lib/tallty_import_export/export.rb

@@ -141,7 +141,7 @@ module TalltyImportExport
     end
 
     def process_options options = {}
-      options = export_options.merge(options).with_indifferent_access
+      options = export_options.merge(options.compact_blank!).with_indifferent_access
 
       @row_height ||= options.delete(:row_height) || 25
       @width ||= (options.delete(:width) || 20).to_f
@@ -157,7 +157,7 @@ module TalltyImportExport
     end
 
     def export_headers_result
-      @headers ||= export_headers&.with_indifferent_access
+      @headers ||= export_headers
     end
 
     def export_headers **args

data/lib/tallty_import_export/import.rb

@@ -53,7 +53,7 @@ module TalltyImportExport
     end
 
     def process_options options
-      options = import_options.merge(options).with_indifferent_access
+      options = import_options.merge(options.compact_blank!).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
       @skip_keys = options.delete(:skip_keys) || @headers.map { |header| header[:skip] ? header[:key].to_sym : nil }.compact
@@ -113,13 +113,17 @@ module TalltyImportExport
     # TODO: 这里，对于import_headers，后面还是不要传参数了
     # 需要合并proc，前端没有办法把proc传过来
     def import_headers_result
-      import_header_hash = import_headers.to_h { |header| [header.with_indifferent_access[:key], header] }.with_indifferent_access
-      @headers.map do |header|
-        key = header[:key]
-        if import_header_hash.dig(key, :proc).present?
-          header[:proc] = import_header_hash.dig(key, :proc)
+      if @headers.present?
+        import_header_hash = import_headers.to_h { |header| [header.with_indifferent_access[:key], header] }.with_indifferent_access
+        @headers.map do |header|
+          key = header[:key]
+          if import_header_hash.dig(key, :proc).present?
+            header[:proc] = import_header_hash.dig(key, :proc)
+          end
+          header
         end
-        header
+      else
+        @headers = import_headers
       end
     rescue
       @headers

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.33"
+  VERSION = "1.0.35"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.33
+  version: 1.0.35
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip