culturecode-roo 2.0.1 → 2.0.2

data/lib/roo/utils.rb

@@ -1,12 +1,16 @@
 module Roo
   module Utils
     extend self
-    LETTERS = ('A'..'Z').to_a
+
     def split_coordinate(str)
-      letter, number = split_coord(str)
-      x              = letter_to_number(letter)
-      y              = number
-      [y, x]
+      @split_coordinate ||= {}
+
+      @split_coordinate[str] ||= begin
+        letter, number = split_coord(str)
+        x = letter_to_number(letter)
+        y = number
+        [y, x]
+      end
     end
 
     alias_method :ref_to_key, :split_coordinate
@@ -22,40 +26,33 @@ module Roo
     end
 
     # convert a number to something like 'AB' (1 => 'A', 2 => 'B', ...)
-    def number_to_letter(n)
-      letters = ''
-      if n > 26
-        while n % 26 == 0 && n != 0
-          letters << 'Z'
-          n = ((n - 26) / 26).to_i
-        end
-        while n > 0
-          num     = n % 26
-          letters = LETTERS[num - 1] + letters
-          n       = (n / 26).to_i
-        end
-      else
-        letters = LETTERS[n - 1]
+    def number_to_letter(num)
+      results = []
+      num = num.to_i
+
+      while (num > 0)
+        mod = (num - 1) % 26
+        results = [(65 + mod).chr] + results
+        num = ((num - mod) / 26)
       end
-      letters
+
+      results.join
     end
 
-    # convert letters like 'AB' to a number ('A' => 1, 'B' => 2, ...)
     def letter_to_number(letters)
-      result = 0
-      while letters && letters.length > 0
-        character = letters[0, 1].upcase
-        num       = LETTERS.index(character)
-        fail ArgumentError, "invalid column character '#{letters[0, 1]}'" if num.nil?
-        num     += 1
-        result  = result * 26 + num
-        letters = letters[1..-1]
+      @letter_to_number ||= {}
+      @letter_to_number[letters] ||= begin
+         result = 0
+
+         # :bytes method returns an enumerator in 1.9.3 and an array in 2.0+
+         letters.bytes.to_a.map{|b| b > 96 ? b - 96 : b - 64 }.reverse.each_with_index{ |num, i| result += num * 26 ** i }
+
+         result
       end
-      result
     end
 
     # Compute upper bound for cells in a given cell range.
-    def self.num_cells_in_range(str)
+    def num_cells_in_range(str)
       cells = str.split(':')
       return 1 if cells.count == 1
       raise ArgumentError.new("invalid range string: #{str}. Supported range format 'A1:B2'") if cells.count != 2

data/lib/roo/version.rb

@@ -1,3 +1,3 @@
 module Roo
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/roo.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+# encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'roo/version'
@@ -6,22 +6,20 @@ require 'roo/version'
 Gem::Specification.new do |spec|
   spec.name          = 'culturecode-roo'
   spec.version       = Roo::VERSION
-  spec.authors       = ['Thomas Preymesser', 'Hugh McGowan', 'Ben Woosley']
-  spec.email         = ['ruby.ruby.ruby.roo@gmail.com']
+  spec.authors       = ['Thomas Preymesser', 'Hugh McGowan', 'Ben Woosley', 'Oleksandr Simonov']
+  spec.email         = ['ruby.ruby.ruby.roo@gmail.com', 'oleksandr@simonov.me']
   spec.summary       = 'Roo can access the contents of various spreadsheet files.'
-  spec.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"
-  spec.homepage      = 'http://github.com/Empact/roo'
+  spec.description   = "Roo can access the contents of various spreadsheet files. It can handle\n* OpenOffice\n* Excelx\n* LibreOffice\n* CSV"
+  spec.homepage      = 'http://github.com/roo-rb/roo'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files.reject! { |fn| fn.include?('test/files') }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'nokogiri'
-  spec.add_dependency 'rubyzip', '>= 1.0.0'
+  spec.add_dependency 'nokogiri', '~> 1'
+  spec.add_dependency 'rubyzip', '~> 1.1', '< 2.0.0'
 
-  spec.add_development_dependency 'bundler', '>= 1.7'
-  spec.add_development_dependency 'rake', '>= 10.0'
-  spec.add_development_dependency 'minitest', '>= 5.4.3'
+  spec.add_development_dependency 'rake', '~> 10.1'
+  spec.add_development_dependency 'minitest', '~> 5.4', '>= 5.4.3'
 end

data/spec/lib/roo/csv_spec.rb

@@ -23,6 +23,20 @@ describe Roo::CSV do
     end
   end
 
+  describe '#parse_with_clean_option' do
+    subject do
+      csv.parse(options)
+    end
+    context 'with clean: true' do
+      let(:options) { {clean: true} }
+      let(:path) { 'test/files/parse_with_clean_option.csv' }
+
+      it "doesn't blow up" do
+        expect { subject }.to_not raise_error
+      end
+    end
+  end
+
   describe '#csv_options' do
     context 'when created with the csv_options option' do
       let(:options) do

data/spec/lib/roo/excelx_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 describe Roo::Excelx do
@@ -35,6 +36,15 @@ describe Roo::Excelx do
         expect(Roo::Excelx.new(path, cell_max: 100)).to be_a(Roo::Excelx)
       end
     end
+
+    context 'file path is a Pathname' do
+      let(:path) { Pathname.new('test/files/file_item_error.xlsx') }
+
+      it 'creates an instance' do
+        expect(subject).to be_a(Roo::Excelx)
+      end
+    end
+
   end
 
   describe '#cell' do
@@ -52,6 +62,13 @@ describe Roo::Excelx do
         end
       end
     end
+
+    context 'for a non-existent cell' do
+      let(:path) { 'test/files/numeric-link.xlsx' }
+      it 'return nil' do
+        expect(xlsx.cell('AAA', 999)).to eq nil
+      end
+    end
   end
 
   describe '#parse' do
@@ -71,12 +88,49 @@ describe Roo::Excelx do
     end
   end
 
+  describe '#parse_with_clean_option' do
+    let(:path) { 'test/files/parse_with_clean_option.xlsx' }
+    let(:options) { {clean: true} }
+
+    context 'with clean: true' do
+
+      it 'does not raise' do
+        expect do
+          xlsx.parse(options)
+        end.not_to raise_error
+      end
+    end
+  end
+
+  describe '#parse_unicode_with_clean_option' do
+    let(:path) { 'test/files/parse_clean_with_unicode.xlsx' }
+    let(:options) { {clean: true, name: 'Name'} }
+
+    context 'with clean: true' do
+
+      it 'returns a non empty string' do
+        expect(xlsx.parse(options).last[:name]).to eql('凯')
+      end
+    end
+  end
+
+
+
+
   describe '#sheets' do
     let(:path) { 'test/files/numbers1.xlsx' }
 
     it 'returns the expected result' do
       expect(subject.sheets).to eq ["Tabelle1", "Name of Sheet 2", "Sheet3", "Sheet4", "Sheet5"]
     end
+
+    describe 'only showing visible sheets' do
+      let(:path) { 'test/files/hidden_sheets.xlsx' }
+
+      it 'returns the expected result' do
+        expect(Roo::Excelx.new(path, only_visible_sheets: true).sheets).to eq ["VisibleSheet1"]
+      end
+    end
   end
 
   describe '#sheet_for' do
@@ -156,6 +210,7 @@ describe Roo::Excelx do
     it 'returns the expected result' do
       expect(subject.formula(1, 1, "Sheet1")).to eq nil
       expect(subject.formula(7, 2, "Sheet1")).to eq "SUM($A$1:B6)"
+      expect(subject.formula(1000, 2000, "Sheet1")).to eq nil
     end
   end
 
@@ -165,6 +220,7 @@ describe Roo::Excelx do
     it 'returns the expected result' do
       expect(subject.formula?(1, 1, "Sheet1")).to eq false
       expect(subject.formula?(7, 2, "Sheet1")).to eq true
+      expect(subject.formula?(1000, 2000, "Sheet1")).to eq false
     end
   end
 
@@ -187,6 +243,7 @@ describe Roo::Excelx do
       expect(subject.font(7, 1).bold?).to eq false
       expect(subject.font(7, 1).italic?).to eq true
       expect(subject.font(7, 1).underline?).to eq true
+      expect(subject.font(1000, 2000)).to eq nil
     end
   end
 
@@ -197,6 +254,7 @@ describe Roo::Excelx do
       expect(subject.celltype(1, 1, "Sheet4")).to eq :date
       expect(subject.celltype(1, 2, "Sheet4")).to eq :float
       expect(subject.celltype(6, 2, "Sheet5")).to eq :string
+      expect(subject.celltype(1000, 2000, "Sheet5")).to eq nil
     end
   end
 
@@ -206,6 +264,7 @@ describe Roo::Excelx do
     it 'returns the expected result' do
       expect(subject.excelx_type(1, 1, "Sheet5")).to eq [:numeric_or_formula, "General"]
       expect(subject.excelx_type(6, 2, "Sheet5")).to eq :string
+      expect(subject.excelx_type(1000, 2000, "Sheet5")).to eq nil
     end
   end
 
@@ -217,6 +276,7 @@ describe Roo::Excelx do
       # way to get these rather than hardcoding.
       expect(subject.excelx_value(1, 1, "Sheet5")).to eq "1"
       expect(subject.excelx_value(6, 2, "Sheet5")).to eq "16"
+      expect(subject.excelx_value(6000, 2000, "Sheet5")).to eq nil
     end
   end
 
@@ -226,8 +286,9 @@ describe Roo::Excelx do
     it 'returns the expected result' do
       # These are the index of the style for a given document
       # might be more reliable way to get this info.
-      expect(subject.excelx_value(1, 1)).to eq "0"
-      expect(subject.excelx_value(5, 1)).to eq "4"
+      expect(subject.excelx_format(1, 1)).to eq "General"
+      expect(subject.excelx_format(2, 2)).to eq "0.00"
+      expect(subject.excelx_format(5000, 1000)).to eq nil
     end
   end
 
@@ -359,5 +420,32 @@ describe Roo::Excelx do
         expect(index).to eq 4
       end
     end
+
+    context 'with offset option' do
+      let(:offset) { 3 }
+
+      it 'returns the expected result' do
+        index = 0
+        subject.each_row_streaming(offset: offset) do |row|
+          expect(row.map(&:value)).to eq expected_rows[index + offset]
+          index += 1
+        end
+        expect(index).to eq 11
+      end
+    end
+
+    context 'with offset and max_rows options' do
+      let(:offset) { 3 }
+      let(:max_rows) { 3 }
+
+      it 'returns the expected result' do
+        index = 0
+        subject.each_row_streaming(offset: offset, max_rows: max_rows) do |row|
+          expect(row.map(&:value)).to eq expected_rows[index + offset]
+          index += 1
+        end
+        expect(index).to eq 4
+      end
+    end
   end
 end

data/spec/lib/roo/libreoffice_spec.rb

@@ -10,4 +10,20 @@ describe Roo::LibreOffice do
       expect(subject).to be_a(Roo::LibreOffice)
     end
   end
+
+  describe '#sheets' do
+    let(:path) { 'test/files/hidden_sheets.ods' }
+
+    describe 'showing all sheets' do
+      it 'returns the expected result' do
+        expect(Roo::LibreOffice.new(path).sheets).to eq ["HiddenSheet1", "VisibleSheet1", "HiddenSheet2"]
+      end
+    end
+
+    describe 'only showing visible sheets' do
+      it 'returns the expected result' do
+        expect(Roo::LibreOffice.new(path, only_visible_sheets: true).sheets).to eq ["VisibleSheet1"]
+      end
+    end
+  end
 end

data/spec/lib/roo/openoffice_spec.rb

@@ -9,6 +9,17 @@ describe Roo::OpenOffice do
     it 'creates an instance' do
       expect(subject).to be_a(Roo::OpenOffice)
     end
+
+    context 'file path is a Pathname' do
+      subject do
+        Roo::OpenOffice.new(Pathname.new('test/files/numbers1.ods'))
+      end
+
+      it 'creates an instance' do
+        expect(subject).to be_a(Roo::OpenOffice)
+      end
+    end
+    
   end
 
   # OpenOffice is an alias of LibreOffice. See libreoffice_spec.

data/spec/lib/roo/utils_spec.rb

@@ -2,16 +2,17 @@ require 'spec_helper'
 
 RSpec.describe ::Roo::Utils do
   subject { described_class }
+
   context '#number_to_letter' do
-    ::Roo::Utils::LETTERS.each_with_index do |l, i|
-      it "should return '#{l}' when passed #{i+1}" do
-        expect(described_class.number_to_letter(i+1)).to eq(l)
+    ('A'..'Z').to_a.each_with_index do |letter, index|
+      it "should return '#{ letter }' when passed #{ index + 1 }" do
+        expect(described_class.number_to_letter(index + 1)).to eq(letter)
       end
     end
 
     {
       27 => 'AA', 26*2 => 'AZ', 26*3 => 'BZ', 26**2 + 26 => 'ZZ', 26**2 + 27 => 'AAA',
-      26**3 + 26**2 + 26 => 'ZZZ', 1.0 => 'A'
+      26**3 + 26**2 + 26 => 'ZZZ', 1.0 => 'A', 676 => 'YZ', 677 => 'ZA'
     }.each do |key, value|
       it "should return '#{value}' when passed #{key}" do
         expect(described_class.number_to_letter(key)).to eq(value)

data/test/test_roo.rb

@@ -18,6 +18,7 @@
 #STDERR.reopen "/dev/null","w"
 
 require 'test_helper'
+require 'stringio'
 
 class TestRoo < Minitest::Test
 
@@ -63,7 +64,7 @@ class TestRoo < Minitest::Test
         yield Roo::Spreadsheet.open(File.join(TESTDIR,
           fixture_filename(options[:name], format)))
       rescue => e
-        raise e, "#{e.message} for #{format}", e.backtrace
+        raise e, "#{e.message} for #{format}", e.backtrace unless options[:ignore_errors]
       end
     end
   end
@@ -935,6 +936,7 @@ Sheet 3:
 
   def test_to_xml
     with_each_spreadsheet(:name=>'numbers1', :encoding => 'utf8') do |oo|
+      skip if defined? JRUBY_VERSION
       oo.to_xml
       sheetname = oo.sheets.first
       doc = Nokogiri::XML(oo.to_xml)
@@ -1645,6 +1647,7 @@ where the expected result is
   end
 
   def test_bug_pfand_from_windows_phone_xlsx
+    return if defined? JRUBY_VERSION
     with_each_spreadsheet(:name=>'Pfand_from_windows_phone', :format=>:excelx) do |oo|
 	    oo.default_sheet = oo.sheets.first
 	    assert_equal ['Blatt1','Blatt2','Blatt3'], oo.sheets
@@ -1686,6 +1689,11 @@ where the expected result is
       oo.default_sheet = oo.sheets[1]
       assert_equal [], oo.comments, "comments error in class #{oo.class}"
     end
+
+    with_each_spreadsheet(:name=>'comments-google', :format=>[:excelx]) do |oo|
+      oo.default_sheet = oo.sheets.first
+      assert_equal [[1, 1, "this is a comment\n\t-Steven Daniels"]], oo.comments(oo.sheets.first), "comments error in class #{oo.class}"
+    end
   end
 
   ## PREVIOUSLY SKIPPED
@@ -1963,7 +1971,7 @@ where the expected result is
     xlsx.default_sheet = xlsx.sheets.last
     assert_equal 'Sheet 2', xlsx.cell('b',2)
   end
-  
+
   def test_openoffice_encryption
     if OPENOFFICE
       assert_raises(ArgumentError) { Roo::LibreOffice.new(File.join(TESTDIR, "encrypted-letmein.ods")) }
@@ -1974,4 +1982,107 @@ where the expected result is
     end
   end
 
+  def test_expand_merged_range
+    return unless EXCELX
+    xlsx  = Roo::Excelx.new(File.join(TESTDIR, "merged_ranges.xlsx"), {:expand_merged_ranges => true})
+    for row in 3..7 do
+      for col in 'a'..'b'
+        if row > 3 && row < 7 && col == 'a'
+          assert_equal 'vertical1', xlsx.cell(col,row)
+        else
+          assert_nil xlsx.cell(col,row)
+        end
+      end
+    end
+    for row in 3..11 do
+      for col in 'f'..'h'
+        if row > 3 && row < 11 && col == 'g'
+          assert_equal 'vertical2', xlsx.cell(col,row)
+        else
+          assert_nil xlsx.cell(col,row)
+        end
+      end
+    end
+    for row in 3..5 do
+      for col in 'b'..'f'
+        if row == 4 && col > 'b' && col < 'f'
+          assert_equal 'horizontal', xlsx.cell(col,row)
+        else
+          assert_nil xlsx.cell(col,row)
+        end
+      end
+    end
+    for row in 8..13 do
+      for col in 'a'..'e'
+        if row > 8 && row < 13 && col > 'a' && col < 'e'
+          assert_equal 'block', xlsx.cell(col,row)
+        else
+          assert_nil xlsx.cell(col,row)
+        end
+      end
+    end
+  end
+
+  def test_noexpand_merged_range
+    return unless EXCELX
+    xlsx  = Roo::Excelx.new(File.join(TESTDIR, "merged_ranges.xlsx"))
+    for row in 3..7 do
+      for col in 'a'..'b'
+        if row == 4 && col == 'a'
+          assert_equal 'vertical1', xlsx.cell(col,row)
+        else
+          assert_nil xlsx.cell(col,row)
+        end
+      end
+    end
+    for row in 3..11 do
+      for col in 'f'..'h'
+        if row == 4 && col == 'g'
+          assert_equal 'vertical2', xlsx.cell(col,row)
+        else
+          assert_nil xlsx.cell(col,row)
+        end
+      end
+    end
+    for row in 3..5 do
+      for col in 'b'..'f'
+        if row == 4 && col == 'c'
+          assert_equal 'horizontal', xlsx.cell(col,row)
+        else
+          assert_nil xlsx.cell(col,row)
+        end
+      end
+    end
+    for row in 8..13 do
+      for col in 'a'..'e'
+        if row == 9 && col == 'b'
+          assert_equal 'block', xlsx.cell(col,row)
+        else
+          assert_nil xlsx.cell(col,row)
+        end
+      end
+    end
+  end
+
+  def test_open_stream
+    return unless EXCELX
+    file_contents = File.read File.join(TESTDIR, fixture_filename(:numbers1, :excelx))
+    stream = StringIO.new(file_contents)
+    xlsx = Roo::Excelx.new(stream)
+    assert_equal ["Tabelle1","Name of Sheet 2","Sheet3","Sheet4","Sheet5"], xlsx.sheets
+  end
+
+  def test_close
+    with_each_spreadsheet(:name=>'numbers1') do |oo|
+      next unless (tempdir = oo.instance_variable_get('@tmpdir'))
+      oo.close
+      assert !File.exists?(tempdir), "Expected #{tempdir} to be cleaned up, but it still exists"
+    end
+  end
+
+  def test_cleanup_on_error
+    old_temp_files = Dir.open(Dir.tmpdir).to_a
+    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
 end # class