roo 1.9.2 → 1.9.3

data/lib/roo.rb

@@ -2,7 +2,7 @@
 module Roo
 
   # :stopdoc:
-  VERSION = '1.9.2'
+  VERSION = '1.9.3'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/roo/generic_spreadsheet.rb

@@ -163,13 +163,15 @@ class GenericSpreadsheet
     true
   end
 
-  def to_matrix(sheet=nil)
+  def to_matrix(from_row=nil, from_column=nil, to_row=nil, to_column=nil,sheet=nil)
     sheet = @default_sheet unless sheet
     arr = []
     pos = 0
-    first_row.upto(last_row) do |row|
+
+    (from_row||first_row(sheet)).upto(to_row||last_row(sheet)) do |row|
       line = []
-      first_column.upto(last_column) do |col|
+      (from_column||first_column(sheet)).upto(to_column||last_column(sheet)) do |col|
+
         line << cell(row,col)
       end
       arr[pos] = line

data/test/test_roo.rb

@@ -72,8 +72,9 @@ class Test::Unit::TestCase
         'time-test' => 'ptu6bbahNZpYBMhk01UfXSg',
         #'datetime' => "r2kQpXWr6xOSUpw9MyXavYg",
         'datetime' => "ptu6bbahNZpYQEtZwzL_dZQ",
-        'whitespace' => "rZyQaoFebVGeHKzjG6e9gRQ"
-      }[spreadsheetname]
+        'whitespace' => "rZyQaoFebVGeHKzjG6e9gRQ",
+        'matrix' => '0AkCuGANLc3jFdHY3cWtYUkM4bVdadjZ5VGpfTzFEUEE',
+                       }[spreadsheetname]
       # 'numbers1' => "o10837434939102457526.4784396906364855777",
       # 'borders' => "o10837434939102457526.664868920231926255",
       # 'simple_spreadsheet' => "ptu6bbahNZpYe-L1vEBmgGA",
@@ -138,10 +139,10 @@ class TestRoo < Test::Unit::TestCase
 
   OPENOFFICE   = true  	# do Openoffice-Spreadsheet Tests?
   EXCEL        = true	  # do Excel Tests?
-  GOOGLE       = false 	# do Google-Spreadsheet Tests?
+  GOOGLE       = true 	# do Google-Spreadsheet Tests?
   EXCELX       = true  	# do Excel-X Tests? (.xlsx-files)
 
-  ONLINE = false
+  ONLINE = true
   LONG_RUN = true
   GLOBAL_TIMEOUT = 48.minutes #*60 # 2*12*60 # seconds
 
@@ -1264,6 +1265,7 @@ class TestRoo < Test::Unit::TestCase
   end
   
   def test_write_google
+    after Date.new(2010,3,10) do
     # write.me: http://spreadsheets.google.com/ccc?key=ptu6bbahNZpY0N0RrxQbWdw&hl=en_GB
     with_each_spreadsheet(:name=>'write.me', :format=>:google) do |oo|
       oo.default_sheet = oo.sheets.first
@@ -1272,6 +1274,7 @@ class TestRoo < Test::Unit::TestCase
       oo.set_value(1,1, 1.0)
       assert_equal 1.0, oo.cell(1,1)
     end
+   end
   end
 
   def test_bug_set_value_with_more_than_one_sheet_google
@@ -1411,7 +1414,7 @@ Sheet 3:
   end
 
   def test_no_remaining_tmp_files_google
-    after Date.new(2009,11,1) do
+    after Date.new(2010,4,1) do
       # Exception ist irgendwie anders, nochmal ansehen TODO:
       if GOOGLE
         assert_nothing_raised() {
@@ -1805,7 +1808,7 @@ Sheet 3:
   # Need to extend to other formats
   def test_row_whitespace
     # auf dieses Dokument habe ich keinen Zugriff TODO:
-    after Date.new(2009,11,1) do
+    after Date.new(2010,4,1) do
       with_each_spreadsheet(:name=>'whitespace') do |oo|
         oo.default_sheet = "Sheet1"
         assert_equal [nil, nil, nil, nil, nil, nil], oo.row(1)
@@ -1823,7 +1826,7 @@ Sheet 3:
   end
   
   def test_col_whitespace
-    after Date.new(2009,11,20) do
+    after Date.new(2010,2,20) do
       #TODO:
       # kein Zugriff auf Dokument whitespace
       with_each_spreadsheet(:name=>'whitespace') do |oo|
@@ -1873,7 +1876,7 @@ Sheet 3:
   end
 
   def test_cell_methods
-    after Date.new(2010,1,30) do
+    after Date.new(2010,3,30) do
       with_each_spreadsheet(:name=>'numbers1') do |oo|
         assert_equal 10, oo.a4 # cell(4,'A')
         assert_equal 11, oo.b4 # cell(4,'B')
@@ -1918,7 +1921,7 @@ Sheet 3:
   end
 
   def test_labeled_cells
-    after Date.new(2010,1,25) do
+    after Date.new(2010,3,25) do
       # TODO: more spreadsheet types
       with_each_spreadsheet(:name=>'named_cells', :format=>:openoffice) do |oo|
         oo.default_sheet = oo.sheets.first
@@ -1961,12 +1964,12 @@ Sheet 3:
 
   def test_bug_excel_last_row_255
     after Date.new(2010,2,20) do
-    oo = Excel.new(File.join('test','ScienceStaff.xls'))
-    oo.default_sheet = oo.sheets.first
-    assert_equal "COMSCI", oo.cell(255,1)
-    assert_equal "lala", oo.cell(256,1)
-   assert_equal 1537, oo.last_row
-   end
+      oo = Excel.new(File.join('test','ScienceStaff.xls'))
+      oo.default_sheet = oo.sheets.first
+      assert_equal "COMSCI", oo.cell(255,1)
+      assert_equal "lala", oo.cell(256,1)
+      assert_equal 1537, oo.last_row
+    end
   end
 
   def test_bug_excel_last_row_255_modified
@@ -1974,13 +1977,46 @@ Sheet 3:
     oo.default_sheet = oo.sheets.first
     assert_equal 1537, oo.last_row
   end
-require 'matrix'
-   def test_matrix
-      with_each_spreadsheet(:name => 'matrix', :format => [:openoffice, :excel, :google]) do |oo|
-        oo.default_sheet = oo.sheets.first
-        assert_equal Matrix[ [1.0, 2.0, 3.0],
-                             [4.0, 5.0, 6.0],
-                             [7.0, 8.0, 9.0] ], oo.to_matrix
+
+  require 'matrix'
+  def test_matrix
+    with_each_spreadsheet(:name => 'matrix', :format => [:openoffice, :excel, :google]) do |oo|
+      oo.default_sheet = oo.sheets.first
+      assert_equal Matrix[
+        [1.0, 2.0, 3.0],
+        [4.0, 5.0, 6.0],
+        [7.0, 8.0, 9.0] ], oo.to_matrix
+    end
+  end
+
+  def test_matrix_selected_range
+    with_each_spreadsheet(:name => 'matrix', :format=>[:excel,:openoffice,:google]) do |oo|
+      oo.default_sheet = 'Sheet2'
+      assert_equal Matrix[
+        [1.0, 2.0, 3.0],
+        [4.0, 5.0, 6.0],
+        [7.0, 8.0, 9.0] ], oo.to_matrix(3,4,5,6)
+    end
+  end
+
+  def test_matrix_all_nil
+    with_each_spreadsheet(:name => 'matrix', :format=>[:excel,:openoffice,:google]) do |oo|
+      oo.default_sheet = 'Sheet2'
+      assert_equal Matrix[
+        [nil, nil, nil],
+        [nil, nil, nil],
+        [nil, nil, nil] ], oo.to_matrix(10,10,12,12)
+    end
+  end
+
+    def test_matrix_values_and_nil
+    with_each_spreadsheet(:name => 'matrix', :format=>[:excel,:openoffice,:google]) do |oo|
+      oo.default_sheet = 'Sheet3'
+      assert_equal Matrix[
+        [1.0, nil, 3.0],
+        [4.0, 5.0, 6.0],
+        [7.0, 8.0, nil] ], oo.to_matrix(1,1,3,3)
       end
     end
-end # class
+
+  end # class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-18 00:00:00 +01:00
+date: 2010-02-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.2.0
+        version: 3.2.1
     version: 
 description: |-
   Roo can access the contents of various spreadsheet files. It can handle
@@ -46,6 +46,7 @@ files:
 - Rakefile
 - bin/roo
 - csv11159
+- csv1414
 - csv9419
 - csv9957
 - lib/roo.rb