tallty_import_export 1.0.11 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac670fce1d35526ff3182599152b1731126e8252b34a23ccfebb21e2fd0bdb05
-  data.tar.gz: c9be74623d6e5530ffeb0908de53f44ed81765d54704ce8e051de099ce4fcfa4
+  metadata.gz: 5a10f7b098cd3e2d58f203bda043ac3ab1fb49f0a846c85c84aeed261ecfab16
+  data.tar.gz: 23bfd18fc032beae0ca7274c467cae73d28bed1c45f02037c9293a5e12945eab
 SHA512:
-  metadata.gz: c4d825be60c8e01fb6f7390d62eafaa530d430ee9ec1f24e6a811e7664c7a565ff3ec28089cebd5ee56bfb889428b524bf71dc515704b5ee429180ed48f90ec4
-  data.tar.gz: e2bfd76beb5a504f35f041be64e5903aaedb31597c646c113e25024c0f8fd138c3d34d7a778a8707f432520394cd5584a68d891a7de63da4fea15a13f50d85c6
+  metadata.gz: 8a02d6d4643a5b473afab17d86c21791bea8c3c040b06bcb04bfdd7d9f8afe8d40bbed12ca3d514201e44b480c5be6a5e5aa663f4619e196863c16de74f424d0
+  data.tar.gz: fca02d7bf9dd5811938cc7130e7170c004aad4544157dda71793a60e00e994ec02b56cf250819bd2582c4d5d25b1b482550282097facd3514ddbae1fde2521ed

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
@@ -51,8 +52,9 @@ module TalltyImportExport
 
     def process_options options
       options = options.with_indifferent_access
-      @headers = options.delete(:headers)
+      @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,10 @@ module TalltyImportExport
         if header[:json]
           h[header[:json]] ||= {}
           h[header[:json]][k] = val
+        elsif header[:finder]
+          $SAFE = 2
+          eval_string = header[:finder] + '(val)'
+          eval eval_string
         else
           h[k.to_sym] = val
         end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.11"
+  VERSION = "1.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.16
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-07 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: