roo 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2784db45a1ab30b18246ae1696392db1ca4060c4
-  data.tar.gz: 7853a5e3754ec869d3e58e33bfb68348438e8fd7
+  metadata.gz: 8604a4f1951ab6dfcd733de054d7bfb5a82a5fe0
+  data.tar.gz: 9d9a0f430db3eaf985772a6a934374d2a04ab822
 SHA512:
-  metadata.gz: 2055e6a386df3ff37ee866cc4dbb0e2b35ee0ce055e6c40097916b43dba9913b51af4871e1f4d837d54178cce3614b741544b704f2c1509a836c973f57666f22
-  data.tar.gz: 763260d4a6fc895396edcaf304902d4b2bc6f5a3a2bb353a2785d5b73195286d73eff88143860be6470f7adeee6d4313ab5a527e18d570ebb58f522372efcf86
+  metadata.gz: cd5bb56cbd0744febca931b1032b14910f512e5f4d5513ec81cbd6de011a75f557fd8855fe53311ab83e77f67f8564c1c8b2774ee16d89b44687906b1ca77332
+  data.tar.gz: b3cef390c20fc5e5bf70d1896222352c04d8f4eac4af5e4a64e850fbb2abfbbf0e2ad5a92aa45568c229562fd5e6e8a82c6f28d8bb089722e7b5d0afd5bfda75

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.2.4
   - 2.3.1
+  - 2.4.0
   - ruby-head
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2

data/CHANGELOG.md

@@ -1,12 +1,23 @@
 ## Unreleased
 
+## [2.6.0] 2016-12-28
+### Fixed
+- Fixed error if sheet name starts with a slash [348](https://github.com/roo-rb/roo/pull/348)
+- Fixed loading to support files on ftp [355](https://github.com/roo-rb/roo/pull/355)
+- Fixed Ruby 2.4.0 deprecation warnings [356](https://github.com/roo-rb/roo/pull/356)
+- properly return date as string [359](https://github.com/roo-rb/roo/pull/359)
+
+### Added
+- Cell values can be set in a CSV [350](https://github.com/roo-rb/roo/pull/350/)
+- Raise an error Roo::Excelx::Extractor document is missing [358](https://github.com/roo-rb/roo/pull/358/)
+
 ## [2.5.1] 2016-08-26
 ### Fixed
 - Fixed NameError. [337](https://github.com/roo-rb/roo/pull/337)
 
 ## [2.5.0] 2016-08-21
 ### Fixed
-- Remove tempdirs via finalizers on garbage collection. This cleans them up in all known cases, rather than just when the #close method is called. The #close method can be used to cleanup early. [329](https://github.com/roo-rb/roo/pull/329)
+- Remove temporary directories via finalizers on garbage collection. This cleans them up in all known cases, rather than just when the #close method is called. The #close method can be used to cleanup early. [329](https://github.com/roo-rb/roo/pull/329)
 - Fixed README.md typo [318](https://github.com/roo-rb/roo/pull/318)
 - Parse sheets in ODS files once to improve performance [320](https://github.com/roo-rb/roo/pull/320)
 - Fix some Cell conversion issues [324](https://github.com/roo-rb/roo/pull/324) and [331](https://github.com/roo-rb/roo/pull/331)
@@ -16,10 +27,10 @@
 ### Deprecations
 - Roo::Base::TEMP_PREFIX should be accessed via Roo::TEMP_PREFIX
 - The private Roo::Base#make_tempdir is now available at the class level in
-  classes that use tempdirs, added via Roo::Tempdir
+  classes that use temporary directories, added via Roo::Tempdir
 =======
 ### Added
-- Discard hiperlinks lookups to allow streaming parsing without loading whole files
+- Discard hyperlinks lookups to allow streaming parsing without loading whole files
 
 ## [2.4.0] 2016-05-14
 ### Fixed  
@@ -41,7 +52,7 @@
 
 ## [2.3.1] - 2016-01-08
 ### Fixed
-- Properly parse sci-notation number like 1E-3 [#288](https://github.com/roo-rb/roo/pull/288)
+- Properly parse scientific-notation number like 1E-3 [#288](https://github.com/roo-rb/roo/pull/288)
 - Include all tests in default rake run [#283](https://github.com/roo-rb/roo/pull/283)
 - Fix zero-padded numbers for Excelx [#282](https://github.com/roo-rb/roo/pull/282)
 

data/Gemfile

@@ -6,7 +6,7 @@ group :test do
   # additional testing libs
   gem 'webmock'
   gem 'shoulda'
-  gem 'activesupport', '< 5.0.0'
+  gem 'activesupport', '< 5.1'
   gem 'rspec', '>= 3.0.0'
   gem 'vcr'
   gem 'simplecov', '>= 0.9.0', require: false

data/Gemfile_ruby2

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'nokogiri', "< 1.7.0"
+
 group :test do
   # additional testing libs
   gem 'webmock'

data/README.md

@@ -18,7 +18,7 @@ Install as a gem
 Or add it to your Gemfile
 
 ```ruby
-gem 'roo', '~> 2.4.0'
+gem "roo", "~> 2.6.0"
 ```
 ## Usage
 
@@ -256,10 +256,11 @@ Roo's public methods have stayed relatively consistent between 1.13.x and 2.0.0,
 ## Contributing
 ### Features
 1. Fork it ( https://github.com/[my-github-username]/roo/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'My new feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+2. Install it (`bundle install --with local_development`)
+3. Create your feature branch (`git checkout -b my-new-feature`)
+4. Commit your changes (`git commit -am 'My new feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create a new Pull Request
 
 ### Issues
 

data/lib/roo/base.rb

@@ -183,7 +183,7 @@ class Roo::Base
     options = (args.last.is_a?(Hash) ? args.pop : {})
 
     case args[0]
-    when Fixnum
+    when Integer
       find_by_row(args[0])
     when :all
       find_by_conditions(options)
@@ -225,7 +225,7 @@ class Roo::Base
 
   def cell_type_by_value(value)
     case value
-    when Fixnum then :float
+    when Integer then :float
     when String, Float then :string
     else
       fail ArgumentError, "Type for #{value} not set"
@@ -590,7 +590,7 @@ class Roo::Base
   # converts cell coordinate to numeric values of row,col
   def normalize(row, col)
     if row.is_a?(::String)
-      if col.is_a?(::Fixnum)
+      if col.is_a?(::Integer)
         # ('A',1):
         # ('B', 5) -> (5, 2)
         row, col = col, row
@@ -605,7 +605,7 @@ class Roo::Base
   end
 
   def uri?(filename)
-    filename.start_with?('http://', 'https://')
+    filename.start_with?('http://', 'https://', 'ftp://')
   rescue
     false
   end
@@ -646,7 +646,7 @@ class Roo::Base
     case sheet
     when nil
       fail ArgumentError, "Error: sheet 'nil' not valid"
-    when Fixnum
+    when Integer
       sheets.fetch(sheet - 1) do
         fail RangeError, "sheet index #{sheet} not found"
       end
@@ -714,7 +714,7 @@ class Roo::Base
       case onecell
       when String
         %("#{onecell.gsub('"', '""')}") unless onecell.empty?
-      when Fixnum
+      when Integer
         onecell.to_s
       when Float
         if onecell == onecell.to_i

data/lib/roo/csv.rb

@@ -41,6 +41,14 @@ class Roo::CSV < Roo::Base
     @options[:csv_options] || {}
   end
 
+  def set_value(row, col, value, _sheet)
+    @cell[[row, col]] = value
+  end
+
+  def set_type(row, col, type, _sheet)
+    @cell_type[[row, col]] = type
+  end
+
   private
 
   TYPE_MAP = {

data/lib/roo/errors.rb

@@ -6,4 +6,6 @@ module Roo
   # Raised when Roo cannot find a header row that matches the given column
   # name(s).
   class HeaderRowNotFoundError < Error; end
+
+  class FileNotFound < Error; end
 end

data/lib/roo/excelx.rb

@@ -363,7 +363,7 @@ module Roo
     def extract_sheets_in_order(entries, sheet_ids, sheets, tmpdir)
       (sheet_ids & sheets.keys).each_with_index do |id, i|
         name = sheets[id]
-        entry = entries.find { |e| e.name =~ /#{name}$/ }
+        entry = entries.find { |e| "/#{e.name}" =~ /#{name}$/ }
         path = "#{tmpdir}/roo_sheet#{i + 1}"
         sheet_files << path
         @sheet_files << path

data/lib/roo/excelx/extractor.rb

@@ -8,9 +8,9 @@ module Roo
       private
 
       def doc
-        if doc_exists?
-          ::Roo::Utils.load_xml(@path).remove_namespaces!
-        end
+        raise FileNotFound, "#{@path} file not found" unless doc_exists?
+
+        ::Roo::Utils.load_xml(@path).remove_namespaces!
       end
 
       def doc_exists?

data/lib/roo/excelx/styles.rb

@@ -51,7 +51,7 @@ module Roo
           xfs.children.map do |xf|
             xf['numFmtId']
           end
-        end
+        end.compact
       end
 
       def extract_num_fmts

data/lib/roo/version.rb

@@ -1,3 +1,3 @@
 module Roo
-  VERSION = "2.5.1"
+  VERSION = "2.6.0"
 end

data/spec/lib/roo/csv_spec.rb

@@ -66,4 +66,16 @@ describe Roo::CSV do
       end
     end
   end
+
+  describe '#set_value' do
+    it 'returns the cell value' do
+      expect(csv.set_value('A', 1, 'some-value', nil)).to eq('some-value')
+    end
+  end
+
+  describe '#set_type' do
+    it 'returns the cell type' do
+      expect(csv.set_type('A', 1, 'some-type', nil)).to eq('some-type')
+    end
+  end
 end

data/spec/lib/roo/excelx_spec.rb

@@ -524,4 +524,14 @@ describe Roo::Excelx do
       expect{ subject }.to_not raise_error
     end
   end
+
+  describe 'opening a file with white space in the styles.xml' do
+    let(:path) { 'test/files/style_nodes_with_white_spaces.xlsx' }
+    subject(:xlsx) do
+      Roo::Spreadsheet.open(path, expand_merged_ranges: true, extension: :xlsx)
+    end
+    it 'should properly recognize formats' do
+      expect(subject.sheet(0).excelx_format(2,1)).to eq 'm/d/yyyy" "h:mm:ss" "AM/PM'
+    end
+  end
 end

data/spec/lib/roo/openoffice_spec.rb

@@ -13,10 +13,10 @@ describe Roo::OpenOffice do
     context 'for float/integer values' do
       context 'integer without point' do
         it { expect(subject.cell(3,"A","Sheet4")).to eq(1234) }
-        it { expect(subject.cell(3,"A","Sheet4")).to be_a(Fixnum) }
+        it { expect(subject.cell(3,"A","Sheet4")).to be_a(Integer) }
       end
 
-      context 'float with point' do 
+      context 'float with point' do
         it { expect(subject.cell(3,"B","Sheet4")).to eq(1234.00) }
         it { expect(subject.cell(3,"B","Sheet4")).to be_a(Float) }
       end

data/test/excelx/cell/test_time.rb

@@ -25,6 +25,6 @@ class TestRooExcelxCellTime < Minitest::Test
 
   def test_value
     cell = time.new('0.0751', nil, [:numeric_or_formula, 'h:mm'], 6, nil, base_date, nil)
-    assert_kind_of Fixnum, cell.value
+    assert_kind_of Integer, cell.value
   end
 end

data/test/test_roo.rb

@@ -1056,14 +1056,14 @@ Sheet 3:
   def test_bug_to_xml_with_empty_sheets
     with_each_spreadsheet(:name=>'emptysheets', :format=>[:openoffice, :excelx]) do |oo|
       oo.sheets.each { |sheet|
-        assert_equal nil, oo.first_row, "first_row not nil in sheet #{sheet}"
-        assert_equal nil, oo.last_row, "last_row not nil in sheet #{sheet}"
-        assert_equal nil, oo.first_column, "first_column not nil in sheet #{sheet}"
-        assert_equal nil, oo.last_column, "last_column not nil in sheet #{sheet}"
-        assert_equal nil, oo.first_row(sheet), "first_row not nil in sheet #{sheet}"
-        assert_equal nil, oo.last_row(sheet), "last_row not nil in sheet #{sheet}"
-        assert_equal nil, oo.first_column(sheet), "first_column not nil in sheet #{sheet}"
-        assert_equal nil, oo.last_column(sheet), "last_column not nil in sheet #{sheet}"
+        assert_nil oo.first_row, "first_row not nil in sheet #{sheet}"
+        assert_nil oo.last_row, "last_row not nil in sheet #{sheet}"
+        assert_nil oo.first_column, "first_column not nil in sheet #{sheet}"
+        assert_nil oo.last_column, "last_column not nil in sheet #{sheet}"
+        assert_nil oo.first_row(sheet), "first_row not nil in sheet #{sheet}"
+        assert_nil oo.last_row(sheet), "last_row not nil in sheet #{sheet}"
+        assert_nil oo.first_column(sheet), "first_column not nil in sheet #{sheet}"
+        assert_nil oo.last_column(sheet), "last_column not nil in sheet #{sheet}"
       }
       oo.to_xml
     end
@@ -2109,4 +2109,9 @@ where the expected result is
     with_each_spreadsheet(:name=>'non_existent_file', :ignore_errors=>true) do |oo|; end
     assert_equal Dir.open(Dir.tmpdir).to_a, old_temp_files
   end
+
+  def test_name_with_leading_slash
+    xlsx = Roo::Excelx.new(File.join(TESTDIR,'name_with_leading_slash.xlsx'))
+    assert_equal 1, xlsx.sheets.count
+  end
 end # class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Thomas Preymesser
@@ -12,74 +12,74 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.4'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.4'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.4.3
 description: |-
@@ -95,10 +95,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/ISSUE_TEMPLATE"
-- ".gitignore"
-- ".simplecov"
-- ".travis.yml"
+- .github/ISSUE_TEMPLATE
+- .gitignore
+- .simplecov
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile_ruby2
@@ -178,19 +178,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Roo can access the contents of various spreadsheet files.
 test_files: []
-has_rdoc: