roo 1.10.0 → 1.10.1

data/History.txt

@@ -1,3 +1,9 @@
+== 1.10.1 2011-11-14
+
+* 2 bugfixes
+  * forgot dependency 'rubyzip'
+  * at least one external application does create xlsx-files with different internal file names which differ from the original file names of Excel. Solution: ignore lower-/upper case in file names. 
+
 == 1.10.0 2011-10-10
 
 * 4 enhancements

data/README.txt

@@ -39,6 +39,7 @@ If you want to support the further development of the Roo gem, send Bitcoins to
   s = Excel.new("myspreadsheet.xls")           # creates an Excel Spreadsheet instance
   s = Google.new("myspreadsheetkey_at_google") # creates an Google Spreadsheet instance
   s = Excelx.new("myspreadsheet.xlsx")         # creates an Excel Spreadsheet instance for Excel .xlsx files
+  s = Csv.new("myspreadsheet.csv")             # creates an Csv Spreadsheet instance for CSV files
 
   s.default_sheet = s.sheets.first  # first sheet in the spreadsheet file will be used
 

data/Rakefile

@@ -25,6 +25,7 @@ Bones {
   #TODO: brauchen wir das noch? depend_on 'gimite-google-spreadsheet-ruby','>= 0.0.5'
   #depend_on 'febeling-rubyzip','>= 0.9.2' # meine aktuelle Version
   #TODO: warum brauchen wir das? es lief doch auch vorher ohne dieses spezielle gem
+  depend_on 'rubyzip' # rubyzip wird benoetigt
   depend_on 'google-spreadsheet-ruby'
   depend_on 'choice'
   depend_on 'todonotes'

data/lib/roo.rb

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

data/lib/roo/excelx.rb

@@ -667,24 +667,29 @@ Datei xl/comments1.xml
             f << zip.read(entry)
           }
         end
-        if entry.to_s.end_with?('sharedStrings.xml')
+        # if entry.to_s.end_with?('sharedStrings.xml')
+	# at least one application creates this file with another (incorrect?)
+	# casing. It doesn't hurt, if we ignore here the correct casing - there
+	# won't be both names in the archive.
+	# Changed the casing of all the following filenames.
+        if entry.to_s.downcase.end_with?('sharedstrings.xml')
           open(@tmpdir+'/'+@file_nr.to_s+'_roo_sharedStrings.xml','wb') {|f|
             f << zip.read(entry)
           }
         end
-        if entry.to_s.end_with?('styles.xml')
+        if entry.to_s.downcase.end_with?('styles.xml')
           open(@tmpdir+'/'+@file_nr.to_s+'_roo_styles.xml','wb') {|f|
             f << zip.read(entry)
           }
         end
-        if entry.to_s =~ /sheet([0-9]+).xml$/
+        if entry.to_s.downcase =~ /sheet([0-9]+).xml$/
           nr = $1
           open(@tmpdir+'/'+@file_nr.to_s+"_roo_sheet#{nr}",'wb') {|f|
             f << zip.read(entry)
           }
           @sheet_files[nr.to_i-1] = @tmpdir+'/'+@file_nr.to_s+"_roo_sheet#{nr}"
         end
-        if entry.to_s =~ /comments([0-9]+).xml$/
+        if entry.to_s.downcase =~ /comments([0-9]+).xml$/
           nr = $1
           open(@tmpdir+'/'+@file_nr.to_s+"_roo_comments#{nr}",'wb') {|f|
             f << zip.read(entry)

data/test/all_ss.rb

@@ -0,0 +1,13 @@
+require 'roo'
+Dir.glob("test/**/*").each do |fn|
+	if fn.end_with? '.ods'
+		begin
+			oo = Openoffice.new fn
+			print File.basename(fn) + " "
+			puts oo.officeversion
+		rescue #Zip::ZipError
+			# file is not a real .ods spreadsheet file
+			#puts "not an Openoffice-spreadsheet"
+		end
+	end
+end

data/test/test_roo.rb

@@ -781,7 +781,7 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_excel_zipped
-    after Date.new(2011,10,30) do
+    after Date.new(2011,12,7) do
       to do
         'hier wieder das Problem, dass ausgepacktes xls File
          unter Windows nicht geloescht werden kann, weil 
@@ -1474,7 +1474,7 @@ Sheet 3:
   end
 
   def test_no_remaining_tmp_files_openoffice
-    after Date.new(2011,10,30) do
+    after Date.new(2011,12,7) do
       # alles noch mal ueberarbeiten
       # temp. Directories sollten in diesem Fall ueberhaupt nicht
       # angelegt werden
@@ -1497,7 +1497,7 @@ Sheet 3:
   end
 
   def test_no_remaining_tmp_files_excel
-    after Date.new(2011,9,30) do
+    after Date.new(2011,12,7) do
       # alles noch mal ueberarbeiten
       # temp. Directories sollten in diesem Fall ueberhaupt nicht
       # angelegt werden
@@ -1515,20 +1515,18 @@ Sheet 3:
   end
 
   def test_no_remaining_tmp_files_excelx
-    after Date.new(2011,11,1) do
+    after Date.new(2011,12,7) do
       # alles noch mal ueberarbeiten
       # temp. Directories sollten in diesem Fall ueberhaupt nicht
       # angelegt werden
       if EXCELX
         prev = Dir.glob(TMP_PREFIX)
         assert_raise(Zip::ZipError) { #TODO: besseres Fehlerkriterium bei
-
           # oo = Excelx.new(File.join(TESTDIR,"no_spreadsheet_file.txt"))
           # es soll absichtlich ein Abbruch provoziert werden, deshalb :ignore
           oo = Excelx.new(File.join(TESTDIR,"no_spreadsheet_file.txt"),
             false,
             :ignore)
-
         }
         now = Dir.glob(TMP_PREFIX)
         assert (now-prev).empty?
@@ -1675,7 +1673,7 @@ Sheet 3:
   end
 
   def test_file_warning_warning
-	  after Date.new(2011,10,14) do
+    after Date.new(2011,12,7) do
       if OPENOFFICE
         assert_nothing_raised(TypeError) {
           assert_raises(Zip::ZipError) {
@@ -1717,7 +1715,7 @@ Sheet 3:
         now = Dir.glob(TMP_PREFIX)
         assert (now-prev).empty?
       end
-	  end
+    end
   end
 
   def test_file_warning_ignore
@@ -2270,7 +2268,7 @@ Sheet 3:
     end end
 
   def test_bug_date_mileszs
-    after Date.new(2011,11,1) do
+    after Date.new(2011,12,7) do
       # to do
       # "An richtige Stelle kopieren. Ist das Dokument vertraulich?"
       # 'ist auf dem Netbook nicht vorhanden'
@@ -2333,7 +2331,7 @@ where the expected result is
   end
   
   def test_bug_guest_list_2011_05_05
-    after Date.new(2011,11,1) do
+    after Date.new(2011,12,7) do
       oo = Excel.new(File.join("..","confidential","guest_list_addresses.xls"))
       oo.default_sheet = oo.sheets.first
       assert_equal "lalala", oo.cell('a',1) # anderer Inhalt im Spreadsheet
@@ -2387,7 +2385,7 @@ where the expected result is
   end
 
   def test_bug_string_as_a_date_2011_05_21
-    after Date.new(2011,11,1) do
+    after Date.new(2011,12,7) do
       #oo = Excel.new(File.join(TESTDIR,'2011-05-21_sample_type_problem.xls'))
       oo = Excel.new(File.join('..','confidential','2011-05-21_sample_type_problem.xls'))
       oo.default_sheet = oo.sheets.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000Z
+date: 2011-11-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &27024132 !ruby/object:Gem::Requirement
+  requirement: &28860984 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *27024132
+  version_requirements: *28860984
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &27023772 !ruby/object:Gem::Requirement
+  requirement: &28860480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *27023772
+  version_requirements: *28860480
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &28859964 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *28859964
 - !ruby/object:Gem::Dependency
   name: google-spreadsheet-ruby
-  requirement: &27023328 !ruby/object:Gem::Requirement
+  requirement: &28859412 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *27023328
+  version_requirements: *28859412
 - !ruby/object:Gem::Dependency
   name: choice
-  requirement: &27022944 !ruby/object:Gem::Requirement
+  requirement: &28858860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *27022944
+  version_requirements: *28858860
 - !ruby/object:Gem::Dependency
   name: todonotes
-  requirement: &27022392 !ruby/object:Gem::Requirement
+  requirement: &28858464 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *27022392
+  version_requirements: *28858464
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &27021996 !ruby/object:Gem::Requirement
+  requirement: &28857900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: 3.7.1
   type: :development
   prerelease: false
-  version_requirements: *27021996
+  version_requirements: *28857900
 description: ! 'Roo can access the contents of various spreadsheet files. It can handle
 
   * Openoffice
@@ -96,19 +107,16 @@ executables:
 extensions: []
 extra_rdoc_files:
 - History.txt
-- Manifest.txt
 - README.txt
 - bin/roo
 - lib/roo/.csv.rb.swp
 - test/no_spreadsheet_file.txt
 files:
 - History.txt
-- Manifest.txt
 - README.txt
 - Rakefile
 - TODO
 - bin/roo
-- datetime.csv
 - lib/roo.rb
 - lib/roo/.csv.rb.swp
 - lib/roo/csv.rb
@@ -128,6 +136,7 @@ files:
 - test/Bibelbund.xlsx
 - test/Bibelbund1.ods
 - test/Pfand_from_windows_phone.xlsx
+- test/all_ss.rb
 - test/bbu.ods
 - test/bbu.xls
 - test/bbu.xlsx

data/Manifest.txt

@@ -1,53 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-base64include.rb
-examples/roo_soap_server.rb
-examples/roo_soap_client.rb
-examples/write_me.rb
-lib/roo.rb
-lib/roo/version.rb
-lib/roo/generic_spreadsheet.rb
-lib/roo/openoffice.rb
-lib/roo/excel.rb
-lib/roo/google.rb
-lib/roo/roo_rails_helper.rb
-scripts/txt2html
-setup.rb
-test/false_encoding.xls
-test/Bibelbund1.ods
-test/Bibelbund.ods
-test/Bibelbund.xls
-test/Bibelbund.csv
-test/bbu.xls
-test/bbu.ods
-test/no_spreadsheet_file.txt
-test/simple_spreadsheet.ods
-test/simple_spreadsheet.xls
-test/simple_spreadsheet_from_italo.ods
-test/simple_spreadsheet_from_italo.xls
-test/test_helper.rb
-test/test_roo.rb
-test/time-test.ods
-test/time-test.xls
-test/time-test.csv
-test/numbers1.csv
-test/numbers1_excel.csv
-test/numbers1.ods
-test/numbers1.xls
-test/borders.ods
-test/borders.xls
-test/formula.ods
-test/formula.xls
-test/only_one_sheet.ods
-test/only_one_sheet.xls
-test/bode-v1.xls.zip
-test/bode-v1.ods.zip
-test/ric.ods
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

data/datetime.csv

@@ -1,7 +0,0 @@
-1961-11-21,,
-,,
-1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
-1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
-1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00,1961-11-21T12:17:18+00:00
-1961-11-21,1961-11-21,1961-11-21
-1961-11-21,1961-11-21,1961-11-21