RubyGems - tallty_import_export - Versions diffs - 1.0.19 → 1.0.23 - Mend

tallty_import_export 1.0.19 → 1.0.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

checksums.yaml +4 -4
data/Gemfile.lock +32 -31
data/lib/tallty_import_export/export.rb +16 -5
data/lib/tallty_import_export/import.rb +3 -3
data/lib/tallty_import_export/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47d4e395eb95191fc74c60002ce97284ba86d11b0d7708be87e59f13296ac983
-  data.tar.gz: 78935b1942529ec78a9ed6b7430d4fa79fe8307f1ecb4f77cffb295c95a5a1cb
+  metadata.gz: 7f43fcc903c964ff3a19c273f812535777d8606ff24627f1e3e465431a8be327
+  data.tar.gz: a78bfa23bd82f2eb659218bff7b68c477a83bc6d6a9f9cab5e2a34a7f97009e9
 SHA512:
-  metadata.gz: 5a59cfce4a219cf9c8022d7b9d6dcc527e1d8fd72a47b8a6536afdc79e792ddfe6e2161bcfdd480d388adf54345447b3ab70e2e8f6db217c2f6e8ddaaedb010e
-  data.tar.gz: 55b49d0a89e8194d1c5029fc2398b9851b079e215acef761a7e37f8c158dc2282740c5025bb43f5abacacbfec7872b0980e53510cd23d479e5967baffd313279
+  metadata.gz: 868e1e722f37534dda11149447ec31215004d5150083edea5c577b2f73679983b1c202f10b4f87e81db22f835fb49a980ee56112db074421b8f1a1a289a31214
+  data.tar.gz: 18e14d3e9c139aef84df4b9b1d988f49a64114220ba6aee4b9e5028a0e042fd328247fd82bdc7c2125f338b55f05f1db817572f91035e9759354c14d490a64f6

data/Gemfile.lock CHANGED Viewed

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tallty_import_export (0.1.0)
+    tallty_import_export (1.0.22)
       activesupport
       caxlsx
       redis
@@ -14,33 +14,35 @@ PATH
 GEM
   remote: https://gems.ruby-china.com/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    caxlsx (3.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    caxlsx (3.1.0)
       htmlentities (~> 4.3, >= 4.3.4)
-      mimemagic (~> 0.3)
+      marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     htmlentities (4.3.4)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    mimemagic (0.3.5)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    marcel (1.0.1)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    nokogiri (1.12.4)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    racc (1.5.2)
     rake (12.3.3)
-    redis (4.2.5)
-    redis-objects (1.5.0)
-      redis (~> 4.0)
+    redis (4.4.0)
+    redis-objects (1.5.1)
+      redis (~> 4.2)
     roo (2.8.3)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -62,18 +64,17 @@ GEM
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
     ruby-ole (1.2.12.2)
-    rubyzip (2.3.0)
-    spreadsheet (1.2.6)
-      ruby-ole (>= 1.0)
-    tallty_duck_record (1.0.2)
-      activemodel (~> 6.0.3)
-      activesupport (~> 6.0.3)
+    rubyzip (2.3.2)
+    spreadsheet (1.2.9)
+      ruby-ole
+    tallty_duck_record (1.1.3)
+      activemodel (>= 5.0)
+      activesupport (>= 5.0)
     tallty_form (1.0.0)
       tallty_duck_record
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)
@@ -86,4 +87,4 @@ DEPENDENCIES
   tallty_import_export!
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/lib/tallty_import_export/export.rb CHANGED Viewed

@@ -27,6 +27,7 @@ module TalltyImportExport
     # index: 数组方式，需要嵌套拿到里面的
     # merge: true/false，默认false，某一列，如果上下行的内容相同，则直接合并单元格
     # json: model_payload，代表存储在某一个列中
+    # select: [{ label: '已报备', value: 'submitted'}, ...]，需要转换的枚举类型
     def export_xlsx records, **options
       records = with_scope records
@@ -138,7 +139,7 @@ module TalltyImportExport
     end
     def export_headers_result
-      @headers || export_headers
+      @headers ||= export_headers&.with_indifferent_access
     end
     def export_headers **args
@@ -159,13 +160,14 @@ module TalltyImportExport
         else
           try_method(record, header[:key])
         end
-        handle_format(data, header)
+      data = handle_format(data, header)
+      data = handle_select(data, header)
     rescue
       ''
     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 +181,18 @@ 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
+    end
+    def handle_select data, header
+      if header[:select].present?
+        select_option = header[:select].find { |option| option[:value].to_s == data.to_s }
+        select_option.present? ? select_option[:label] : data
       else
         data
       end

data/lib/tallty_import_export/import.rb CHANGED Viewed

@@ -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
@@ -89,7 +89,7 @@ module TalltyImportExport
           h[header[:json]] ||= {}
           h[header[:json]][k] = val
         elsif header[:finder]
-          $SAFE = 2
+          # $SAFE = 2
           h[k.to_sym] = eval header[:finder]
         else
           h[k.to_sym] = val
@@ -104,7 +104,7 @@ module TalltyImportExport
     end
     def import_headers_result
-      @headers || import_headers
+      @headers ||= import_headers&.with_indifferent_access
     end
     def import_headers **args

data/lib/tallty_import_export/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.19"
+  VERSION = "1.0.23"
 end

metadata CHANGED Viewed

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