roo 2.7.1 → 2.8.0

data/spec/lib/roo/weak_instance_cache_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+if RUBY_PLATFORM == "java"
+  require 'java'
+  java_import 'java.lang.System'
+end
+
+describe Roo::Helpers::WeakInstanceCache do
+  let(:klass) do
+    Class.new do
+      include Roo::Helpers::WeakInstanceCache
+
+      def memoized_data
+        instance_cache(:@memoized_data) do
+          "Some Costly Operation #{rand(1000)}" * 1_000
+        end
+      end
+    end
+  end
+
+  subject do
+    klass.new
+  end
+
+  it 'should be lazy' do
+    expect(subject.instance_variables).to_not include(:@memoized_data)
+    data = subject.memoized_data
+    expect(subject.instance_variables).to include(:@memoized_data)
+  end
+
+
+  it 'should be memoized' do
+    data = subject.memoized_data
+    expect(subject.memoized_data).to equal(data)
+  end
+
+  it 'should recalculate after GC' do
+    expect(subject.instance_variables).to_not include(:@memoized_data)
+    GC.disable
+    subject.memoized_data && nil
+    expect(subject.instance_variables).to include(:@memoized_data)
+
+    force_gc
+    expect(subject.instance_variables).to_not include(:@memoized_data)
+    GC.disable
+    subject.memoized_data && nil
+    expect(subject.instance_variables).to include(:@memoized_data)
+  end
+
+  it 'must remove instance variable' do
+    expect(subject.instance_variables).to_not include(:@memoized_data)
+    GC.disable
+    subject.memoized_data && nil
+    expect(subject.instance_variables).to include(:@memoized_data)
+
+    force_gc
+    expect(subject.instance_variables).to_not include(:@memoized_data)
+  end
+
+  context '#inspect must not raise' do
+    it 'before calculation' do
+      expect{subject.inspect}.to_not raise_error
+    end
+    it 'after calculation' do
+      GC.disable
+      subject.memoized_data && nil
+      expect{subject.inspect}.to_not raise_error
+      expect(subject.inspect).to include("Some Costly Operation")
+      force_gc
+    end
+    it 'after GC' do
+      subject.memoized_data && nil
+      force_gc
+      expect(subject.instance_variables).to_not include(:@memoized_data)
+      expect{subject.inspect}.to_not raise_error
+      expect(subject.inspect).to_not include("Some Costly Operation")
+    end
+  end
+
+  if RUBY_PLATFORM == "java"
+    def force_gc
+      System.gc
+      sleep(0.1)
+    end
+  else
+    def force_gc
+      GC.start(full_mark: true, immediate_sweep: true)
+      sleep(0.1)
+      GC.start(full_mark: true, immediate_sweep: true)
+    end
+  end
+end

data/test/excelx/cell/test_attr_reader_default.rb

@@ -0,0 +1,72 @@
+require "test_helper"
+
+class TestAttrReaderDefault < Minitest::Test
+  def base
+    Roo::Excelx::Cell::Base
+  end
+
+  def boolean
+    Roo::Excelx::Cell::Boolean
+  end
+
+  def class_date
+    Roo::Excelx::Cell::Date
+  end
+
+  def datetime
+    Roo::Excelx::Cell::DateTime
+  end
+
+  def empty
+    Roo::Excelx::Cell::Empty
+  end
+
+  def number
+    Roo::Excelx::Cell::Number
+  end
+
+  def string
+    Roo::Excelx::Cell::String
+  end
+
+  def base_date
+    ::Date.new(1899, 12, 30)
+  end
+
+  def base_timestamp
+    ::Date.new(1899, 12, 30).to_datetime.to_time.to_i
+  end
+
+  def class_time
+    Roo::Excelx::Cell::Time
+  end
+
+  def test_cell_default_values
+    assert_values base.new(nil, nil, [], 1, nil, nil), default_type: :base, :@default_type => nil, style: 1, :@style => nil
+    assert_values boolean.new("1", nil, nil, nil, nil), default_type: :boolean, :@default_type => nil, cell_type: :boolean, :@cell_type => nil
+    assert_values class_date.new("41791", nil, [:numeric_or_formula, "mm-dd-yy"], 6, nil, base_date, nil), default_type: :date, :@default_type => nil
+    assert_values class_time.new("0.521", nil, [:numeric_or_formula, "hh:mm"], 6, nil, base_timestamp, nil), default_type: :time, :@default_type => nil
+    assert_values datetime.new("41791.521", nil, [:numeric_or_formula, "mm-dd-yy hh:mm"], 6, nil, base_timestamp, nil), default_type: :datetime, :@default_type => nil
+    assert_values empty.new(nil), default_type: nil, :@default_type => nil, style: nil, :@style => nil
+    assert_values number.new("42", nil, ["0"], nil, nil, nil), default_type: :float, :@default_type => nil
+    assert_values string.new("1", nil, nil, nil, nil), default_type: :string, :@default_type => nil, cell_type: :string, :@cell_type => nil
+
+    assert_values base.new(nil, nil, [], 2, nil, nil), style: 2, :@style => 2
+  end
+
+  def assert_values(object, value_hash)
+    value_hash.each do |attr_name, expected_value|
+      value = if attr_name.to_s.include?("@")
+                object.instance_variable_defined?(attr_name) ? object.instance_variable_get(attr_name) : nil
+              else
+                object.public_send(attr_name)
+      end
+
+      if expected_value
+        assert_equal expected_value, value
+      else
+        assert_nil value
+      end
+    end
+  end
+end

data/test/excelx/cell/test_base.rb

@@ -25,6 +25,11 @@ class TestRooExcelxCellBase < Minitest::Test
     refute cell.empty?
   end
 
+  def test_presence
+    cell = base.new(value, nil, [], nil, nil, nil)
+    assert_equal cell, cell.presence
+  end
+
   def test_cell_type_is_formula
     formula = true
     cell = base.new(value, formula, [], nil, nil, nil)

data/test/excelx/cell/test_datetime.rb

@@ -2,12 +2,12 @@ require 'test_helper'
 
 class TestRooExcelxCellDateTime < Minitest::Test
   def test_cell_value_is_datetime
-    cell = datetime.new('30000.323212', nil, ['mm-dd-yy'], nil, nil, base_date, nil)
+    cell = datetime.new('30000.323212', nil, ['mm-dd-yy'], nil, nil, base_timestamp, nil)
     assert_kind_of ::DateTime, cell.value
   end
 
   def test_cell_type_is_datetime
-    cell = datetime.new('30000.323212', nil, [], nil, nil, base_date, nil)
+    cell = datetime.new('30000.323212', nil, [], nil, nil, base_timestamp, nil)
     assert_equal :datetime, cell.type
   end
 
@@ -19,7 +19,7 @@ class TestRooExcelxCellDateTime < Minitest::Test
       ['mmm-yy', 'JAN-15'],
       ['m/d/yy h:mm', '1/25/15 8:15']
     ].each do |format, formatted_value|
-      cell = datetime.new '42029.34375', nil, [format], nil, nil, base_date, nil
+      cell = datetime.new '42029.34375', nil, [format], nil, nil, base_timestamp, nil
       assert_equal formatted_value, cell.formatted_value
     end
   end
@@ -30,7 +30,7 @@ class TestRooExcelxCellDateTime < Minitest::Test
       ['h:mm:ss000 mm/yy', '8:15:00000 01/15'],
       ['mmm yyy', '2015-01-25 08:15:00']
     ].each do |format, formatted_value|
-      cell = datetime.new '42029.34375', nil, [format], nil, nil, base_date, nil
+      cell = datetime.new '42029.34375', nil, [format], nil, nil, base_timestamp, nil
       assert_equal formatted_value, cell.formatted_value
     end
   end
@@ -39,7 +39,7 @@ class TestRooExcelxCellDateTime < Minitest::Test
     Roo::Excelx::Cell::DateTime
   end
 
-  def base_date
-    Date.new(1899, 12, 30)
+  def base_timestamp
+    DateTime.new(1899, 12, 30).to_time.to_i
   end
 end

data/test/excelx/cell/test_empty.rb

@@ -4,4 +4,15 @@ class TestRooExcelxCellEmpty < Minitest::Test
   def empty
     Roo::Excelx::Cell::Empty
   end
+
+  def test_empty?
+    cell = empty.new(nil)
+    assert_same  true, cell.empty?
+  end
+
+  def test_nil_presence
+    cell = empty.new(nil)
+    assert_nil cell.presence
+  end
+
 end

data/test/excelx/cell/test_number.rb

@@ -25,6 +25,11 @@ class TestRooExcelxCellNumber < Minitest::Test
     assert_kind_of(Float, cell.value)
   end
 
+  def test_very_simple_scientific_notation
+    cell = Roo::Excelx::Cell::Number.new '1e6', nil, ['0'], nil, nil, nil
+    assert_kind_of(Float, cell.value)
+  end
+
   def test_percent
     cell = Roo::Excelx::Cell::Number.new '42.1', nil, ['0.00%'], nil, nil, nil
     assert_kind_of(Float, cell.value)
@@ -53,8 +58,12 @@ class TestRooExcelxCellNumber < Minitest::Test
   def test_formats
     [
       ['General', '1042'],
+      ['GENERAL', '1042'],
       ['0', '1042'],
+      ['000000', '001042'],
       ['0.00', '1042.00'],
+      ['0.0000', '1042.0000'],
+      ['0.000000000', '1042.000000000'],
       ['#,##0', '1,042'],
       ['#,##0.00', '1,042.00'],
       ['0%', '104200%'],

data/test/excelx/cell/test_string.rb

@@ -25,4 +25,24 @@ class TestRooExcelxCellString < Minitest::Test
     cell = string.new '0', nil, nil, nil, nil
     assert_equal '0', cell.value
   end
+
+  def test_not_empty?
+    cell = string.new '1', nil, nil, nil, nil
+    assert_equal false, cell.empty?
+  end
+
+  def test_empty?
+    cell = string.new '', nil, nil, nil, nil
+    assert_equal true, cell.empty?
+  end
+
+  def test_presence
+    cell = string.new '1', nil, nil, nil, nil
+    assert_equal cell, cell.presence
+  end
+
+  def test_nil_presence
+    cell = string.new '', nil, nil, nil, nil
+    assert_nil cell.presence
+  end
 end

data/test/excelx/cell/test_time.rb

@@ -5,8 +5,8 @@ class TestRooExcelxCellTime < Minitest::Test
     Roo::Excelx::Cell::Time
   end
 
-  def base_date
-    Date.new(1899, 12, 30)
+  def base_timestamp
+    DateTime.new(1899, 12, 30).to_time.to_i
   end
 
   def test_formatted_value
@@ -18,13 +18,13 @@ class TestRooExcelxCellTime < Minitest::Test
       ['[h]:mm:ss', '[1]:48:09'],
       ['mmss.0', '4809.0'] # Cell::Time always get rounded to the nearest second.
     ].each do |style_format, result|
-      cell = roo_time.new(value, nil, [:numeric_or_formula, style_format], 6, nil, base_date, nil)
+      cell = roo_time.new(value, nil, [:numeric_or_formula, style_format], 6, nil, base_timestamp, nil)
       assert_equal result, cell.formatted_value, "Style=#{style_format} is not properly formatted"
     end
   end
 
   def test_value
-    cell = roo_time.new('0.0751', nil, [:numeric_or_formula, 'h:mm'], 6, nil, base_date, nil)
+    cell = roo_time.new('0.0751', nil, [:numeric_or_formula, 'h:mm'], 6, nil, base_timestamp, nil)
     assert_kind_of Integer, cell.value
   end
 end

data/test/excelx/test_coordinate.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class TestRooExcelxCoordinate < Minitest::Test
+  def row
+    10
+  end
+
+  def column
+    20
+  end
+
+  def coordinate
+    Roo::Excelx::Coordinate.new(row, column)
+  end
+
+  def array
+    [row, column]
+  end
+
+  def test_row
+    assert_same  row, coordinate.row
+  end
+
+  def test_column
+    assert_same  column, coordinate.column
+  end
+
+  def test_frozen?
+    assert coordinate.frozen?
+  end
+
+  def test_equality
+    hash = {}
+    hash[coordinate] = true
+    assert hash.key?(coordinate)
+    assert hash.key?(array)
+  end
+
+  def test_expand
+    r, c = coordinate
+    assert_same row, r
+    assert_same column, c
+  end
+
+  def test_aref
+    assert_same row, coordinate[0]
+    assert_same column, coordinate[1]
+  end
+end

data/test/formatters/test_csv.rb

@@ -100,6 +100,23 @@ class TestRooFormatterCSV < Minitest::Test
     end
   end
 
+  def test_bug_datetime_offset_change
+    # DO NOT REMOVE Asia/Calcutta
+    [nil, "US/Eastern", "US/Pacific", "Asia/Calcutta"].each do |zone|
+      with_timezone(zone) do
+        with_each_spreadsheet(name: "datetime_timezone_ist_offset_change", format: %i[excelx openoffice libreoffice]) do |workbook|
+          Dir.mktmpdir do |tempdir|
+            datetime_csv_file = File.join(tempdir, "datetime_timezone_ist_offset_change.csv")
+
+            assert workbook.to_csv(datetime_csv_file)
+            assert File.exist?(datetime_csv_file)
+            assert_equal "", file_diff("#{TESTDIR}/so_datetime_timezone_ist_offset_change.csv", datetime_csv_file)
+          end
+        end
+      end
+    end
+  end
+
   def test_true_class
     assert_equal "true", cell_to_csv(1, 1)
   end

data/test/formatters/test_xml.rb

@@ -16,7 +16,7 @@ class TestRooFormatterXML < Minitest::Test
         all_cells = init_all_cells(workbook, sheetname)
         cells = xml_sheet.children.reject(&:text?)
 
-        assert_equal sheetname, xml_sheet.attribute("name").value
+        assert_equal sheetname, xml_sheet["name"]
         assert_equal all_cells.size, cells.size
 
         cells.each_with_index do |cell, i|
@@ -27,10 +27,10 @@ class TestRooFormatterXML < Minitest::Test
             all_cells[i][:type],
           ]
           result = [
-            cell.attribute("row").value,
-            cell.attribute("column").value,
+            cell["row"],
+            cell["column"],
             cell.text,
-            cell.attribute("type").value,
+            cell["type"],
           ]
 
           assert_equal expected, result

data/test/roo/test_base.rb

@@ -63,11 +63,11 @@ class TestRooBase < Minitest::Test
       workbook.default_sheet = workbook.sheets.first
       result = workbook.find 20
       assert result
-      assert_equal "Brief aus dem Sekretariat", result[0]["TITEL"]
+      assert_equal "Brief aus dem Sekretariat", result[0]
 
       result = workbook.find 22
       assert result
-      assert_equal "Brief aus dem Skretariat. Tagung in Amberg/Opf.", result[0]["TITEL"]
+      assert_equal "Brief aus dem Skretariat. Tagung in Amberg/Opf.", result[0]
     end
   end
 

data/test/roo/test_csv.rb

@@ -13,6 +13,34 @@ class TestRooCSV < Minitest::Test
     end
   end
 
+  def test_download_uri_with_query_string
+    file = filename("simple_spreadsheet")
+    port = 12_347
+    url = "#{local_server(port)}/#{file}?query-param=value"
+
+    start_local_server(file, port) do
+      csv = roo_class.new(url)
+      assert_equal "Task 1", csv.cell("f", 4)
+      assert_equal 1, csv.first_row
+      assert_equal 13, csv.last_row
+      assert_equal 1, csv.first_column
+      assert_equal 6, csv.last_column
+    end
+  end
+
+  def test_open_stream
+    file = filename("Bibelbund")
+    file_contents = File.read File.join(TESTDIR, file)
+    stream = StringIO.new(file_contents)
+    csv = roo_class.new(stream)
+
+    assert_equal "Aktuelle Seite", csv.cell("h", 12)
+    assert_equal 1, csv.first_row
+    assert_equal 3735, csv.last_row
+    assert_equal 1, csv.first_column
+    assert_equal 8, csv.last_column
+  end
+
   def test_nil_rows_and_lines_csv
     # x_123
     oo = Roo::CSV.new(File.join(TESTDIR,'Bibelbund.csv'))