roo 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62db88823f6fadaa7e33bbc16a68f3ed67f85d7676cbc51340d48c6867622187
-  data.tar.gz: ada9c23708c44a4c97e145918022170fd425f0a651e56b1748be2c258f41fe26
+  metadata.gz: a37f2ce32f1bfc19bdb5af4016f5bda177037047c0924e207489214dd9b2988a
+  data.tar.gz: b803f2d67944137e95e4c703853018397f7c3188354cec3c8447ccc2d040816d
 SHA512:
-  metadata.gz: ebb7cc89869d46e4bbf36166c00d86462878e1c54676a1439537f1499ed4c388254e4c1b89197487a96e3905f89cf601e6e3b8f7c0db977844b478de8938d58a
-  data.tar.gz: 885465f444f35ffd2ce68e0963d87ab1457234df91c16012d60d58f38f0eda6ad0822867fe44623921f8c0184465c1477f4484c80183b692f0106ecc235cd8e1
+  metadata.gz: 33338f3c847a1d6ea293bdeb87be3401835027efb521c468b8471b1065b4d8bd2ec14a1ba1719e2974c321c3193eadffee0a3b37e4afbf6b8955a29dc7651f39
+  data.tar.gz: d40ff41b78de4f6ef8fba9cfcf464a6d25735f5f1ead8e1b724415c7018ac9058a55db65c1e174826e654b808364a33508e16a68d0099417070a4a05415e57e7

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ##  Unreleased
 
+##  [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)

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)
@@ -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.1"
+  VERSION = "2.8.2"
 end

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_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

@@ -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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Thomas Preymesser
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -182,6 +182,7 @@ 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