tallty_import_export 1.0.12 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63f572a45e25db9ed6c9750619aa2d07be0c63898d754ddd419fc3b9f54a479a
-  data.tar.gz: 71e22aec7b4d6e444e87c35d2844779bdb3bf44afe4eb760c140c7a7c52ef832
+  metadata.gz: 2136c7b712f1edf45c672eaa6b488263ea0df3be0aa96f8f004afd15899a0872
+  data.tar.gz: 42c9ec7fce94b70c6a63bfaec4934dbf622d2e09fdace4309c3b37a276eb9f92
 SHA512:
-  metadata.gz: 4b8180e95abd821119324ca582c8748f8cf89f089e7098e64ede6040bf1c1eafc8c408d00f8a17c76286cf7ea4b079ddc93d98c3ae9f05c77147e71a315eac1e
-  data.tar.gz: 818c4b2d0b3a96cc47bf5f8b79422029d0e03e3df607e6d5d598cf194458ffcd0c19842dda59738495cc94efa3f3e2cde7472e2eae9ce89336024de52756d9fd
+  metadata.gz: 18a517b979b812ca2d3ecbcacff2d0014e2471c34fbc39f97779db59574e56cf0a5543007d35cd59175786f5c264920482b7f1bcea6e15338da297a2bfc77c63
+  data.tar.gz: c5e8e51074abe0729d18187678110fd641efffa835d1cbcb030ddb60d3c78186a5a1e9258cd5549507ae584b8f021f16dde65ebeea22823119df684e2fb557ba

data/lib/tallty_import_export/export.rb

@@ -40,11 +40,13 @@ module TalltyImportExport
         if @group_by.present?
           if records.is_a?(Array)
             records.group_by { |record| record.send(@group_by)}.each do |key, group_records|
+              next unless key.present?
               @group_key = key
               export_workbook workbook, group_records
             end
           else
             records.group(@group_by).count.keys.each do |key|
+              next unless key.present?
               @group_key = key
               export_workbook workbook, records.ransack("#{@group_where}" => key).result
             end

data/lib/tallty_import_export/import.rb

@@ -15,6 +15,7 @@ module TalltyImportExport
     # convert: 导入时候，把excel的内容转换成导入时候代码逻辑需要的内容
     # primary_key: 是否是主键
     # json: model_payload，代表存储在某一个列中
+    # finder: 执行代码，可以查找到相关的对象
 
     # xlsx_file 为 file path or file object or TalltyImportExport::Excel.new
     def import_xlsx xlsx_file, associations, **options
@@ -53,6 +54,7 @@ module TalltyImportExport
       options = options.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
+      @params = options
 
       @excel_hash = @headers.reduce({}) do |h, header|
         h[header[:key].to_sym] = header[:name]
@@ -84,6 +86,11 @@ module TalltyImportExport
         if header[:json]
           h[header[:json]] ||= {}
           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
         else
           h[k.to_sym] = val
         end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.12"
+  VERSION = "1.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.17
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip
@@ -149,8 +149,6 @@ files:
 - lib/tallty_import_export/import.rb
 - 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: