rodf 0.1.7 → 0.1.8

data/lib/odf/cell.rb

@@ -46,7 +46,7 @@ module ODF
             if contains_url?
               p.text:a, @value, 'xlink:href' => @url
             else
-              p << @value
+              p.text! @value
             end
           end
         end
@@ -64,9 +64,10 @@ module ODF
     end
 
     def make_element_attributes(type, value, opts)
-      attrs = {'office:value-type' => type}
-      attrs['office:date-value'] = value if :date == type
-      attrs['office:value'] = value if :float == type
+      attrs = {}
+      attrs['office:value-type'] = type if :string == type || !empty(value) || !opts[:formula].nil?
+      attrs['office:date-value'] = value if :date == type && !empty(value)
+      attrs['office:value'] = value if :float == type && !empty(value)
       attrs['table:formula'] = opts[:formula] unless opts[:formula].nil?
       attrs['table:style-name'] = opts[:style] unless opts[:style].nil?
       attrs['table:number-columns-spanned'] = opts[:span] unless opts[:span].nil?
@@ -74,6 +75,12 @@ module ODF
         attrs['table:number-matrix-rows-spanned'] = 1 if opts[:matrix_formula]
       attrs
     end
+
+  private
+
+    def empty(value)
+      value.nil? || value.empty?
+    end
   end
 end
 

data/rodf.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rodf}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Arrais"]
-  s.date = %q{2010-04-19}
+  s.date = %q{2010-04-23}
   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/data_style.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_section.rb", "lib/odf/style.rb", "lib/odf/table.rb"]

data/spec/cell_spec.rb

@@ -124,4 +124,24 @@ describe ODF::Cell do
     Hpricot(ODF::Cell.new(Date.parse('16 Apr 2010'), :type => :date).xml).
       at('table:table-cell')['office:date-value'] = '2010-04-16'
   end
+
+  it "should escape entities" do
+    output = ODF::Cell.new('Fish & Chips').xml
+    output.should have_tag('//table:table-cell/*')
+    output.should have_tag('//text:p')
+    Hpricot(output).at('text:p').innerHTML.should == 'Fish & Chips'
+  end
+
+  it "should not render value type for non-string nil values" do
+    Hpricot(ODF::Cell.new(nil, :type => :string).xml).
+      at('table:table-cell').innerHTML.should == ''
+
+    [:float, :date].each do |t|
+      cell = Hpricot(ODF::Cell.new(nil, :type => t).xml).at('table:table-cell')
+      cell.innerHTML.should == ''
+      cell['office:value'].should be_nil
+      cell['office:date-value'].should be_nil
+      cell['office:value-type'].should be_nil
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Thiago Arrais
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -03:00
+date: 2010-04-23 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency