rodf 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.3.3. Documents can now write themselves to disk
 v0.3.2. Fixes broken styles.xml
 v0.3.1. Adds support for conditional formatting
 v0.3. Allow parameterless blocks

data/README.rdoc

@@ -70,4 +70,29 @@ Some basic conditional formatting is also possible:
       row {cell '0', :type => :float, :style => 'cond1' }
       row {cell '5', :type => :float, :style => 'cond1' }
     end
-  end
+  end
+
+==== Procedural style
+
+The declarative style shown above is just syntatic sugar. A more procedural
+style can also be used. Like so:
+
+    require 'odf/spreadsheet'
+
+    ss = ODF::Spreadsheet.new
+    t = ss.table 'My first table from Ruby'
+    r = t.row
+    c = r.cell 'Hello, rODF world!'
+
+    ss.write_to 'my-spreadsheet.ods'
+
+Both styles can be mixed and matched at will:
+
+    require 'odf/spreadsheet'
+
+    ss = ODF::Spreadsheet.new
+    ss.table 'My first table from Ruby' do
+      row { cell 'Hello, rODF world!' }
+    end
+
+    ss.write_to 'my-spreadsheet.ods'

data/lib/odf/document.rb

@@ -28,17 +28,20 @@ module ODF
     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('META-INF/manifest.xml') {|f| f << skeleton.manifest(doc_type) }
-
       (doc = new).instance_eval(&contents)
+      doc.write_to ods_file_name
+    end
+
+    def write_to(ods_file_name)
+      ods_file = Zip::ZipFile.open(ods_file_name, Zip::ZipFile::CREATE)
+      ods_file.get_output_stream('META-INF/manifest.xml') {|f| f << self.class.skeleton.manifest(self.class.doc_type) }
 
       ods_file.get_output_stream('styles.xml') do |f|
-        f << skeleton.styles
-        f << doc.office_styles_xml unless doc.office_styles.empty?
+        f << self.class.skeleton.styles
+        f << self.office_styles_xml unless self.office_styles.empty?
         f << "</office:styles> </office:document-styles>"
       end
-      ods_file.get_output_stream('content.xml') {|f| f << doc.xml}
+      ods_file.get_output_stream('content.xml') {|f| f << self.xml}
 
       ods_file.close
     end

data/lib/odf/property.rb

@@ -23,6 +23,7 @@ module ODF
     PROPERTY_NAMES = {:cell => 'table-cell-properties',
                       :text => 'text-properties',
                       :column => 'table-column-properties',
+                      :row => 'table-row-properties',
                       :conditional => 'map'}
     TRANSLATED_SPECS = [:border_color, :border_style, :border_width]
     STYLE_ATTRIBUTES = ['column-width', 'rotation-angle', 'text-underline-type',

data/lib/odf/row.rb

@@ -25,13 +25,17 @@ module ODF
   class Row < Container
     contains :cells
     attr_reader :number
+    attr_writer :style
 
-    def initialize(number=0)
+    def initialize(number=0, opts={})
       @number = number
+      @style = opts[:style]
     end
 
     def xml
-      Builder::XmlMarkup.new.tag! 'table:table-row' do |xml|
+      elem_attrs = {}
+      elem_attrs['table:style-name'] = @style unless @style.nil?
+      Builder::XmlMarkup.new.tag! 'table:table-row', elem_attrs do |xml|
         xml << cells_xml
       end
     end

data/lib/odf/style.rb

@@ -25,7 +25,7 @@ module ODF
   class Style < Container
     contains :properties
 
-    FAMILIES = {:cell => 'table-cell', :column => 'table-column'}
+    FAMILIES = {:cell => 'table-cell', :column => 'table-column', :row => 'table-row'}
 
     def initialize(name='', opts={}, node_tag='style:style')
       @name, @node_tag = name, node_tag

data/rodf.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rodf"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Arrais, Foivos Zakkak"]
-  s.date = "2012-11-08"
+  s.date = "2013-02-01"
   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.pxml", "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"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rodf", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "rodf"
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.25"
   s.summary = "ODF generation library for Ruby"
 
   if s.respond_to? :specification_version then

data/spec/property_spec.rb

@@ -45,6 +45,12 @@ describe ODF::Property do
     elem['style:rotation-angle'].should == '-90'
   end
 
+  it "should generate row properties tag" do
+    property = ODF::Property.new :row, 'background-color' => '#f5f57a'
+
+    property.xml.should have_tag('//style:table-row-properties')
+  end
+
   it "should accept full perimeter border specs" do
     property = ODF::Property.new :cell, :border => "0.025in solid #000000"
 

data/spec/row_spec.rb

@@ -41,4 +41,19 @@ describe ODF::Row do
     output.should have_tag('//table:table-row/*', :count => 2)
     output.should have_tag('//table:table-cell')
   end
+
+  it "should be stylable in the initialization" do
+    output = ODF::Row.create 0, :style => 'dark' do
+      cell
+    end
+    Hpricot(output).at('table:table-row')['table:style-name'].
+      should == 'dark'
+  end
+
+  it "should be attr_writer stylable" do
+    row = ODF::Row.new
+    row.style = 'dark'
+    Hpricot(row.xml).at('table:table-row')['table:style-name'].
+      should == 'dark'
+  end
 end

data/spec/style_spec.rb

@@ -83,6 +83,13 @@ describe ODF::Style do
     xml.should have_tag('//style:table-column-properties')
   end
 
+  it "should be able to describe row styles" do
+    xml = ODF::Style.create 'column-style', :family => :row do |style|
+    end
+
+    Hpricot(xml).at('//style:style')['style:family'].should == 'table-row'
+  end
+
   it "should accept other families" do
     Hpricot(ODF::Style.create('text-style', :family => :text)).
       at('//style:style')['style:family'].should == 'text'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodf
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &83228770 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *83228770
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &83228560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *83228560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &83228350 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *83228350
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83228140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *83228140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rspec_hpricot_matchers
-  requirement: &83227930 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *83227930
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: echoe
-  requirement: &83227720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +101,12 @@ dependencies:
         version: '4.6'
   type: :development
   prerelease: false
-  version_requirements: *83227720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.6'
 description: ODF generation library for Ruby
 email: thiago.arrais@gmail.com
 executables: []
@@ -182,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: rodf
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ODF generation library for Ruby