ntq_excelsior 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1b7c2ea8995dcb68450bc1771e8fef43e04dc6aeea67b585783378bf68bd8c1
-  data.tar.gz: a8f6b916a1b0cca7e6ee306a9453ac802d0ce859eb1f3bf82d1aa4d8e991ef40
+  metadata.gz: b29b9647c8d1431ec7f81883960af69dbaa8686bb29398e015c30b1d07c6e5f9
+  data.tar.gz: c3b9e0e4fd0718d2cdeea72484f07755dff6376878ae4042599056233f08ae82
 SHA512:
-  metadata.gz: 0efaeba2512cd02f8770014c4a02c06b7245e6e42db275bd0f4d5f2a5455ca54b1aaec40fc221086d50795e706b1ec5594a5054cb7a3d6b04898abf57d795d39
-  data.tar.gz: 3db4c3881a7a1677bd6a61b820384657cc25b2041f78463b175597b3032932f94550c7a8b941b975b18e571383dbdeb90e0e99618c873915c6aa57815c9fab0a
+  metadata.gz: dc5abd51daaae03d38f51329ee2201e04f758102b0bcc5794e987f033ddead70f04fb7da8755fb9b476742d20d724b0f827790291140c422e15b31c8319a8ab9
+  data.tar.gz: 94a68a1fda84f0a79f1f3ac432622f18582f11e083ce9e4e5878bab5cebaef85bdd92830fcc90457acf9af9ee62270239d508bda6a1a20dd07bb38934c99a9b3

data/Gemfile.lock

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

data/lib/ntq_excelsior/importer.rb

@@ -54,7 +54,7 @@ module NtqExcelsior
       return @required_headers if @required_headers
 
       @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) }
+      @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
@@ -64,17 +64,19 @@ module NtqExcelsior
     def spreadsheet_data
       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...)'
+        raise 'File is inconsistent, please check all headers of your file for specials characters (, / ; etc...)' unless spreadsheet_data.size > 0
       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_missing_regex = transform_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
+            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]
+          if header_found && header_found.is_a?(Hash)
+            missing_headers << header_found[:header].is_a?(String) ? header_found[:header] : (header_found[:humanized_header] || header_missing)
+          elsif header_found&.is_a?(String)
+            missing_headers << header_found
           else
             missing_headers << header_missing
           end
@@ -224,7 +226,7 @@ module NtqExcelsior
       column[:header]
     end
   
-    def tranform_header_to_regexp(header, gsub_enclosure = false)
+    def transform_header_to_regexp(header, gsub_enclosure = false)
       return header unless header.is_a?(String)
 
       if gsub_enclosure && header.scan(/^\/[\^]?([^(\$\/)]+)[\$]?\/[i]?$/i) && $1

data/lib/ntq_excelsior/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ntq_excelsior
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Kevin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx