rodf 0.3 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.3.1. Adds support for conditional formatting
 v0.3. Allow parameterless blocks
 v0.2.2. Reintroduce compatibility with Ruby 1.8
 v0.2.1. Update to newer libraries and Ruby 1.9

data/Manifest

@@ -36,6 +36,7 @@ spec/page_layout_spec.rb
 spec/paragraph_spec.rb
 spec/property_spec.rb
 spec/row_spec.rb
+spec/skeleton_spec.rb
 spec/span_spec.rb
 spec/spec_helper.rb
 spec/spreadsheet_spec.rb

data/README.rdoc

@@ -37,3 +37,37 @@ Some basic formatting is also possible:
     end
   end
 
+Some basic conditional formatting is also possible:
+
+  require 'odf/spreadsheet'
+
+  ODF::Spreadsheet.file("my-spreadsheet.ods") do
+
+    office_style 'red-cell', :family => :cell do
+      property :text, 'font-weight' => 'bold', 'color' => '#ff0000'
+    end
+
+    office_style 'green-cell', :family => :cell do
+      property :text, 'font-weight' => 'bold', 'color' => '#00ff00'
+    end
+
+    # conditional formating must be defined as style and the value of
+    # apply-style-name must be an office_style
+    style 'cond1', :family => :cell do
+
+      property :conditional,
+                'condition' => 'cell-content()<0',
+                'apply-style-name' => 'red-cell'
+
+      property :conditional,
+                'condition' => 'cell-content()>0',
+                'apply-style-name' => 'green-cell'
+    end
+
+    table 'Red text table' do
+      row {cell 'Red force', :style => 'red-cell' }
+      row {cell '-4', :type => :float, :style => 'cond1' }
+      row {cell '0', :type => :float, :style => 'cond1' }
+      row {cell '5', :type => :float, :style => 'cond1' }
+    end
+  end

data/Rakefile

@@ -7,7 +7,7 @@ task :test => :spec
 
 require 'echoe'
 Echoe.new('rodf') do |gem|
-  gem.author = "Thiago Arrais"
+  gem.author = ["Thiago Arrais", "Foivos Zakkak"]
   gem.email = "thiago.arrais@gmail.com"
   gem.url = "http://github.com/thiagoarrais/rodf/tree"
   gem.summary = "ODF generation library for Ruby"

data/lib/odf/document.rb

@@ -25,15 +25,19 @@ require 'odf/style'
 
 module ODF
   class Document < Container
-    contains :styles, :default_styles
+    contains :styles, :default_styles, :office_styles
 
     def self.file(ods_file_name, &contents)
       ods_file = Zip::ZipFile.open(ods_file_name, Zip::ZipFile::CREATE)
-      ods_file.get_output_stream('styles.xml') {|f| f << skeleton.styles }
       ods_file.get_output_stream('META-INF/manifest.xml') {|f| f << skeleton.manifest(doc_type) }
 
       (doc = new).instance_eval(&contents)
 
+      ods_file.get_output_stream('styles.xml') do |f|
+        f << skeleton.styles
+        f << doc.office_styles_xml unless doc.office_styles.empty?
+        f << "</office:styles> </office:document-styles>"
+      end
       ods_file.get_output_stream('content.xml') {|f| f << doc.xml}
 
       ods_file.close

data/lib/odf/property.rb

@@ -20,15 +20,17 @@ require 'builder'
 
 module ODF
   class Property
-    PROPERTY_NAMES = {:cell => 'style:table-cell-properties',
-                      :text => 'style:text-properties',
-                      :column => 'style:table-column-properties'}
+    PROPERTY_NAMES = {:cell => 'table-cell-properties',
+                      :text => 'text-properties',
+                      :column => 'table-column-properties',
+                      :conditional => 'map'}
     TRANSLATED_SPECS = [:border_color, :border_style, :border_width]
     STYLE_ATTRIBUTES = ['column-width', 'rotation-angle', 'text-underline-type',
-                        'tab-stop-distance']
+                        'tab-stop-distance', 'condition', 'apply-style-name',
+                        'base-cell-address']
 
     def initialize(type, specs={})
-      @name = PROPERTY_NAMES[type] || "style:#{type}-properties"
+      @name = 'style:' + (PROPERTY_NAMES[type] || "#{type}-properties")
       @specs = translate(specs).map { |k, v| [k.to_s, v] }
     end
 

data/lib/odf/skeleton/styles.xml

@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                        xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                        xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-                        xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0">
-  <office:font-face-decls>
-    <style:font-face style:name="Arial1" svg:font-family="Arial" style:font-family-generic="swiss"/>
-  </office:font-face-decls>
-  <office:styles>
-    <style:style style:name="Default" style:family="table-cell">
-      <style:table-cell-properties style:rotation-align="none"/>
-      <style:text-properties style:font-name="Arial1" style:font-name-complex="Arial1"/>
-    </style:style>
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                        xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                        xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+                        xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+                        xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0">
+  <office:font-face-decls>
+    <style:font-face style:name="Arial1" svg:font-family="Arial" style:font-family-generic="swiss"/>
+  </office:font-face-decls>
+  <office:styles>
+    <style:style style:name="Default" style:family="table-cell">
+      <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="currency-grouped">
-      <number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true" />
-    </number:number-style>
+      <number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true" />
+    </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>
@@ -24,6 +25,5 @@
       <number:text>-</number:text>
       <number:day number:style="long"/>
     </number:date-style>
-  </office:styles>
+  </office:styles>
 </office:document-styles>
-

data/lib/odf/spreadsheet.rb

@@ -33,14 +33,15 @@ module ODF
       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:number' => "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
-                                        'xmlns:xlink' => "http://www.w3.org/1999/xlink" do
+      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:number' => "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
+              'xmlns:xlink' => "http://www.w3.org/1999/xlink" do
       |xml|
         xml.tag! 'office:styles' do
           xml << default_styles_xml

data/lib/odf/style.rb

@@ -24,7 +24,7 @@ require 'odf/property'
 module ODF
   class Style < Container
     contains :properties
-    
+
     FAMILIES = {:cell => 'table-cell', :column => 'table-column'}
 
     def initialize(name='', opts={}, node_tag='style:style')
@@ -53,6 +53,9 @@ module ODF
     end
   end
 
+  class OfficeStyle < Style
+  end
+
   class DefaultStyle < Style
     def initialize(opts={})
       super(nil, opts, 'style:default-style')

data/rodf.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = "rodf"
-  s.version = "0.3"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Thiago Arrais"]
-  s.date = "2012-07-13"
+  s.authors = ["Thiago Arrais, Foivos Zakkak"]
+  s.date = "2012-10-25"
   s.description = "ODF generation library for Ruby"
   s.email = "thiago.arrais@gmail.com"
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE.LGPL", "README.rdoc", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/compatibility.rb", "lib/odf/container.rb", "lib/odf/data_style.rb", "lib/odf/document.rb", "lib/odf/hyperlink.rb", "lib/odf/master_page.rb", "lib/odf/page_layout.rb", "lib/odf/paragraph.rb", "lib/odf/paragraph_container.rb", "lib/odf/property.rb", "lib/odf/row.rb", "lib/odf/skeleton.rb", "lib/odf/skeleton/manifest.xml.erb", "lib/odf/skeleton/styles.xml", "lib/odf/span.rb", "lib/odf/spreadsheet.rb", "lib/odf/style.rb", "lib/odf/style_section.rb", "lib/odf/tab.rb", "lib/odf/table.rb", "lib/odf/text.rb"]
-  s.files = ["CHANGELOG", "Gemfile", "LICENSE.LGPL", "Manifest", "README.rdoc", "Rakefile", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/compatibility.rb", "lib/odf/container.rb", "lib/odf/data_style.rb", "lib/odf/document.rb", "lib/odf/hyperlink.rb", "lib/odf/master_page.rb", "lib/odf/page_layout.rb", "lib/odf/paragraph.rb", "lib/odf/paragraph_container.rb", "lib/odf/property.rb", "lib/odf/row.rb", "lib/odf/skeleton.rb", "lib/odf/skeleton/manifest.xml.erb", "lib/odf/skeleton/styles.xml", "lib/odf/span.rb", "lib/odf/spreadsheet.rb", "lib/odf/style.rb", "lib/odf/style_section.rb", "lib/odf/tab.rb", "lib/odf/table.rb", "lib/odf/text.rb", "rodf.gemspec", "spec/cell_spec.rb", "spec/data_style_spec.rb", "spec/hyperlink_spec.rb", "spec/master_page_spec.rb", "spec/page_layout_spec.rb", "spec/paragraph_spec.rb", "spec/property_spec.rb", "spec/row_spec.rb", "spec/span_spec.rb", "spec/spec_helper.rb", "spec/spreadsheet_spec.rb", "spec/style_section_spec.rb", "spec/style_spec.rb", "spec/tab_spec.rb", "spec/table_spec.rb", "spec/text_spec.rb"]
+  s.files = ["CHANGELOG", "Gemfile", "LICENSE.LGPL", "Manifest", "README.rdoc", "Rakefile", "lib/odf/cell.rb", "lib/odf/column.rb", "lib/odf/compatibility.rb", "lib/odf/container.rb", "lib/odf/data_style.rb", "lib/odf/document.rb", "lib/odf/hyperlink.rb", "lib/odf/master_page.rb", "lib/odf/page_layout.rb", "lib/odf/paragraph.rb", "lib/odf/paragraph_container.rb", "lib/odf/property.rb", "lib/odf/row.rb", "lib/odf/skeleton.rb", "lib/odf/skeleton/manifest.xml.erb", "lib/odf/skeleton/styles.xml", "lib/odf/span.rb", "lib/odf/spreadsheet.rb", "lib/odf/style.rb", "lib/odf/style_section.rb", "lib/odf/tab.rb", "lib/odf/table.rb", "lib/odf/text.rb", "rodf.gemspec", "spec/cell_spec.rb", "spec/data_style_spec.rb", "spec/hyperlink_spec.rb", "spec/master_page_spec.rb", "spec/page_layout_spec.rb", "spec/paragraph_spec.rb", "spec/property_spec.rb", "spec/row_spec.rb", "spec/skeleton_spec.rb", "spec/span_spec.rb", "spec/spec_helper.rb", "spec/spreadsheet_spec.rb", "spec/style_section_spec.rb", "spec/style_spec.rb", "spec/tab_spec.rb", "spec/table_spec.rb", "spec/text_spec.rb"]
   s.homepage = "http://github.com/thiagoarrais/rodf/tree"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rodf", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/spec/skeleton_spec.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2012 Foivos Zakkak
+#
+# 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 File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/skeleton'
+
+describe ODF::Skeleton do
+  it "should have the expected structure" do
+    output = ODF::Skeleton.new.styles
+    output.should have_tag('//office:document-styles/*')
+    output.should have_tag('//office:font-face-decls')
+    output.should have_tag('//office:styles', :count => 1)
+    output.should have_tag('//style:style', :count => 1)
+    output.should have_tag('//number:number-style', :count => 2)
+    output.should have_tag('//number:date-style', :count => 1)
+  end
+end
+

data/spec/spreadsheet_spec.rb

@@ -15,36 +15,36 @@
 # 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 File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-require 'odf/spreadsheet'
-
-describe ODF::SpreadSheet do
-  it "should have the expected structure" do
-    output = ODF::SpreadSheet.create {|s| }
-    output.should have_tag('//office:document-content/*')
-    output.should have_tag('//office:body/*')
-    output.should have_tag('//office:spreadsheet')
-  end
-
-  it "should be empty if no tables were added" do
-    output = ODF::SpreadSheet.create {|s| }
-    output.should_not have_tag('//office:spreadsheet/*')
-  end
-
-  it "should include tables when asked to" do
-    output = ODF::SpreadSheet.create { |s|
-      s.table 'Example'
-    }
-    output.should have_tag('//office:spreadsheet/*', :count => 1)
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/spreadsheet'
+
+describe ODF::SpreadSheet do
+  it "should have the expected structure" do
+    output = ODF::SpreadSheet.create {|s| }
+    output.should have_tag('//office:document-content/*')
+    output.should have_tag('//office:body/*')
+    output.should have_tag('//office:spreadsheet')
+  end
+
+  it "should be empty if no tables were added" do
+    output = ODF::SpreadSheet.create {|s| }
+    output.should_not have_tag('//office:spreadsheet/*')
+  end
+
+  it "should include tables when asked to" do
+    output = ODF::SpreadSheet.create { |s|
+      s.table 'Example'
+    }
+    output.should have_tag('//office:spreadsheet/*', :count => 1)
     output.should have_tag('//table:table', :count => 1)
     Hpricot(output).at('//table:table')['table:name'].should == 'Example'
-
-    output = ODF::SpreadSheet.create { |s|
-      s.table 'First table'
-      s.table 'Second table'
-    }
-    output.should have_tag('//office:spreadsheet/*', :count => 2)
+
+    output = ODF::SpreadSheet.create { |s|
+      s.table 'First table'
+      s.table 'Second table'
+    }
+    output.should have_tag('//office:spreadsheet/*', :count => 2)
   end
 
   it "should allow rows to be added inside tables" do
@@ -76,6 +76,48 @@ describe ODF::SpreadSheet do
     end
     output.should have_tag('//office:automatic-styles/*', :count => 1)
     output.should have_tag('//number:date-style')
-  end
+  end
+
+  it "should allow conditional styles to be added" do
+    output = ODF::SpreadSheet.create do |s|
+      s.style 'cond-cell', :family => :cell do
+        property :conditional,
+        'condition' => 'cell-content()!=0',
+        'apply-style-name' => 'red-cell'
+      end
+    end
+
+    output.should have_tag('//style:map')
+    Hpricot(output).at('//style:map')['style:apply-style-name'].should == 'red-cell'
+  end
+
+  it "should allow office styles to be added" do
+    spread = ODF::SpreadSheet.new
+    spread.office_style 'red-cell', :family => :cell
+
+    output = spread.office_styles_xml
+
+    output.should have_tag('//style:style')
+    Hpricot(output).at('//style:style')['style:name'].should == 'red-cell'
+    spread.xml.should_not have_tag('//style:style')
+  end
+
+  it "should support mixed office and conditional styles to be added" do
+    spread = ODF::SpreadSheet.new
+    spread.office_style 'red-cell', :family => :cell
+    spread.style 'cond-cell', :family => :cell do
+      property :conditional,
+      'condition' => 'cell-content()!=0',
+      'apply-style-name' => 'red-cell'
+    end
+
+    output = spread.styles_xml
+    output.should have_tag('//style:map')
+    Hpricot(output).at('//style:map')['style:apply-style-name'].should == 'red-cell'
+
+    output = spread.office_styles_xml
+    output.should have_tag('//style:style')
+    Hpricot(output).at('//style:style')['style:name'].should == 'red-cell'
+  end
 end
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rodf
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
-- Thiago Arrais
+- Thiago Arrais, Foivos Zakkak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &75169230 !ruby/object:Gem::Requirement
+  requirement: &85321850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *75169230
+  version_requirements: *85321850
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &75169020 !ruby/object:Gem::Requirement
+  requirement: &85321640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *75169020
+  version_requirements: *85321640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &75168810 !ruby/object:Gem::Requirement
+  requirement: &85321430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *75168810
+  version_requirements: *85321430
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75168600 !ruby/object:Gem::Requirement
+  requirement: &85321220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *75168600
+  version_requirements: *85321220
 - !ruby/object:Gem::Dependency
   name: rspec_hpricot_matchers
-  requirement: &75168390 !ruby/object:Gem::Requirement
+  requirement: &85321010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *75168390
+  version_requirements: *85321010
 - !ruby/object:Gem::Dependency
   name: echoe
-  requirement: &75168180 !ruby/object:Gem::Requirement
+  requirement: &85320800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '4.6'
   type: :development
   prerelease: false
-  version_requirements: *75168180
+  version_requirements: *85320800
 description: ODF generation library for Ruby
 email: thiago.arrais@gmail.com
 executables: []
@@ -147,6 +147,7 @@ files:
 - spec/paragraph_spec.rb
 - spec/property_spec.rb
 - spec/row_spec.rb
+- spec/skeleton_spec.rb
 - spec/span_spec.rb
 - spec/spec_helper.rb
 - spec/spreadsheet_spec.rb