remote_table 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50af57458cfc9beb6a37a724f127267441351407
-  data.tar.gz: f9fdaa022aa12c22f4bebfbb8c62bda6f5fc78c3
+  metadata.gz: c25d96a8296ef90b00e61d671d709ac0d8f6fcbe
+  data.tar.gz: f2c0d575d566db733dabd3a32f4ae5db17ee7310
 SHA512:
-  metadata.gz: ce9f84c1e533c92c7d77383aa948e489c77e542b51a7e6c6a79064b64eaf1ad38a71ba35662f24068e517918eb0405e1960afaeb0c9e8d5d45a2d0d0b783a4b9
-  data.tar.gz: 992797ec369a10179ad2ffa5cfe30fc0ca787b366f91cb6ea090eeaff772abe9564d3b19e7dbdabca37043878060489af4c508a3923cc1d8673a7af1bb02bae7
+  metadata.gz: 279b9c85ad97831e3e24cd0d5d8f919a58b711391afa0304f0072f6bd0c515263571ec28bc90581b1b09552323aab6ff9c38272c43440055eb12d7b1250c7daa
+  data.tar.gz: 1b2c8c63a2f011af898e4652a8548ad7e33f793bea8d3342c1947b3db09613e0f9ef1e6144bb5b886adbc8f3eac1d0afcce869d5aaca0fccead81e99cec3daf5

data/CHANGELOG

@@ -1,3 +1,14 @@
+3.3.3 / 2016-02-01
+
+* Enhancements
+
+  * New option :stop_after_untitled_headers
+
+* Bug fixes
+
+  * Fix Excel support via roo-xls
+  * Treat headers: true as :first_row in roo
+
 3.3.2 / 2015-10-01
 
 * Bug fixes

data/lib/remote_table.rb

@@ -154,6 +154,7 @@ class RemoteTable
     :keep_blank_rows => false,
     :skip => 0,
     :encoding => 'UTF-8',
+    :stop_after_untitled_headers => false,
   }
   OLD_SETTING_NAMES = {
     :pre_select => [:select],
@@ -353,6 +354,15 @@ class RemoteTable
   # @return [String]
   attr_reader :root_node
 
+  # When to trim untitled headers. Set this to 100 to prevent more than 100 untitled headers being created; the rest will be silently discarded.
+  #
+  # Note: This is effectively a right trim... the counting starts from the left.
+  #
+  # Default: false, don't try
+  #
+  # @return [Integer]
+  attr_reader :stop_after_untitled_headers
+
   # @private
   class NullParser
     def call(row)
@@ -444,6 +454,7 @@ class RemoteTable
     @errata = grab settings, :errata
     @root_node = grab settings, :root_node
     @parser = grab settings, :parser
+    @stop_after_untitled_headers = grab settings, :stop_after_untitled_headers
 
     @other_options = settings
 

data/lib/remote_table/delimited.rb

@@ -46,6 +46,7 @@ class RemoteTable
           # represent the row as a hash
           hash = ::ActiveSupport::OrderedHash.new
           row.each do |k, v|
+            next if k.nil?
             v = RemoteTable.normalize_whitespace v
             if not some_value_present and not keep_blank_rows and v.present?
               some_value_present = true
@@ -95,9 +96,11 @@ class RemoteTable
         end while line.length == 0
         proto_headers = Engine.parse_line(line, csv_options)
         if proto_headers
-          proto_headers.map do |v|
+          proto_headers.inject([]) do |memo, v|
+            break memo if stop_after_untitled_headers and i > stop_after_untitled_headers
             header = RemoteTable.normalize_whitespace v
-            header.present? ? header : "untitled_#{i+=1}"
+            memo << (header.present? ? header : "untitled_#{i+=1}")
+            memo
           end
         else
           raise "No headers found in first line: #{line.inspect}"

data/lib/remote_table/processed_by_roo.rb

@@ -50,7 +50,7 @@ class RemoteTable
         # create a hash to represent this row
         current_headers = ::ActiveSupport::OrderedHash.new
         i = 0
-        if headers == :first_row
+        if headers == :first_row or headers == true
           (1..spreadsheet.last_column).each do |x|
             v = spreadsheet.cell(first_row, x)
             if v.blank?
@@ -62,6 +62,9 @@ class RemoteTable
               # 'foobar' is found at column 6
               current_headers[v] = x
             else
+              if stop_after_untitled_headers and i > stop_after_untitled_headers
+                break
+              end
               current_headers["untitled_#{i+=1}"] = x
             end
           end

data/lib/remote_table/version.rb

@@ -1,3 +1,3 @@
 class RemoteTable
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
 end

data/lib/remote_table/xls.rb

@@ -5,7 +5,7 @@ class RemoteTable
       base.extend ProcessedByRoo
     end
     def roo_class
-      Roo.const_defined?(:Excel) ? Roo::Excel : ::Excel
+      Roo::Excel
     end
   end
 end

data/remote_table.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'fastercsv', '>=1.5.0'
   s.add_runtime_dependency 'hash_digest', '>=1.1.3'
 
+  s.add_development_dependency 'roo-xls'
   s.add_development_dependency 'errata', '>=0.2.0'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'

data/test/helper.rb

@@ -3,6 +3,7 @@ require 'bundler/setup'
 require 'minitest/autorun'
 # require 'pry-rescue/minitest'
 require 'remote_table'
+require 'roo-xls'
 
 class MiniTest::Spec
   def setup

data/test/test_remote.rb

@@ -6,7 +6,7 @@ describe RemoteTable do
   describe 'used on remote files' do
     it "add a row hash to every row" do
       t = RemoteTable.new(:url => 'http://www.customerreferenceprogram.org/uploads/CRP_RFP_template.xlsx')
-      t[5].row_hash.must_equal "06d8a738551c17735e2731e25c8d0461"
+      t[5].row_hash.must_equal "59a3cf905334493bbdda971298f1b2a2f58e05cb"
     end
 
     it "open a google doc" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_table
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Seamus Abshere
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: roo-xls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: errata
   requirement: !ruby/object:Gem::Requirement