tallty_import_export 1.0.5 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01a93e8f64b1aac7a0795ef697fe6fe27f084edc4570805e0bc8000750f3c611
-  data.tar.gz: 7ee6334bd719ec319f25f64a07c38d88a9073926de5c379cf75483655195aa8a
+  metadata.gz: a04b3934c446e2bbf669f01a5e3db5f5cb898a10be14c46da3388b0d45f11ede
+  data.tar.gz: f4f1fa8e5cd8d58a52ecd6b82c7547181ee11078c41eeec4a22f4ada037de3c3
 SHA512:
-  metadata.gz: b70babba1dcec1b39c0ec311f44b51bf5a41268fc301f365099b960d292e4b6812cf6917acee757c24744db671e66494ced0f2eea457c5f8e8d7e934deff0b60
-  data.tar.gz: 6ecac3c336068b4331e9fb3525c902f38f70bd0f0a1bfd73209ced1b357a1ad076a660349cdacf51492e5be07e909df77996a2e78435afec0751cee82ad8068c
+  metadata.gz: cc7e2b3836f2feebbc23d4844079c57a78b470a7f103d4efd78d456ad4e6b574745668c99054375add3bbc936a62648b0340ab562a977f3b26df4856099a2a9a
+  data.tar.gz: 8eff47ec5ea1fa31a819c74f13073f23374819c70f7218ecaebbdfb3853fbb07a84f77943d80a0c55b7f8152afaa1cd68b94a207039b8876040ca52f5627ba73

data/lib/tallty_import_export/export.rb

@@ -174,6 +174,8 @@ module TalltyImportExport
     # 根据数据类型 attr_type 进行数据的格式化
     def handle_format data, header
       case header[:attr_type].to_s
+      when 'string'
+        date.to_s
       when 'datetime'
         data ? data.strftime('%F %H:%M') : nil
       when 'date'

data/lib/tallty_import_export/import.rb

@@ -51,10 +51,10 @@ module TalltyImportExport
 
     def process_options options
       options = options.with_indifferent_access
-      self.headers = options.delete(:headers) || []
-      @primary_keys = options.delete(:primary_keys) || headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
+      @headers = options.delete(:headers)
+      @primary_keys = options.delete(:primary_keys) || @headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
 
-      @excel_hash = headers.reduce({}) do |h, header|
+      @excel_hash = @headers.reduce({}) do |h, header|
         h[header[:key].to_sym] = header[:name]
         h
       end
@@ -75,7 +75,7 @@ module TalltyImportExport
 
     def convert_data line_info
       line_info.with_indifferent_access.reduce({}) do |h, (k, v)|
-        header = headers.find do |_header|
+        header = @headers.find do |_header|
           _header[:key].to_sym == k.to_sym
         end
         # header[:convert] = handle_xxx
@@ -104,29 +104,29 @@ module TalltyImportExport
       @headers || klass.try(:headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers'))
     end
 
-    # 只保留 key, name, json, 合并到 import_header
-    def headers= val
-      if val.empty?
-        @headers = import_headers_result.map { |header| header.with_indifferent_access }
-        return
-      end
-
-      key_to_coming_header = val.reduce({}) do |out, header|
-        out[header.with_indifferent_access[:key].to_sym] = header.with_indifferent_access
-        out
-      end
-
-      result = []
-      val.map do |header|
-        if (exist_header = import_headers_result.find { |model_header| model_header[:key] === header[:key] })
-          result.push(exist_header.merge(name: header[:name], json: header[:json]))
-        else
-          result.push({ key: header[:key], name: header[:name], json: header[:json]})
-        end
-      end
-
-      @headers = result
-    end
+    # # 只保留 key, name, json, 合并到 import_header
+    # def headers= val
+    #   if val.empty?
+    #     @headers = import_headers_result.map { |header| header.with_indifferent_access }
+    #     return
+    #   end
+    #
+    #   key_to_coming_header = val.reduce({}) do |out, header|
+    #     out[header.with_indifferent_access[:key].to_sym] = header.with_indifferent_access
+    #     out
+    #   end
+    #
+    #   result = []
+    #   val.map do |header|
+    #     if (exist_header = import_headers_result.find { |model_header| model_header[:key] === header[:key] })
+    #       result.push(exist_header.merge(header.compact))
+    #     else
+    #       result.push(header)
+    #     end
+    #   end
+    #
+    #   @headers = result
+    # end
 
     def skip val, processing_line_info, raw_line_info
       # do nothing there, use for header[:convert]

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.5"
+  VERSION = "1.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip
@@ -150,6 +150,7 @@ files:
 - lib/tallty_import_export/importable.rb
 - lib/tallty_import_export/version.rb
 - tallty_import_export-1.0.3.gem
+- tallty_import_export-1.0.5.gem
 - tallty_import_export.gemspec
 homepage: https://git.tallty.com/open-source/tallty_import_export
 licenses: