rodf 0.1.3 → 0.1.5

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.1.5. Bug fix
+v0.1.4. Allow the setting of an entire cell's content to a hyperlink (by Merul Patel)
 v0.1.3. Dependency fix (by Merul Patel)
 v0.1.2. Cell span
 v0.1.1. Basic spreadsheet styling support

data/lib/odf/cell.rb

@@ -24,6 +24,7 @@ module ODF
       value = args.first || ''
       opts = args.last.instance_of?(Hash) ? args.last : {}
 
+      @url = opts[:url]
       @type = opts[:type] || :string
       @value = value.to_s.strip unless value.instance_of? Hash
 
@@ -34,7 +35,11 @@ module ODF
     def xml
       markup = Builder::XmlMarkup.new
       text = markup.tag! 'table:table-cell', @elem_attrs do |xml|
-        xml.text(:p, @value) if contains_string?
+        if contains_url?
+          xml.text(:p){|x| x.text(:a, @value, 'xlink:href' => @url)}
+        elsif contains_string?
+          xml.text(:p, @value)
+        end
       end
       (@mutiply - 1).times {text = markup.tag! 'table:table-cell'}
       text
@@ -44,6 +49,10 @@ module ODF
       :string == @type && !@value.nil? && !@value.empty?
     end
 
+    def contains_url?
+      !@url.nil? && !@url.empty?
+    end
+
     def make_element_attributes(type, value, opts)
       attrs = {'office:value-type' => type}
       attrs['office:value'] = value unless contains_string?

data/lib/odf/spreadsheet.rb

@@ -23,7 +23,7 @@ require 'zip/zip'
 require 'odf/container'
 require 'odf/style'
 require 'odf/table'
-
+
 module ODF
   class SpreadSheet < Container
     contains :tables, :styles
@@ -41,31 +41,32 @@ module ODF
     end
 
     def xml
-      b = Builder::XmlMarkup.new
-
-      b.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
-      b.tag! 'office:document-content', 'xmlns:office' => "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-                                        'xmlns:table' => "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-                                        'xmlns:text' => "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-                                        'xmlns:oooc' => "http://openoffice.org/2004/calc",
-                                        'xmlns:style' => "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-                                        'xmlns:fo' => "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" do
+      b = Builder::XmlMarkup.new
+
+      b.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
+      b.tag! 'office:document-content', 'xmlns:office' => "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
+                                        'xmlns:table' => "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+                                        'xmlns:text' => "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+                                        'xmlns:oooc' => "http://openoffice.org/2004/calc",
+                                        'xmlns:style' => "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+                                        'xmlns:fo' => "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+                                        'xmlns:xlink' => "http://www.w3.org/1999/xlink" do
       |xml|
         xml.tag! 'office:automatic-styles' do
           xml << styles_xml
         end unless styles.empty?
-        xml.office:body do
+        xml.office:body do
           xml.office:spreadsheet do
             xml << tables_xml
-          end
-        end
-      end
+          end
+        end
+      end
     end
 
   private
     def self.skeleton(fname)
       File.open(File.dirname(__FILE__) + '/skeleton/' + fname).read
-    end
+    end
   end
 end
 

data/rodf.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rodf}
-  s.version = "0.1.3"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Arrais", "Merul Patel"]
-  s.date = %q{2010-04-06}
+  s.date = %q{2010-04-08}
   s.description = %q{ODF generation library for Ruby}
   s.email = %q{thiago.arrais@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE.LGPL", "README.rdoc", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/container.rb", "lib/odf/property.rb", "lib/odf/row.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/spreadsheet.rb", "lib/odf/style.rb", "lib/odf/table.rb"]

data/spec/cell_spec.rb

@@ -95,4 +95,17 @@ describe ODF::Cell do
     doc.at('table:table-cell')['table:number-columns-spanned'].should == '4'
     doc.search('table:table-cell').size.should == 4
   end
+
+  it "should have the URL set correctly when requested on a string" do
+    cell = ODF::Cell.new 'Example Link', :url => 'http://www.example.org'
+    doc = Hpricot(cell.xml)
+    doc.at('text:a')['xlink:href'].should == 'http://www.example.org'
+  end
+
+  it "should have the URL set correctly when requested on a float" do
+    cell = ODF::Cell.new(47.1, :type => :float, :url => 'http://www.example.org')
+    doc = Hpricot(cell.xml)
+    doc.at('text:a')['xlink:href'].should == 'http://www.example.org'
+    doc.at('text:a').innerHTML.should == '47.1'
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Thiago Arrais
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -03:00
+date: 2010-04-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency