imp_exp 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b590fb77458ecbbde482ccc594ac06b3480551b6f32ad6361c9e34b30cd4c49b
-  data.tar.gz: 5ac34f8c6a50ec3a2d1571ffa83ccb9a07241c1822ab4860b217d3980c941961
+  metadata.gz: 5f28ed3841e2f2cef56566da34d4994ba911680f3524d5568cb0a2211dab2d0c
+  data.tar.gz: e7f954cf9859c05aabe70b21c0d8cb6db9623e96e0ba269bb348b39f0bc2905b
 SHA512:
-  metadata.gz: 1551c0ad5706897955e9be29229686b9b1c65b0307654114c23dea08ce62771e90bbdcbcc5df867012b0ed9e8774caffded874cc5d4da6ed62ecc450e9c14162
-  data.tar.gz: b677f5e62d8e066bc1254efdfc00faa15f39266ddb95945d2e800f5178b912a25e87cc14ff7a80d0d4ae9a789b7ae5d4908cd23eb7ace35dede73161c011c4da
+  metadata.gz: 96e48f2adb43f7eeb7a49d5a367c9eb4aeaf5f2ac0fd6eb377fd092521b0ce4bc1a7eac3d783236668297d6889508251cacb9684accbcdb24d8878667affcf62
+  data.tar.gz: 84bdf4afd2c4a37285347394523ac0354bfd791f21ed661727bc03737bc36601df9f3f14c6b58eda374fc7bf563e200b4a4548eb6e7c0f421d630d7a79b172da

data/app/services/imp_exp/importers/base.rb

@@ -82,8 +82,7 @@ module ImpExp
           end
 
           begin
-            if record.save(context: :import)
-              model.after_save(record)
+            if model.save(record)
               @imported[model.model_name] += 1
               next
             end
@@ -145,7 +144,7 @@ module ImpExp
 
           full_file_path = File.join(files_directory_path, file_path.strip)
           begin
-            file = File.open(full_file_path)
+            file = File.open(full_file_path) # rubocop:disable Style/FileOpen
             record.send(file_attribute_name).attach(io: file, filename: File.basename(file_path))
           rescue Errno::ENOENT
             error_msg = I18n.t('imp_exp.importer.file_not_found', file_path: file_path)

data/app/services/imp_exp/importers/xlsx.rb

@@ -42,6 +42,8 @@ module ImpExp
                         end
 
         { format_errors: format_errors, data_validation_errors: data_validation_errors }.merge(import_result)
+      rescue Xsv::DuplicateHeaders
+        { format_errors: { name: :duplicated_headers } }
       end
 
       private

data/app/services/imp_exp/models/base.rb

@@ -143,7 +143,9 @@ module ImpExp
         "#{active_storage_file.name}-#{active_storage_file.record.code}#{file_extension(active_storage_file)}"
       end
 
-      def after_save(_record); end
+      def save(record)
+        record.save(context: :import)
+      end
 
       private
 

data/app/services/imp_exp/serializers/whole_records.rb

@@ -26,7 +26,7 @@ module ImpExp
           return [ImpExp::Serializers::Errors::WrongFormat.new("#{relation_name} error | #{message}")]
         end
 
-        unless data.is_a?(Array) && data.all? { |datum| datum.is_a?(Hash) }
+        unless data.is_a?(Array) && data.all?(Hash)
           return [ImpExp::Serializers::Errors::WrongFormat.new("#{relation_name} should be an array of hashes")]
         end
 

data/config/locales/en.yml

@@ -1,6 +1,7 @@
 en:
   imp_exp:
     importer:
+      duplicated_headers: "A duplicate header in a sheet of the import file prevents the file from being imported"
       invalid_columns: "The %{model_name} sheet does not contain the expected columns. Expected columns: %{expected_columns} Columns in the file: %{in_file_columns}."
       invalid_sheets: "The file does not contain the expected sheets. Expected sheets: %{expected_sheets} Sheets in the file: %{in_file_sheets}."
       record_not_found: "%{model_name} with %{conditions} conditions has not been found."

data/config/locales/fr.yml

@@ -1,6 +1,7 @@
 fr:
   imp_exp:
     importer:
+      duplicated_headers: "Un doublon d'en-tête de colonne dans une feuille du fichier d'import empêche l'import de fonctionner."
       invalid_columns: "La feuille %{model_name} ne contient pas les colonnes attendues. Colonnes attendues : %{expected_columns}. Colonnes dans le fichier : %{in_file_columns}."
       invalid_sheets: "Le fichier ne contient pas les feuilles attendues. Feuilles attendues : %{expected_sheets}. Feuilles dans le fichier : %{in_file_sheets}."
       record_not_found: "%{model_name} avec les conditions %{conditions} n'a pas été trouvé."

data/lib/imp_exp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImpExp
-  VERSION = "1.1.2"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imp_exp
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Dev team Nerya
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Import data from xlsx into a rails app and export data to xlsx from a rails
   app