Refactor FoodsoftFile to reuse the code later

lib/foodsoft_file.rb

@@ -1,5 +1,3 @@
-require 'roo'
-
 # Foodsoft-file import
 class FoodsoftFile
 
@@ -7,35 +5,23 @@ class FoodsoftFile
   # returns two arrays with articles and outlisted_articles
   # the parsed article is a simple hash
   def self.parse(file, options = {})
-    filepath = file.is_a?(String) ? file : file.to_path
+    SpreadsheetFile.parse file, options do |row, row_index|
-    filename = options.delete(:filename) || filepath
+      next if row[2].blank?
-    fileext = File.extname(filename)
-    options[:csv_options] = {col_sep: ';', encoding: 'utf-8'}.merge(options[:csv_options]||{})
-    s = Roo::Spreadsheet.open(filepath, options.merge({extension: fileext}))
 
-    row_index = 1
+      article = {:order_number => row[1],
-    s.each do |row|
+                  :name => row[2],
-      if row_index == 1
+                  :note => row[3],
-        # @todo try to detect headers; for now using the index is ok
+                  :manufacturer => row[4],
-
+                  :origin => row[5],
-      elsif !row[2].blank?
+                  :unit => row[6],
-        article = {:order_number => row[1],
+                  :price => row[7],
-                   :name => row[2],
+                  :tax => row[8],
-                   :note => row[3],
+                  :deposit => (row[9].nil? ? "0" : row[9]),
-                   :manufacturer => row[4],
+                  :unit_quantity => row[10],
-                   :origin => row[5],
+                  :article_category => row[13]}
-                   :unit => row[6],
+      status = row[0] && row[0].strip.downcase == 'x' ? :outlisted : nil
-                   :price => row[7],
+      yield status, article, row_index
-                   :tax => row[8],
-                   :deposit => (row[9].nil? ? "0" : row[9]),
-                   :unit_quantity => row[10],
-                   :article_category => row[13]}
-        status = row[0] && row[0].strip.downcase == 'x' ? :outlisted : nil
-        yield status, article, row_index
-      end
-      row_index += 1
     end
-    row_index
   end
 
 end

lib/spreadsheet_file.rb

@@ -0,0 +1,24 @@
+require 'roo'
+
+class SpreadsheetFile
+
+  def self.parse(file, options = {})
+    filepath = file.is_a?(String) ? file : file.to_path
+    filename = options.delete(:filename) || filepath
+    fileext = File.extname(filename)
+    options[:csv_options] = {col_sep: ';', encoding: 'utf-8'}.merge(options[:csv_options]||{})
+    s = Roo::Spreadsheet.open(filepath, options.merge({extension: fileext}))
+
+    row_index = 1
+    s.each do |row|
+      if row_index == 1
+        # @todo try to detect headers; for now using the index is ok
+      else
+        yield row, row_index
+      end
+      row_index += 1
+    end
+    row_index
+  end
+
+end