roo 1.3.9 → 1.3.11

data/README.markdown

@@ -1,6 +1,6 @@
 # README for Roo
 
-1.3.5 is now available on Rubyforge. You can install the official release with 'gem install roo' or refer to the installation instructions below for the latest development gem. 
+Roo is available here and on Rubyforge. You can install the official release with 'gem install roo' or refer to the installation instructions below for the latest development gem. 
 
 
 ## Installation

data/examples/roo_soap_client.rb

@@ -0,0 +1,53 @@
+require 'soap/rpc/driver'
+
+  def ferien_fuer_region(proxy, region, year=nil)
+    proxy.first_row.upto(proxy.last_row) { |row|
+      if proxy.cell(row, 2) == region
+        jahr = proxy.cell(row,1).to_i
+        if year == nil || jahr == year
+          bis_datum = proxy.cell(row,5)
+          if DateTime.now > bis_datum
+            print '('
+          end
+          print jahr.to_s+" "
+          print proxy.cell(row,2)+" "
+          print proxy.cell(row,3)+" "
+          print proxy.cell(row,4).to_s+" "
+          print bis_datum.to_s+" "
+          print (proxy.cell(row,6) || '')+" "
+          if DateTime.now > bis_datum
+            print ')'
+          end
+          puts
+        end
+      end 
+    } 
+  end
+
+proxy = SOAP::RPC::Driver.new("http://localhost:12321","spreadsheetserver")
+proxy.add_method('cell','row','col')
+proxy.add_method('officeversion')
+proxy.add_method('last_row')
+proxy.add_method('last_column')
+proxy.add_method('first_row')
+proxy.add_method('first_column')
+proxy.add_method('sheets')
+proxy.add_method('set_default_sheet','s')
+proxy.add_method('ferien_fuer_region', 'region')
+
+sheets = proxy.sheets
+proxy.set_default_sheet(sheets.first)
+
+puts "first row: #{proxy.first_row}"
+puts "first column: #{proxy.first_column}"
+puts "last row: #{proxy.last_row}"
+puts "last column: #{proxy.last_column}"
+puts "cell: #{proxy.cell('C',8)}"
+puts "cell: #{proxy.cell('F',12)}"
+puts "officeversion: #{proxy.officeversion}"
+puts "Berlin:"
+
+ferien_fuer_region(proxy, "Berlin")
+
+
+

data/examples/roo_soap_server.rb

@@ -0,0 +1,29 @@
+require 'rubygems'
+require 'roo'
+require 'soap/rpc/standaloneServer'
+
+NS = "spreadsheetserver" # name of your service = namespace
+class Server2 < SOAP::RPC::StandaloneServer
+
+  def on_init
+    spreadsheet = Openoffice.new("./Ferien-de.ods")
+    add_method(spreadsheet, 'cell', 'row', 'col')
+    add_method(spreadsheet, 'officeversion')
+    add_method(spreadsheet, 'first_row')
+    add_method(spreadsheet, 'last_row')
+    add_method(spreadsheet, 'first_column')
+    add_method(spreadsheet, 'last_column')
+    add_method(spreadsheet, 'sheets')
+    #add_method(spreadsheet, 'default_sheet=', 's')
+    # method with '...=' did not work? alias method 'set_default_sheet' created
+    add_method(spreadsheet, 'set_default_sheet', 's')
+  end
+
+end
+
+PORT = 12321
+puts "serving at port #{PORT}"
+svr = Server2.new('Roo', NS, '0.0.0.0', PORT)
+
+trap('INT') { svr.shutdown }
+svr.start

data/examples/write_me.rb

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'roo'
+
+#-- create a new spreadsheet within your google-spreadsheets and paste
+#-- the 'key' parameter in the spreadsheet URL 
+MAXTRIES = 1000
+print "what's your name? "
+my_name = gets.chomp
+print "where do you live? "
+my_location = gets.chomp
+print "your message? (if left blank, only your name and location will be inserted) "
+my_message = gets.chomp
+spreadsheet = Google.new('ptu6bbahNZpY0N0RrxQbWdw')
+spreadsheet.default_sheet = 'Sheet1'
+success = false
+MAXTRIES.times do
+  col = rand(10)+1
+  row = rand(10)+1
+  if spreadsheet.empty?(row,col)
+    if my_message.empty?
+      text = Time.now.to_s+" "+"Greetings from #{my_name} (#{my_location})"
+    else
+      text = Time.now.to_s+" "+"#{my_message} from #{my_name} (#{my_location})"
+    end
+    spreadsheet.set_value(row,col,text)
+    puts "message written to row #{row}, column #{col}"
+    success = true
+    break
+  end
+  puts "Row #{row}, column #{col} already occupied, trying again..."
+end
+puts "no empty cell found within #{MAXTRIES} tries" if !success
+

data/lib/roo/google.rb

@@ -1,44 +1,64 @@
 require 'gdata/spreadsheet'
 require 'xml'
 
+class GoogleHTTPError < RuntimeError; end
+class GoogleReadError < RuntimeError; end
+class GoogleWriteError < RuntimeError; end
+
 # overwrite some methods from the gdata-gem:
 module GData
   class Spreadsheet < GData::Base
+    
+    def visibility
+      @headers ? "private" : "public"
+    end
+   
+    def projection
+      @headers ? "full" : "values"
+    end
+    
     #-- modified
     def evaluate_cell(cell, sheet_no=1)
       raise ArgumentError, "invalid cell: #{cell}" unless cell
       raise ArgumentError, "invalid sheet_no: #{sheet_no}" unless sheet_no >0 and sheet_no.class == Fixnum
-      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{@headers ? "private" : "public"}/basic/#{cell}"
-
+      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{visibility}/#{projection}/#{cell}"
       doc = Hpricot(request(path))
       result = (doc/"content").inner_html
     end
 
     #-- new
     def sheetlist
-      path = "/feeds/worksheets/#{@spreadsheet_id}/private/basic"
+      path = "/feeds/worksheets/#{@spreadsheet_id}/#{visibility}/#{projection}"
       doc = Hpricot(request(path))
       result = []
       (doc/"content").each { |elem|
         result << elem.inner_html
       }
+      if result.size == 0 
+        if (doc/"h2").inner_html =~ /Error/
+          raise GoogleHTTPError, "#{(doc/'h2').inner_html}: #{(doc/'title').inner_html} [key '#{@spreadsheet_id}']"
+        else
+          raise GoogleReadError, "#{doc} [key '#{@spreadsheet_id}']"
+        end  
+      end
       result
     end
 
     #-- new
     #@@ added sheet_no to definition
     def save_entry_roo(entry, sheet_no)
-      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{@headers ? 'private' : 'public'}/full"
+      raise GoogleWriteError, "unable to write to public spreadsheets" if visibility == 'public'
+      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{visibility}/#{projection}"
       post(path, entry)
     end
 
     #-- new
     def entry_roo(formula, row=1, col=1)
-      <<XML
+    <<-XML
     <entry xmlns='http://www.w3.org/2005/Atom' xmlns:gs='http://schemas.google.com/spreadsheets/2006'>
       <gs:cell row='#{row}' col='#{col}' inputValue='#{formula}' />
     </entry>
-XML
+    XML
     end
 
     #-- new
@@ -49,13 +69,13 @@ XML
    
     #-- new
     def get_one_sheet
-      path = "/feeds/cells/#{@spreadsheet_id}/1/private/full"
+      path = "/feeds/cells/#{@spreadsheet_id}/1/#{visibility}/#{projection}"
       doc = Hpricot(request(path))
     end
 
     #new
     def oben_unten_links_rechts(sheet_no)
-      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/private/full"
+      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{visibility}/#{projection}"
       doc = Hpricot(request(path))
       rows = []
       cols = []
@@ -67,7 +87,7 @@ XML
     end
 
     def fulldoc(sheet_no)
-      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/private/full"
+      path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{visibility}/#{projection}"
       doc = Hpricot(request(path))
       return doc
     end
@@ -90,7 +110,6 @@ class Google < GenericSpreadsheet
     unless password
       password = ENV['GOOGLE_PASSWORD']
     end
-    @default_sheet = nil
     @cell = Hash.new {|h,k| h[k]=Hash.new}
     @cell_type = Hash.new {|h,k| h[k]=Hash.new}
     @formula = Hash.new
@@ -104,11 +123,8 @@ class Google < GenericSpreadsheet
     @datetime_format = '%d/%m/%Y %H:%M:%S' 
     @time_format = '%H:%M:%S'
     @gs = GData::Spreadsheet.new(spreadsheetkey)
-    @gs.authenticate(user, password)
+    @gs.authenticate(user, password) unless user.empty? || password.empty?
     @sheetlist = @gs.sheetlist
-    #-- ----------------------------------------------------------------------
-    #-- TODO: Behandlung von Berechtigungen hier noch einbauen ???
-    #-- ----------------------------------------------------------------------
     @default_sheet = self.sheets.first
   end
 
@@ -192,7 +208,7 @@ class Google < GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
-    if @formula[sheet]["#{row},#{col}"]
+    if @formula.size > 0 && @formula[sheet]["#{row},#{col}"]
       return :formula
     else
       @cell_type[sheet]["#{row},#{col}"]
@@ -335,7 +351,7 @@ class Google < GenericSpreadsheet
   end
   
   def determine_datatype(val, numval=nil)
-    if val[0,1] == '='
+    if val.nil? || val[0,1] == '='
       ty = :formula
       if numeric?(numval)
         val = numval.to_f

data/test/test_roo.rb

@@ -158,6 +158,16 @@ class TestRoo < Test::Unit::TestCase
      yield Roo::Spreadsheet.open(key_of(options[:name]) || options[:name]) if GOOGLE && options[:format].include?(:google)
   end
 
+  def with_public_google_spreadsheet(&block)
+    user = ENV['GOOGLE_MAIL']
+    pass = ENV['GOOGLE_PASSWORD']
+    ENV['GOOGLE_MAIL'] = ''
+    ENV['GOOGLE_PASSWORD'] = ''
+    block.call
+    ENV['GOOGLE_MAIL'] = user
+    ENV['GOOGLE_PASSWORD'] = pass
+  end
+  
   # Using Date.strptime so check that it's using the method
   # with the value set in date_format
   def test_date
@@ -385,7 +395,7 @@ class TestRoo < Test::Unit::TestCase
   def test_empty_eh
     with_each_spreadsheet(:name=>'numbers1') do |oo|
       assert oo.empty?('a',14)
-      assert ! oo.empty?('a',15)
+      assert !oo.empty?('a',15)
       assert oo.empty?('a',20)
     end
   end
@@ -1199,6 +1209,7 @@ class TestRoo < Test::Unit::TestCase
   
   def test_write_google
     # write.me: http://spreadsheets.google.com/ccc?key=ptu6bbahNZpY0N0RrxQbWdw&hl=en_GB
+    
     with_each_spreadsheet(:name=>'write.me', :format=>:google) do |oo|
       oo.set_value(1,1,"hello from the tests")
       assert_equal "hello from the tests", oo.cell(1,1)
@@ -1345,7 +1356,7 @@ Sheet 3:
 
   def test_no_remaining_tmp_files_google
     if GOOGLE
-      assert_nothing_raised() {
+      assert_raise(GoogleReadError) {
         oo = Google.new(key_of("no_spreadsheet_file.txt"))
       }
       a=Dir.glob("oo_*")
@@ -1780,5 +1791,32 @@ Sheet 3:
       assert_equal :date, oo.celltype(1,1)
     end  
   end
+  
+  
+  def test_bad_excel_date
+    with_each_spreadsheet(:name=>'bad_exceL_date', :format=>:excel) do |oo|   
+      assert_nothing_raised(ArgumentError) {
+        assert_equal DateTime.new(2006,2,2,10,0,0), oo.cell('a',1)
+      }
+    end
+  end
+  
+  def test_public_google_doc
+    with_public_google_spreadsheet do 
+      assert_raise(GoogleHTTPError) { Google.new("foo") }
+      assert_raise(GoogleReadError) { Google.new(key_of('numbers1'))}
+      assert_nothing_raised { Google.new("0AncOJVyN5MMMcjZtN0hGbFVPd3N0MFJUVVR1aFEwT3c") } # use spreadsheet key (private)
+      assert_nothing_raised { Google.new(key_of('write.me')) } # use spreadsheet key (public)
+    end
+  end    
+
+  def test_public_google_doc_write
+    with_public_google_spreadsheet do 
+      assert_raise(GoogleWriteError) {
+        oo = Google.new(key_of('write.me'))
+        oo.set_value(1,1,'test')
+      }  
+    end
+  end    
    
 end # class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 1.3.9
+  version: 1.3.11
 platform: ruby
 authors: 
 - Hugh McGowan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -05:00
+date: 2009-08-31 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,9 +70,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.markdown
 - History.txt
+- README.markdown
 files: 
+- lib/roo.rb
 - lib/roo/excel.rb
 - lib/roo/excelx.rb
 - lib/roo/generic_spreadsheet.rb
@@ -80,17 +81,17 @@ files:
 - lib/roo/openoffice.rb
 - lib/roo/roo_rails_helper.rb
 - lib/roo/version.rb
-- lib/roo.rb
 - test/1900_base.xls
 - test/1904_base.xls
-- test/bbu.ods
-- test/bbu.xls
-- test/bbu.xlsx
 - test/Bibelbund.csv
 - test/Bibelbund.ods
 - test/Bibelbund.xls
 - test/Bibelbund.xlsx
 - test/Bibelbund1.ods
+- test/bad_excel_date.xls
+- test/bbu.ods
+- test/bbu.xls
+- test/bbu.xlsx
 - test/bode-v1.ods.zip
 - test/bode-v1.xls.zip
 - test/boolean.ods
@@ -142,8 +143,8 @@ files:
 - test/whitespace.ods
 - test/whitespace.xls
 - test/whitespace.xlsx
-- README.markdown
 - History.txt
+- README.markdown
 has_rdoc: true
 homepage: http://roo.rubyforge.org
 licenses: []
@@ -152,8 +153,6 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.markdown
-- --inline-source
-- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -171,9 +170,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: roo
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: roo
-test_files: []
-
+test_files: 
+- test/skipped_tests.rb
+- test/test_helper.rb
+- test/test_roo.rb
+- examples/roo_soap_client.rb
+- examples/roo_soap_server.rb
+- examples/write_me.rb