remote_table 3.0.0.rc1 → 3.0.0.rc2

data/CHANGELOG

@@ -1,3 +1,19 @@
+3.0.0.rc2 / 2013-08-30
+
+* Breaking changes
+
+  * skip blank lines at the top of CSV files when looking for headers
+  * require rubyzip2 for Roo compatibility with Ruby 1.9
+
+* Enhancements
+
+  * eagerly load format-specific methods (instead of waiting for #each to be called)
+  * use new Roo class names (Roo::OpenOffice instead of Roo::Openoffice)
+
+* Bug fixes
+
+  * pass CSV options to header parser - before, options like delimiter weren't passed so it couldn't read TSVs
+
 3.0.0.rc1 / 2013-08-08
 
 * Breaking changes

data/lib/remote_table.rb

@@ -444,6 +444,7 @@ class RemoteTable
     @other_options = settings
     
     @local_copy = LocalCopy.new self
+    extend!
   end
 
   # Yield each row.
@@ -452,7 +453,6 @@ class RemoteTable
   #
   # @yield [Hash,Array] A hash or an array depending on whether the RemoteTable has named headers (column names).
   def each
-    extend!
     if fully_cached?
       cache.each do |row|
         yield row

data/lib/remote_table/delimited.rb

@@ -23,7 +23,7 @@ class RemoteTable
 
     # Yield each row using Ruby's CSV parser (FasterCSV on Ruby 1.8).
     def _each
-      Engine.new(local_copy.encoded_io, csv_options).each do |row|
+      Engine.new(local_copy.encoded_io, csv_options.merge(headers: headers)).each do |row|
 
         some_value_present = false
 
@@ -65,7 +65,6 @@ class RemoteTable
     def csv_options
       {
         skip_blanks: !keep_blank_rows,
-        headers:     headers,
         col_sep:     delimiter,
         quote_char:  quote_char,
       }
@@ -78,10 +77,17 @@ class RemoteTable
         false
       when :first_row, TrueClass
         i = 0
-        line = local_copy.encoded_io.gets
-        Engine.parse_line(line).map do |v|
-          header = RemoteTable.normalize_whitespace v
-          header.present? ? header : "empty_#{i+=1}"
+        begin
+          line = local_copy.encoded_io.gets.strip
+        end while line.length == 0
+        proto_headers = Engine.parse_line(line, csv_options)
+        if proto_headers
+          proto_headers.map do |v|
+            header = RemoteTable.normalize_whitespace v
+            header.present? ? header : "empty_#{i+=1}"
+          end
+        else
+          raise "No headers found in first line: #{line.inspect}"
         end
       when Array
         @headers

data/lib/remote_table/ods.rb

@@ -11,7 +11,14 @@ class RemoteTable
       if ::RUBY_PLATFORM == 'java'
         ::Kernel.warn "[remote_table] Opening ODS files on JRuby is known to fail because of a flaw in the underlying Roo library"
       end
-      Roo.const_defined?(:Openoffice) ? Roo::Openoffice : ::Openoffice
+      [:Openoffice, :OpenOffice]
+      if ::Roo.const_defined?(:OpenOffice)
+        ::Roo::OpenOffice
+      elsif ::Roo.const_defined?(:Openoffice)
+        ::Roo::Openoffice
+      else
+        raise "Couldn't find roo's OpenOffice class, maybe you need a newer version?"
+      end
     end
   end
 end

data/lib/remote_table/version.rb

@@ -1,3 +1,3 @@
 class RemoteTable
-  VERSION = '3.0.0.rc1'
+  VERSION = '3.0.0.rc2'
 end

data/remote_table.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'unix_utils', '>=0.0.8'
   s.add_runtime_dependency 'fastercsv', '>=1.5.0'
   s.add_runtime_dependency 'hash_digest'
+  s.add_runtime_dependency 'rubyzip2'
 
   s.add_development_dependency 'errata', '>=0.2.0'
   s.add_development_dependency 'minitest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_table
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-08 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,6 +124,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: errata
   requirement: !ruby/object:Gem::Requirement