remote_table 0.2.29 → 0.2.30

data/VERSION

@@ -1 +1 @@
-0.2.29
+0.2.30

data/lib/remote_table/file/roo_spreadsheet.rb

@@ -1,18 +1,31 @@
 class RemoteTable
   module RooSpreadsheet
     def each_row(&block)
-      headers = Hash.new
       oo = roo_klass.new(path, nil, :ignore)
       oo.default_sheet = sheet.is_a?(Numeric) ? oo.sheets[sheet] : sheet
-      for col in (1..oo.last_column)
-        headers[col] = oo.cell(header_row, col)
-        headers[col] = oo.cell(header_row - 1, col) if headers[col].blank? # look up
+      column_references = Hash.new
+      if headers == false
+        # zero-based numeric keys
+        for col in (1..oo.last_column)
+          column_references[col] = col - 1
+        end
+      elsif headers.is_a? Array
+        # names
+        for col in (1..oo.last_column)
+          column_references[col] = headers[col - 1]
+        end
+      else
+        # read headers from the file itself
+        for col in (1..oo.last_column)
+          column_references[col] = oo.cell(header_row, col)
+          column_references[col] = oo.cell(header_row - 1, col) if column_references[col].blank? # look up
+        end
       end
       first_data_row.upto(oo.last_row) do |raw_row|
         ordered_hash = ActiveSupport::OrderedHash.new
         for col in (1..oo.last_column)
-          next if headers[col].blank?
-          ordered_hash[headers[col]] = oo.cell(raw_row, col).to_s.gsub(/<[^>]+>/, '').strip
+          next if column_references[col].blank?
+          ordered_hash[column_references[col]] = oo.cell(raw_row, col).to_s.gsub(/<[^>]+>/, '').strip
         end
         yield ordered_hash if keep_blank_rows or ordered_hash.any? { |k, v| v.present? }
       end

data/remote_table.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remote_table}
-  s.version = "0.2.29"
+  s.version = "0.2.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seamus Abshere", "Andy Rossmeissl"]

data/test/remote_table_test.rb

@@ -130,6 +130,16 @@ class RemoteTableTest < Test::Unit::TestCase
   end
   
   if ENV['ALL'] == 'true' or ENV['FAST'] == 'true'
+    should "open an XLSX like an array (numbered columns)" do
+      t = RemoteTable.new(:url => 'www.customerreferenceprogram.org/uploads/CRP_RFP_template.xlsx', :headers => false)
+      assert_equal "Secure encryption of all data", t.rows[5][0]
+    end
+
+    should "open an XLSX with custom headers" do
+      t = RemoteTable.new(:url => 'www.customerreferenceprogram.org/uploads/CRP_RFP_template.xlsx', :headers => %w{foo bar baz})
+      assert_equal "Secure encryption of all data", t.rows[5]['foo']
+    end
+
     should "open an XLSX" do
       t = RemoteTable.new(:url => 'www.customerreferenceprogram.org/uploads/CRP_RFP_template.xlsx')
       assert_equal "Secure encryption of all data", t.rows[5]["Requirements"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: remote_table
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 2
-  - 29
-  version: 0.2.29
+  - 30
+  version: 0.2.30
 platform: ruby
 authors: 
 - Seamus Abshere