tallty_import_export 1.0.20 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1cb38513ee9efd2e26a8cabc623e52306cf5f2a3ecf53711993aeb8067b2915
-  data.tar.gz: bcc91bcc85017141640c259777996e2036347fc68a978403d22a7085c704c1b1
+  metadata.gz: f5b4baee923834e5a843ab33b902d60cb200c4706c278793f45626fb1a93182e
+  data.tar.gz: 83feee2c88ef9d40ab6273002bb0764447ed450d9262e97bad4ba0a5781f5f7c
 SHA512:
-  metadata.gz: 6465b690fba9935d30109b3423119cc9a93dd6b5872eacc647404400ed50da95156fbb9d1b35d94c7f733fef2236601de11ce244ab76618789ed2756027fe23b
-  data.tar.gz: 326fe9117444b0cb0461731181ac2131584b36b64582c8b2a21fab3eb7de761bf27c23d3d710ef703eded66f76fb106373628552437bf042d4371178448c3eb8
+  metadata.gz: 12c078e974198c3471a9c211a80edaeb7dfe7b1bd8e551320663bb08d9f933d74aa734cdb40c8b1a58175eebff3d98b1676f52c9da4f2c8eb160010cb462139e
+  data.tar.gz: 2fa62a1f0d57499115c734ca854274b354e55e3ad752e0b55c339b8a71668fcff9051062839a4bedce680df721d9629fde9fb59be62904b89b8cd4e037dade56

data/Gemfile.lock

@@ -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

@@ -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
@@ -79,10 +80,10 @@ module TalltyImportExport
         if respond_to?(:first_header)
           row_index = Axlsx.col_ref(headers.size - 1)
           sheet.merge_cells("A1:#{row_index}1")
-          sheet.add_row [first_header], style: title1, height: 40
+          sheet.add_row [first_header], style: title1, height: 30
         end
 
-        sheet.add_row headers.map{|header| header[:name]}, style: title2, height: 39
+        sheet.add_row headers.map{|header| header[:name]}, style: title2, height: 25
 
         last_row = nil
         merge_column_hash = {}
@@ -125,7 +126,7 @@ module TalltyImportExport
     def process_options options = {}
       options = options.with_indifferent_access
 
-      @row_height ||= options.delete(:row_height) || 35
+      @row_height ||= options.delete(:row_height) || 25
       @width ||= (options.delete(:width) || 20).to_f
       @filename ||= options.delete(:filename)
       @group_by ||= options.delete(:group_by)
@@ -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

@@ -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

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

metadata

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