tallty_import_export 1.1.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c586f1a3e13625520d1ce6378e478ee8dc6cf0055a16528f63ead86c20794f
-  data.tar.gz: 857a44c2a36c69347a2baed91855d943a16581427bdd1b562dd02e54d4a7d97c
+  metadata.gz: 284928193ebed0e079f44ba98ee7a2f0d51c05f0c1ea5100dd68973940f56369
+  data.tar.gz: 75dbf1351c7a08ce445b508ea60aba31da811fcfc87e9355c5f8c710f66be47a
 SHA512:
-  metadata.gz: 9ae472d4119ebb57fe5066615d49001ba99a417a067d0586f25010338e7bba1d5fdda737cf8a7892483e68b079af065e21862e87225409f3a7f2e7e0683f8d5f
-  data.tar.gz: fd6af86be0af8b552d2d5170e86b807a301550e7b7f3e604fa0cef539fe6f4630083a4117a494071bc734f83fb29950425f6cdb147b82e130b978c0a2fc8af6f
+  metadata.gz: 8d335d50b6059608dcdb41cc3f44e16f75746d900d698ff1ea3960de8d2541b0fdfadf9b7fceeadef33f70906a3c4673f8247c6aa9406195826f0b45a9977d5e
+  data.tar.gz: e72f4ddf2a9bb43f00d031aa74c56723870b63ce0b548110d6c3112a0945dbd21f789759a88834fb1101f24c61e30ce179bd14dea19001c2e4bb81f5e7721c9e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tallty_import_export (1.0.35)
+    tallty_import_export (1.1.1)
       activesupport
       attr_json
       caxlsx
@@ -27,27 +27,31 @@ GEM
       tzinfo (~> 2.0)
     attr_json (1.4.0)
       activerecord (>= 5.0.0, < 7.1)
-    caxlsx (3.2.0)
+    caxlsx (3.3.0)
       htmlentities (~> 4.3, >= 4.3.4)
       marcel (~> 1.0)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.3.0, < 3)
     concurrent-ruby (1.1.10)
+    connection_pool (2.3.0)
     diff-lcs (1.4.4)
     htmlentities (4.3.4)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     marcel (1.0.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
-    nokogiri (1.13.4)
+    minitest (5.16.3)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     racc (1.6.0)
     rake (12.3.3)
-    redis (4.6.0)
-    redis-objects (1.5.1)
-      redis (~> 4.2)
+    redis (5.0.5)
+      redis-client (>= 0.9.0)
+    redis-client (0.10.0)
+      connection_pool
+    redis-objects (1.7.0)
+      redis
     roo (2.9.0)
       nokogiri (~> 1)
       rubyzip (>= 1.3.0, < 3.0.0)
@@ -77,7 +81,7 @@ GEM
       activesupport (>= 5.0)
     tallty_form (1.0.0)
       tallty_duck_record
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)

data/lib/tallty_import_export/attr/export_header.rb

@@ -14,7 +14,7 @@ module TalltyImportExport
       attr_json :json, :string
       attr_json :select, ActiveModel::Type::Value.new, array: true
       attr_json :source, :boolean
-      attr_json :proc, ActiveModel::Type::Value.new, array: true
+      attr_json :proc, ActiveModel::Type::Value.new
       attr_json :children, self.to_type, array: true
 
       attr_accessor :depth, :parent_path, :seq

data/lib/tallty_import_export/common.rb

@@ -6,14 +6,14 @@ module TalltyImportExport
     end
 
     module ClassMethods
-      def model_headers **args
+      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',
           }
         end
       end

data/lib/tallty_import_export/excel.rb

@@ -2,6 +2,7 @@ module TalltyImportExport
   class Excel
     require 'redis-objects'
     require 'roo'
+    require 'roo-xls'
 
     attr_reader :uid, :cache
 

data/lib/tallty_import_export/export.rb

@@ -2,7 +2,7 @@ module TalltyImportExport
   class Export
     attr_reader :klass, :context
 
-    def initialize klass
+    def initialize(klass)
       @klass = klass
       @context = Context.new({})
     end
@@ -34,7 +34,7 @@ module TalltyImportExport
     # proc: proc或者lamda，支持call，传入 record 和 context
     # list: 对于list布局的，进行嵌套，生成子表格
 
-    def export_xlsx records, **options
+    def export_xlsx(records, **options)
       records = with_scope records
       process_options(options)
 
@@ -46,14 +46,16 @@ module TalltyImportExport
 
         if @group_by.present?
           if records.is_a?(Array)
-            records.group_by { |record| record.send(@group_by)}.each do |key, group_records|
+            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, **options
             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, **options
             end
@@ -72,16 +74,16 @@ module TalltyImportExport
       end
     end
 
-    def export_workbook workbook, association_records, **options
+    def export_workbook(workbook, association_records, **options)
       # excel导出样式
       alignment = { vertical: :center, horizontal: :center }
       border    = { color: '969696', style: :thin }
       title1 = workbook.styles.add_style(alignment: alignment, border: border, sz: 12, b: true)
-      title2 = workbook.styles.add_style(alignment: alignment, border: border, bg_color: "2a5caa",  sz: 12, fg_color: "fffffb")
+      title2 = workbook.styles.add_style(alignment: alignment, border: border, bg_color: '2a5caa', sz: 12, fg_color: 'fffffb')
       title3 = workbook.styles.add_style(alignment: alignment.merge(wrap_text: true), border: border, sz: 10)
-      headers = export_headers_result **options
+      headers = export_headers_result(**options)
 
-      _sheet_name = respond_to?(:sheet_name) ? self.sheet_name : nil
+      _sheet_name = respond_to?(:sheet_name) ? sheet_name : nil
 
       workbook.add_worksheet(name: _sheet_name) do |sheet|
         if respond_to?(:first_header)
@@ -90,7 +92,7 @@ module TalltyImportExport
           sheet.add_row [first_header], style: title1, height: 30
         end
 
-        sheet.add_row headers.map{|header| header[:name]}, style: title2, height: 25
+        sheet.add_row headers.map { |header| header[:name] }, style: title2, height: 25
 
         last_row = nil
         merge_column_hash = {}
@@ -133,12 +135,12 @@ module TalltyImportExport
           merge_column_hash.each do |col_index, row_arr|
             row_arr.each do |arr|
               sheet.merge_cells(
-                Axlsx::cell_r(col_index, arr.first) + ':' + Axlsx::cell_r(col_index, arr.last)
+                Axlsx.cell_r(col_index, arr.first) + ':' + Axlsx.cell_r(col_index, arr.last),
               )
             end
           end
         end
-        sheet.column_widths(*headers.map{|header| (header[:width] || @width).to_f})
+        sheet.column_widths(*headers.map { |header| (header[:width] || @width).to_f })
       end
     end
 
@@ -147,7 +149,7 @@ module TalltyImportExport
       {}
     end
 
-    def process_options options = {}
+    def process_options(options = {})
       options = export_options.merge(options).with_indifferent_access
 
       @row_height ||= options.delete(:row_height) || 25
@@ -161,30 +163,30 @@ module TalltyImportExport
       context.params = @params
     end
 
-    def with_scope records
+    def with_scope(records)
       records
     end
 
-    def export_headers_result **options
+    def export_headers_result(**options)
       if @headers.present? && @group_key.blank?
         headers_hash = @headers.to_h { |header| [header.with_indifferent_access[:key], header] }.with_indifferent_access
         export_headers(**options.symbolize_keys).select do |_header|
           _header.with_indifferent_access[:key].to_s.in?(headers_hash.keys)
         end.map do |_header|
           _header = _header.with_indifferent_access
-          _header.merge(headers_hash[_header[:key]].delete_if { |k, v| v.blank? })
+          _header.merge(headers_hash[_header[:key]].delete_if { |_k, v| v.blank? })
         end
       else
         @headers = export_headers(**options.symbolize_keys)
       end
     end
 
-    def export_headers **args
+    def export_headers(**args)
       @headers || klass.try(:headers) || klass.try(:model_headers)
     end
 
     # 处理一个记录的数据
-    def handle_data record, header, index=0, **opts
+    def handle_data(record, header, index = 0, **opts)
       data =
         if header[:key] == '_index'
           index
@@ -200,28 +202,36 @@ module TalltyImportExport
       data = handle_format(data, header, **opts)
       data = handle_data_type(data, **opts)
       data = handle_select(data, header, **opts)
-    rescue
+    rescue StandardError
       ''
     end
 
-    def try_chain record, arr
+    def try_chain(record, arr)
       arr.reduce(record) do |r, m|
         if r.is_a?(Array)
           r.try(m) || r.try(:[], m.to_i)
         else
-          r.try(:[], m) || r.try(:[], m.to_sym) || r.try(m)
+          begin
+            r.try(:[], m)
+          rescue StandardError
+            nil
+          end || begin
+            r.try(:[], m.to_sym)
+          rescue StandardError
+            nil
+          end || r.try(m)
         end
       end
     end
 
-    def try_method record, method, prefix: nil
+    def try_method(record, method, prefix: nil)
       prefix_arr = prefix.to_s.split(/\./)
       arr = method.to_s.split(/\./)
       try_chain record, prefix_arr + arr
     end
 
     # 根据数据类型 attr_type 进行数据的格式化
-    def handle_format data, header, **opts
+    def handle_format(data, header, **opts)
       case header[:attr_type].to_s
       when 'string'
         data.to_s
@@ -234,7 +244,7 @@ module TalltyImportExport
       end
     end
 
-    def handle_data_type data, **opts
+    def handle_data_type(data, **opts)
       if data.is_a?(Time)
         data.in_time_zone.strftime('%F %H:%M')
       elsif data.is_a?(Date)
@@ -257,7 +267,7 @@ module TalltyImportExport
       end
     end
 
-    def handle_select data, header, **opts
+    def handle_select(data, header, **opts)
       if header[:select].present?
         select_option = header[:select].find { |option| option[:value].to_s == data.to_s }
         select_option.present? ? select_option[:label] : data

data/lib/tallty_import_export/export_form.rb

@@ -126,7 +126,7 @@ module TalltyImportExport
 
     def export_headers_result **options
       @headers = options.symbolize_keys[:headers]
-      super(**options)
+      @headers = super(**options)
       @headers = TalltyImportExport::Attr::ExportHeader.new({ items: @headers })
     end
 

data/lib/tallty_import_export/import.rb

@@ -1,9 +1,10 @@
 module TalltyImportExport
   class Import
     require 'roo'
+    require 'roo-xls'
     attr_reader :klass, :context, :primary_keys, :associations
 
-    def initialize klass
+    def initialize(klass)
       @klass = klass
       @context = Context.new({})
     end
@@ -20,13 +21,41 @@ module TalltyImportExport
     # skip: 用来综合使用的数据，但是不导入
 
     # xlsx_file 为 file path or file object or TalltyImportExport::Excel.new
-    def import_xlsx xlsx_file, associations, **options
+    def import_xlsx(xlsx_file, associations, **options)
       process_xlsx_line_info(xlsx_file, associations, **options) do |line_info, associations|
         process_line_info(line_info, associations)
       end
     end
 
-    def exchange_to_ids xlsx_file, associations, **options
+    # 导出excel的空模版
+    def export_template_xlsx(**options)
+      origin_options = options.dup
+      process_options(options)
+
+      Axlsx::Package.new do |pack|
+        pack.use_shared_strings = true
+        workbook = pack.workbook
+
+        export_workbook workbook, **origin_options
+
+        file_path = File.join(Rails.root, 'public', 'import')
+        FileUtils.mkdir_p(file_path) unless Dir.exist?(file_path)
+        file_name = "#{Time.now.strftime('%Y%m%d%H%M%S')}#{@filename}.xlsx"
+        file_path_with_name = File.join(file_path, file_name)
+        pack.serialize(file_path_with_name)
+        return file_path_with_name
+      end
+    end
+
+    def export_workbook(workbook, **options)
+      export_instance = TalltyImportExport::Export.new(@klass)
+      opts = options.symbolize_keys.merge({ headers: @headers })
+      Rails.logger.info opts
+      export_instance.process_options(opts)
+      export_instance.export_workbook(workbook, [], **opts)
+    end
+
+    def exchange_to_ids(xlsx_file, associations, **options)
       errors = []
       ids = []
       process_xlsx_line_info(xlsx_file, associations, **options) do |line_info, associations|
@@ -37,33 +66,34 @@ module TalltyImportExport
         error_msg = errors.map do |line_info|
           "【#{@primary_keys.map { |key| line_info[key] }.join(' - ')}】"
         end.join(' ')
-        raise RecordNotFountError.new("以下内容未找到: #{error_msg}")
+        raise RecordNotFountError, "以下内容未找到: #{error_msg}"
       end
-      return ids.compact.uniq
+      ids.compact.uniq
     end
 
-    def process_xlsx_line_info xlsx_file, associations, **options
+    def process_xlsx_line_info(xlsx_file, associations, **options)
       @associations = associations
       # 先处理获取出来Excel每行的数据, line_info
       process_options(options)
 
-      if TalltyImportExport::Excel === xlsx_file
+      if xlsx_file.is_a?(TalltyImportExport::Excel)
         xlsx_file.rows.each_with_excel_hash(@excel_hash) do |line_info|
           yield line_info.with_indifferent_access, associations
         end
       else
         file_path = xlsx_file.is_a?(String) ? xlsx_file : xlsx_file.path
-        xlsx = ::Roo::Excelx.new(file_path)
+        xlsx = ::Roo::Spreadsheet.open(file_path, extension: File.extname(file_path) == '.xls' ? :xls : :xlsx)
         xlsx.each_with_pagename do |_sheetname, sheet|
           sheet.each(**@excel_hash).with_index do |line_info, index|
             next if index == 0
+
             yield line_info.with_indifferent_access, associations
           end
         end
       end
     end
 
-    def import_data data, associations, **options
+    def import_data(data, associations, **options)
       process_options(options)
       TalltyImportExport::Excel::Rows.new(data).each_with_excel_hash(@excel_hash) do |line_info|
         process_line_info(line_info.with_indifferent_access, associations)
@@ -74,25 +104,25 @@ module TalltyImportExport
       TalltyImportExport::Excel
     end
 
-    def process_options options
+    def process_options(options)
       options = import_options.merge(options).with_indifferent_access
-      @headers = options.delete(:headers) || import_headers
+      @headers = options.delete(:headers) || import_headers(**options)
       @primary_keys = options.delete(:primary_keys) || @headers.map { |header| header[:primary_key] ? header[:key].to_sym : nil }.compact
       @skip_keys = options.delete(:skip_keys) || @headers.map { |header| header[:skip] ? header[:key].to_sym : nil }.compact
       @params = options
       context.params = @params
 
-      @excel_hash = @headers.reduce({}) do |h, header|
+      @excel_hash = @headers.each_with_object({}) do |header, h|
         h[header[:key].to_sym] = header[:name]
-        h
       end
 
       options
     end
 
-    def process_line_info line_info, associations
+    def process_line_info(line_info, associations)
       # 去除空行内容
       return unless line_info.values.any?(&:present?)
+
       context.line_info = line_info
       # 转换处理导入的数据格式
       line_info = convert_data(line_info)
@@ -104,14 +134,16 @@ module TalltyImportExport
       context.last_line_info = line_info
     end
 
-    def convert_data line_info
+    def convert_data(line_info)
       info = line_info.with_indifferent_access
-      import_headers_result.reduce({}) do |h, header|
+      import_headers_result.each_with_object({}.with_indifferent_access) do |header, h|
         k = header[:key]
+        k_arr = k.to_s.split(/\./)
         v = info[k]
         # header[:convert] = handle_xxx
         # handle_xxx(val, processing_line_info, raw_line_info)
         val = header[:convert] ? send(header[:convert], v, h, info) : v
+        val.strip! if val.is_a?(String)
         if header[:json]
           h[header[:json]] ||= {}
           h[header[:json]][k] = val
@@ -120,15 +152,20 @@ module TalltyImportExport
         elsif header[:finder]
           # $SAFE = 2
           h[k.to_sym] = eval header[:finder]
+        elsif k_arr.size > 1
+          # hash设置
+          attr = k_arr.first
+          val = { k_arr[1..-1].join('.') => v }.to_nested_hash
+          h[attr.to_sym] ||= {}
+          h[attr.to_sym].merge! val
         else
           h[k.to_sym] = val
         end
-        h
       end.with_indifferent_access
     end
 
     # 通过转换后，数据是否合法，如果不合法，则直接跳过不处理这个数据
-    def valid? line_info
+    def valid?(line_info)
       true
     end
 
@@ -141,12 +178,12 @@ module TalltyImportExport
           _header.with_indifferent_access[:key].to_s.in?(headers_hash.keys)
         end.map do |_header|
           _header = _header.with_indifferent_access
-          _header.merge(headers_hash[_header[:key]].delete_if { |k, v| v.blank? })
+          _header.merge(headers_hash[_header[:key]].delete_if { |_k, v| v.blank? })
         end
       else
-        @headers = import_headers(**options.symbolize_keys)
+        @headers = import_headers
       end
-    rescue
+    rescue StandardError
       @headers
     end
 
@@ -154,8 +191,8 @@ module TalltyImportExport
       {}
     end
 
-    def import_headers **args
-      @headers || klass.try(: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, 'missing import_headers')
     end
 
     # # 只保留 key, name, json, 合并到 import_header
@@ -182,12 +219,12 @@ module TalltyImportExport
     #   @headers = result
     # end
 
-    def skip val, processing_line_info, raw_line_info
+    def skip(val, processing_line_info, raw_line_info)
       # do nothing there, use for header[:convert]
     end
 
     ###  这个方法是可以由复杂业务进行重载的 ###
-    def import_record line_info, associations
+    def import_record(line_info, associations)
       if primary_keys.present?
         _record = associations.find_or_initialize_by(line_info.clone.extract!(*primary_keys))
         _record.update!(line_info.clone.except!(*primary_keys, *@skip_keys))
@@ -196,23 +233,26 @@ module TalltyImportExport
       end
     end
 
-    def exchange_line_info_to_id line_info, associations, errors
+    def exchange_line_info_to_id(line_info, associations, errors)
       # 去除空行内容
       return unless line_info.values.any?(&:present?)
+
       context.line_info = line_info
 
       return unless primary_keys.present?
+
       ids = associations.where(line_info.clone.extract!(*primary_keys)).pluck(:id)
 
       context.last_line_info = line_info
 
       errors << line_info unless ids[0]
-      return ids[0]
+      ids[0]
     end
 
     class RecordNotFountError < StandardError
       attr_accessor :message
-      def initialize message
+
+      def initialize(message)
         @message = message
         super()
       end

data/lib/tallty_import_export/importable.rb

@@ -28,6 +28,10 @@ module TalltyImportExport
       def exchange_to_ids xlsx_file, associations, **options
         import_instance.exchange_to_ids(xlsx_file, associations, **options)
       end
+
+      def export_template_xlsx **options
+        import_instance.export_template_xlsx(**options)
+      end
     end
   end
 end

data/lib/tallty_import_export/version.rb

@@ -1,3 +1,3 @@
 module TalltyImportExport
-  VERSION = "1.1.0"
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tallty_import_export
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors:
 - liyijie
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip-zip