tallty_import_export 1.0.18 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c0a62d935867d8420680ac232d8c156c8c653b805534ede5880bc615514706
-  data.tar.gz: 4efe0c40688bed288036ae32f51fe6ac7d3e28a9faddb7aa0dc05f8f901cc0c0
+  metadata.gz: e281a3f593eedd9a07fe79f779c95a389d02cc5f5296e799bf7c29d42f31b126
+  data.tar.gz: 6a7b95014024711b1eeb6136f3eafc55f51f54dcfb10f750dbf34fb73dc74c34
 SHA512:
-  metadata.gz: b4f9e59896340ed7d75128c165d40ca8ddc4d0d584953d3953433f90bfbfe3d8cfe355cd7b4ee3182c19217a238f98c8d10b2100483b949ebc5aad1a73d31868
-  data.tar.gz: 0f36b4f04a2bc8759b4e835cd4dcd0e051933735322a0fefb18b5a06f438a0954d269fb9c7d3e30f436b603e94c54cfedb26e4dfcf1039d92c734874c2da838e
+  metadata.gz: a1f2f542f68b84527e1321bf143525765568470a767bacdf3a9e8d43f14efa435e3b98e53a551b9ad14442fbd38c1175ff04c0c6d930e27aa08eb5e99e0bc122
+  data.tar.gz: 5fa2f4f7286b75fb5e9d14450c1233bdf95bbdb10433d1dbe66f5cf7effbe4eccb07c7414d74ac30f54642415679a4308f05bcbe7f82161713985bb8d346a5fa

data/lib/tallty_import_export/export.rb

@@ -165,7 +165,7 @@ module TalltyImportExport
     end
 
     def try_chain record, arr
-      arr.inject(record, :try)
+      arr.reduce(record) { |r, m| r.try(m) || r.try(:[], m) }
     end
 
     def try_method record, method
@@ -179,9 +179,9 @@ module TalltyImportExport
       when 'string'
         data.to_s
       when 'datetime'
-        data ? data.strftime('%F %H:%M') : nil
+        data ? data.in_time_zone.strftime('%F %H:%M') : nil
       when 'date'
-        data ? data.strftime('%F') : nil
+        data ? data.in_time_zone.strftime('%F') : nil
       else
         data
       end

data/lib/tallty_import_export/import.rb

@@ -79,7 +79,7 @@ module TalltyImportExport
 
     def convert_data line_info
       line_info.with_indifferent_access.reduce({}) do |h, (k, v)|
-        header = @headers.find do |_header|
+        header = import_headers_result.find do |_header|
           _header[:key].to_sym == k.to_sym
         end
         # header[:convert] = handle_xxx
@@ -90,9 +90,7 @@ module TalltyImportExport
           h[header[:json]][k] = val
         elsif header[:finder]
           $SAFE = 2
-          eval_string = header[:finder] + '(val)'
-          eval_val = eval eval_string
-          h[k.to_sym] = eval_val
+          h[k.to_sym] = eval header[:finder]
         else
           h[k.to_sym] = val
         end
@@ -106,7 +104,7 @@ module TalltyImportExport
     end
 
     def import_headers_result
-      @headers || import_headers
+      @headers ||= import_headers
     end
 
     def import_headers **args

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.18"
+  VERSION = "1.0.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.22
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip