batch_factory 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de755e29b2ab64eb96981e9399f2c04f2445f418
-  data.tar.gz: f823d42bca1cade8dac3685c85af46d1ce3276e5
+  metadata.gz: 6f33676dbbb2880f05b0d68c8354d73842e800e8
+  data.tar.gz: 8b73db2c704de678ffe46edcde50e4e88f655fb6
 SHA512:
-  metadata.gz: 7d7e689e7404dfe1454b282d55555287146c6b165d38d04af3d04b1c21e26891d6a8c70b1ca3336909372502f07f1e5ca1b1baff4eb02421fccb3be83767a96a
-  data.tar.gz: f9db6af5626c42b1d40fc09101210e2fc938035fde02757f0c526fce25d52ed076042b095f40d8a4950a4a7cece1260147091bef6294984d342f554a4482e6ba
+  metadata.gz: 3458d01dcee4626806d1cf1c002c0321376cac3d530973a96f479f9d57477c9fe3a7dc421e409154fe06e0ddc8d530622050c62433c5f719bcb9ad8e9643a629
+  data.tar.gz: 84957e02bb3382aab41a53eee4f594551988cb87da3c6b48f241cd8585d0b59501f5dc6b5a3f711d0e36165eabd275b923fda7918405bd5632497afb3215414b

data/lib/batch_factory.rb

@@ -9,11 +9,11 @@ require 'batch_factory/hashed_worksheet'
 
 module BatchFactory
   class << self
-    def from_file file_location
+    def from_file file_location, keys = nil
       parser = BatchFactory::Parser.new
-      parser.open file_location
+      parser.open file_location, 0, keys
       parser.parse!
-      
+
       parser.hashed_worksheet
     end
   end

data/lib/batch_factory/hashed_worksheet.rb

@@ -1,12 +1,12 @@
 module BatchFactory
   class HashedWorksheet
     attr_accessor :keys, :rows
-    
+
     def initialize(keys, rows)
       @keys = keys
       @rows = rows
     end
-    
+
     def method_missing(method, *args, &block)
       if (Enumerable.public_instance_methods + Array.public_instance_methods).include? method.to_sym
         @rows.send(method, *args, &block)
@@ -14,6 +14,6 @@ module BatchFactory
         super
       end
     end
-    
+
   end
 end

data/lib/batch_factory/parser.rb

@@ -1,61 +1,64 @@
 module BatchFactory
   class Parser
-    attr_accessor :worksheet, :heading_keys, :column_bounds, :row_hashes
-  
+    attr_accessor :worksheet, :user_heading_keys, :heading_keys, :column_bounds, :row_hashes
+
     def initialize
       @heading_keys = []
       @column_bounds = []
       @row_hashes = []
     end
-  
-    def open(file_location, sheet_number = 0)
+
+    def open(file_location, sheet_number = 0, user_keys = nil)
       @worksheet = SpreadsheetDocument.new(file_location, sheet_number)
+      @user_heading_keys = user_keys
     end
-    
+
     def parse!
       @hashed_worksheet = nil
-    
+
       parse_column_bounds
       parse_heading_keys
       parse_data_rows
     end
-    
+
     def parse_heading_keys
-      @heading_keys = worksheet.row(worksheet.first_row).map do |key|
+      @heading_keys = user_heading_keys || worksheet.row(worksheet.first_row).map do |key|
         key.blank? ? nil : key.strip
       end
     end
-    
+
     def parse_column_bounds
       @column_bounds = (@worksheet.first_column-1)..(@worksheet.last_column-1)
     end
-    
+
     def parse_data_rows
       @row_hashes = []
-      
-      rows_range = (worksheet.first_row+1..worksheet.last_row)
+
+      first_row_offset = user_heading_keys ? 0 : 1
+
+      rows_range = ((worksheet.first_row+first_row_offset)..worksheet.last_row)
       rows_range.each do |idx|
         row = worksheet.row(idx)
         hash = HashWithIndifferentAccess.new
-        
+
         for cell_index in @column_bounds
           if key = @heading_keys[cell_index] and
             value = row[cell_index]
-            
+
             hash[key] = value if value.present?
           end
         end
-        
+
         @row_hashes << hash unless hash.empty?
       end
     end
-    
+
     def hashed_worksheet
       @hashed_worksheet ||= HashedWorksheet.new(
         @heading_keys,
         @row_hashes
       )
     end
-    
+
   end
 end

data/lib/batch_factory/version.rb

@@ -1,3 +1,3 @@
 module BatchFactory
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/spreadsheet_document.rb

@@ -9,11 +9,11 @@ class SpreadsheetDocument
       when 'ods'
         Roo::Openoffice.new(file_name)
       else
-        Roo::Csv.new(file_name)
+        Roo::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

data/spec/unit/batch_factory.rb

@@ -5,8 +5,9 @@ describe BatchFactory do
   context 'w/ class methods' do
     it 'should open a file and return a hashed workbook' do
       worksheet = BatchFactory.from_file VALID_SPREADSHEET
+      puts worksheet.inspect
       worksheet.size.should == 1
-      worksheet[0][:age].should == '50'
+      worksheet[0][:age].should == 50
     end
   end
   

data/spec/unit/batch_factory/hashed_worksheet.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe BatchFactory::HashedWorksheet do
-  
+
   context 'w/ instance methods' do
     let(:worksheet) do
       parser = BatchFactory::Parser.new
@@ -9,15 +9,15 @@ describe BatchFactory::HashedWorksheet do
       parser.parse!
       parser.hashed_worksheet
     end
-    
+
     it 'should return an array of heading keys' do
       worksheet.keys[0].should == 'name'
     end
-    
+
     it 'should return an array of data hashes' do
       worksheet.rows[0][:age].should == 50
     end
-    
+
     it 'should iterate over the rows' do
       worksheet.size.should == 1
       worksheet.each_with_index do |hash, index|
@@ -25,5 +25,5 @@ describe BatchFactory::HashedWorksheet do
       end
     end
   end
-  
+
 end

data/spec/unit/batch_factory/parser.rb

@@ -8,26 +8,26 @@ describe BatchFactory::Parser do
       parser.open VALID_SPREADSHEET
       parser.worksheet.should_not be_nil
     end
-    
+
     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 == (1..6)
+        parser.column_bounds.should == (0..5)
       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
@@ -40,20 +40,20 @@ describe BatchFactory::Parser do
         parser.open VALID_SPREADSHEET, 1
         parser.parse!
       end
-      
+
       it 'should parse column information' do
-        parser.column_bounds.should == (3..8)
+        parser.column_bounds.should == (2..7)
       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
@@ -61,7 +61,5 @@ describe BatchFactory::Parser do
       end
     end
 
-    
   end
-  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batch_factory
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Denis Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo