roo 1.10.2 → 1.10.3

data/Gemfile

@@ -1,4 +1,8 @@
 source 'http://rubygems.org'
 
 # pull reqs from gemspec
-gemspec
+gemspec
+
+# additional testing libs
+gem 'webmock'
+gem 'shoulda'

data/Gemfile.lock

@@ -1,32 +1,36 @@
 PATH
   remote: .
   specs:
-    roo (1.10.1)
-      nokogiri (>= 1.5.2)
-      rubyzip (>= 0.9.6.1)
+    roo (1.10.3)
+      nokogiri (>= 1.4.0)
+      rubyzip (>= 0.9.9)
       spreadsheet (> 0.6.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.2)
     bones (3.8.0)
       little-plugger (~> 1.1.3)
       loquacious (~> 1.9.1)
       rake (>= 0.8.7)
+    crack (0.3.1)
     little-plugger (1.1.3)
     loquacious (1.9.1)
-    nokogiri (1.5.5)
-    nokogiri (1.5.5-java)
+    nokogiri (1.5.6)
     rake (0.9.2.2)
-    ruby-ole (1.2.11.4)
+    ruby-ole (1.2.11.6)
     rubyzip (0.9.9)
     shoulda (3.0.1)
       shoulda-context (~> 1.0.0)
       shoulda-matchers (~> 1.0.0)
     shoulda-context (1.0.0)
     shoulda-matchers (1.0.0)
-    spreadsheet (0.7.3)
+    spreadsheet (0.8.2)
       ruby-ole (>= 1.0)
+    webmock (1.9.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
 
 PLATFORMS
   java
@@ -35,4 +39,5 @@ PLATFORMS
 DEPENDENCIES
   bones (>= 3.8.0)
   roo!
-  shoulda (~> 3.0)
+  shoulda
+  webmock

data/History.txt

@@ -1,3 +1,18 @@
+== 1.10.3 2013-03-03
+
+* 1 bugfix
+  * Support both nokogiri 1.5.5 and 1.5.6 (Karsten Richter) https://github.com/Empact/roo/pull/18
+
+* 1 enhancement
+  * Relax our nokogiri dependency back to 1.4.0, as we have no particular reason
+    to require a newer version.
+
+== 1.10.2 2013-02-03
+
+* 2 bugfixes
+  * Support opening URIs with query strings https://github.com/Empact/roo/commit/abf94bdb59cabc16d4f7764025e88e3661983525
+  * Support both http: & https: urls https://github.com/Empact/roo/commit/fc5c5899d96dd5f9fbb68125d0efc8ce9be2c7e1
+
 == 1.10.1 2011-11-14
 
 * 2 bugfixes

data/lib/roo.rb

@@ -1,6 +1,6 @@
 module Roo
 
-  VERSION = '1.10.2'
+  VERSION = '1.10.3'
 
   class Spreadsheet
     class << self

data/lib/roo/excel2003xml.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'zip/zipfilesystem'
 require 'date'
 require 'base64'
 require 'cgi'

data/lib/roo/excelx.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'zip/zipfilesystem'
 require 'date'
 require 'rubygems'
 require 'nokogiri'

data/lib/roo/generic_spreadsheet.rb

@@ -2,6 +2,7 @@
 
 require 'tmpdir'
 require 'stringio'
+require 'zip/zipfilesystem'
 
 # Base class for all other types of spreadsheets
 class Roo::GenericSpreadsheet
@@ -536,6 +537,10 @@ class Roo::GenericSpreadsheet
     else
       raise "unknown file type: #{ext}"
     end
+
+    if uri?(filename) && qs_begin = filename.rindex('?')
+      filename = filename[0..qs_begin-1]
+    end
     if File.extname(filename).downcase != ext
       case warning_level
       when :error

data/lib/roo/openoffice.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'fileutils'
-require 'zip/zipfilesystem'
 require 'date'
 require 'nokogiri'
 require 'cgi'
@@ -184,7 +183,7 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
   def sheets
     return_sheets = []
     @doc.xpath("//*[local-name()='table']").each do |sheet|
-      return_sheets << sheet['name']
+      return_sheets << sheet.attributes["name"].value
     end
     return_sheets
   end
@@ -271,7 +270,7 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
   # read the version of the OO-Version
   def oo_version
     @doc.xpath("//*[local-name()='document-content']").each do |office|
-      @officeversion = office.attributes['version'].to_s
+      @officeversion = attr(office,'version')
     end
   end
 
@@ -299,10 +298,10 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
       @cell[sheet][key] = str_v
     when :date
       #TODO: if table_cell.attributes['date-value'].size != "XXXX-XX-XX".size
-      if table_cell.attributes['date-value'].to_s.size != "XXXX-XX-XX".size
+      if attr(table_cell,'date-value').size != "XXXX-XX-XX".size
         #-- dann ist noch eine Uhrzeit vorhanden
         #-- "1961-11-21T12:17:18"
-        @cell[sheet][key] = DateTime.parse(table_cell.attributes['date-value'].to_s)
+        @cell[sheet][key] = DateTime.parse(attr(table_cell,'date-value').to_s)
         @cell_type[sheet][key] = :datetime
       else
         @cell[sheet][key] = table_cell.attributes['date-value']
@@ -328,7 +327,7 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
     sheet_found = false
 
     @doc.xpath("//*[local-name()='table']").each do |ws|
-      if sheet == ws['name']
+      if sheet == attr(ws,'name')
         sheet_found = true
         col = 1
         row = 1
@@ -338,15 +337,15 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
             @style_defaults[sheet] << table_element.attributes['default-cell-style-name']
           when 'table-row'
             if table_element.attributes['number-rows-repeated']
-              skip_row = table_element.attributes['number-rows-repeated'].to_s.to_i
+              skip_row = attr(table_element,'number-rows-repeated').to_s.to_i
               row = row + skip_row - 1
             end
             table_element.children.each do |cell|
-              skip_col = cell['number-columns-repeated']
-              formula = cell['formula']
-              value_type = cell['value-type']
-              v =  cell['value']
-              style_name = cell['style-name']
+              skip_col = attr(cell, 'number-columns-repeated')
+              formula = attr(cell,'formula')
+              value_type = attr(cell,'value-type')
+              v =  attr(cell,'value')
+              style_name = attr(cell,'style-name')
               case value_type
               when 'string'
                 str_v  = ''
@@ -407,7 +406,7 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
               when 'float'
                 #
               when 'boolean'
-                v = cell.attributes['boolean-value'].to_s
+                v = attr(cell,'boolean-value').to_s
               else
                 # raise "unknown type #{value_type}"
               end
@@ -449,8 +448,8 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
       #-
       # $Sheet1.$C$5
       #+
-      name = ne.attribute('name').to_s
-      sheetname,coords = ne.attribute('cell-range-address').to_s.split('.$')
+      name = attr(ne,'name').to_s
+      sheetname,coords = attr(ne,'cell-range-address').to_s.split('.$')
       col, row = coords.split('$')
       sheetname = sheetname[1..-1] if sheetname[0,1] == '$'
       [name, [sheetname,row,col]]
@@ -461,12 +460,12 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
     @style_definitions['Default'] = Roo::Openoffice::Font.new
     style_elements.each do |style|
       next unless style.name == 'style'
-      style_name = style.attributes['name']
+      style_name = attr(style,'name')
       style.each do |properties|
         font = Roo::Openoffice::Font.new
-        font.bold = properties.attributes['font-weight']
-        font.italic = properties.attributes['font-style']
-        font.underline = properties.attributes['text-underline-style']
+        font.bold = attr(properties,'font-weight')
+        font.italic = attr(properties,'font-style')
+        font.underline = attr(properties,'text-underline-style')
         @style_definitions[style_name] = font
       end
     end
@@ -507,6 +506,14 @@ class Roo::Openoffice < Roo::GenericSpreadsheet
     result
   end
 
+
+  private
+  def attr(node, attr_name)
+    if node.attributes[attr_name]
+      node.attributes[attr_name].value
+    end
+  end
+
 end # class
 
 # Libreoffice is just an alias for Roo::Openoffice class

data/roo.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "roo"
-  s.version = "1.10.2"
+  s.version = "1.10.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Preymesser", "Hugh McGowan", "Ben Woosley"]
-  s.date = "2012-11-05"
+  s.date = "2013-03-04"
   s.description = "Roo can access the contents of various spreadsheet files. It can handle\n* Openoffice\n* Excel\n* Google spreadsheets\n* Excelx\n* Libreoffice\n* CSV"
   s.email = "thopre@gmail.com"
   s.executables = ["roo"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "roo"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "1.8.24"
   s.summary = "Roo can access the contents of various spreadsheet files."
   s.test_files = ["test/test_generic_spreadsheet.rb", "test/test_helper.rb", "test/test_roo.rb"]
 
@@ -25,18 +25,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<spreadsheet>, ["> 0.6.4"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 1.5.5"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.9"])
       s.add_development_dependency(%q<bones>, [">= 3.8.0"])
     else
       s.add_dependency(%q<spreadsheet>, ["> 0.6.4"])
-      s.add_dependency(%q<nokogiri>, [">= 1.5.5"])
+      s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
       s.add_dependency(%q<rubyzip>, [">= 0.9.9"])
       s.add_dependency(%q<bones>, [">= 3.8.0"])
     end
   else
     s.add_dependency(%q<spreadsheet>, ["> 0.6.4"])
-    s.add_dependency(%q<nokogiri>, [">= 1.5.5"])
+    s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
     s.add_dependency(%q<rubyzip>, [">= 0.9.9"])
     s.add_dependency(%q<bones>, [">= 3.8.0"])
   end

data/test/test_helper.rb

@@ -7,6 +7,7 @@ require 'fileutils'
 require 'timeout'
 require 'logger'
 require 'date'
+require 'webmock/test_unit'
 
 # require gem files
 require File.dirname(__FILE__) + '/../lib/roo'
@@ -186,4 +187,4 @@ class Test::Unit::TestCase
   #     )
   #   end
   # end
-end
+end

data/test/test_roo.rb

@@ -2684,6 +2684,22 @@ This attached file is the newer format of Microsoft Excel (.xlsx).
     end
   end
 
+  def test_open_from_uri_with_query_string
+    dir = File.expand_path("#{File.dirname __FILE__}/files")
+    { xls:  [EXCEL,       Roo::Excel],
+      xlsx: [EXCELX,      Roo::Excelx],
+      ods:  [OPENOFFICE,  Roo::Openoffice]}.each do |extension, (flag, type)|
+        if flag
+          file = "#{dir}/simple_spreadsheet.#{extension}"
+          url = "http://test.example.com/simple_spreadsheet.#{extension}?query-param=value"
+          stub_request(:any, url).to_return(body: File.read(file))
+          spreadsheet = type.new(url)
+          spreadsheet.default_sheet = spreadsheet.sheets.first
+          assert_equal 'Task 1', spreadsheet.cell('f', 4)
+        end
+      end
+  end
+
   def test_to_ascii_openoffice #file does not exist
     local_only do
       with_each_spreadsheet(:name=>'verysimple_spreadsheet', :format=>:openoffice) do |oo|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -252,12 +252,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 888687487029488184
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 888687487029488184
 requirements: []
 rubyforge_project: roo
 rubygems_version: 1.8.24