rodf 0.2.2 → 0.3

data/CHANGELOG

@@ -1,3 +1,4 @@
+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
 v0.1.6. Fix date handling

data/README.rdoc

@@ -18,9 +18,9 @@ rODF works pretty much like Builder, but with ODF-aware constructs. Try this:
 
   require 'odf/spreadsheet'
 
-  ODF::Spreadsheet.file("my-spreadsheet.ods") do |spreadsheet|
-    spreadsheet.table 'My first table from Ruby' do |table|
-      table.row {|row|  row.cell 'Hello, rODF world!' }
+  ODF::Spreadsheet.file("my-spreadsheet.ods") do
+    table 'My first table from Ruby' do
+      row {cell 'Hello, rODF world!' }
     end
   end
 
@@ -28,12 +28,12 @@ Some basic formatting is also possible:
 
   require 'odf/spreadsheet'
 
-  ODF::Spreadsheet.file("my-spreadsheet.ods") do |spreadsheet|
-    spreadsheet.style 'red-cell', :family => :cell do |style|
-      style.property :text, 'font-weight' => 'bold', 'color' => '#ff0000'
+  ODF::Spreadsheet.file("my-spreadsheet.ods") do
+    style 'red-cell', :family => :cell do
+      property :text, 'font-weight' => 'bold', 'color' => '#ff0000'
     end
-    spreadsheet.table 'Red text table' do |table|
-      table.row {|row|  row.cell 'Red', :style => 'red-cell' }
+    table 'Red text table' do
+      row {cell 'Red', :style => 'red-cell' }
     end
   end
 

data/lib/odf/cell.rb

@@ -56,16 +56,16 @@ module ODF
       text
     end
 
+    def contains_url?
+      !@url.nil? && !@url.empty?
+    end
+
   private
 
     def contains_string?
       :string == @type && !@value.nil? && !@value.empty?
     end
 
-    def contains_url?
-      !@url.nil? && !@url.empty?
-    end
-
     def make_element_attributes(type, value, opts)
       attrs = {}
       attrs['office:value-type'] = type if :string == type || !empty(value) || !opts[:formula].nil?
@@ -81,11 +81,12 @@ module ODF
 
     def make_value_paragraph
       if contains_string?
-        paragraph do |p|
-          if contains_url?
-            p.link @value, :href => @url
+        cell, value, url = self, @value, @url
+        paragraph do
+          if cell.contains_url?
+            link value, :href => url
           else
-            p << @value
+            self << value
           end
         end
       end

data/lib/odf/container.rb

@@ -33,9 +33,9 @@ module ODF
           end"
 
         self.class_eval "
-          def #{stuff}(*args)
+          def #{stuff}(*args, &contents)
             c = #{stuff_class}.new(*args)
-            yield c if block_given?
+            c.instance_eval(&contents) if block_given?
             #{stuffs} << c
             c
           end"
@@ -47,9 +47,9 @@ module ODF
       end
     end
 
-    def self.create(*args)
+    def self.create(*args, &contents)
       container = self.new(*args)
-      yield container if block_given?
+      container.instance_eval(&contents) if block_given?
       container.xml
     end
   end

data/lib/odf/document.rb

@@ -27,12 +27,12 @@ module ODF
   class Document < Container
     contains :styles, :default_styles
 
-    def self.file(ods_file_name)
+    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) }
 
-      yield(doc = new)
+      (doc = new).instance_eval(&contents)
 
       ods_file.get_output_stream('content.xml') {|f| f << doc.xml}
 

data/lib/odf/table.rb

@@ -32,8 +32,8 @@ module ODF
     end
 
     alias create_row row
-    def row
-      create_row(next_row) {|r| yield r if block_given?}
+    def row(&contents)
+      create_row(next_row) {instance_eval(&contents) if block_given?}
     end
 
     def xml

data/rodf.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rodf"
-  s.version = "0.2.2"
+  s.version = "0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thiago Arrais"]
-  s.date = "2012-04-25"
+  s.date = "2012-07-13"
   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"]

data/spec/cell_spec.rb

@@ -164,5 +164,19 @@ describe ODF::Cell do
       cell['office:value-type'].should be_nil
     end
   end
+
+  it "should accept parameterless blocks" do
+    output = ODF::Cell.create do
+      paragraph "first"
+      paragraph "second"
+    end
+
+    output.should have_tag("//table:table-cell/*", :count => 2)
+    output.should have_tag("//text:p")
+
+    ps = Hpricot(output).search('text:p')
+    ps[0].innerHTML.should == 'first'
+    ps[1].innerHTML.should == 'second'
+  end
 end
 

data/spec/data_style_spec.rb

@@ -46,5 +46,16 @@ describe ODF::DataStyle do
     output.should have_tag('number:month')
     output.should have_tag('number:day')
   end
+
+  it "should accept parameterless blocks" do
+    output = ODF::DataStyle.create 'year-to-day', :date do
+      section :year, :style => 'long'
+      section :month, :style => 'long'
+      section :day
+    end
+
+    output.should have_tag('number:date-style')
+    output.should have_tag('number:year')
+  end
 end
 

data/spec/hyperlink_spec.rb

@@ -49,5 +49,14 @@ describe ODF::Hyperlink do
     span['text:style-name'].should == 'strong'
     span.innerHTML.should == 'important link'
   end
+
+  it "should accept parameterless blocks" do
+    output = ODF::Hyperlink.create 'http://www.example.com/' do
+      strong 'important link'
+    end
+
+    output.should have_tag('//text:a/*')
+    output.should have_tag('//text:span/*')
+  end
 end
 

data/spec/page_layout_spec.rb

@@ -33,5 +33,13 @@ describe ODF::PageLayout do
     output.should have_tag('//style:page-layout/*', :count => 1)
     output.should have_tag('style:page-layout-properties')
   end
+
+  it "should accept parameterless blocks" do
+    output = ODF::PageLayout.create 'main-layout' do
+      property 'page-layout'
+    end
+    output.should have_tag('//style:page-layout/*', :count => 1)
+    output.should have_tag('style:page-layout-properties')
+  end
 end
 

data/spec/row_spec.rb

@@ -32,4 +32,13 @@ describe ODF::Row do
     output.should have_tag('//table:table-row/*', :count => 2)
     output.should have_tag('//table:table-cell')
   end
+
+  it "should accept parameterless blocks" do
+    output = ODF::Row.create do
+      cell
+      cell
+    end
+    output.should have_tag('//table:table-row/*', :count => 2)
+    output.should have_tag('//table:table-cell')
+  end
 end

data/spec/style_spec.rb

@@ -22,7 +22,7 @@ require 'odf/style'
 describe ODF::Style do
   it "should output properties when they're added" do
     ODF::Style.create.should_not have_tag('//style:style/*')
-    
+
     output = ODF::Style.create 'odd-row-cell', :family => :cell do |s|
       s.property :cell, 'background-color' => '#b3b3b3',
                         'border' => '0.002cm solid #000000'
@@ -90,5 +90,13 @@ describe ODF::Style do
     Hpricot(ODF::Style.create('text-style', :family => :paragraph)).
       at('//style:style')['style:family'].should == 'paragraph'
   end
+
+  it "should accept parameterless blocks" do
+    output = ODF::Style.create 'odd-row-cell', :family => :cell do
+      property :text, 'color' => '#4c4c4c', 'font-weight' => 'bold'
+    end
+
+    output.should have_tag('//style:style/*')
+  end
 end
 

data/spec/table_spec.rb

@@ -55,4 +55,23 @@ describe ODF::Table do
     column = Hpricot(xml).at('table:table-column')
     column['table:style-name'].should == 'wide'
   end
+
+  it "should accept parameterless block" do
+    output = ODF::Table.create('MyTable') {
+      row
+      row
+    }
+    output.should have_tag('//table:table/*', :count => 2)
+    output.should have_tag('//table:table-row')
+  end
+
+  it "should have children that accept parameterless blocks too" do
+    output = ODF::Table.create('MyTable') {
+      row {cell}
+      row
+    }
+    output.should have_tag('//table:table/*', :count => 2)
+    output.should have_tag('//table:table-row')
+    output.should have_tag('//table:table-cell')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodf
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &87158270 !ruby/object:Gem::Requirement
+  requirement: &75169230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *87158270
+  version_requirements: *75169230
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &87158060 !ruby/object:Gem::Requirement
+  requirement: &75169020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *87158060
+  version_requirements: *75169020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &87157850 !ruby/object:Gem::Requirement
+  requirement: &75168810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *87157850
+  version_requirements: *75168810
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &87157640 !ruby/object:Gem::Requirement
+  requirement: &75168600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *87157640
+  version_requirements: *75168600
 - !ruby/object:Gem::Dependency
   name: rspec_hpricot_matchers
-  requirement: &87157430 !ruby/object:Gem::Requirement
+  requirement: &75168390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *87157430
+  version_requirements: *75168390
 - !ruby/object:Gem::Dependency
   name: echoe
-  requirement: &87157220 !ruby/object:Gem::Requirement
+  requirement: &75168180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '4.6'
   type: :development
   prerelease: false
-  version_requirements: *87157220
+  version_requirements: *75168180
 description: ODF generation library for Ruby
 email: thiago.arrais@gmail.com
 executables: []