roo-xls 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1123a00b02f4882fe61348d8ce2e4d291ee69e18
-  data.tar.gz: 08219e99656723cb9d1d0c22439285985eb98cb5
+  metadata.gz: 72a5eeec41696350e22d685b1337489727f9211c
+  data.tar.gz: d149d0621aec472b1b64ef3b817ef167d7cfd785
 SHA512:
-  metadata.gz: 36d6728ac2bc30d611630220a91e16ae9dd7a37138cf10c60fec43794881a196218a7a9b8bcf69e08867e5ad54defed15f5514d72941f00b038a543d8bfb23b7
-  data.tar.gz: 0f3d5a35a4c83e19c964375cd0c1dc458bdad69b88d495b07b23595e2f0da506f4eebbc06c9222af37c3c009436543fd34d682cdafec4ba1f908f68cb4b4bbe2
+  metadata.gz: b4c1534cb3cbe004cc8bfe510c88f9565adbf4e9e607c42961a49827dbc579ce06b630716eb9804d04076afb0ee79b5269a02b333eb0a096a97b4bbbfa417e4d
+  data.tar.gz: faf978fc060d3bf38ff0011bc8ff239ffa9067835ad2cee1fa9f7c09aeb64a181136c7365e70ddb7c5015e9ac24e076cd7473414e6d8fcec60feb5cb12dd1458

data/.travis.yml

@@ -1,11 +1,15 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.0
   - 2.1
+  - 2.2
+  - 2.3
+  - 2.4.0
   - ruby-head
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: rbx-2
 bundler_args: --without local_development

data/Gemfile

@@ -4,11 +4,13 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['TRAVIS']
-  gem 'roo', '>= 2.0.0beta1', github: 'roo-rb/roo'
+  gem 'roo', '>= 2.0.0beta1', git: 'https://github.com/roo-rb/roo.git'
 else
   gem 'roo', '>= 2.0.0beta1', path: ::File.expand_path('../../roo', __FILE__)
 end
 
+gem 'activesupport', '~> 4.2.0' if RUBY_VERSION < '2.2'
+
 group :test do
   # additional testing libs
   gem 'webmock'

data/README.md

@@ -1,4 +1,6 @@
-# Roo::Xls [![BuildStatus](https://travis-ci.org/roo-rb/roo-xls.svg)](https://travis-ci.org/roo-rb/roo-xls)[![Code Climate](https://codeclimate.com/github/roo-rb/roo-xls/badges/gpa.svg)](https://codeclimate.com/github/roo-rb/roo-xls)[![Coverage Status](https://coveralls.io/repos/roo-rb/roo-xls/badge.svg?branch=master)](https://coveralls.io/r/roo-rb/roo-xls?branch=master)
+# Roo::Xls
+
+[![Build Status](https://img.shields.io/travis/roo-rb/roo-xls.svg?style=flat-square)](https://travis-ci.org/roo-rb/roo-xls) [![Code Climate](https://img.shields.io/codeclimate/github/roo-rb/roo-xls.svg?style=flat-square)](https://codeclimate.com/github/roo-rb/roo-xls) [![Coverage Status](https://img.shields.io/coveralls/roo-rb/roo-xls.svg?style=flat-square)](https://coveralls.io/r/roo-rb/roo-xls) [![Gem Version](https://img.shields.io/gem/v/roo-xls.svg?style=flat-square)](https://rubygems.org/gems/roo-xls)
 
 This library extends Roo to add support for handling class Excel files, including:
 
@@ -10,7 +12,7 @@ of a formula but not the formula itself.
 
 ## License
 
-While Roo and Roo::Xls are licensed under the MIT / Expat license, please note that the 'spreadsheet' gem [is released under](https://github.com/zdavatz/spreadsheet/blob/master/LICENSE.txt) the GPLv3 license.
+While Roo and Roo::Xls are licensed under the MIT / Expat license, please note that the `spreadsheet` gem [is released under](https://github.com/zdavatz/spreadsheet/blob/master/LICENSE.txt) the GPLv3 license. Please be aware that the author of the `spreadsheet` gem [claims you need a commercial license](http://spreadsheet.ch/2014/10/24/using-ruby-spreadsheet-on-heroku-with-dynos/) to use it as part of a public-facing, closed-source service, an interpretation [at odds with the FSF's intent and interpretation of the license](http://www.gnu.org/licenses/gpl-faq.html#UnreleasedMods). 
 
 ## Installation
 
@@ -34,7 +36,7 @@ TODO: Write usage instructions here
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/roo-xls/fork )
+1. Fork it ( https://github.com/roo-rb/roo-xls/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/roo/xls/excel.rb

@@ -1,11 +1,12 @@
 require 'roo/xls/version'
 require 'roo/base'
 require 'spreadsheet'
+require 'tmpdir'
 
 module Roo
   # Class for handling Excel-Spreadsheets
   class Excel < Roo::Base
-    FORMULAS_MESSAGE = 'the spreadsheet gem does not support forumulas, so roo can not.'
+    FORMULAS_MESSAGE = 'the spreadsheet gem does not support formulas, so roo can not.'
     CHARGUESS =
       begin
         require 'charguess'
@@ -23,18 +24,25 @@ module Roo
       file_warning = options[:file_warning] || :error
       mode = options[:mode] || 'rb+'
 
-      file_type_check(filename, '.xls', 'an Excel', file_warning, packed)
-      make_tmpdir do |tmpdir|
-        filename = download_uri(filename, tmpdir) if uri?(filename)
-        filename = open_from_stream(filename[7..-1], tmpdir) if filename.is_a?(::String) && filename[0, 7] == 'stream:'
-        filename = unzip(filename, tmpdir) if packed == :zip
+      if is_stream?(filename)
+        @workbook = ::Spreadsheet.open(filename, mode)
+      else
+        file_type_check(filename, '.xls', 'an Excel', file_warning, packed)
+        Dir.mktmpdir do |tmpdir|
+          filename = download_uri(filename, tmpdir) if uri?(filename)
+          if filename.is_a?(::String) && filename[0, 7] == 'stream:'
+            filename = open_from_stream(filename[7..-1], tmpdir)
+          end
+          filename = unzip(filename, tmpdir) if packed == :zip
 
-        @filename = filename
-        unless File.file?(@filename)
-          fail IOError, "file #{@filename} does not exist"
+          @filename = filename
+          unless File.file?(@filename)
+            raise IOError, "file #{@filename} does not exist"
+          end
+          @workbook = ::Spreadsheet.open(filename, mode)
         end
-        @workbook = ::Spreadsheet.open(filename, mode)
       end
+
       super(filename, options)
       @formula = {}
       @fonts = {}
@@ -57,7 +65,7 @@ module Roo
 
     # this method lets you find the worksheet with the most data
     def longest_sheet
-      sheet(worksheets.inject do|m, o|
+      sheet(worksheets.inject do |m, o|
         o.row_count > m.row_count ? o : m
       end.name)
     end
@@ -67,20 +75,16 @@ module Roo
       validate_sheet!(sheet)
 
       read_cells(sheet)
-      fail 'should be read' unless @cells_read[sheet]
+      raise 'should be read' unless @cells_read[sheet]
       row, col = normalize(row, col)
       if celltype(row, col, sheet) == :date
         yyyy, mm, dd = @cell[sheet][[row, col]].split('-')
         return Date.new(yyyy.to_i, mm.to_i, dd.to_i)
       end
       if celltype(row, col, sheet) == :string
-        return platform_specific_encoding(@cell[sheet][[row, col]])
+        platform_specific_encoding(@cell[sheet][[row, col]])
       else
-        if @cell[sheet] && @cell[sheet][[row, col]]
-          return @cell[sheet][[row, col]]
-        else
-          return nil
-        end
+        @cell[sheet] && @cell[sheet][[row, col]]
       end
     end
 
@@ -109,13 +113,13 @@ module Roo
 
     # returns NO formula in excel spreadsheets
     def formula(_row, _col, _sheet = nil)
-      fail NotImplementedError, FORMULAS_MESSAGE
+      raise NotImplementedError, FORMULAS_MESSAGE
     end
     alias_method :formula?, :formula
 
     # returns NO formulas in excel spreadsheets
     def formulas(_sheet = nil)
-      fail NotImplementedError, FORMULAS_MESSAGE
+      raise NotImplementedError, FORMULAS_MESSAGE
     end
 
     # Given a cell, return the cell's font
@@ -136,18 +140,18 @@ module Roo
 
     # converts name of a sheet to index (0,1,2,..)
     def sheet_no(name)
-      return name - 1 if name.is_a?(Fixnum)
+      return name - 1 if name.is_a?(Integer)
       i = 0
       worksheets.each do |worksheet|
         return i if name == normalize_string(worksheet.name)
         i += 1
       end
-      fail StandardError, "sheet '#{name}' not found"
+      raise StandardError, "sheet '#{name}' not found"
     end
 
     def normalize_string(value)
       value = every_second_null?(value) ? remove_every_second_null(value) : value
-      if CHARGUESS && encoding = CharGuess.guess(value)
+      if CHARGUESS && (encoding = CharGuess.guess(value))
         encoding.encode Encoding::UTF_8
       else
         platform_specific_encoding(value)
@@ -164,9 +168,7 @@ module Roo
         else
           value
         end
-      if every_second_null?(result)
-        result = remove_every_second_null(result)
-      end
+      result = remove_every_second_null(result) if every_second_null?(result)
       result
     end
 
@@ -198,8 +200,8 @@ module Roo
       @cell_type[sheet] = {} unless @cell_type[sheet]
       @cell_type[sheet][key] = value_type
       @formula[sheet] = {} unless @formula[sheet]
-      @formula[sheet][key] = formula  if formula
-      @cell[sheet]    = {} unless @cell[sheet]
+      @formula[sheet][key] = formula if formula
+      @cell[sheet] = {} unless @cell[sheet]
       @fonts[sheet] = {} unless @fonts[sheet]
       @fonts[sheet][key] = font
 
@@ -250,7 +252,7 @@ module Roo
       worksheet.each(0) do |row|
         (0..row.size).each do |cell_index|
           cell = row.at(cell_index)
-          next if cell.nil?  # skip empty cells
+          next if cell.nil? # skip empty cells
           next if cell.class == ::Spreadsheet::Formula && cell.value.nil? # skip empty formula cells
           value_type, v =
             if date_or_time?(row, cell_index)
@@ -299,17 +301,18 @@ module Roo
         f = cell * 24.0 * 60.0 * 60.0
         secs = f.round
         h = (secs / 3600.0).floor
-        secs = secs - 3600 * h
+        secs -= 3600 * h
         m = (secs / 60.0).floor
-        secs = secs - 60 * m
+        secs -= 60 * m
         s = secs
         value = h * 3600 + m * 60 + s
       else
-        if row.at(idx).class == ::Spreadsheet::Formula
-          datetime = row.send(:_datetime, cell)
-        else
-          datetime = row.datetime(idx)
-        end
+        datetime =
+          if row.at(idx).class == ::Spreadsheet::Formula
+            row.send(:_datetime, cell)
+          else
+            row.datetime(idx)
+          end
         if datetime.hour != 0 ||
            datetime.min != 0 ||
            datetime.sec != 0
@@ -317,11 +320,12 @@ module Roo
           value = datetime
         else
           value_type = :date
-          if row.at(idx).class == ::Spreadsheet::Formula
-            value = row.send(:_date, cell)
-          else
-            value = row.date(idx)
-          end
+          value =
+            if row.at(idx).class == ::Spreadsheet::Formula
+              row.send(:_date, cell)
+            else
+              row.date(idx)
+            end
           value = sprintf('%04d-%02d-%02d', value.year, value.month, value.day)
         end
       end
@@ -333,7 +337,7 @@ module Roo
     def read_cell(row, idx)
       cell = read_cell_content(row, idx)
       case cell
-      when Float, Integer, Fixnum, Bignum
+      when Float, Integer
         value_type = :float
         value = cell.to_f
       when ::Spreadsheet::Link

data/lib/roo/xls/excel_2003_xml.rb

@@ -1,6 +1,7 @@
 require 'date'
 require 'base64'
 require 'nokogiri'
+require 'tmpdir'
 
 class Roo::Excel2003XML < Roo::Base
   # initialization and opening of a spreadsheet file
@@ -9,14 +10,14 @@ class Roo::Excel2003XML < Roo::Base
     packed = options[:packed]
     file_warning = options[:file_warning] || :error
 
-    make_tmpdir do |tmpdir|
+    Dir.mktmpdir do |tmpdir|
       filename = download_uri(filename, tmpdir) if uri?(filename)
       filename = unzip(filename, tmpdir) if packed == :zip
 
       file_type_check(filename, '.xml', 'an Excel 2003 XML', file_warning)
       @filename = filename
       unless File.file?(@filename)
-        fail IOError, "file #{@filename} does not exist"
+        raise IOError, "file #{@filename} does not exist"
       end
       @doc = ::Roo::Utils.load_xml(@filename)
     end
@@ -240,7 +241,7 @@ class Roo::Excel2003XML < Roo::Base
       end
     end
     unless sheet_found
-      fail RangeError, "Unable to find sheet #{sheet} for reading"
+      raise RangeError, "Unable to find sheet #{sheet} for reading"
     end
     @cells_read[sheet] = true
   end

data/lib/roo/xls/version.rb

@@ -1,5 +1,5 @@
 module Roo
   module Xls
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/roo-xls.gemspec

@@ -19,9 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "roo", ">= 2.0.0beta1", "< 3"
-  spec.add_dependency "nokogiri"
   spec.add_dependency "spreadsheet", "> 0.9.0"
 
+  if RUBY_VERSION >= '2.1'
+    spec.add_dependency "nokogiri"
+  else
+    spec.add_dependency "nokogiri", "~> 1.6.0"
+  end
+
   spec.add_development_dependency "bundler", ">= 1.7"
   spec.add_development_dependency "rake", ">= 10.0"
 end

data/test/test_roo_excel.rb

@@ -1,5 +1,6 @@
 # -- encoding : utf-8 --
 require 'test_helper'
+require 'stringio'
 
 class TestRooExcel < MiniTest::Test
   def with_spreadsheet(name)
@@ -1034,7 +1035,7 @@ Sheet 3:
       i += 1
     end
     if letter == '' || number == 0
-      fail ArgumentError
+      raise ArgumentError
     end
     [letter, number]
   end
@@ -1090,4 +1091,12 @@ Sheet 3:
   #     assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
   #   end
   # end
+
+  def test_excel_via_stringio
+    io = StringIO.new(
+      File.read(File.join(TESTDIR, 'simple_spreadsheet.xls')))
+    spreadsheet = ::Roo::Spreadsheet.open(io, extension: '.xls')
+    spreadsheet.default_sheet = spreadsheet.sheets.first
+    assert_equal 'Task 1', spreadsheet.cell('f', 4)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo-xls
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Preymesser
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -33,33 +33,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Roo::Excel can access the contents of classic xls files.