ntq_excelsior 0.6.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30e1baadc2da0aac67e885c5e4c1a3db870b0701b8cd22b74a396d62b8ad75f0
-  data.tar.gz: c186e0afb0b554b220678415dc228a88c1a7157066238d1453c92352657166bc
+  metadata.gz: 2534fffa978dea103d8390ddd1cd836af2f893a014420e5c40d533ecfbb36a74
+  data.tar.gz: e12b3fbe2bc7936ee524c2d5840192f3a052b66ae4efbfe40a04f740374c7168
 SHA512:
-  metadata.gz: 271686e925552310034a81b8b5e91234a4832189075a08813d79cba53481afaddb8906e40ff765363868e78b81db432c19824c6b44bf7f38d4655bfa4359aa3a
-  data.tar.gz: 5790ae3ee05cb1b71f03c880c937b66ac35c33cfa23615e351ff935904338db2532535294d107001a1063fa1f507d3b4bcdcdccd93fc841e9c18a93aad7a8f15
+  metadata.gz: 3875d165c478e19f7e7ced68842df945078d257c8af9e5dc0e6eb6b42ac47d558b814889dfe5c775f6f349e6382d083709fbdfa6b5c578fe45155e7166bdf905
+  data.tar.gz: 7bcbc5f75d39f5444c53039dbd2e3c8968b3a8ef39f756529474cf9d1656d9ef13f1376fe593373732e668d067af1625ee8a2f2938a1d7b5b3a9d59d5befd0bd

data/.codeclimate.yml

@@ -0,0 +1,19 @@
+version: "2"
+plugins:
+  rubocop:
+    enabled: true
+    channel: "beta"
+exclude_patterns:
+- "config/"
+- "db/"
+- "dist/"
+- "features/"
+- "**/node_modules/"
+- "script/"
+- "**/spec/"
+- "**/test/"
+- "**/tests/"
+- "Tests/"
+- "**/vendor/"
+- "**/*_test.go"
+- "**/*.d.ts"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ntq_excelsior (0.6.0)
+    ntq_excelsior (1.0.1)
       caxlsx (< 4)
       roo (< 3)
 

data/README.md

@@ -132,7 +132,8 @@ class UserImporter < NtqExcelsior::Importer
       required: true
     },
     active: {
-      header: /Actif/i,
+      header: /Actif.+/i,
+      humanized_header: 'Actif', # (Optional) if provided, will be displayed instead regex in missing headers
       required: false
     }
   })

data/lib/ntq_excelsior/importer.rb

@@ -2,11 +2,9 @@ require 'roo'
 
 module NtqExcelsior
   class Importer
-
     attr_accessor :file, :check, :lines, :options, :status_tracker
 
     class << self
-
       def autosave(value = nil)
         @autosave ||= value
       end
@@ -48,38 +46,58 @@ module NtqExcelsior
       return @spreadsheet unless @spreadsheet.nil?
 
       raise 'File is missing' unless file.present?
-  
+
       @spreadsheet = Roo::Spreadsheet.open(file, self.class.spreadsheet_options || {})
     end
 
     def required_headers
       return @required_headers if @required_headers
 
-      @required_columns = self.class.schema.select { |field, column_config| !column_config.is_a?(Hash) || !column_config.has_key?(:required) || column_config[:required] }
-      @required_line_keys = @required_columns.map{ |k, v| k }
-      @required_headers = @required_columns.map{ |k, column_config| column_config.is_a?(Hash) ? column_config[:header] : column_config }.map{|header| header.is_a?(String) ? Regexp.new("^#{header}$", "i") : header}
-      if self.class.primary_key && !@required_line_keys.include?(self.class.primary_key)
-        @required_line_keys = @required_line_keys.unshift(self.class.primary_key)
-        @required_headers = @required_headers.unshift(Regexp.new(self.class.primary_key.to_s, "i")) 
+      @required_columns = self.class.schema.select { |_field, column_config| !column_config.is_a?(Hash) || !column_config.key?(:required) || column_config[:required] }
+      @required_headers = @required_columns.values.map { |column| get_column_header(column) }.map { |header| transform_header_to_regexp(header) }
+      if self.class.primary_key && !@required_columns.keys.include?(self.class.primary_key)
+        @required_headers.unshift(Regexp.new(self.class.primary_key.to_s, "i"))
       end
       @required_headers
     end
 
     def spreadsheet_data
-      spreadsheet.sheet(spreadsheet.sheets[0]).parse(header_search: required_headers)
+      begin
+        spreadsheet_data = spreadsheet.sheet(spreadsheet.sheets[0]).parse(header_search: required_headers)
+        raise 'File is inconsistent, please check all headers of your file for specials characters (, / ; etc...)'
+      rescue Roo::HeaderRowNotFoundError => e
+        missing_headers = []
+
+        e.message.slice(1..-1).chop.split(",").map(&:strip).each do |header_missing|
+          header_missing_regex = transform_header_to_regexp(header_missing, true)
+          header_found = @required_columns.values.find do |column|
+            transform_header_to_regexp(get_column_header(column)) == header_missing_regex
+          end
+          if header_found && header_found.is_a?(Hash) && header_found[:humanized_header].present?
+            missing_headers << header_found[:humanized_header]
+          elsif header_found&.is_a?(String)
+            missing_headers << header_found
+          else
+            missing_headers << header_missing
+          end
+        end
+        raise Roo::HeaderRowNotFoundError, missing_headers.join(", ")
+      end
     end
 
     def detect_header_scheme
       return @header_scheme if @header_scheme
+
       @header_scheme = {}
-      l = spreadsheet_data[0].dup
+      l = spreadsheet_data[0].dup || []
 
       self.class.schema.each do |field, column_config|
         header = column_config.is_a?(Hash) ? column_config[:header] : column_config
 
         l.each do |parsed_header, _value|
+          next unless parsed_header
           next unless (header.is_a?(Regexp) && parsed_header && parsed_header.match?(header)) || header.is_a?(String) && parsed_header == header
-          
+
           l.delete(parsed_header)
           @header_scheme[parsed_header] = field
         end
@@ -131,7 +149,7 @@ module NtqExcelsior
     def record_attributes(record)
       return @record_attributes if @record_attributes
 
-      @record_attributes = self.class.schema.keys.select{|k| k.to_sym != :id && record.respond_to?(:"#{k}=") }
+      @record_attributes = self.class.schema.keys.select { |k| k.to_sym != :id && record.respond_to?(:"#{k}=") }
     end
 
     def set_record_fields(record, line)
@@ -149,7 +167,7 @@ module NtqExcelsior
       @success = false
       @action = nil
       @errors = []
-      
+
       if (self.class.autoset)
         record = set_record_fields(record, line)
       end
@@ -199,6 +217,24 @@ module NtqExcelsior
 
       { success_count: success_count, not_found_count: not_found_count, errors: errors_lines }
     end
+    
+  private
+  
+    def get_column_header(column)
+      return column unless column.is_a?(Hash)
+  
+      column[:header]
+    end
+  
+    def transform_header_to_regexp(header, gsub_enclosure = false)
+      return header unless header.is_a?(String)
+
+      if gsub_enclosure && header.scan(/^\/[\^]?([^(\$\/)]+)[\$]?\/[i]?$/i) && $1
+        header = $1
+      end
+      Regexp.new("^#{header}$", "i")
+    end
 
   end
+
 end

data/lib/ntq_excelsior/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NtqExcelsior
-  VERSION = "0.6.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ntq_excelsior
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kevin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md