importance 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0df06e38c78ddb548f82dd7108a1ff45ac679ad21c8b6549ccba6107cbf37b3
-  data.tar.gz: 1cd461bbaf521ab3d4358faa4accf85553d47fbb9941b8462d7e4342a154b45e
+  metadata.gz: 9f0dbf1d26a306836bbe35292350eb8f7cb58cbe665c0e37e06449f47d8c119c
+  data.tar.gz: b1bcbb1da753d6ffb93b7602afeb7c990f93744f1c9b17b0a3b4de6b61858f46
 SHA512:
-  metadata.gz: 855023fbe7167ff911683626c1e3f0d2eb0ae058f261f56c7f2e9d96afb01dc40e8a7e192f62fb1f47c79e824a971b8b46dee408d0b68370fc304695a0e66020
-  data.tar.gz: 0b98ee22a71bb61a5cf7a218795eb934b418317dde08ebd22bd267757d7648c531d0ae0e432ec5e4746146ca54562620c2d397c005473fc237aa19cde80f8b23
+  metadata.gz: 05b520199b43d3db0af5d4a276494c7f5d9b7224bf6ec775fafb55def64e856a971bc0a411df5c345fe97c7cec997e8381839295acc952dd1f49d1746c4d1c70
+  data.tar.gz: 6b466a41845678c9e572e3e930874fe84d7e0e6e9f4e30fa1bda2c6ee979566ff4d14761a9b81c00065e4a79b40f791454fca418deda3d46141c6fdf294b30ea

data/README.md

@@ -130,6 +130,7 @@ the first row is automatically treated as the header row.
 ```erb
 <%= form_with url: importance.submit_path(importer: :students), multipart: true do |form| %>
   <%= form.file_field :file, accept: ".xlsx,.xls,.csv" %>
+  <%= form.hidden_field :redirect_url, value: root_path >
   <%= form.submit "Submit" %>
 <% end %>
 ```

data/Rakefile

@@ -6,3 +6,13 @@ load "rails/tasks/engine.rake"
 load "rails/tasks/statistics.rake"
 
 require "bundler/gem_tasks"
+
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.verbose = false
+end
+
+task default: :test

data/app/controllers/importance/imports_controller.rb

@@ -1,4 +1,4 @@
-require "xsv"
+require "roo"
 require "csv"
 
 module Importance
@@ -26,6 +26,7 @@ module Importance
 
       session[:path] = persist_path
       session[:importer] = params[:importer].to_sym
+      session[:redirect_url] = params[:redirect_url]
 
       redirect_to map_path
     end
@@ -36,22 +37,19 @@ module Importance
 
       raise ArgumentError, "Importer cannot be nil" if importer.nil?
 
-      if csv_file?
-        csv_data = CSV.read(session[:path], headers: true)
-        @file_headers = csv_data.headers
-        @samples = csv_data.first(5).map(&:to_h)
-      else
-        workbook = Xsv.open(session[:path], parse_headers: true)
-        worksheet = workbook.first
-        @file_headers = worksheet.first.keys
-        @samples = worksheet.first(5)
-      end
+      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
 
       @importer_attributes = importer.attributes
       @layout = "Importance::#{Importance.configuration.layout.to_s.camelize}Layout".constantize
     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]
@@ -81,7 +79,7 @@ module Importance
         if importer.teardown_callback
           instance_exec(&importer.teardown_callback)
         else
-          redirect_to session[:redirect_url] || root_path, notice: "Import completed."
+          redirect_to (session[:redirect_url] || main_app.root_path), notice: "Import completed."
         end
 
       rescue => e
@@ -97,33 +95,31 @@ module Importance
       File.extname(session[:path]).downcase == ".csv"
     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(mappings)
-      if csv_file?
-        CSV.foreach(session[:path], headers: true) do |row|
-          record = process_row(row.to_h, mappings)
-          next if record.empty? || record.values.all? { |v| v.nil? || v.to_s.strip.empty? }
-          yield record
-        end
-      else
-        workbook = Xsv.open(session[:path], parse_headers: true)
-        worksheet = workbook.first
-        worksheet.each do |row|
-          record = process_row(row, mappings)
-          next if record.empty? || record.values.all? { |v| v.nil? || v.to_s.strip.empty? }
-          yield record
-        end
+      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
       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 = {}
-      row.each do |row_header, value|
-        attribute = mappings.permit!.to_h.find { |column_name, attribute_name| column_name == row_header }
-        next if attribute.nil?
-        attribute = attribute[1]
-        next if attribute.nil? || attribute == ""
-        record[attribute.to_sym] = value
+
+      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
 

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

@@ -4,14 +4,14 @@
     <table class="importance-table <%= @layout.table_class %>">
       <thead>
         <tr>
-          <% @file_headers.each do |file_header| %>
+          <% @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)
               %>
-              <%= form.select "mappings[#{file_header}]",
+              <%= form.select "mappings[#{file_header_idx}]",
                               options_for_select(
                                 [[t('importance.ignore'), ""]] + 
                                 @importer_attributes.map { |attr| [attr.labels.first, attr.key] },
@@ -29,13 +29,16 @@
       <tbody>
         <% @samples.each do |sample| %>
           <tr>
-            <% @file_headers.each do |file_header| %>
-              <td><%= sample[file_header] %></td>
+            <% @file_headers.each_with_index do |file_header, file_header_idx| %>
+              <td><%= sample[file_header_idx] %></td>
             <% end %>
           </tr>
         <% end %>
       </tbody>
     </table>
+    <p>
+      <%= t('importance.import_description', count: @samples.count, full_count: @full_count) %>
+    </p>
   </div>
 <% end %>
 

data/config/locales/de.yml

@@ -3,3 +3,4 @@ de:
     use_column_as: Spalte verwenden als
     ignore: Ignorieren
     import: Importieren
+    import_description: "Es werden %{count} von %{full_count} Beispieldatensätzen angezeigt."

data/config/locales/en.yml

@@ -3,3 +3,4 @@ en:
     use_column_as: Use column as
     ignore: Ignore
     import: Import
+    import_description: "Showing %{count} of %{full_count} sample records."

data/config/locales/fr.yml

@@ -3,3 +3,4 @@ fr:
     use_column_as: Utiliser la colonne comme
     ignore: Ignorer
     import: Importer
+    import_description: "Affichage de %{count} sur %{full_count} exemples d'enregistrements."

data/config/locales/it.yml

@@ -3,3 +3,4 @@ it:
     use_column_as: Utilizzare come
     ignore: Ignora
     import: Importare
+    import_description: "Mostrati %{count} di %{full_count} record di esempio."

data/lib/importance/version.rb

@@ -1,3 +1,3 @@
 module Importance
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: importance
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Lukas_Skywalker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-06-07 00:00:00.000000000 Z
+date: 2025-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.0.2
 - !ruby/object:Gem::Dependency
-  name: xsv
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -45,27 +45,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 description: Importance is a Rails engine that allows users to upload Excel and CSV
   files and interactively map columns to model attributes. It handles files with arbitrary
   headers by letting users select which columns to import and which to ignore, with
@@ -127,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Flexible Excel and CSV import engine with column mapping for Rails applications