importance 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dbfd3e3f5165908c080e2e2f01c41b1d5ec266ca5a06f65d1dac0f67ba441fa
-  data.tar.gz: 1c191b2a8720eddcc21c84981aa0efb3f80d70b34f9247cbc68041fdfdc14728
+  metadata.gz: eaa9c663497a1803a8073c007296562b853d4d1e97d6c8d8336210bd719db481
+  data.tar.gz: 43e5fc5fee72a4c57fbbf5838fdc1c3a83d1628433d5bdde457b01197d52b8ca
 SHA512:
-  metadata.gz: 39b547bf1e0525d582ad017e23b80ebcceef4d0cae23712062932c76f16f39dd21f94648dc9598fe984823b0364480b66c343754a35cea7ea3cef0e4a9486cea
-  data.tar.gz: 2657a35594799c90db8f48d331cf8fde189e6d5882397ec076cbccba0898a36ac363ef628d19faa07cba96f7115f2139b45c63b7e1587c64fa00b0cbc9515015
+  metadata.gz: 212918817607bb11fd2696f49f4997ff30e5ee92cd2f1f36e577b7346357bb8e0aa917f849e62f42898ba53b78aa513d3efbe7ead1c03b250d349467c5b4c0b2
+  data.tar.gz: e1ae1c63063963932f8ebcf67f263e1755bfbf722c1c399bc8a2d709e6705a6e1eb8f13e455994c72be017a6b2651812f3ffb7c1fffe812c8033a96e15f69aec

data/app/controllers/importance/imports_controller.rb

@@ -6,125 +6,112 @@ module Importance
     # Form submission target. Persist the file and redirect to the mapping page.
     def submit
       upload = params[:file]
+      session[:redirect_url] = params[:redirect_url]
+      session[:importer] = params[:importer].to_sym
 
-      raise ArgumentError, "Upload cannot be nil" if upload.nil?
+      if upload.nil?
+        flash[:alert] = t("importance.errors.no_file")
+        redirect_to session[:redirect_url] and return
+      end
 
       upload_extension = File.extname(upload.original_filename).downcase
       supported_extensions = [ ".xlsx", ".xls", ".csv" ]
 
-      raise ArgumentError, "Unsupported file format. Please upload Excel (.xlsx, .xls) or CSV (.csv) files." unless supported_extensions.include?(upload_extension)
+      if !supported_extensions.include?(upload_extension)
+        flash[:alert] = t("importance.errors.invalid_file_type", types: supported_extensions.join(", "))
+        redirect_to session[:redirect_url] and return
+      end
 
       system_tmp_dir = Dir.tmpdir
       upload_path = upload.tempfile.path
       persist_filename = "#{SecureRandom.uuid}#{upload_extension}"
 
       persist_path =  File.join(system_tmp_dir, persist_filename)
+      session[:path] = persist_path
 
-      raise ArgumentError, "File does not exist at #{upload_path}" if !File.exist?(upload_path)
+      if !File.exist?(upload_path)
+        flash[:alert] = t("importance.errors.no_file")
+        redirect_to session[:redirect_url] and return
+      end
 
       FileUtils.mv(upload_path, persist_path)
 
-      session[:path] = persist_path
-      session[:importer] = params[:importer].to_sym
-      session[:redirect_url] = params[:redirect_url]
-
       redirect_to map_path
     end
 
     # Mapping page. Load headers and samples, display the form.
     def map
-      importer = Importance.configuration.importers[session[:importer].to_sym]
-
-      raise ArgumentError, "Importer cannot be nil" if importer.nil?
+      @layout = "Importance::#{Importance.configuration.layout.to_s.camelize}Layout".constantize
+      @importer = Importance.configuration.importers[session[:importer].to_sym]
 
-      workbook = Roo::Spreadsheet.open(session[:path], { csv_options: { encoding: "bom|utf-8" } })
-      worksheet = workbook.sheet(0)
-      @file_headers = worksheet.row(1)
-      @samples = worksheet.parse[1..5]
-      @full_count = worksheet.count - 1
+      if @importer.nil?
+        flash[:alert] = t("importance.errors.no_importer")
+        redirect_to session[:redirect_url] and return
+      end
 
-      @importer_attributes = importer.attributes
-      @layout = "Importance::#{Importance.configuration.layout.to_s.camelize}Layout".constantize
+      @importer.add_spreadsheet(session[:path])
     end
 
     # Import page. Load the file according to the mapping and import it.
     # Mappings param is of the form mappings[excel_column_idx] = target_attribute
     # mappings[0] = "first_name", mappings[1] = "", mappings[2] = "last_name" ...
     def import
-      importer = Importance.configuration.importers[session[:importer].to_sym]
-      mappings = params[:mappings]
+      @layout = "Importance::#{Importance.configuration.layout.to_s.camelize}Layout".constantize
+      @importer = Importance.configuration.importers[session[:importer].to_sym]
+      @importer.add_spreadsheet(session[:path])
 
-      raise ArgumentError, "Mapping cannot be nil" if mappings.nil?
+      if @importer.nil?
+        flash[:alert] = t("importance.errors.no_importer")
+        render :map and return
+      end
 
-      if importer.setup_callback
-        instance_exec(&importer.setup_callback)
+      if params[:mappings].nil?
+        flash[:alert] = t("importance.errors.no_mappings")
+        render :map and return
       end
 
-      begin
-        records_to_import = []
+      @mappings = params[:mappings].permit!.to_h.map { |k, v| [ k.to_i, v ] }.to_h
 
-        each_processed_row(mappings) do |record|
-          records_to_import << record
+      @importer.importer_attributes.each do |attribute|
+        next if !attribute.options[:required]
+        next if @mappings.values.include?(attribute.key.to_s)
 
-          if importer.batch && records_to_import.size >= importer.batch
-            instance_exec(records_to_import, &importer.perform_callback)
-            records_to_import = []
-          end
-        end
+        flash[:alert] = t("importance.errors.missing_mapping", attribute: attribute.labels.first)
+        render :map and return
+      end
 
-        if records_to_import.any?
-          instance_exec(records_to_import, &importer.perform_callback)
-        end
+      @mappings.each do |column_index, attribute_name|
+        next if attribute_name == ""
+        next if @mappings.values.count(attribute_name) <= 1
 
-        if importer.teardown_callback
-          instance_exec(&importer.teardown_callback)
-        else
-          redirect_to (session[:redirect_url] || main_app.root_path), notice: "Import completed."
-        end
+        flash[:alert] = t("importance.errors.duplicate_mapping", attribute: attribute_name)
+        render :map and return
+      end
 
-      rescue => e
-        if importer.error_callback
-          instance_exec(e, &importer.error_callback)
-        end
+      if @importer.setup_callback
+        instance_exec(&@importer.setup_callback)
       end
-    end
 
-    private
+      records_to_import = []
 
-    def csv_file?
-      File.extname(session[:path]).downcase == ".csv"
-    end
+      @importer.each_processed_row(session[:path], @mappings) do |record|
+        records_to_import << record
 
-    # Yields each processed row (a hash of attribute => value) to the given block.
-    # Skips empty rows (all values nil or empty).
-    def each_processed_row(mappings)
-      workbook = Roo::Spreadsheet.open(session[:path], { csv_options: { encoding: "bom|utf-8" } })
-      worksheet = workbook.sheet(0)
-      worksheet.each_with_index do |row, idx|
-        next if idx == 0 # Skip header row
-        record = process_row(row, mappings)
-        next if record.empty? || record.values.all? { |v| v.nil? || v.to_s.strip.empty? }
-        yield record
+        if @importer.batch && records_to_import.size >= @importer.batch
+          instance_exec(records_to_import, &@importer.perform_callback)
+          records_to_import = []
+        end
       end
-    end
-
-    # Turn a row of the form ["Hans", "Robert", 1970, "male", "Apple Inc.", "hr@apple.com"]
-    # and a mapping of the form {"0"=>"first_name", "1"=>"last_name", "2"=>"", "3"=>"", "4"=>"", "5"=>"email"}
-    # into a record of the form { first_name: "Hans", last_name: "Robert", email: "hr@apple.com" }
-    def process_row(row, mappings)
-      record = {}
 
-      mappings.each do |column_index, attribute_name|
-        next if attribute_name.nil? || attribute_name == ""
-        value = row[column_index.to_i]
-        record[attribute_name.to_sym] = value
+      if records_to_import.any?
+        instance_exec(records_to_import, &@importer.perform_callback)
       end
 
-      record
-    end
-
-    def rails_routes
-      ::Rails.application.routes.url_helpers
+      if @importer.teardown_callback
+        instance_exec(&@importer.teardown_callback)
+      else
+        redirect_to (session[:redirect_url] || main_app.root_path), notice: t("importance.success.import_completed")
+      end
     end
   end
 end

data/app/views/importance/imports/map.html.erb

@@ -4,32 +4,32 @@
     <table class="importance-table <%= @layout.table_class %>">
       <thead>
         <tr>
-          <% @file_headers.each_with_index do |file_header, file_header_idx| %>
+          <% @importer.file_headers.each_with_index do |file_header, file_header_idx| %>
             <th>
               <%= t('importance.use_column_as') %>
               <%
-                attribute_mappings = Importance::Header.match_attributes_to_headers(@importer_attributes, @file_headers)
-                default_value = Importance::Header.default_value_for_header(file_header, attribute_mappings)
+                attribute_mappings = Importance::Header.match_attributes_to_headers(@importer.importer_attributes, @importer.file_headers)
+                default_value = (@mappings && @mappings[file_header_idx]) || Importance::Header.default_value_for_header(file_header, attribute_mappings)
               %>
               <%= form.select "mappings[#{file_header_idx}]",
                               options_for_select(
                                 [[t('importance.ignore'), ""]] + 
-                                @importer_attributes.map { |attr| [attr.labels.first, attr.key] },
+                                @importer.importer_attributes.map { |attr| [attr.labels.first, attr.key] },
                                 default_value
                               ), {}, class: @layout.select_class %>
             </th>
           <% end %>
         </tr>
         <tr>
-          <% @file_headers.each do |file_header| %>
+          <% @importer.file_headers.each do |file_header| %>
             <th><%= file_header %></th>
           <% end %>
         </tr>
       </thead>
       <tbody>
-        <% @samples.each do |sample| %>
+        <% @importer.samples.each do |sample| %>
           <tr>
-            <% @file_headers.each_with_index do |file_header, file_header_idx| %>
+            <% @importer.file_headers.each_with_index do |file_header, file_header_idx| %>
               <td><%= sample[file_header_idx] %></td>
             <% end %>
           </tr>
@@ -38,7 +38,7 @@
     </table>
   </div>
   <p>
-    <%= t('importance.import_description', count: @samples.count, full_count: @full_count) %>
+    <%= t('importance.import_description', count: @importer.samples.count, full_count: @importer.full_count) %>
   </p>
 <% end %>
 

data/config/locales/de.yml

@@ -3,4 +3,14 @@ de:
     use_column_as: Spalte verwenden als
     ignore: Ignorieren
     import: Importieren
-    import_description: "Es werden %{count} von %{full_count} Beispieldatensätzen angezeigt."
+    import_description: Es werden %{count} von %{full_count} Beispieldatensätzen angezeigt.
+    errors:
+      no_importer: Kein Importer ausgewählt.
+      no_file: Keine Datei hochgeladen.
+      invalid_file_type: Ungültiger Dateityp. Erlaubt sind %{types}.
+      no_mappings: Keine Zuordnungen angegeben.
+      duplicate_mapping: Attribut %{attribute} wird mehrfach verwendet.
+      import_failed: Import fehlgeschlagen. %{error}.
+      missing_mapping: Fehlende Zuordnung für erforderliches Attribut %{attribute}.
+    success:
+      import_completed: Import abgeschlossen.

data/config/locales/en.yml

@@ -3,4 +3,14 @@ en:
     use_column_as: Use column as
     ignore: Ignore
     import: Import
-    import_description: "Showing %{count} of %{full_count} sample records."
+    import_description: Showing %{count} of %{full_count} sample records.
+    errors:
+      no_importer: No importer selected.
+      no_file: No file uploaded.
+      invalid_file_type: Invalid file type. Allowed types are %{types}.
+      no_mappings: No mappings provided.
+      duplicate_mapping: Attribute %{attribute} is used multiple times.
+      import_failed: Import failed. %{error}.
+      missing_mapping: Missing mapping for required attribute %{attribute}.
+    success:
+      import_completed: Import completed.

data/config/locales/fr.yml

@@ -3,4 +3,14 @@ fr:
     use_column_as: Utiliser la colonne comme
     ignore: Ignorer
     import: Importer
-    import_description: "Affichage de %{count} sur %{full_count} exemples d'enregistrements."
+    import_description: Affichage de %{count} sur %{full_count} exemples d'enregistrements.
+    errors:
+      no_importer: Aucun importateur sélectionné.
+      no_file: Aucune fichier téléchargé.
+      invalid_file_type: Type de fichier invalide. Les types autorisés sont %{types}.
+      no_mappings: Aucune correspondance fournie.
+      duplicate_mapping: L'attribut %{attribute} est utilisé plusieurs fois.
+      import_failed: Import échoué. %{error}.
+      missing_mapping: Correspondance manquante pour l'attribut requis %{attribute}.
+    success:
+      import_completed: Import terminé.

data/config/locales/it.yml

@@ -3,4 +3,14 @@ it:
     use_column_as: Utilizzare come
     ignore: Ignora
     import: Importare
-    import_description: "Mostrati %{count} di %{full_count} record di esempio."
+    import_description: Mostrati %{count} di %{full_count} record di esempio.
+    errors:
+      no_importer: Nessun importatore selezionato.
+      no_file: Nessun file caricato.
+      invalid_file_type: Tipo di file non valido. I tipi consentiti sono %{types}.
+      no_mappings: Nessuna mappatura fornita.
+      duplicate_mapping: L'attributo %{attribute} è utilizzato più volte.
+      import_failed: Import fallito. %{error}.
+      missing_mapping: Mappatura mancante per l'attributo obbligatorio %{attribute}.
+    success:
+      import_completed: Import completato.

data/lib/importance/configuration.rb

@@ -29,11 +29,12 @@ module Importance
       @teardown_callback = nil
       @error_callback = nil
       @batch = false
+      @worksheet = nil
       instance_eval(&block) if block_given?
     end
 
-    def attribute(key, labels)
-      @attributes << OpenStruct.new(key: key, labels: labels)
+    def attribute(key, labels, options = {})
+      @attributes << OpenStruct.new(key: key, labels: labels, options: options)
     end
 
     def batch_size(size)
@@ -55,6 +56,49 @@ module Importance
     def error(&block)
       @error_callback = block
     end
+
+    def add_spreadsheet(path)
+      workbook = Roo::Spreadsheet.open(path, { csv_options: { encoding: "bom|utf-8" } })
+      @worksheet = workbook.sheet(0)
+    end
+
+    def file_headers
+      @worksheet.row(1)
+    end
+
+    def samples
+      @worksheet.parse[1..5]
+    end
+
+    def full_count
+      @worksheet.count - 1
+    end
+
+    # Yields each processed row (a hash of attribute => value) to the given block.
+    # Skips empty rows (all values nil or empty).
+    def each_processed_row(path, mappings)
+      @worksheet.each_with_index do |row, idx|
+        next if idx == 0 # Skip header row
+        record = process_row(row, mappings)
+        next if record.empty? || record.values.all? { |v| v.nil? || v.to_s.strip.empty? }
+        yield record
+      end
+    end
+
+    # Turn a row of the form ["Hans", "Robert", 1970, "male", "Apple Inc.", "hr@apple.com"]
+    # and a mapping of the form {"0"=>"first_name", "1"=>"last_name", "2"=>"", "3"=>"", "4"=>"", "5"=>"email"}
+    # into a record of the form { first_name: "Hans", last_name: "Robert", email: "hr@apple.com" }
+    def process_row(row, mappings)
+      record = {}
+
+      mappings.each do |column_index, attribute_name|
+        next if attribute_name.nil? || attribute_name == ""
+        value = row[column_index.to_i]
+        record[attribute_name.to_sym] = value
+      end
+
+      record
+    end
   end
 
   def self.configure

data/lib/importance/version.rb

@@ -1,3 +1,3 @@
 module Importance
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importance
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - Lukas_Skywalker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-10-10 00:00:00.000000000 Z
+date: 2025-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails