roo 1.3.11 → 1.9.0

data/lib/roo/openoffice.rb

@@ -1,9 +1,9 @@
-require 'xml'
+require 'rubygems'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
 require 'base64'
-require 'cgi'
+require 'nokogiri'
 
 class Openoffice < GenericSpreadsheet
 
@@ -36,7 +36,8 @@ class Openoffice < GenericSpreadsheet
       @file_nr = @@nr
       extract_content
       file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml"))
-      @doc = XML::Parser.io(file).parse
+      #TODO: @doc = XML::Parser.io(file).parse
+      @doc = Nokogiri::XML(file)
       file.close
     ensure
       #if ENV["roo_local"] != "thomas-p"
@@ -55,6 +56,7 @@ class Openoffice < GenericSpreadsheet
     @style_defaults = Hash.new { |h,k| h[k] = [] }
     @style_definitions = Hash.new 
     @header_line = 1
+    @labels = {}
   end
 
   # creates a new empty openoffice-spreadsheet file
@@ -78,7 +80,8 @@ class Openoffice < GenericSpreadsheet
     read_cells(sheet) unless @cells_read[sheet]
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
-      yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
+      #TODO: yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
+      yyyy,mm,dd = @cell[sheet][[row,col]].to_s.split('-')
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
     end
     @cell[sheet][[row,col]]
@@ -170,8 +173,10 @@ class Openoffice < GenericSpreadsheet
 
   def sheets
     return_sheets = []
-    @doc.find("//*[local-name()='table']").each do |sheet|
-      return_sheets << sheet.attributes['name']
+    #TODO: @doc.find("//*[local-name()='table']").each do |sheet|
+    @doc.xpath("//*[local-name()='table']").each do |sheet|
+      #TODO: return_sheets << sheet.attributes['name']
+      return_sheets << sheet['name']
     end
     return_sheets
   end
@@ -213,12 +218,29 @@ class Openoffice < GenericSpreadsheet
     theformulas
   end
 
+  # returns the row,col values of the labelled cell
+  # (nil,nil) if label is not defined
+  # sheet parameter is not really needed because label names are global
+  # to the whole spreadsheet
+  def label(labelname,sheet=nil)
+    sheet = @default_sheet unless sheet
+    read_cells(sheet) unless @cells_read[sheet]
+    if @labels.has_key? labelname
+      return @labels[labelname][1].to_i,
+        GenericSpreadsheet.letter_to_number(@labels[labelname][2]),
+        @labels[labelname][0]
+    else
+      return nil,nil,nil
+    end
+  end
+
   private
 
   # read the version of the OO-Version
   def oo_version
-    @doc.find("//*[local-name()='document-content']").each do |office|
-      @officeversion = office.attributes['version']
+    #TODO: @doc.find("//*[local-name()='document-content']").each do |office|
+    @doc.xpath("//*[local-name()='document-content']").each do |office|
+      @officeversion = office.attributes['version'].to_s
     end
   end
 
@@ -238,10 +260,11 @@ class Openoffice < GenericSpreadsheet
     when :string
       @cell[sheet][key] = str_v
     when :date
-      if table_cell.attributes['date-value'].size != "XXXX-XX-XX".size
+      #TODO: if table_cell.attributes['date-value'].size != "XXXX-XX-XX".size
+      if table_cell.attributes['date-value'].to_s.size != "XXXX-XX-XX".size
         #-- dann ist noch eine Uhrzeit vorhanden
         #-- "1961-11-21T12:17:18"
-        @cell[sheet][key] = DateTime.parse(table_cell.attributes['date-value'])
+        @cell[sheet][key] = DateTime.parse(table_cell.attributes['date-value'].to_s)
         @cell_type[sheet][key] = :datetime
       else
         @cell[sheet][key] = table_cell.attributes['date-value']
@@ -267,31 +290,59 @@ class Openoffice < GenericSpreadsheet
     raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
     raise RangeError unless self.sheets.include? sheet
 
-    @doc.find("//*[local-name()='table']").each do |ws|
-      if sheet == ws.attributes['name']
+    #-
+    # Labels
+    # should be factored out in separate method because labels are global
+    # to the whole spreadsheet file (and not to specific sheet)
+    #+
+    @doc.xpath("//table:named-range").each do |ne|
+      #-
+      # $Sheet1.$C$5
+      #+
+      name = ne.attribute('name').to_s
+      sheetname,coords = ne.attribute('cell-range-address').to_s.split('.')
+      col = coords.split('$')[1]
+      row = coords.split('$')[2]
+      sheetname = sheetname[1..-1] if sheetname[0,1] == '$'
+      @labels[name] = [sheetname,row,col]
+    end
+    
+    #TODO: @doc.find("//*[local-name()='table']").each do |ws|
+    @doc.xpath("//*[local-name()='table']").each do |ws|
+      #TODO: if sheet == ws.attributes['name']
+      if sheet == ws['name']
         sheet_found = true
         col = 1
         row = 1
-        ws.each_element do |table_element|
+        #TODO: ws.each_element do |table_element|
+        ws.children.each do |table_element|
           case table_element.name
           when 'table-column'
             @style_defaults[sheet] << table_element.attributes['default-cell-style-name'] 
           when 'table-row'
             if table_element.attributes['number-rows-repeated']
-              skip_row = table_element.attributes['number-rows-repeated'].to_i
+              #TODO: skip_row = table_element.attributes['number-rows-repeated'].to_i
+              skip_row = table_element.attributes['number-rows-repeated'].to_s.to_i
               row = row + skip_row - 1
             end
-            table_element.each_element do |cell|
-              skip_col = cell.attributes['number-columns-repeated']
-              formula = cell.attributes['formula']
-              vt = cell.attributes['value-type']
-              v =  cell.attributes['value']
-              style_name = cell.attributes['style-name']
+            #TODO: table_element.each_element do |cell|
+            table_element.children.each do |cell|
+              #TODO: skip_col = cell.attributes['number-columns-repeated']
+              skip_col = cell['number-columns-repeated']
+              #TODO: formula = cell.attributes['formula']
+              formula = cell['formula']
+              #TODO: vt = cell.attributes['value-type']
+              vt = cell['value-type']
+              #TODO: v =  cell.attributes['value']
+              v =  cell['value']
+              #TODO: style_name = cell.attributes['style-name']
+              style_name = cell['style-name']
               if vt == 'string'
                 str_v  = ''
                 # insert \n if there is more than one paragraph
                 para_count = 0
-                cell.each_element do |str|
+                #TODO: cell.each_element do |str|
+                cell.children.each do |str|
                   if str.name == 'p'
                     v = str.content
                     str_v += "\n" if para_count > 0
@@ -306,9 +357,10 @@ class Openoffice < GenericSpreadsheet
                     str_v.gsub!(/&apos;/,"'")  # special case not supported by unescapeHTML
                     str_v = CGI.unescapeHTML(str_v)
                   end # == 'p'
-                 end
+                end
               elsif vt == 'time'
-                cell.each_element do |str|
+                #TODO: cell.each_element do |str|
+                cell.children.each do |str|
                   if str.name == 'p'
                     v = str.content
                   end
@@ -322,8 +374,7 @@ class Openoffice < GenericSpreadsheet
               elsif vt == 'float'
                 #
               elsif vt == 'boolean'
-                v = cell.attributes['boolean-value']
-                #
+                v = cell.attributes['boolean-value'].to_s
               else
                 # raise "unknown type #{vt}"
               end
@@ -345,7 +396,8 @@ class Openoffice < GenericSpreadsheet
       end
     end
     
-    @doc.find("//*[local-name()='automatic-styles']").each do |style|
+    #TODO: @doc.find("//*[local-name()='automatic-styles']").each do |style|
+    @doc.xpath("//*[local-name()='automatic-styles']").each do |style|
       read_styles(style)
     end
     if !sheet_found
@@ -434,7 +486,7 @@ class Openoffice < GenericSpreadsheet
         result = result + child.content
       else
         if child.name == 's'
-          compressed_spaces = child.attributes['c'].to_i
+          compressed_spaces = child.attributes['c'].to_s.to_i
           # no explicit number means a count of 1:
           if compressed_spaces == 0
             compressed_spaces = 1

data/lib/roo/version.rb

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

data/tasks/ann.rake

@@ -0,0 +1,80 @@
+
+begin
+  require 'bones/smtp_tls'
+rescue LoadError
+  require 'net/smtp'
+end
+require 'time'
+
+namespace :ann do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  file PROJ.ann.file do
+    ann = PROJ.ann
+    puts "Generating #{ann.file}"
+    File.open(ann.file,'w') do |fd|
+      fd.puts("#{PROJ.name} version #{PROJ.version}")
+      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
+      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
+      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
+      fd.puts
+      fd.puts("== DESCRIPTION")
+      fd.puts
+      fd.puts(PROJ.description)
+      fd.puts
+      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
+      fd.puts
+      ann.paragraphs.each do |p|
+        fd.puts "== #{p.upcase}"
+        fd.puts
+        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
+        fd.puts
+      end
+      fd.puts ann.text if ann.text
+    end
+  end
+
+  desc "Create an announcement file"
+  task :announcement => ['ann:prereqs', PROJ.ann.file]
+
+  desc "Send an email announcement"
+  task :email => ['ann:prereqs', PROJ.ann.file] do
+    ann = PROJ.ann
+    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
+    to   = Array(ann.email[:to])
+
+    ### build a mail header for RFC 822
+    rfc822msg =  "From: #{from}\n"
+    rfc822msg << "To: #{to.join(',')}\n"
+    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
+    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
+    rfc822msg << "\n"
+    rfc822msg << "Date: #{Time.new.rfc822}\n"
+    rfc822msg << "Message-Id: "
+    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
+    rfc822msg << File.read(ann.file)
+
+    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
+      ann.email[key]
+    end
+
+    params[3] = PROJ.email if params[3].nil?
+
+    if params[4].nil?
+      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
+      params[4] = STDIN.gets.chomp
+    end
+
+    ### send email
+    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
+  end
+end  # namespace :ann
+
+desc 'Alias to ann:announcement'
+task :ann => 'ann:announcement'
+
+CLOBBER << PROJ.ann.file
+
+# EOF

data/tasks/bones.rake

@@ -0,0 +1,20 @@
+
+if HAVE_BONES
+
+namespace :bones do
+
+  desc 'Show the PROJ open struct'
+  task :debug do |t|
+    atr = if t.application.top_level_tasks.length == 2
+      t.application.top_level_tasks.pop
+    end
+
+    if atr then Bones::Debug.show_attr(PROJ, atr)
+    else Bones::Debug.show PROJ end
+  end
+
+end  # namespace :bones
+
+end  # HAVE_BONES
+
+# EOF

data/tasks/gem.rake

@@ -0,0 +1,201 @@
+
+require 'find'
+require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
+
+module Bones
+class GemPackageTask < Rake::PackageTask
+  # Ruby GEM spec containing the metadata for this package.  The
+  # name, version and package_files are automatically determined
+  # from the GEM spec and don't need to be explicitly provided.
+  #
+  attr_accessor :gem_spec
+
+  # Tasks from the Bones gem directory
+  attr_reader :bones_files
+
+  # Create a GEM Package task library.  Automatically define the gem
+  # if a block is given.  If no block is supplied, then +define+
+  # needs to be called to define the task.
+  #
+  def initialize(gem_spec)
+    init(gem_spec)
+    yield self if block_given?
+    define if block_given?
+  end
+
+  # Initialization tasks without the "yield self" or define
+  # operations.
+  #
+  def init(gem)
+    super(gem.name, gem.version)
+    @gem_spec = gem
+    @package_files += gem_spec.files if gem_spec.files
+    @bones_files = []
+
+    local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
+    if !test(?e, local_setup)
+      Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
+    end
+  end
+
+  # Create the Rake tasks and actions specified by this
+  # GemPackageTask.  (+define+ is automatically called if a block is
+  # given to +new+).
+  #
+  def define
+    super
+    task :prereqs
+    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
+    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
+      when_writing("Creating GEM") {
+        chdir(package_dir_path) do
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, "../#{gem_file}"
+          }
+        end
+      }
+    end
+
+    file package_dir_path => bones_files do
+      mkdir_p package_dir rescue nil
+
+      gem_spec.files = (gem_spec.files +
+          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
+
+      bones_files.each do |fn|
+        base_fn = File.join('tasks', File.basename(fn))
+        f = File.join(package_dir_path, base_fn)
+        fdir = File.dirname(f)
+        mkdir_p(fdir) if !File.exist?(fdir)
+        if File.directory?(fn)
+          mkdir_p(f)
+        else
+          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
+          safe_ln(fn, f)
+        end
+      end
+    end
+  end
+  
+  def gem_file
+    if @gem_spec.platform == Gem::Platform::RUBY
+      "#{package_name}.gem"
+    else
+      "#{package_name}-#{@gem_spec.platform}.gem"
+    end
+  end
+end  # class GemPackageTask
+end  # module Bones
+
+namespace :gem do
+
+  PROJ.gem._spec = Gem::Specification.new do |s|
+    s.name = PROJ.name
+    s.version = PROJ.version
+    s.summary = PROJ.summary
+    s.authors = Array(PROJ.authors)
+    s.email = PROJ.email
+    s.homepage = Array(PROJ.url).first
+    s.rubyforge_project = PROJ.rubyforge.name
+
+    s.description = PROJ.description
+
+    PROJ.gem.dependencies.each do |dep|
+      s.add_dependency(*dep)
+    end
+
+    PROJ.gem.development_dependencies.each do |dep|
+      s.add_development_dependency(*dep)
+    end
+
+    s.files = PROJ.gem.files
+    s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
+    s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
+
+    s.bindir = 'bin'
+    dirs = Dir["{#{PROJ.libs.join(',')}}"]
+    s.require_paths = dirs unless dirs.empty?
+
+    incl = Regexp.new(PROJ.rdoc.include.join('|'))
+    excl = PROJ.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
+    excl = Regexp.new(excl.join('|'))
+    rdoc_files = PROJ.gem.files.find_all do |fn|
+                   case fn
+                   when excl; false
+                   when incl; true
+                   else false end
+                 end
+    s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
+    s.extra_rdoc_files = rdoc_files
+    s.has_rdoc = true
+
+    if test ?f, PROJ.test.file
+      s.test_file = PROJ.test.file
+    else
+      s.test_files = PROJ.test.files.to_a
+    end
+
+    # Do any extra stuff the user wants
+    PROJ.gem.extras.each do |msg, val|
+      case val
+      when Proc
+        val.call(s.send(msg))
+      else
+        s.send "#{msg}=", val
+      end
+    end
+  end  # Gem::Specification.new
+
+  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
+    pkg.need_tar = PROJ.gem.need_tar
+    pkg.need_zip = PROJ.gem.need_zip
+  end
+
+  desc 'Show information about the gem'
+  task :debug => 'gem:prereqs' do
+    puts PROJ.gem._spec.to_ruby
+  end
+
+  desc 'Write the gemspec '
+  task :spec => 'gem:prereqs' do
+    File.open("#{PROJ.name}.gemspec", 'w') do |f|
+      f.write PROJ.gem._spec.to_ruby
+    end
+  end
+
+  desc 'Install the gem'
+  task :install => [:clobber, 'gem:package'] do
+    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
+
+    # use this version of the command for rubygems > 1.0.0
+    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
+  end
+
+  desc 'Uninstall the gem'
+  task :uninstall do
+    installed_list = Gem.source_index.find_name(PROJ.name)
+    if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
+      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
+    end
+  end
+
+  desc 'Reinstall the gem'
+  task :reinstall => [:uninstall, :install]
+
+  desc 'Cleanup the gem'
+  task :cleanup do
+    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
+  end
+end  # namespace :gem
+
+
+desc 'Alias to gem:package'
+task :gem => 'gem:package'
+
+task :clobber => 'gem:clobber_package'
+remove_desc_for_task 'gem:clobber_package'
+
+# EOF