tallty_import_export 1.0.3 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9e60e31f0ac0c3d979739c50f9631e4a678e61aa86325cd655bd40b45bc7d1
-  data.tar.gz: a75eb5bb8b865c3d1edd470a5704d1bdc0fda9002411dde9816ea1cd3ab44e98
+  metadata.gz: 8caa796932bff10fefba6f63f2d084488b1fcb2dd102f7fb1d3d8c84b4500244
+  data.tar.gz: c46cdba654ab877946f7810d6d634c0ba326b882d9b177fba7dd17ed1b4350d9
 SHA512:
-  metadata.gz: 1d7adcd134a5ead8f4c0eefa8812f5f5578bf2f01dfd396c02c4ce45544e94f97b5397d8e81da5c320117b7034534c65cc0c54569fc66c884d7e4e03bad5e380
-  data.tar.gz: 3c36721ef2be7db0df34064fa5b02abd55b3b808644ea8f53f3e982ed90d58a60326ab62ceee365ed351faf0440180bf9d68d637b0a442cc31e4215245dab7ba
+  metadata.gz: 5d22ead9b9e98e6d2e23672bddcc2b187bea2287f2702c9b83a8bb3e32dc249c4e11d655b7bd2b2c68954bea7998ec4ff80e555ed93b5de8f7467fded4e2508c
+  data.tar.gz: efc7da3bd4d17e2878fb2721948ccfabbbdb16b91981982be07b33f8165aa56e8b66dfb61e3242abb1773507bebd7b18cdfa891b601b55a64c3cc4356f586b5d

data/lib/tallty_import_export/common.rb

@@ -6,14 +6,14 @@ module TalltyImportExport
     end
 
     module ClassMethods
-      def model_headers
+      def model_headers **args
         columns.map do |column|
           {
             key: column.name,
             name: column.comment || column.name,
             attr_type: column.type,
             format: column.type == :string ? :string : nil,
-            primary_key: column.name == 'id' ? true : false 
+            primary_key: column.name == 'id' ? true : false
           }
         end
       end

data/lib/tallty_import_export/export.rb

@@ -26,6 +26,7 @@ module TalltyImportExport
     # chain: 导出时对象属性通过链式调用
     # index: 数组方式，需要嵌套拿到里面的
     # merge: true/false，默认false，某一列，如果上下行的内容相同，则直接合并单元格
+    # json: model_payload，代表存储在某一个列中
 
     def export_xlsx records, **options
       records = with_scope records
@@ -138,7 +139,7 @@ module TalltyImportExport
       @headers || export_headers
     end
 
-    def export_headers
+    def export_headers **args
       @headers || klass.try(:headers) || klass.try(:model_headers)
     end
 

data/lib/tallty_import_export/import.rb

@@ -1,11 +1,10 @@
 module TalltyImportExport
   class Import
     require 'roo'
-    attr_reader :klass, :context, :headers, :primary_keys, :associations
+    attr_reader :klass, :context, :primary_keys, :associations
 
     def initialize klass
       @klass = klass
-      @headers = import_headers_result.map { |header| header.with_indifferent_access }
       @context = Context.new({})
     end
 
@@ -15,6 +14,7 @@ module TalltyImportExport
     # format: excel是否需要特定的格式，目前主要是类似于身份证号，可以用string
     # convert: 导入时候，把excel的内容转换成导入时候代码逻辑需要的内容
     # primary_key: 是否是主键
+    # json: model_payload，代表存储在某一个列中
 
     # xlsx_file 为 file path or file object or TalltyImportExport::Excel.new
     def import_xlsx xlsx_file, associations, **options
@@ -51,10 +51,10 @@ module TalltyImportExport
 
     def process_options options
       options = options.with_indifferent_access
-      self.headers = options.delete(:headers) || []
-      @primary_keys = options.delete(:primary_keys) || headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
+      @headers = options.delete(:headers)
+      @primary_keys = options.delete(:primary_keys) || @headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
 
-      @excel_hash = headers.reduce({}) do |h, header|
+      @excel_hash = @headers.reduce({}) do |h, header|
         h[header[:key].to_sym] = header[:name]
         h
       end
@@ -75,7 +75,7 @@ module TalltyImportExport
 
     def convert_data line_info
       line_info.with_indifferent_access.reduce({}) do |h, (k, v)|
-        header = headers.find do |_header|
+        header = @headers.find do |_header|
           _header[:key].to_sym == k.to_sym
         end
         # header[:convert] = handle_xxx
@@ -100,33 +100,33 @@ module TalltyImportExport
       @headers || import_headers
     end
 
-    def import_headers
-      @headers || klass.try(:import_headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers'))
+    def import_headers **args
+      @headers || klass.try(:headers) || klass.try(:model_headers) || (raise ArgumentError.new('missing import_headers'))
     end
 
-    # 只保留 key, name, json, 合并到 import_header
-    def headers= val
-      if val.empty?
-        @headers = import_headers_result.map { |header| header.with_indifferent_access }
-        return
-      end
-
-      key_to_coming_header = val.reduce({}) do |out, header|
-        out[header.with_indifferent_access[:key].to_sym] = header.with_indifferent_access
-        out
-      end
-
-      result = []
-      val.map do |header|
-        if (exist_header = import_headers_result.find { |model_header| model_header[:key] === header[:key] })
-          result.push(exist_header.merge(name: header[:name], json: header[:json]))
-        else
-          result.push({ key: header[:key], name: header[:name], json: header[:json]})
-        end
-      end
-
-      @headers = result
-    end
+    # # 只保留 key, name, json, 合并到 import_header
+    # def headers= val
+    #   if val.empty?
+    #     @headers = import_headers_result.map { |header| header.with_indifferent_access }
+    #     return
+    #   end
+    #
+    #   key_to_coming_header = val.reduce({}) do |out, header|
+    #     out[header.with_indifferent_access[:key].to_sym] = header.with_indifferent_access
+    #     out
+    #   end
+    #
+    #   result = []
+    #   val.map do |header|
+    #     if (exist_header = import_headers_result.find { |model_header| model_header[:key] === header[:key] })
+    #       result.push(exist_header.merge(header.compact))
+    #     else
+    #       result.push(header)
+    #     end
+    #   end
+    #
+    #   @headers = result
+    # end
 
     def skip val, processing_line_info, raw_line_info
       # do nothing there, use for header[:convert]

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.0.3"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.9
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip
@@ -149,6 +149,8 @@ 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: