rodf 0.1 → 0.1.1

data/CHANGELOG

@@ -1,2 +1,3 @@
-v0.1. First version with very basic support for spreadsheet generation
+v0.1.1. Basic spreadsheet styling support
+v0.1.   First version with very basic support for spreadsheet generation
 

data/Manifest

@@ -1,6 +1,7 @@
 lib/odf/row.rb
 lib/odf/spreadsheet.rb
 lib/odf/cell.rb
+lib/odf/column.rb
 lib/odf/table.rb
 lib/odf/property.rb
 lib/odf/style.rb

data/README.rdoc

@@ -1,20 +1,18 @@
 = rODF
 
-This is (soon to be) a RubyGem for writing to ODF output. It currently supports
-creating spreadsheets.
+This is a library for writing to ODF output with Ruby. It currently only
+supports creating spreadsheets (ODS). Text documents (ODT) and slide shows (ODP)
+may be added some time in the future.
 
 This is NOT an ODF reading library.
 
-== Installation
+=== Installation
 
-At some moment you'll be able to
+You should be able to install the latest stable version by saying something like
 
   sudo gem install rodf
 
-But for the time being, try going to the project's GitHub page and downloading
-the source: http://github.com/thiagoarrais/rodf/tree
-
-== How do I use it?
+=== How do I use it?
 
 rODF works pretty much like Builder, but with ODF-aware constructs. Try this:
 

data/Rakefile

@@ -14,8 +14,9 @@ Echoe.new('rodf') do |gem|
   gem.runtime_dependencies = [
     ["builder", ">= 2.1.2"],
     ["rubyzip", ">= 0.9.1"],
-    ["activesupport", ">= 2.0.0"]]
+    ["activesupport", "= 2.1.2"]]
   gem.development_dependencies = [
+    ["rspec", ">= 1.1.11"],
     ["rspec_hpricot_matchers" , ">= 1.0"],
     ["echoe" , ">= 3.0.2"]]
 end

data/lib/odf/cell.rb

@@ -25,18 +25,13 @@ module ODF
       opts = args.last.instance_of?(Hash) ? args.last : {}
 
       @type = opts[:type] || :string
-      @formula = opts[:formula]
-      @style = opts[:style]
       @value = value.to_s.strip unless value.instance_of? Hash
+
+      @elem_attrs = make_element_attributes(@type, @value, opts)
     end
 
     def xml
-      elem_attrs = {'office:value-type' => @type}
-      elem_attrs['office:value'] = @value unless contains_string?
-      elem_attrs['table:formula'] = @formula unless @formula.nil?
-      elem_attrs['table:style-name'] = @style unless @style.nil?
-
-      Builder::XmlMarkup.new.tag! 'table:table-cell', elem_attrs do |xml|
+      Builder::XmlMarkup.new.tag! 'table:table-cell', @elem_attrs do |xml|
         xml.text(:p, @value) if contains_string?
       end
     end
@@ -44,6 +39,16 @@ module ODF
     def contains_string?
       :string == @type && !@value.nil? && !@value.empty?
     end
+
+    def make_element_attributes(type, value, opts)
+      attrs = {'office:value-type' => type}
+      attrs['office:value'] = value unless contains_string?
+      attrs['table:formula'] = opts[:formula] unless opts[:formula].nil?
+      attrs['table:style-name'] = opts[:style] unless opts[:style].nil?
+      attrs['table:number-matrix-columns-spanned'] =
+        attrs['table:number-matrix-rows-spanned'] = 1 if opts[:matrix_formula]
+      attrs
+    end
   end
 end
 

data/lib/odf/column.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2008 Thiago Arrais
+#
+# This file is part of rODF.
+#
+# rODF is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of
+# the License, or (at your option) any later version.
+
+# rODF is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public License
+# along with rODF.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'rubygems'
+require 'builder'
+
+module ODF
+  class Column
+    def initialize(opts={})
+      @elem_attrs = {}
+      @elem_attrs['table:style-name'] = opts[:style] unless opts[:style].nil?
+    end
+
+    def xml
+      Builder::XmlMarkup.new.tag! 'table:table-column', @elem_attrs
+    end
+  end
+end
+

data/lib/odf/container.rb

@@ -16,6 +16,8 @@
 # along with rODF.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
+gem 'activesupport', '2.1.2'
+
 require 'active_support/core_ext/string'
 
 module ODF

data/lib/odf/property.rb

@@ -21,7 +21,8 @@ require 'builder'
 module ODF
   class Property
     PROPERTY_NAMES = {:cell => 'style:table-cell-properties',
-                      :text => 'style:text-properties'}
+                      :text => 'style:text-properties',
+                      :column => 'style:table-column-properties'}
 
     def initialize(type, specs={})
       @name = PROPERTY_NAMES[type]
@@ -29,9 +30,9 @@ module ODF
     end
 
     def xml
-      specs = {}
-      @specs.each do |k, v|
-        specs['fo:' + k] = v
+      specs = @specs.inject({}) do |acc, kv|
+        prefix = 'column-width' == kv.first ? 'style' : 'fo'
+        acc.merge prefix + ':' + kv.first => kv.last
       end
       Builder::XmlMarkup.new.tag! @name, specs
     end

data/lib/odf/skeleton/styles.xml

@@ -11,13 +11,12 @@
       <style:table-cell-properties style:rotation-align="none"/>
       <style:text-properties style:font-name="Arial1" style:font-name-complex="Arial1"/>
     </style:style>
-    <number:number-style style:name="number-currency-positive" style:volatile="true">
+    <number:number-style style:name="currency-grouped">
       <number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true" />
     </number:number-style>
-    <number:number-style style:name="number-currency">
-      <number:text>-</number:text>
-      <number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true" />
-      <style:map style:condition="value()&gt;=0" style:apply-style-name="number-currency-positive" />
-    </number:number-style>
+    <number:number-style style:name="integer-grouped">
+      <number:number number:decimal-places="0" number:min-integer-digits="1" number:grouping="true" />
+    </number:number-style>
   </office:styles>
-</office:document-styles>
+</office:document-styles>
+

data/lib/odf/style.rb

@@ -25,20 +25,29 @@ module ODF
   class Style < Container
     contains :properties
     
-    FAMILIES = {:cell => 'table-cell'}
+    FAMILIES = {:cell => 'table-cell', :column => 'table-column'}
 
     def initialize(name='', opts={})
       @name = name
-      @family = FAMILIES[opts[:family]]
+      @elem_attrs = make_element_attributes(@name, opts)
     end
 
     def xml
-      Builder::XmlMarkup.new.style:style, 'style:name' => @name,
-                                          'style:family' => @family do
-      |xml|
+      Builder::XmlMarkup.new.style:style, @elem_attrs do |xml|
         xml << properties_xml
       end
     end
+
+    def make_element_attributes(name, opts)
+      attrs = {'style:name' => name, 'style:family' => FAMILIES[opts[:family]]}
+      attrs['style:data-style-name'] = opts[:data_style] unless opts[:data_style].nil?
+      attrs['style:parent-style-name'] = opts[:parent].to_s unless opts[:parent].nil?
+      attrs
+    end
+
+    def to_s
+      @name
+    end
   end 
 end
 

data/lib/odf/table.rb

@@ -18,12 +18,13 @@
 require 'rubygems'
 require 'builder'
 
+require 'odf/column'
 require 'odf/container'
 require 'odf/row'
 
 module ODF
   class Table < Container
-    contains :rows    
+    contains :rows, :columns
 
     def initialize(title)
       @title = title
@@ -37,6 +38,7 @@ module ODF
 
     def xml
       Builder::XmlMarkup.new.table:table, 'table:name' => @title do |xml|
+        xml << columns_xml
         xml << rows_xml
       end
     end

data/rodf.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rodf}
-  s.version = "0.1"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Arrais"]
-  s.date = %q{2008-11-22}
+  s.date = %q{2008-12-02}
   s.description = %q{ODF generation library for Ruby}
   s.email = %q{thiago.arrais@gmail.com}
-  s.extra_rdoc_files = ["lib/odf/row.rb", "lib/odf/spreadsheet.rb", "lib/odf/cell.rb", "lib/odf/table.rb", "lib/odf/property.rb", "lib/odf/style.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/container.rb", "CHANGELOG", "README.rdoc", "LICENSE.LGPL"]
-  s.files = ["lib/odf/row.rb", "lib/odf/spreadsheet.rb", "lib/odf/cell.rb", "lib/odf/table.rb", "lib/odf/property.rb", "lib/odf/style.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/container.rb", "CHANGELOG", "README.rdoc", "Rakefile", "LICENSE.LGPL", "spec/cell_spec.rb", "spec/spreadsheet_spec.rb", "spec/spec_helper.rb", "spec/row_spec.rb", "spec/table_spec.rb", "spec/style_spec.rb", "spec/property_spec.rb", "Manifest", "rodf.gemspec"]
+  s.extra_rdoc_files = ["lib/odf/row.rb", "lib/odf/spreadsheet.rb", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/table.rb", "lib/odf/property.rb", "lib/odf/style.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/container.rb", "CHANGELOG", "README.rdoc", "LICENSE.LGPL"]
+  s.files = ["lib/odf/row.rb", "lib/odf/spreadsheet.rb", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/table.rb", "lib/odf/property.rb", "lib/odf/style.rb", "lib/odf/skeleton/manifest.xml", "lib/odf/skeleton/styles.xml", "lib/odf/container.rb", "CHANGELOG", "README.rdoc", "Rakefile", "LICENSE.LGPL", "spec/cell_spec.rb", "spec/spreadsheet_spec.rb", "spec/spec_helper.rb", "spec/row_spec.rb", "spec/table_spec.rb", "spec/style_spec.rb", "spec/property_spec.rb", "Manifest", "rodf.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/thiagoarrais/rodf/tree}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rodf", "--main", "README.rdoc"]
@@ -26,20 +26,23 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.1"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 2.1.2"])
+      s.add_development_dependency(%q<rspec>, [">= 1.1.11"])
       s.add_development_dependency(%q<rspec_hpricot_matchers>, [">= 1.0"])
       s.add_development_dependency(%q<echoe>, [">= 3.0.2"])
     else
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<rubyzip>, [">= 0.9.1"])
-      s.add_dependency(%q<activesupport>, [">= 2.0.0"])
+      s.add_dependency(%q<activesupport>, ["= 2.1.2"])
+      s.add_dependency(%q<rspec>, [">= 1.1.11"])
       s.add_dependency(%q<rspec_hpricot_matchers>, [">= 1.0"])
       s.add_dependency(%q<echoe>, [">= 3.0.2"])
     end
   else
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<rubyzip>, [">= 0.9.1"])
-    s.add_dependency(%q<activesupport>, [">= 2.0.0"])
+    s.add_dependency(%q<activesupport>, ["= 2.1.2"])
+    s.add_dependency(%q<rspec>, [">= 1.1.11"])
     s.add_dependency(%q<rspec_hpricot_matchers>, [">= 1.0"])
     s.add_dependency(%q<echoe>, [">= 3.0.2"])
   end

data/spec/cell_spec.rb

@@ -59,6 +59,24 @@ describe ODF::Cell do
     elem['table:formula'].should == 'oooc:=SUM([.A1:.A4])'
   end
 
+  it "should accept matrix formulas" do
+    output = ODF::Cell.new(:type => :float, :matrix_formula => true,
+                           :formula => "oooc:=SUM([.A1:.A4])").xml
+
+    elem = Hpricot(output).at('table:table-cell')
+    elem['table:number-matrix-columns-spanned'].should == '1'
+    elem['table:number-matrix-rows-spanned'].should == '1'
+  end
+
+  it "should not make a matrix formula when asked not too" do
+    output = ODF::Cell.new(:type => :float, :matrix_formula => false,
+                           :formula => "oooc:=SUM([.A1:.A4])").xml
+
+    elem = Hpricot(output).at('table:table-cell')
+    elem['table:number-matrix-columns-spanned'].should be_nil
+    elem['table:number-matrix-rows-spanned'].should be_nil
+  end
+
   it "should not have an empty paragraph" do
     [ODF::Cell.new, ODF::Cell.new(''), ODF::Cell.new('  ')].each do |cell|
       cell.xml.should_not have_tag('text:p')

data/spec/property_spec.rb

@@ -26,5 +26,14 @@ describe ODF::Property do
     elem['fo:color'].should == '#4c4c4c'
     elem['fo:font-weight'].should == 'bold'
   end
+
+  it "should prefix column-width property with style namespace" do
+    property = ODF::Property.new :column, 'column-width' => '2cm'
+
+    property.xml.should have_tag('//style:table-column-properties')
+
+    elem = Hpricot(property.xml).at('//style:table-column-properties')
+    elem['style:column-width'].should == '2cm'
+  end
 end
 

data/spec/style_spec.rb

@@ -40,5 +40,38 @@ describe ODF::Style do
     text_elem = Hpricot(output).at('style:text-properties')
     text_elem['fo:color'].should == '#4c4c4c'
   end
+
+  it "should allow data styles" do
+    xml = ODF::Style.create 'my-style', :family => :cell,
+                            :data_style => 'currency-grouped'
+
+    style = Hpricot(xml).at('//style:style')
+    style['style:data-style-name'].should == 'currency-grouped'
+  end
+
+  it "should allow parent styles" do
+    xml = ODF::Style.create 'child-style', :family => :cell,
+                            :parent => 'cell-default'
+
+    style = Hpricot(xml).at('//style:style')
+    style['style:parent-style-name'].should == 'cell-default'
+
+    cell_style = ODF::Style.new('cell-default', :family => :cell)
+    xml = ODF::Style.create 'child-style', :family => :cell,
+                            :parent => cell_style
+
+    style = Hpricot(xml).at('//style:style')
+    style['style:parent-style-name'].should == 'cell-default'
+  end
+
+  it "should be able to describe column styles" do
+    xml = ODF::Style.create 'column-style', :family => :column do |style|
+      style.property :column, 'column-width' => '2cm'
+    end
+
+    Hpricot(xml).at('//style:style')['style:family'].should == 'table-column'
+    xml.should have_tag('//style:style/*', :count => 1)
+    xml.should have_tag('//style:table-column-properties')
+  end
 end
 

data/spec/table_spec.rb

@@ -45,4 +45,14 @@ describe ODF::Table do
     output.should have_tag('text:p')
     Hpricot(output).at('text:p').innerHTML.should == '2'
   end
+
+  it "should allow column style specifications" do
+    xml = ODF::Table.create('Styles columns table') do |t|
+      t.column :style => 'wide'
+    end
+
+    xml.should have_tag('table:table-column')
+    column = Hpricot(xml).at('table:table-column')
+    column['table:style-name'].should == 'wide'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rodf
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Thiago Arrais
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-22 00:00:00 -03:00
+date: 2008-12-02 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,11 +36,21 @@ dependencies:
   name: activesupport
   type: :runtime
   version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.1.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 1.1.11
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec_hpricot_matchers
@@ -72,6 +82,7 @@ extra_rdoc_files:
 - lib/odf/row.rb
 - lib/odf/spreadsheet.rb
 - lib/odf/cell.rb
+- lib/odf/column.rb
 - lib/odf/table.rb
 - lib/odf/property.rb
 - lib/odf/style.rb
@@ -85,6 +96,7 @@ files:
 - lib/odf/row.rb
 - lib/odf/spreadsheet.rb
 - lib/odf/cell.rb
+- lib/odf/column.rb
 - lib/odf/table.rb
 - lib/odf/property.rb
 - lib/odf/style.rb