read columns based on the order of dcolumn definitions and not order from csv file

Author: tracyloisel

lib/csv_importer/column.rb

@@ -6,5 +6,6 @@ class Column
 
     attribute :name, String
     attribute :definition, ColumnDefinition
+    attribute :rank, Integer, default: 0
   end
 end

lib/csv_importer/header.rb

@@ -8,13 +8,17 @@ class Header
     attribute :column_names, Array[String]
 
     def columns
+      max_column = column_names.size
+
       column_names.map do |column_name|
         # ensure column name escapes invisible characters
         column_name = column_name.gsub(/\P{Print}|\p{Cf}/, '')
+        rank = column_definitions.index { |definition| definition.match?(column_name) }
 
         Column.new(
           name: column_name,
-          definition: find_column_definition(column_name)
+          definition: find_column_definition(column_name),
+          rank: rank || max_column
         )
       end
     end

lib/csv_importer/row.rb

@@ -33,7 +33,7 @@ def csv_attributes
 
     # Set attributes
     def set_attributes(model)
-      header.columns.each do |column|
+      header.columns.sort_by(&:rank).each do |column|
         value = csv_attributes[column.name]
         begin
           value = value.dup if value