roo 2.8.0 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b99744522c3a62e004d42498388c4e99cdb2d45157fc26b87eb54023a957452f
-  data.tar.gz: ab4445f118a1144c71142a2c28724686da05d28ce04a04c0746c49628834d132
+  metadata.gz: 1e41bf12228c4a168e8df0a0cbf5b94eceaa89a1f5d174f3a3588a1a965d49f4
+  data.tar.gz: 69d749c2667ba4efbdcd7257550ba380d6ba0250633d439ae738673e6d2b5924
 SHA512:
-  metadata.gz: 9bc47d73a1556e7b82b652379bcba4940f9982814286feb626097e9ddea0f3a021c7ca7e9d8399293248df5272ac8db0b39c896abd940a759683ce09260e77e2
-  data.tar.gz: 69baf682a05fa581756a92a270e6bd44431f36683d9f1104d0466f8452201d32a34cf6a626b8168d6ef022bb2ed6b0d932e2ff5a3b1c2367c02fd4f224ce8eeb
+  metadata.gz: 14c8d1e69b31e1be16c8845c686e596c108e9c4251e4d5ee75471dd8ea325c2aacdcf1fa4b10f6262cd840bd063de5b11432439a9bce1b82b4c350566981bb48
+  data.tar.gz: 7a01fefbe77485af0252384dcd20770e0c993c29b916be55736a86fcdc8de710d99709fb09d95f4d628a2b3819069c3aba5df28f3488a5f519753b854c82cd48

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+##  Unreleased
+
+##  [2.8.3] 2020-02-03
+### Changed/Added
+- Updated rubyzip version. Now minimal version is 1.3.0 [515](https://github.com/roo-rb/roo/pull/515) - [CVE-2019-16892](https://github.com/rubyzip/rubyzip/pull/403)
+
+##  [2.8.2] 2019-02-01
+### Changed/Added
+- Support range cell for Excelx's links [490](https://github.com/roo-rb/roo/pull/490)
+- Skip `extract_hyperlinks` if not required [488](https://github.com/roo-rb/roo/pull/488)
+
+### Fixed
+- Fixed error for invalid link [492](https://github.com/roo-rb/roo/pull/492)
+
+##  [2.8.1] 2019-01-21
+### Fixed
+- Fixed error if excelx's cell have empty children [487](https://github.com/roo-rb/roo/pull/487)
+
 ##  [2.8.0] 2019-01-18
 ### Fixed
 - Fixed inconsistent column length for CSV [375](https://github.com/roo-rb/roo/pull/375)

data/README.md

@@ -18,7 +18,7 @@ Install as a gem
 Or add it to your Gemfile
 
 ```ruby
-gem "roo", "~> 2.7.0"
+gem "roo", "~> 2.8.0"
 ```
 ## Usage
 

data/lib/roo/excelx/relationships.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'roo/excelx/extractor'
 
 module Roo
@@ -11,10 +13,16 @@ module Roo
         @relationships ||= extract_relationships
       end
 
+      def include_type?(type)
+        to_a.any? do |_, rel|
+          rel["Type"]&.include? type
+        end
+      end
+
       private
 
       def extract_relationships
-        return [] unless doc_exists?
+        return {} unless doc_exists?
 
         doc.xpath('/Relationships/Relationship').each_with_object({}) do |rel, hash|
           hash[rel['Id']] = rel

data/lib/roo/excelx/sheet_doc.rb

@@ -22,7 +22,7 @@ module Roo
 
       def hyperlinks(relationships)
         # If you're sure you're not going to need this hyperlinks you can discard it
-        @hyperlinks ||= if @options[:no_hyperlinks]
+        @hyperlinks ||= if @options[:no_hyperlinks] || !relationships.include_type?("hyperlink")
           {}
         else
           extract_hyperlinks(relationships)
@@ -120,7 +120,7 @@ module Roo
           end
         end
 
-        create_empty_cell(coordinate)
+        create_empty_cell(coordinate, empty_cell)
       end
 
       def create_empty_cell(coordinate, empty_cell)
@@ -185,7 +185,10 @@ module Roo
           if relationship = relationships[hyperlink['id']]
             target_link = relationship['Target']
             target_link += "##{hyperlink['location']}" if hyperlink['location']
-            hash[::Roo::Utils.ref_to_key(hyperlink["ref"].to_s)] = target_link
+
+            Roo::Utils.coordinates_in_range(hyperlink["ref"].to_s) do |coord|
+              hash[coord] = target_link
+            end
           end
         end
       end

data/lib/roo/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Roo
   module Utils
     extend self
@@ -41,7 +43,7 @@ module Roo
 
     # convert a number to something like 'AB' (1 => 'A', 2 => 'B', ...)
     def number_to_letter(num)
-      result = ""
+      result = +""
 
       until num.zero?
         num, index = (num - 1).divmod(26)
@@ -73,6 +75,25 @@ module Roo
       (x2 - (x1 - 1)) * (y2 - (y1 - 1))
     end
 
+    def coordinates_in_range(str)
+      return to_enum(:coordinates_in_range, str) unless block_given?
+      coordinates = str.split(":", 2).map! { |s| extract_coordinate s }
+
+      case coordinates.size
+      when 1
+        yield coordinates[0]
+      when 2
+        tl, br = coordinates
+        rows = tl.row..br.row
+        cols = tl.column..br.column
+        rows.each do |row|
+          cols.each do |column|
+            yield Excelx::Coordinate.new(row, column)
+          end
+        end
+      end
+    end
+
     def load_xml(path)
       ::File.open(path, 'rb') do |file|
         ::Nokogiri::XML(file)

data/lib/roo/version.rb

@@ -1,3 +1,3 @@
 module Roo
-  VERSION = "2.8.0"
+  VERSION = "2.8.3"
 end

data/roo.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version  = ">= 2.3.0"
 
   spec.add_dependency 'nokogiri', '~> 1'
-  spec.add_dependency 'rubyzip', '>= 1.2.1', '< 2.0.0'
+  spec.add_dependency 'rubyzip', '>= 1.3.0', '< 3.0.0'
 
   spec.add_development_dependency 'rake', '~> 10.1'
   spec.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'

data/spec/lib/roo/excelx/relationships_spec.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Roo::Excelx::Relationships do
+  subject(:relationships) { Roo::Excelx::Relationships.new Roo::Excelx.new(path).rels_files[0] }
+
+  describe "#include_type?" do
+    [
+      ["with hyperlink type", "test/files/link.xlsx", true, false],
+      ["with nil path", "test/files/Bibelbund.xlsx", false, false],
+      ["with comments type", "test/files/comments-google.xlsx", false, true],
+    ].each do |context_desc, file_path, hyperlink_value, comments_value|
+      context context_desc do
+        let(:path) { file_path }
+
+        it "should return #{hyperlink_value} for hyperlink" do
+          expect(subject.include_type?("hyperlink")).to be hyperlink_value
+        end
+
+        it "should return #{hyperlink_value} for link" do
+          expect(subject.include_type?("link")).to be hyperlink_value
+        end
+
+        it "should return false for hypelink" do
+          expect(subject.include_type?("hypelink")).to be false
+        end
+
+        it "should return false for coment" do
+          expect(subject.include_type?("coment")).to be false
+        end
+
+        it "should return #{comments_value} for comments" do
+          expect(subject.include_type?("comments")).to be comments_value
+        end
+
+        it "should return #{comments_value} for comment" do
+          expect(subject.include_type?("comment")).to be comments_value
+        end
+      end
+    end
+  end
+end

data/spec/lib/roo/excelx/sheet_doc_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Roo::Excelx::SheetDoc do
+  subject(:blank_children) { Roo::Excelx.new("test/files/blank_children.xlsx") }
+
+  example "#last_row" do
+    expect(subject.last_row).to eq 3
+  end
+end

data/spec/lib/roo/excelx_spec.rb

@@ -379,9 +379,34 @@ describe Roo::Excelx do
       expect(subject.hyperlink?(1, 1)).to eq true
       expect(subject.hyperlink?(1, 2)).to eq false
     end
+
+    context 'defined on cell range' do
+     let(:path) { 'test/files/cell-range-link.xlsx' }
+
+      it 'returns the expected result' do
+        [[false]*3, *[[true, true, false]]*4, [false]*3].each.with_index(1) do |row, row_index|
+          row.each.with_index(1) do |value, col_index|
+            expect(subject.hyperlink?(row_index, col_index)).to eq(value)
+          end
+        end
+      end
+    end
   end
 
   describe '#hyperlink' do
+    context 'defined on cell range' do
+     let(:path) { 'test/files/cell-range-link.xlsx' }
+
+      it 'returns the expected result' do
+        link = "http://www.google.com"
+        [[nil]*3, *[[link, link, nil]]*4, [nil]*3].each.with_index(1) do |row, row_index|
+          row.each.with_index(1) do |value, col_index|
+            expect(subject.hyperlink(row_index, col_index)).to eq(value)
+          end
+        end
+      end
+    end
+
     context 'without location' do
       let(:path) { 'test/files/link.xlsx' }
 

data/spec/lib/roo/utils_spec.rb

@@ -90,6 +90,19 @@ RSpec.describe ::Roo::Utils do
     end
   end
 
+  context '.coordinates_in_range' do
+    it "returns the expected result" do
+      expect(described_class.coordinates_in_range('').to_a).to eq []
+      expect(described_class.coordinates_in_range('B2').to_a).to eq [[2, 2]]
+      expect(described_class.coordinates_in_range('D2:G3').to_a).to eq [[2, 4], [2, 5], [2, 6], [2, 7], [3, 4], [3, 5], [3, 6], [3, 7]]
+      expect(described_class.coordinates_in_range('G3:D2').to_a).to eq []
+    end
+
+    it "raises an error when appropriate" do
+      expect { described_class.coordinates_in_range('D2:G3:I5').to_a }.to raise_error(ArgumentError)
+    end
+  end
+
   context '.load_xml' do
     it 'returns the expected result' do
       expect(described_class.load_xml('test/files/sheet1.xml')).to be_a(Nokogiri::XML::Document)

data/test/roo/test_excelx.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class TestRworkbookExcelx < Minitest::Test
   def test_download_uri_with_invalid_host
     assert_raises(RuntimeError) do
-      Roo::Excelx.new("http://example.com/file.xlsx")
+      Roo::Excelx.new("http://examples.com/file.xlsx")
     end
   end
 
@@ -302,6 +302,11 @@ class TestRworkbookExcelx < Minitest::Test
     end
   end
 
+  def test_handles_link_without_hyperlink
+    workbook = Roo::Spreadsheet.open(File.join(TESTDIR, "bad_link.xlsx"))
+    assert_equal "Test", workbook.cell(1, 1)
+  end
+
   # Excel has two base date formats one from 1900 and the other from 1904.
   # see #test_base_dates_in_excel
   def test_base_dates_in_excelx

data/test/roo/test_open_office.rb

@@ -15,7 +15,7 @@ class TestRooOpenOffice < Minitest::Test
 
   def test_download_uri_with_invalid_host
     assert_raises(RuntimeError) do
-      roo_class.new("http://example.com/file.ods")
+      roo_class.new("http://examples.com/file.ods")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.3
 platform: ruby
 authors:
 - Thomas Preymesser
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -35,20 +35,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,8 @@ files:
 - spec/lib/roo/base_spec.rb
 - spec/lib/roo/csv_spec.rb
 - spec/lib/roo/excelx/format_spec.rb
+- spec/lib/roo/excelx/relationships_spec.rb
+- spec/lib/roo/excelx/sheet_doc_spec.rb
 - spec/lib/roo/excelx_spec.rb
 - spec/lib/roo/libreoffice_spec.rb
 - spec/lib/roo/openoffice_spec.rb
@@ -238,8 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Roo can access the contents of various spreadsheet files.