ntq_excelsior 0.5.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc8cbf2a89c838237dc9ab67a36e6c610b058ee4636ba2b7d8b1e6c782ffe989
-  data.tar.gz: d4ccb408477c98f9cb66cf7dea7e3ae255b1a69690090f58207c7786e9856647
+  metadata.gz: b1b7c2ea8995dcb68450bc1771e8fef43e04dc6aeea67b585783378bf68bd8c1
+  data.tar.gz: a8f6b916a1b0cca7e6ee306a9453ac802d0ce859eb1f3bf82d1aa4d8e991ef40
 SHA512:
-  metadata.gz: ca1474e047e0785f7312a3275c8f4fda697c366b6efa156442eb253a9d8b7ead28d3d1997b35562f7300fa3a4cc506e2538a41b111470ba9424365c131775b9e
-  data.tar.gz: 2d45cdd5ad98112b37c94e0c60c1b07cdc92dd80a1d28ace095a958958d327d129a51b93fa8e7cfdb77e73a616d3ed5e656c6f1ebd408458025bacbcc7b675fc
+  metadata.gz: 0efaeba2512cd02f8770014c4a02c06b7245e6e42db275bd0f4d5f2a5455ca54b1aaec40fc221086d50795e706b1ec5594a5054cb7a3d6b04898abf57d795d39
+  data.tar.gz: 3db4c3881a7a1677bd6a61b820384657cc25b2041f78463b175597b3032932f94550c7a8b941b975b18e571383dbdeb90e0e99618c873915c6aa57815c9fab0a

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

@@ -0,0 +1,75 @@
+PATH
+  remote: .
+  specs:
+    ntq_excelsior (1.0.0)
+      caxlsx (< 4)
+      roo (< 3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    caxlsx (3.3.0)
+      htmlentities (~> 4.3, >= 4.3.4)
+      marcel (~> 1.0)
+      nokogiri (~> 1.10, >= 1.10.4)
+      rubyzip (>= 1.3.0, < 3)
+    diff-lcs (1.5.0)
+    htmlentities (4.3.4)
+    json (2.6.3)
+    marcel (1.0.2)
+    nokogiri (1.15.2-arm64-darwin)
+      racc (~> 1.4)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    racc (1.7.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.5)
+    roo (2.10.0)
+      nokogiri (~> 1)
+      rubyzip (>= 1.3.0, < 3.0.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    rubocop (1.52.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.2.3)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    rubyzip (2.3.2)
+    unicode-display_width (2.4.2)
+
+PLATFORMS
+  arm64-darwin-21
+
+DEPENDENCIES
+  caxlsx (~> 3.2)
+  ntq_excelsior!
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rubocop (~> 1.21)
+
+BUNDLED WITH
+   2.4.14

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,56 @@ 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| tranform_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 = tranform_header_to_regexp(header_missing, true)
+          header_found = @required_columns.values.find do |column|
+            tranform_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]
+          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 header.is_a?(Regexp) && parsed_header.match?(header) || header.is_a?(String) && parsed_header == header
-          
+          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 +147,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 +165,7 @@ module NtqExcelsior
       @success = false
       @action = nil
       @errors = []
-      
+
       if (self.class.autoset)
         record = set_record_fields(record, line)
       end
@@ -199,6 +215,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 tranform_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.5.4"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ntq_excelsior
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Kevin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -45,11 +45,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile