rodf 0.1.8 → 0.2.0

data/Manifest

@@ -7,21 +7,36 @@ lib/odf/cell.rb
 lib/odf/column.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/manifest.xml
+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/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/table_spec.rb
+spec/text_spec.rb

data/README.rdoc

@@ -1,7 +1,7 @@
 = rODF
 
 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)
+supports creating spreadsheets (ODS) and text documents (ODT). Slide shows (ODP)
 may be added some time in the future.
 
 This is NOT an ODF reading library.
@@ -18,7 +18,7 @@ rODF works pretty much like Builder, but with ODF-aware constructs. Try this:
 
   require 'odf/spreadsheet'
 
-  ODF::SpreadSheet.file("my-spreadsheet.ods") do |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!' }
     end
@@ -28,7 +28,7 @@ Some basic formatting is also possible:
 
   require 'odf/spreadsheet'
 
-  ODF::SpreadSheet.file("my-spreadsheet.ods") do |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'
     end

data/lib/odf/cell.rb

@@ -18,8 +18,15 @@
 require 'rubygems'
 require 'builder'
 
+require 'odf/container'
+require 'odf/paragraph'
+
 module ODF
-  class Cell
+  class Cell < Container
+    contains :paragraphs
+
+    alias :p :paragraph
+
     def initialize(*args)
       value = args.first || ''
       opts = args.last.instance_of?(Hash) ? args.last : {}
@@ -36,25 +43,21 @@ module ODF
 
       @elem_attrs = make_element_attributes(@type, @value, opts)
       @mutiply = (opts[:span] || 1).to_i
+
+      make_value_paragraph
     end
 
     def xml
       markup = Builder::XmlMarkup.new
       text = markup.tag! 'table:table-cell', @elem_attrs do |xml|
-        if contains_string?
-          xml.text:p do |p|
-            if contains_url?
-              p.text:a, @value, 'xlink:href' => @url
-            else
-              p.text! @value
-            end
-          end
-        end
+        xml << paragraphs_xml
       end
       (@mutiply - 1).times {text = markup.tag! 'table:table-cell'}
       text
     end
 
+  private
+
     def contains_string?
       :string == @type && !@value.nil? && !@value.empty?
     end
@@ -76,7 +79,17 @@ module ODF
       attrs
     end
 
-  private
+    def make_value_paragraph
+      if contains_string?
+        paragraph do |p|
+          if contains_url?
+            p.link @value, :href => @url
+          else
+            p << @value
+          end
+        end
+      end
+    end
 
     def empty(value)
       value.nil? || value.empty?

data/lib/odf/document.rb

@@ -0,0 +1,48 @@
+# Copyright (c) 2010 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 'zip/zip'
+
+require 'odf/container'
+require 'odf/skeleton'
+
+module ODF
+  class Document < Container
+    def self.file(ods_file_name)
+      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)
+
+      ods_file.get_output_stream('content.xml') {|f| f << doc.xml}
+
+      ods_file.close
+    end
+  private
+    def self.skeleton
+      @skeleton ||= Skeleton.new
+    end
+
+    def self.doc_type
+      name.split('::').last.downcase
+    end
+  end
+end
+

data/lib/odf/hyperlink.rb

@@ -0,0 +1,51 @@
+# Copyright (c) 2010 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'
+
+require 'odf/paragraph_container'
+
+module ODF
+  class Hyperlink < ParagraphContainer
+    def initialize(first, second = {})
+      if second.instance_of?(Hash) && second.empty?
+        @href = first
+      else
+        span(first)
+        @href = second.instance_of?(Hash) ? second[:href] : second
+      end
+    end
+
+    def xml
+      Builder::XmlMarkup.new.text:a, 'xlink:href' => @href do |a|
+        a << content_parts_xml
+      end
+    end
+  end
+
+  class ParagraphContainer < Container
+    def link(*args)
+      l = Hyperlink.new(*args)
+      yield l if block_given?
+      content_parts << l
+      l
+    end
+    alias a link
+  end
+end
+

data/lib/odf/master_page.rb

@@ -0,0 +1,33 @@
+# Copyright (c) 2010 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 MasterPage
+    def initialize(name, opts = {})
+      @name, @layout = name, opts[:layout]
+    end
+
+    def xml
+      Builder::XmlMarkup.new.tag! 'style:master-page',
+        'style:name' => @name, 'style:page-layout-name' => @layout
+    end
+  end
+end
+

data/lib/odf/page_layout.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2010 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'
+
+require 'odf/container'
+require 'odf/property'
+
+module ODF
+  class PageLayout < Container
+    contains :properties
+
+    def initialize(name)
+      @name = name
+    end
+
+    def xml
+      Builder::XmlMarkup.new.tag! 'style:page-layout', 'style:name' => @name do |b|
+        b << properties_xml
+      end
+    end
+  end
+end
+

data/lib/odf/paragraph.rb

@@ -0,0 +1,46 @@
+# Copyright (c) 2010 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'
+
+require 'odf/paragraph_container'
+
+module ODF
+  class Paragraph < ParagraphContainer
+    def initialize(fst = nil, snd = {})
+      first_is_hash = fst.instance_of? Hash
+      span(fst) unless first_is_hash
+      @elem_attrs = make_element_attributes(first_is_hash ? fst : snd)
+    end
+
+    def xml
+      Builder::XmlMarkup.new.text:p, @elem_attrs do |xml|
+        xml << content_parts_xml
+      end
+    end
+
+  private
+
+    def make_element_attributes(opts)
+      attrs = {}
+      attrs['text:style-name'] = opts[:style] unless opts[:style].nil?
+      attrs
+    end
+
+  end
+end

data/lib/odf/paragraph_container.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2010 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'
+
+require 'odf/container'
+
+module ODF
+  # Container for all kinds of paragraph content
+  class ParagraphContainer < Container
+    def content_parts
+      @content_parts ||= []
+    end
+
+    def content_parts_xml
+      content_parts.map {|p| p.xml}.join
+    end
+  end
+end
+

data/lib/odf/property.rb

@@ -24,15 +24,16 @@ module ODF
                       :text => 'style:text-properties',
                       :column => 'style:table-column-properties'}
     TRANSLATED_SPECS = [:border_color, :border_style, :border_width]
+    STYLE_ATTRIBUTES = ['column-width', 'rotation-angle', 'text-underline-type']
 
     def initialize(type, specs={})
-      @name = PROPERTY_NAMES[type]
+      @name = PROPERTY_NAMES[type] || "style:#{type}-properties"
       @specs = translate(specs).map { |k, v| [k.to_s, v] }
     end
 
     def xml
       specs = @specs.inject({}) do |acc, kv|
-        prefix = 'column-width' == kv.first ? 'style' : 'fo'
+        prefix = STYLE_ATTRIBUTES.include?(kv.first) ? 'style' : 'fo'
         acc.merge prefix + ':' + kv.first => kv.last
       end
       Builder::XmlMarkup.new.tag! @name, specs

data/lib/odf/skeleton.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2010 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 'erb'
+
+module ODF
+  class Skeleton
+    def manifest(document_type)
+      ERB.new(template('manifest.xml.erb')).result(binding)
+    end
+
+    def styles
+      template('styles.xml')
+    end
+  private
+    def template(fname)
+      File.open(File.dirname(__FILE__) + '/skeleton/' + fname).read
+    end
+  end
+end

data/lib/odf/skeleton/{manifest.xml → manifest.xml.erb}

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
 <manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
- <manifest:file-entry manifest:media-type="application/vnd.oasis.opendocument.spreadsheet" manifest:full-path="/"/>
+ <manifest:file-entry manifest:media-type="application/vnd.oasis.opendocument.<%= document_type.to_s %>" manifest:full-path="/"/>
  <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="content.xml"/>
  <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="styles.xml"/>
-</manifest:manifest>
+</manifest:manifest>

data/lib/odf/span.rb

@@ -0,0 +1,69 @@
+# Copyright (c) 2010 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'
+
+require 'odf/paragraph_container'
+
+module ODF
+  class TextNode
+    def initialize(content)
+      @content = content
+    end
+
+    def xml
+      @content.to_s.to_xs
+    end
+  end
+
+  class Span < ParagraphContainer
+    def initialize(first, second = nil)
+      if first.instance_of?(Symbol)
+        @style = first
+        content_parts << TextNode.new(second) unless second.nil?
+      else
+        content_parts << TextNode.new(first)
+      end
+    end
+
+    def xml
+      return content_parts_xml if @style.nil?
+      Builder::XmlMarkup.new.text:span, 'text:style-name' => @style do |xml|
+        xml << content_parts_xml
+      end
+    end
+  end
+
+  class ParagraphContainer < Container
+    def span(*args)
+      s = Span.new(*args)
+      yield s if block_given?
+      content_parts << s
+      s
+    end
+
+    def <<(content)
+      span(content)
+    end
+
+    def method_missing(style, *args)
+      span(style, *args)
+    end
+  end
+end
+

data/lib/odf/spreadsheet.rb

@@ -18,29 +18,18 @@
 require 'rubygems'
 
 require 'builder'
-require 'zip/zip'
 
-require 'odf/container'
 require 'odf/data_style'
+require 'odf/document'
+require 'odf/hyperlink'
+require 'odf/span'
 require 'odf/style'
 require 'odf/table'
 
 module ODF
-  class SpreadSheet < Container
+  class Spreadsheet < Document
     contains :tables, :styles, :data_styles
 
-    def self.file(ods_file_name)
-      ods_file = Zip::ZipFile.open(ods_file_name, Zip::ZipFile::CREATE)
-      ods_file.get_output_stream('styles.xml') {|f| f << skeleton('styles.xml')}
-      ods_file.get_output_stream('META-INF/manifest.xml') {|f| f << skeleton('manifest.xml')}
-      
-      yield(spreadsheet = new)
-
-      ods_file.get_output_stream('content.xml') {|f| f << spreadsheet.xml}
-
-      ods_file.close
-    end
-
     def xml
       b = Builder::XmlMarkup.new
 
@@ -65,11 +54,8 @@ module ODF
         end
       end
     end
-
-  private
-    def self.skeleton(fname)
-      File.open(File.dirname(__FILE__) + '/skeleton/' + fname).read
-    end
   end
+
+  SpreadSheet = Spreadsheet
 end
 

data/lib/odf/style.rb

@@ -39,9 +39,12 @@ module ODF
     end
 
     def make_element_attributes(name, opts)
-      attrs = {'style:name' => name, 'style:family' => FAMILIES[opts[:family]]}
+      attrs = {
+        'style:name' => name,
+        'style:family' => (FAMILIES[opts[:family]] || 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['style:master-page-name'] = opts[:master_page] unless opts[:master_page].nil?
       attrs
     end
 

data/lib/odf/text.rb

@@ -0,0 +1,64 @@
+# Copyright (c) 2010 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'
+
+require 'odf/document'
+require 'odf/master_page'
+require 'odf/page_layout'
+require 'odf/paragraph'
+require 'odf/span'
+require 'odf/hyperlink'
+require 'odf/style'
+
+module ODF
+  class Text < Document
+    contains :paragraphs, :styles, :page_layouts, :master_pages
+
+    alias :p :paragraph
+
+    def xml
+      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:xlink' => "http://www.w3.org/1999/xlink" do
+      |xml|
+        xml.tag! 'office:automatic-styles' do
+          xml << styles_xml
+          xml << page_layouts_xml
+        end unless styles.empty? && page_layouts.empty?
+        xml.tag! 'office:master-styles' do
+          xml << master_pages_xml
+        end unless master_pages.empty?
+        xml.office:body do
+          xml.office:text do
+            xml << paragraphs_xml
+          end
+        end
+      end
+    end
+  end
+end
+

data/rodf.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rodf}
-  s.version = "0.1.8"
+  s.version = "0.2.0"
 
   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-23}
+  s.date = %q{2010-05-28}
   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"]
-  s.files = ["CHANGELOG", "LICENSE.LGPL", "Manifest", "README.rdoc", "Rakefile", "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", "rodf.gemspec", "spec/cell_spec.rb", "spec/data_style_spec.rb", "spec/property_spec.rb", "spec/row_spec.rb", "spec/spec_helper.rb", "spec/spreadsheet_spec.rb", "spec/style_section_spec.rb", "spec/style_spec.rb", "spec/table_spec.rb"]
+  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/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_section.rb", "lib/odf/style.rb", "lib/odf/table.rb", "lib/odf/text.rb"]
+  s.files = ["CHANGELOG", "LICENSE.LGPL", "Manifest", "README.rdoc", "Rakefile", "lib/odf/cell.rb", "lib/odf/column.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_section.rb", "lib/odf/style.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/table_spec.rb", "spec/text_spec.rb"]
   s.homepage = %q{http://github.com/thiagoarrais/rodf/tree}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rodf", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/spec/cell_spec.rb

@@ -125,11 +125,29 @@ describe ODF::Cell do
       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'
+  it "should contain paragraph" do
+    c = ODF::Cell.new
+    c.paragraph "testing"
+    output = c.xml
+
+    output.should have_tag("//table:table-cell/*", :count => 1)
+    output.should have_tag("//text:p")
+
+    Hpricot(output).at('text:p').innerHTML.should == 'testing'
+  end
+
+  it "should be able to hold multiple paragraphs" do
+    output = ODF::Cell.create do |c|
+      c.paragraph "first"
+      c.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
 
   it "should not render value type for non-string nil values" do
@@ -145,3 +163,4 @@ describe ODF::Cell do
     end
   end
 end
+

data/spec/hyperlink_spec.rb

@@ -0,0 +1,53 @@
+# Copyright (c) 2010 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 File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/hyperlink'
+
+describe ODF::Hyperlink do
+  it "should receive content text in first argument" do
+    output = ODF::Hyperlink.new('link somewhere', :href => 'http://www.example.org/').xml
+    output.should have_tag('//text:a')
+
+    link = Hpricot(output).at('text:a')
+    link.innerHTML.should == 'link somewhere'
+    link['xlink:href'].should == 'http://www.example.org/'
+  end
+
+  it "should accept ref both in second argument as in argument hash" do
+    Hpricot(ODF::Hyperlink.new('link somewhere', :href => 'http://www.example.org/').xml).
+      at('text:a')['xlink:href'].should == 'http://www.example.org/'
+
+    Hpricot(ODF::Hyperlink.new('link somewhere', 'http://www.example.org/').xml).
+      at('text:a')['xlink:href'].should == 'http://www.example.org/'
+  end
+
+  it "should allow nested span elements" do
+    output = ODF::Hyperlink.create 'http://www.example.com/' do |link|
+      link.strong 'important link'
+    end
+
+    output.should have_tag('//text:a/*', :count => 1)
+    tree = Hpricot(output)
+    tree.at('//text:a')['xlink:href'].should == 'http://www.example.com/'
+    span = tree.at('//text:span')
+    span['text:style-name'].should == 'strong'
+    span.innerHTML.should == 'important link'
+  end
+end
+

data/spec/master_page_spec.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2010 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 File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/master_page'
+
+describe ODF::MasterPage do
+  it "should have a name" do
+    output = ODF::MasterPage.new('my-master-page').xml
+    output.should have_tag('//style:master-page')
+
+    Hpricot(output).at('style:master-page')['style:name'].should == 'my-master-page'
+  end
+
+  it "should accept a layout reference" do
+    Hpricot(ODF::MasterPage.new('my-master-page', :layout => 'A4').xml).
+      at('style:master-page')['style:page-layout-name'].should == 'A4'
+  end
+end
+

data/spec/page_layout_spec.rb

@@ -0,0 +1,37 @@
+# Copyright (c) 2010 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 File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/page_layout'
+
+describe ODF::PageLayout do
+  it "should have a name" do
+    output = ODF::PageLayout.new('main-layout').xml
+    output.should have_tag('style:page-layout')
+    Hpricot(output).at('style:page-layout')['style:name'].should == 'main-layout'
+  end
+
+  it "should have properties" do
+    output = ODF::PageLayout.create 'main-layout' do |l|
+      l.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/paragraph_spec.rb

@@ -0,0 +1,75 @@
+# Copyright (c) 2010 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 File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/paragraph'
+
+describe ODF::Paragraph do
+  it "should allow text content inside" do
+    output = ODF::Paragraph.new('Hello').xml
+    output.should have_tag('//text:p')
+    Hpricot(output).at('text:p').innerHTML.should == 'Hello'
+  end
+
+  it "should accept an input sequence" do
+    output = ODF::Paragraph.create { |p|
+      p << "Hello, "
+      p << "world!"
+    }
+    output.should have_tag('//text:p')
+    Hpricot(output).at('text:p').innerHTML.should == 'Hello, world!'
+  end
+
+  it "should accept styled spans" do
+    output = ODF::Paragraph.create { |p|
+      p << "Hello, "
+      p.span :bold, "world! "
+      p << "This is not bold. "
+      p.bold "But this is."
+    }
+    spans = Hpricot(output).at('text:p').search('text:span')
+    spans.first.innerHTML.should == 'world! '
+    spans.first['text:style-name'].should == 'bold'
+    spans.last.innerHTML.should == 'But this is.'
+    spans.last['text:style-name'].should == 'bold'
+  end
+
+  it "should be able to hold hyperlinks" do
+    output = ODF::Paragraph.create {|p|
+      p << "please visit "
+      p.a "example.org", :href => "http://www.example.org/"
+      p << " for more details"
+    }
+    output.should have_tag("//text:p/*", :count => 3)
+    output.should have_tag("//text:a")
+
+    Hpricot(output).at('text:a').innerHTML.should == 'example.org'
+  end
+
+  it "should support style attribute" do
+    Hpricot(ODF::Paragraph.create('styled paragraph', :style => 'highlight')).
+      at('text:p')['text:style-name'].should == 'highlight'
+  end
+
+  it "should accept attributes in the first parameter too" do
+    para = Hpricot(ODF::Paragraph.create(:style => 'testing')).at('text:p')
+    para.innerHTML.should be_empty
+    para['text:style-name'].should == 'testing'
+  end
+end
+

data/spec/property_spec.rb

@@ -36,6 +36,15 @@ describe ODF::Property do
     elem['style:column-width'].should == '2cm'
   end
 
+  it "should prefix rotation-angle property with style namespace" do
+    property = ODF::Property.new :cell, 'rotation-angle' => '-90'
+
+    property.xml.should have_tag('//style:table-cell-properties')
+
+    elem = Hpricot(property.xml).at('//style:table-cell-properties')
+    elem['style:rotation-angle'].should == '-90'
+  end
+
   it "should accept full perimeter border specs" do
     property = ODF::Property.new :cell, :border => "0.025in solid #000000"
 
@@ -109,5 +118,15 @@ describe ODF::Property do
     elem = Hpricot(property.xml).at('//style:table-cell-properties')
     elem['fo:border-left'].should == "0.1in solid #ffff00"
   end
+
+  it "should prefix underline property with style namespace" do
+    Hpricot(ODF::Property.new(:text, 'text-underline-type' => 'single').xml).
+      at('style:text-properties')['style:text-underline-type'].should == 'single'
+  end
+
+  it "should support paragraph properties" do
+    ODF::Property.new(:paragraph).xml.
+      should have_tag('style:paragraph-properties')
+  end
 end
 

data/spec/span_spec.rb

@@ -0,0 +1,65 @@
+# Copyright (c) 2010 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 File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/span'
+
+describe ODF::Span do
+  it "should print non-styled spans in pure text" do
+    ODF::Span.new('no style').xml.should == 'no style'
+  end
+
+  it "should wrap styled output in span tags" do
+    output = ODF::Span.new(:italics, 'styled text').xml
+    output.should have_tag('text:span')
+    span = Hpricot(output).at('text:span')
+    span['text:style-name'].should == 'italics'
+    span.innerHTML.should == 'styled text'
+  end
+
+  it "should allow nesting" do
+    output = ODF::Span.create :bold do |s|
+      s.italics 'highlighted text'
+    end
+
+    output.should have_tag('//text:span/*', :count => 2)
+    Hpricot(output).search('//text:span')[1].
+      innerHTML.should == 'highlighted text'
+  end
+
+  it "should allow links" do
+    output = ODF::Span.create :bold do |s|
+      s.link 'there', 'http://www.example.org/'
+      s << ' and '
+      s.a 'back again', 'http://www.example.com/'
+    end
+
+    output.should have_tag('//text:a', :count => 2)
+    elem = Hpricot(output)
+
+    links = elem.search('//text:a')
+    links.first.innerHTML.should == 'there'
+    links.last.innerHTML.should == 'back again'
+
+    elem.at('//text:span').children[1].to_plain_text.should == " and "
+  end
+
+  it "should escape entities" do
+    ODF::Span.create('Fish & Chips').should == 'Fish &amp; Chips'
+  end
+end

data/spec/style_spec.rb

@@ -26,7 +26,7 @@ describe ODF::Style do
     output = ODF::Style.create 'odd-row-cell', :family => :cell do |s|
       s.property :cell, 'background-color' => '#b3b3b3',
                         'border' => '0.002cm solid #000000'
-      s.property :text, 'color' => '#4c4c4c'
+      s.property :text, 'color' => '#4c4c4c', 'font-weight' => 'bold'
     end
 
     output.should have_tag('//style:style/*', :count => 2)
@@ -39,6 +39,7 @@ describe ODF::Style do
 
     text_elem = Hpricot(output).at('style:text-properties')
     text_elem['fo:color'].should == '#4c4c4c'
+    text_elem['fo:font-weight'].should == 'bold'
   end
 
   it "should allow data styles" do
@@ -64,6 +65,14 @@ describe ODF::Style do
     style['style:parent-style-name'].should == 'cell-default'
   end
 
+  it "should allow master pages" do
+    xml = ODF::Style.create 'standard',
+      :family => :paragraph,
+      :master_page => 'letter'
+
+    Hpricot(xml).at('//style:style')['style:master-page-name'].should == 'letter'
+  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'
@@ -73,5 +82,13 @@ describe ODF::Style do
     xml.should have_tag('//style:style/*', :count => 1)
     xml.should have_tag('//style:table-column-properties')
   end
+
+  it "should accept other families" do
+    Hpricot(ODF::Style.create('text-style', :family => :text)).
+      at('//style:style')['style:family'].should == 'text'
+
+    Hpricot(ODF::Style.create('text-style', :family => :paragraph)).
+      at('//style:style')['style:family'].should == 'paragraph'
+  end
 end
 

data/spec/text_spec.rb

@@ -0,0 +1,71 @@
+# Copyright (c) 2010 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 File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'odf/text'
+
+describe ODF::Text do
+  it "should have the expected structure" do
+    output = ODF::Text.create
+    output.should have_tag('//office:document-content/*')
+    output.should have_tag('//office:body/*')
+    output.should have_tag('//office:text')
+  end
+
+  it "should have paragraphs" do
+    output = ODF::Text.create { |doc|
+      doc.paragraph "Hello"
+      doc.p "World!"
+    }
+    output.should have_tag('//office:text/*')
+    output.should have_tag('//text:p')
+    ps = Hpricot(output).search('text:p')
+    ps.size.should == 2
+    ps.first.innerHTML.should == 'Hello'
+    ps.last.innerHTML.should == 'World!'
+  end
+
+  it "should allow styles" do
+    ODF::Text.create.should_not have_tag('//office:automatic-styles')
+    output = ODF::Text.create { |doc|
+      doc.style('bold', :family => 'text') {|s|
+        s.property(:text, 'font-weight' => 'bold') }
+      doc.style('italic', :family => 'text') {|s|
+        s.property(:text, 'font-weight' => 'italic') }
+    }
+    output.should have_tag('//office:automatic-styles/*', :count => 2)
+    output.should have_tag('//style:style')
+  end
+
+  it "should support page layout as auto-style" do
+    output = ODF::Text.create { |doc|
+      doc.page_layout 'main-layout'
+    }
+    output.should have_tag('//office:automatic-styles/*', :count => 1)
+    output.should have_tag('//style:page-layout')
+  end
+
+  it "should support master pages" do
+    output = ODF::Text.create do |doc|
+      doc.master_page 'standard', :layout => 'letter'
+    end
+    output.should have_tag('//office:master-styles/*', :count => 1)
+    output.should have_tag('//style:master-page')
+  end
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Thiago Arrais
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -03:00
+date: 2010-05-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,14 +114,23 @@ extra_rdoc_files:
 - lib/odf/column.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/manifest.xml
+- 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_section.rb
 - lib/odf/style.rb
 - lib/odf/table.rb
+- lib/odf/text.rb
 files: 
 - CHANGELOG
 - LICENSE.LGPL
@@ -132,24 +141,39 @@ files:
 - lib/odf/column.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/manifest.xml
+- 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_section.rb
 - lib/odf/style.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/table_spec.rb
+- spec/text_spec.rb
 has_rdoc: true
 homepage: http://github.com/thiagoarrais/rodf/tree
 licenses: []