roo 1.2.2 → 1.2.3

data/History.txt

@@ -1,9 +1,16 @@
-== 1.2.2 2008-12-??
+== 1.2.3 2009-01-04
+
+* bugfix
+  * fixed encoding in #cell at exported Google-spreadsheets (.xls)
+
+== 1.2.2 2008-12-14
+
 * 2 enhancements
   * added celltype :datetime in Excelx
   * added celltype :datetime in Google
 
 == 1.2.1 2008-11-13
+
 * 1 enhancement
   * added celltype :datetime in Openoffice and Excel
 

data/Manifest.txt

@@ -60,6 +60,7 @@ test/emptysheets.ods
 test/emptysheets.xls
 test/datetime.ods
 test/datetime.xls
+test/datetime.xlsx
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js

data/lib/roo/excel.rb

@@ -91,7 +91,11 @@ class Excel < GenericSpreadsheet
       yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
     end
-    return @cell[sheet][[row,col]]
+    if celltype(row,col,sheet) == :string
+      return platform_specific_iconv(@cell[sheet][[row,col]])
+    else
+      return @cell[sheet][[row,col]]
+    end
   end
 
   # returns the type of a cell:
@@ -265,6 +269,7 @@ class Excel < GenericSpreadsheet
 
   def every_second_null?(str)
     result = true
+    return false if str.length < 2
     0.upto(str.length/2-1) do |i|
       c = str[i*2,1]
       n = str[i*2+1,1]

data/lib/roo/generic_spreadsheet.rb

@@ -434,21 +434,56 @@ class GenericSpreadsheet
     return row,col
   end
 
+  #  def open_from_uri(uri)
+  #    require 'open-uri' ;
+  #    tempfilename = File.join(@tmpdir, File.basename(uri))
+  #    f = File.open(tempfilename,"wb")
+  #    begin
+  #      open(uri) do |net|
+  #        f.write(net.read)
+  #      end
+  #    rescue
+  #      raise "could not open #{uri}"
+  #    end
+  #    f.close
+  #    File.join(@tmpdir, File.basename(uri))
+  #  end
+
+  #  OpenURI::HTTPError
+  #  def open_from_uri(uri)
+  #    require 'open-uri'
+  #    #existiert URL?
+  #    r = Net::HTTP.get_response(URI.parse(uri))
+  #    raise "URL nicht verfuegbar" unless r.is_a? Net::HTTPOK
+  #    tempfilename = File.join(@tmpdir, File.basename(uri))
+  #    f = File.open(tempfilename,"wb")
+  #    open(uri) do |net|
+  #      f.write(net.read)
+  #    end
+  #    #   rescue
+  #    #    raise "could not open #{uri}"
+  #    # end
+  #    f.close
+  #    File.join(@tmpdir, File.basename(uri))
+  #  end
+  
   def open_from_uri(uri)
-    require 'open-uri' ;
-    tempfilename = File.join(@tmpdir, File.basename(uri))
-    f = File.open(tempfilename,"wb")
+    require 'open-uri'
+    response = ''
     begin
-      open(uri) do |net|
-        f.write(net.read)
-      end
-    rescue
+      open(uri, "User-Agent" => "Ruby/#{RUBY_VERSION}") { |net| 
+        response = net.read 
+        tempfilename = File.join(@tmpdir, File.basename(uri))
+        f = File.open(tempfilename,"wb")
+        f.write(response)
+        f.close
+      }
+    rescue OpenURI::HTTPError
       raise "could not open #{uri}"
     end
-    f.close
     File.join(@tmpdir, File.basename(uri))
   end
-
+  
   def open_from_stream(stream)
     tempfilename = File.join(@tmpdir, "spreadsheet")
     f = File.open(tempfilename,"wb")

data/lib/roo/version.rb

@@ -2,7 +2,7 @@ module Roo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_roo.rb

@@ -113,7 +113,7 @@ class TestRoo < Test::Unit::TestCase
   EXCELX      = true  	# do Excel-X Tests? (.xlsx-files)
 
   OPENOFFICEWRITE = false # experimental: write access with OO-Documents
-  ONLINE = false
+  ONLINE = true
   LONG_RUN = false
   GLOBAL_TIMEOUT = 48.minutes #*60 # 2*12*60 # seconds
 
@@ -1972,7 +1972,7 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_excel_zipped
-    after Date.new(2008,12,31) do
+    after Date.new(2009,1,10) do
       if EXCEL
         $log.level = Logger::DEBUG
         excel = Excel.new(File.join("test","bode-v1.xls.zip"), :zip)
@@ -3398,23 +3398,23 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_should_raise_file_not_found_error
-    after Date.new(2008,12,31) do
-      if OPENOFFICE
-        assert_raise(IOError) {
-          oo = Openoffice.new(File.join('testnichtvorhanden','Bibelbund.ods'))
-        }
-      end
-      if EXCEL
-        assert_raise(IOError) {
-          oo = Excel.new(File.join('testnichtvorhanden','Bibelbund.xls'))
-        }
-      end
-      if EXCELX
-        assert_raise(IOError) {
-          oo = Excelx.new(File.join('testnichtvorhanden','Bibelbund.xlsx'))
-        }
-      end
-      if GOOGLE
+    if OPENOFFICE
+      assert_raise(IOError) {
+        oo = Openoffice.new(File.join('testnichtvorhanden','Bibelbund.ods'))
+      }
+    end
+    if EXCEL
+      assert_raise(IOError) {
+        oo = Excel.new(File.join('testnichtvorhanden','Bibelbund.xls'))
+      }
+    end
+    if EXCELX
+      assert_raise(IOError) {
+        oo = Excelx.new(File.join('testnichtvorhanden','Bibelbund.xlsx'))
+      }
+    end
+    if GOOGLE
+      after Date.new(2009,1,15) do
         assert_raise(IOError) {
           # oo = Google.new(key_of('testnichtvorhanden'+'Bibelbund.ods'))
           oo = Google.new('testnichtvorhanden')
@@ -3422,7 +3422,7 @@ class TestRoo < Test::Unit::TestCase
       end
     end
   end
-
+  
   def test_bug_cell_no_default_sheet
     if GOOGLE
       oo = Google.new(key_of("numbers1"))
@@ -3876,20 +3876,20 @@ Sheet 3:
   end
 
   def test_bug_row_column_fixnum_float
-      if EXCEL
-        ex = Excel.new(File.join('test','bug-row-column-fixnum-float.xls'))
-        ex.default_sheet = ex.sheets.first
-        assert_equal 42.5, ex.cell('b',2)
-        assert_equal 43  , ex.cell('c',2)
-        assert_equal ['hij',42.5, 43], ex.row(2)
-        assert_equal ['def',42.5, 'nop'], ex.column(2)
-      end
+    if EXCEL
+      ex = Excel.new(File.join('test','bug-row-column-fixnum-float.xls'))
+      ex.default_sheet = ex.sheets.first
+      assert_equal 42.5, ex.cell('b',2)
+      assert_equal 43  , ex.cell('c',2)
+      assert_equal ['hij',42.5, 43], ex.row(2)
+      assert_equal ['def',42.5, 'nop'], ex.column(2)
+    end
     
   end
 
   def test_bug_c2
     if EXCEL
-      after Date.new(2008,12,25) do
+      after Date.new(2009,1,6) do
         local_only do
           expected = ['Supermodel X','T6','Shaun White','Jeremy','Custom',
             'Warhol','Twin','Malolo','Supermodel','Air','Elite',
@@ -3914,7 +3914,7 @@ Sheet 3:
   end
 
   def test_bug_c2_parseexcel
-    after Date.new(2008,12,11) do
+    after Date.new(2009,1,10) do
       local_only do
         #-- this is OK
         @workbook = Spreadsheet::ParseExcel.parse(File.join('test',"problem.xls"))
@@ -3993,7 +3993,7 @@ Sheet 3:
 
   def test_compare_csv_excelx_excel
     if EXCELX
-      after Date.new(2008,12,10) do
+      after Date.new(2008,12,30) do
         # parseexcel bug
         local_only do
           s1 = Excel.new(File.join("test","problem.xls"))
@@ -4015,7 +4015,7 @@ Sheet 3:
   end
 
   def test_problemx_csv_imported
-    after Date.new(2008,12,26) do
+    after Date.new(2009,1,6) do
       if EXCEL
         local_only do
           # wieder eingelesene CSV-Datei aus obigem Test
@@ -4164,24 +4164,24 @@ Sheet 3:
   end
 
   def test_open_from_uri
-      if ONLINE
-        if OPENOFFICE
-          assert_raises(RuntimeError) {
-            oo = Openoffice.new("http://gibbsnichtdomainxxxxx.com/file.ods")
-          }
-        end
-        if EXCEL
-          assert_raises(RuntimeError) {
-            oo = Excel.new("http://gibbsnichtdomainxxxxx.com/file.xls")
-          }
-        end
-        if EXCELX
-          assert_raises(RuntimeError) {
-            oo = Excelx.new("http://gibbsnichtdomainxxxxx.com/file.xlsx")
-          }
-        end
+    if ONLINE
+      if OPENOFFICE
+        assert_raises(RuntimeError) {
+          oo = Openoffice.new("http://gibbsnichtdomainxxxxx.com/file.ods")
+        }
       end
+      if EXCEL
+        assert_raises(RuntimeError) {
+          oo = Excel.new("http://gibbsnichtdomainxxxxx.com/file.xls")
+        }
+      end
+      if EXCELX
+        assert_raises(RuntimeError) {
+          oo = Excelx.new("http://gibbsnichtdomainxxxxx.com/file.xlsx")
+        }
       end
+    end
+  end
 
   def test_bug_last_row_excel
     if EXCEL
@@ -4369,7 +4369,7 @@ Sheet 3:
 
   def test_possible_bug_snowboard_cells
     local_only do
-      after Date.new(2008,12,26) do
+      after Date.new(2009,1,6) do
         # warten auf Bugfix in parseexcel
         if EXCEL
           ex = Excel.new(File.join('test','problem.xls'))
@@ -4697,24 +4697,26 @@ This attached file is the newer format of Microsoft Excel (.xlsx).
   def test_huge_table_timing_10_000_openoffice
     after Date.new(2009,1,1) do
       if OPENOFFICE
-        assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(3.minutes) do |timeout_length|
-            oo = Openoffice.new("/home/tp/ruby-test/too-testing/speedtest_10000.ods")
-            # process every cell
-            sum = 0
-            oo.sheets.each {|sheet|
-              oo.default_sheet = sheet
-              for row in oo.first_row..oo.last_row do
-                for col in oo.first_column..oo.last_column do
-                  c = oo.cell(row,col)
-                  sum += c.length if c
+        if LONG_RUN
+          assert_nothing_raised(Timeout::Error) {
+            Timeout::timeout(3.minutes) do |timeout_length|
+              oo = Openoffice.new("/home/tp/ruby-test/too-testing/speedtest_10000.ods")
+              # process every cell
+              sum = 0
+              oo.sheets.each {|sheet|
+                oo.default_sheet = sheet
+                for row in oo.first_row..oo.last_row do
+                  for col in oo.first_column..oo.last_column do
+                    c = oo.cell(row,col)
+                    sum += c.length if c
+                  end
                 end
-              end
-              p sum
-              assert sum > 0
-            }
-          end
-        }
+                p sum
+                assert sum > 0
+              }
+            end
+          }
+        end
       end
     end
   end
@@ -4722,24 +4724,26 @@ This attached file is the newer format of Microsoft Excel (.xlsx).
   def test_huge_table_timing_10_000_excel
     after Date.new(2009,1,1) do
       if EXCEL
-        assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(3.minutes) do |timeout_length|
-            oo = Excel.new("/home/tp/ruby-test/too-testing/speedtest_10000.xls")
-            # process every cell
-            sum = 0
-            oo.sheets.each {|sheet|
-              oo.default_sheet = sheet
-              for row in oo.first_row..oo.last_row do
-                for col in oo.first_column..oo.last_column do
-                  c = oo.cell(row,col)
-                  sum += c.length if c
+        if LONG_RUN
+          assert_nothing_raised(Timeout::Error) {
+            Timeout::timeout(3.minutes) do |timeout_length|
+              oo = Excel.new("/home/tp/ruby-test/too-testing/speedtest_10000.xls")
+              # process every cell
+              sum = 0
+              oo.sheets.each {|sheet|
+                oo.default_sheet = sheet
+                for row in oo.first_row..oo.last_row do
+                  for col in oo.first_column..oo.last_column do
+                    c = oo.cell(row,col)
+                    sum += c.length if c
+                  end
                 end
-              end
-              p sum
-              assert sum > 0
-            }
-          end
-        }
+                p sum
+                assert sum > 0
+              }
+            end
+          }
+        end
       end
     end
   end
@@ -4747,24 +4751,26 @@ This attached file is the newer format of Microsoft Excel (.xlsx).
   def test_huge_table_timing_10_000_google
     after Date.new(2009,1,1) do
       if GOOGLE
-        assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(3.minutes) do |timeout_length|
-            oo = Excel.new(key_of("/home/tp/ruby-test/too-testing/speedtest_10000.xls"))
-            # process every cell
-            sum = 0
-            oo.sheets.each {|sheet|
-              oo.default_sheet = sheet
-              for row in oo.first_row..oo.last_row do
-                for col in oo.first_column..oo.last_column do
-                  c = oo.cell(row,col)
-                  sum += c.length if c
+        if LONG_RUN
+          assert_nothing_raised(Timeout::Error) {
+            Timeout::timeout(3.minutes) do |timeout_length|
+              oo = Excel.new(key_of("/home/tp/ruby-test/too-testing/speedtest_10000.xls"))
+              # process every cell
+              sum = 0
+              oo.sheets.each {|sheet|
+                oo.default_sheet = sheet
+                for row in oo.first_row..oo.last_row do
+                  for col in oo.first_column..oo.last_column do
+                    c = oo.cell(row,col)
+                    sum += c.length if c
+                  end
                 end
-              end
-              p sum
-              assert sum > 0
-            }
-          end
-        }
+                p sum
+                assert sum > 0
+              }
+            end
+          }
+        end
       end
     end
   end
@@ -4772,26 +4778,56 @@ This attached file is the newer format of Microsoft Excel (.xlsx).
   def test_huge_table_timing_10_000_excelx
     after Date.new(2009,1,1) do
       if EXCELX
-        assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(3.minutes) do |timeout_length|
-            oo = Excelx.new("/home/tp/ruby-test/too-testing/speedtest_10000.xlsx")
-            # process every cell
-            sum = 0
-            oo.sheets.each {|sheet|
-              oo.default_sheet = sheet
-              for row in oo.first_row..oo.last_row do
-                for col in oo.first_column..oo.last_column do
-                  c = oo.cell(row,col)
-                  sum += c.length if c
+        if LONG_RUN
+          assert_nothing_raised(Timeout::Error) {
+            Timeout::timeout(3.minutes) do |timeout_length|
+              oo = Excelx.new("/home/tp/ruby-test/too-testing/speedtest_10000.xlsx")
+              # process every cell
+              sum = 0
+              oo.sheets.each {|sheet|
+                oo.default_sheet = sheet
+                for row in oo.first_row..oo.last_row do
+                  for col in oo.first_column..oo.last_column do
+                    c = oo.cell(row,col)
+                    sum += c.length if c
+                  end
                 end
-              end
-              p sum
-              assert sum > 0
-            }
-          end
-        }
+                p sum
+                assert sum > 0
+              }
+            end
+          }
+        end
       end
     end
   end
   
+  # Eine Spreadsheetdatei wird nicht als Dateiname sondern direkt als Dokument
+  # geoeffnettest_problemx_csv_imported
+  def test_from_stream_openoffice
+    after Date.new(2009,1,6) do
+      if OPENOFFICE
+        filecontent = nil
+        File.open(File.join("test","numbers1.ods")) do |f|
+          filecontent = f.read
+          p filecontent.class
+          p filecontent.size
+          #p filecontent
+          assert filecontent.size > 0
+          # #stream macht das gleiche wie #new liest abe aus Stream anstatt Datei
+          oo = Openoffice.stream(filecontent)
+        end
+        #oo = Openoffice.open()
+      end
+    end
+  end
+  
+  
+  def test_bug_encoding_exported_from_google
+    if EXCEL
+      xl = Excel.new(File.join("test","numbers1_from_google.xls"))
+      xl.default_sheet = xl.sheets.first
+      assert_equal 'test', xl.cell(2,'F')
+    end
+  end
 end # class

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>roo</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/roo"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/roo" class="numbers">1.2.1</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">1.2.2</a>
     </div>
     <h2>What</h2>
 <p>This gem allows you to access the content of</p>
@@ -155,10 +155,12 @@ returned:</p>
 	<li>:percentage</li>
 	<li>:formula</li>
 	<li>:time</li>
+	<li>:datetime</li>
 </ul>
 <p>Numeric values are returned as type :float, the return value is a Ruby Float object (note: integer values like 42 are returned as 42.0 &#8211; not as a Fixnum 42 object).</p>
 <p>String values are returned as type :string and Ruby String object.</p>
 <p>Date values are returned as type :date and as a Ruby Date object.</p>
+<p>Datetime values are returned as type :datetime and as a Ruby DateTime object.</p>
 <p>Percentage are return as type :percentage and as Ruby Float object with the <br />
 range from 0.0 to 1.0.</p>
 <p>Formulas are returned as type :formula &#8211; the value of the cell is the computed<br />
@@ -372,7 +374,7 @@ h2. Feature Requests / Bugs</p>
 	<li>Thanks to Ryan Waldron for a bug-fix patch in Google set_value</li>
 </ul>
     <p class="coda">
-      <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>, 26th September 2008<br>
+      <a href="mailto:thopre@gmail.com">Thomas Preymesser</a>, 8th December 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -146,7 +146,7 @@ String values are returned as type :string and Ruby String object.
 
 Date values are returned as type :date and as a Ruby Date object.
 
-Datetime values are returned as type :datedate and as a Ruby DateTime object.
+Datetime values are returned as type :datetime and as a Ruby DateTime object.
 
 Percentage are return as type :percentage and as Ruby Float object with the 
 range from 0.0 to 1.0.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Thomas Preymesser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-08 00:00:00 +01:00
+date: 2009-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,6 +138,7 @@ files:
 - test/emptysheets.xls
 - test/datetime.ods
 - test/datetime.xls
+- test/datetime.xlsx
 - website/index.html
 - website/index.txt
 - website/javascripts/rounded_corners_lite.inc.js