batch_factory 0.0.2 → 0.0.3

data/lib/batch_factory/parser.rb

@@ -8,9 +8,8 @@ module BatchFactory
       @row_hashes = []
     end
   
-    def open file_location
-      workbook = Spreadsheet.open File.open(file_location)
-      @worksheet = workbook.worksheet(0)
+    def open(file_location, sheet_number = 0)
+      @worksheet = SpreadsheetDocument.new(file_location, sheet_number)
     end
     
     def parse!
@@ -22,26 +21,28 @@ module BatchFactory
     end
     
     def parse_heading_keys
-      @heading_keys = worksheet.row(0).map do |key|
+      @heading_keys = worksheet.row(worksheet.first_row).map do |key|
         key.blank? ? nil : key.strip
       end
     end
     
     def parse_column_bounds
-      @column_bounds = [@worksheet.dimensions[2], @worksheet.dimensions[3]-1]
+      @column_bounds = @worksheet.first_column..@worksheet.last_column
     end
     
     def parse_data_rows
       @row_hashes = []
       
-      worksheet.each(1) do |row|
+      rows_range = (worksheet.first_row+1..worksheet.last_row)
+      rows_range.each do |idx|
+        row = worksheet.row(idx)
         hash = HashWithIndifferentAccess.new
         
-        for cell_index in @column_bounds[0]..@column_bounds[1]
+        for cell_index in @column_bounds
           if key = @heading_keys[cell_index] and
             value = row[cell_index]
             
-            hash[key] = sanitize_value value if value.present?
+            hash[key] = value if value.present?
           end
         end
         
@@ -49,14 +50,6 @@ module BatchFactory
       end
     end
     
-    def sanitize_value value
-      if value.is_a? Spreadsheet::Formula
-        value.value
-      else
-        value.to_s.strip
-      end
-    end
-    
     def hashed_worksheet
       @hashed_worksheet ||= HashedWorksheet.new(
         @heading_keys,

data/lib/batch_factory/version.rb

@@ -1,3 +1,3 @@
 module BatchFactory
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/batch_factory.rb

@@ -2,6 +2,7 @@ require 'spreadsheet'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/indifferent_access'
 
+require 'spreadsheet_document'
 require 'batch_factory/version'
 require 'batch_factory/parser'
 require 'batch_factory/hashed_worksheet'

data/lib/spreadsheet_document.rb

@@ -0,0 +1,25 @@
+require 'roo'
+class SpreadsheetDocument
+  def initialize(file_name, sheet_number)
+    @spreadsheet = case file_name.split('.').last
+      when 'xls'
+        Excel.new(file_name)
+      when 'xlsx'
+        Excelx.new(file_name)
+      when 'ods'
+        Openoffice.new(file_name)
+      else
+        Csv.new(file_name)
+    end
+    @current_sheet = @spreadsheet.sheets[sheet_number]
+  end
+  
+  def method_missing(method, *args, &block)
+    if @spreadsheet.respond_to? method.to_sym
+      args << @current_sheet
+      @spreadsheet.send(method, *args, &block)
+    else
+      super
+    end
+  end
+end

data/spec/unit/batch_factory/hashed_worksheet.rb

@@ -15,7 +15,7 @@ describe BatchFactory::HashedWorksheet do
     end
     
     it 'should return an array of data hashes' do
-      worksheet.rows[0][:age].should == '50'
+      worksheet.rows[0][:age].should == 50
     end
     
     it 'should iterate over the rows' do

data/spec/unit/batch_factory/parser.rb

@@ -9,14 +9,14 @@ describe BatchFactory::Parser do
       parser.worksheet.should_not be_nil
     end
     
-    context 'when parsing' do
+    context 'when parsing default worksheet' do
       before do
         parser.open VALID_SPREADSHEET
         parser.parse!
       end
       
       it 'should parse column information' do
-        parser.column_bounds.should == [0,5]
+        parser.column_bounds.should == (1..6)
       end
       
       it 'should parse the heading keys' do
@@ -24,7 +24,7 @@ describe BatchFactory::Parser do
       end
       
       it 'should parse the data rows' do
-        parser.row_hashes[0]['age'].should == '50'
+        parser.row_hashes[0]['age'].should == 50
         parser.row_hashes.size.should == 1
       end
       
@@ -34,6 +34,33 @@ describe BatchFactory::Parser do
         worksheet.keys.should == parser.heading_keys
       end
     end
+
+    context 'when parsing second worksheet' do
+      before do
+        parser.open VALID_SPREADSHEET, 1
+        parser.parse!
+      end
+      
+      it 'should parse column information' do
+        parser.column_bounds.should == (3..8)
+      end
+      
+      it 'should parse the heading keys' do
+        parser.heading_keys.should == ['name', 'address', nil, 'country', 'bid', 'age']
+      end
+      
+      it 'should parse the data rows' do
+        parser.row_hashes[0]['age'].should == 50
+        parser.row_hashes.size.should == 1
+      end
+      
+      it 'should return a hashed worksheet' do
+        worksheet = parser.hashed_worksheet
+        worksheet.rows.should == parser.row_hashes
+        worksheet.keys.should == parser.heading_keys
+      end
+    end
+
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batch_factory
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -67,9 +67,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/batch_factory.rb
+- lib/spreadsheet_document.rb
 - lib/batch_factory/hashed_worksheet.rb
-- lib/batch_factory/parser.rb
 - lib/batch_factory/version.rb
+- lib/batch_factory/parser.rb
 - spec/spec_helper.rb
 - spec/unit/batch_factory.rb
 - spec/unit/batch_factory/hashed_worksheet.rb