rodf 1.1.1 → 1.2.0

data/lib/rodf/document.rb

@@ -1,20 +1,14 @@
-require 'zip'
-
-require_relative 'container'
-require_relative 'skeleton'
-require_relative 'style'
-
 module RODF
   class Document < Container
-    contains :styles, :default_styles, :office_styles
-
     def self.file(ods_file_name, &contents)
       doc = new
+
       if contents.arity.zero?
         contents.call(doc)
       else
         doc.instance_exec(doc, &contents)
       end
+
       doc.write_to ods_file_name
     end
 
@@ -25,22 +19,109 @@ module RODF
     def bytes
       buffer = Zip::OutputStream::write_buffer do |zio|
         zio.put_next_entry('META-INF/manifest.xml')
+
         zio << self.class.skeleton.manifest(self.class.doc_type)
 
         zio.put_next_entry('styles.xml')
+
         zio << self.class.skeleton.styles
+
         zio << self.office_styles_xml unless self.office_styles.empty?
+
         zio << "</office:styles> </office:document-styles>"
 
         zio.put_next_entry('content.xml')
+
         zio << self.xml
       end
 
       buffer.set_encoding('ASCII-8BIT')
+
       buffer.rewind
+
       buffer.sysread
     end
-  private
+
+    def styles
+      @styles ||= []
+    end
+
+    def style(*args, &block)
+      x = Style.new(*args, &block)
+
+      styles << x
+
+      return x
+    end
+
+    def styles_xml
+      styles.map(&:xml).join
+    end
+
+    def add_styles(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        style(element)
+      end
+    end
+
+    def default_styles
+      @default_styles ||= []
+    end
+
+    def default_style(*args, &block)
+      x = DefaultStyle.new(*args, &block)
+
+      default_styles << x
+
+      return x
+    end
+
+    def default_styles_xml
+      default_styles.map(&:xml).join
+    end
+
+    def add_default_styles(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        default_style(element)
+      end
+    end
+
+    def office_styles
+      @office_styles ||= []
+    end
+
+    def office_style(*args, &block)
+      x = OfficeStyle.new(*args, &block)
+
+      office_styles << x
+
+      return x
+    end
+
+    def office_styles_xml
+      office_styles.map(&:xml).join
+    end
+
+    def add_office_styles(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        office_style(element)
+      end
+    end
+
+    private
+
     def self.skeleton
       @skeleton ||= Skeleton.new
     end

data/lib/rodf/hyperlink.rb

@@ -1,7 +1,3 @@
-require 'builder'
-
-require_relative 'paragraph_container'
-
 module RODF
   class Hyperlink < ParagraphContainer
     def initialize(first, second = {})
@@ -25,8 +21,11 @@ module RODF
   class ParagraphContainer < Container
     def link(*args)
       l = Hyperlink.new(*args)
+
       yield l if block_given?
+
       content_parts << l
+
       l
     end
     alias a link

data/lib/rodf/master_page.rb

@@ -1,5 +1,3 @@
-require 'builder'
-
 module RODF
   class MasterPage
     def initialize(name, opts = {})
@@ -7,8 +5,7 @@ module RODF
     end
 
     def xml
-      Builder::XmlMarkup.new.tag! 'style:master-page',
-        'style:name' => @name, 'style:page-layout-name' => @layout
+      Builder::XmlMarkup.new.tag! 'style:master-page', 'style:name' => @name, 'style:page-layout-name' => @layout
     end
   end
 end

data/lib/rodf/page_layout.rb

@@ -1,18 +1,37 @@
-require 'builder'
-
-require_relative 'container'
-require_relative 'property'
-
 module RODF
   class PageLayout < Container
-    contains :properties
-
     def initialize(name)
       super
 
       @name = name
     end
 
+    def properties
+      @properties ||= []
+    end
+
+    def property(*args, &block)
+      x = Property.new(*args, &block)
+
+      properties << x
+
+      return x
+    end
+
+    def properties_xml
+      properties.map(&:xml).join
+    end
+
+    def add_properties(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        property(element)
+      end
+    end
+
     def xml
       Builder::XmlMarkup.new.tag! 'style:page-layout', 'style:name' => @name do |b|
         b << properties_xml

data/lib/rodf/paragraph.rb

@@ -1,14 +1,12 @@
-require 'builder'
-
-require_relative 'paragraph_container'
-
 module RODF
   class Paragraph < ParagraphContainer
     def initialize(fst = nil, snd = {})
       super
 
-      first_is_hash = fst.instance_of? Hash
+      first_is_hash = fst.instance_of?(Hash)
+
       span(fst) unless first_is_hash
+
       @elem_attrs = make_element_attributes(first_is_hash ? fst : snd)
     end
 
@@ -18,7 +16,7 @@ module RODF
       end
     end
 
-  private
+    private
 
     def make_element_attributes(opts)
       attrs = {}

data/lib/rodf/paragraph_container.rb

@@ -1,7 +1,3 @@
-require 'builder'
-
-require_relative 'container'
-
 module RODF
   # Container for all kinds of paragraph content
   class ParagraphContainer < Container
@@ -12,5 +8,23 @@ module RODF
     def content_parts_xml
       content_parts.map {|p| p.xml}.join
     end
+
+    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/rodf/property.rb

@@ -1,66 +1,82 @@
-require 'builder'
-
 module RODF
   class Property
-    PROPERTY_NAMES = {cell: 'table-cell-properties',
-                      text: 'text-properties',
-                      column: 'table-column-properties',
-                      row: 'table-row-properties',
-                      page_layout: 'page-layout-properties',
-                      header_footer: 'header-footer-properties',
-                      list_level: 'list-level-properties',
-                      conditional: 'map'}
+    PROPERTY_NAMES = {
+      cell: 'table-cell-properties',
+      text: 'text-properties',
+      column: 'table-column-properties',
+      row: 'table-row-properties',
+      page_layout: 'page-layout-properties',
+      header_footer: 'header-footer-properties',
+      list_level: 'list-level-properties',
+      conditional: 'map',
+    }
+
     TRANSLATED_SPECS = [:border_color, :border_style, :border_width]
 
-    ATTRIBUTES_TO_NAMESPACES = [[
-      ['column-width', 'rotation-angle', 'text-underline-type', 'tab-stop-distance',
-       'condition', 'apply-style-name', 'base-cell-address', 'row-height',
-       'country-asian', 'country-complex', 'font-charset', 'font-charset-asian',
-       'font-charset-complex', 'font-family-asian', 'font-family-complex', 'font-family-generic',
-       'font-family-generic-asian', 'font-family-generic-complex', 'font-name', 'font-name-asian',
-       'font-name-complex', 'font-pitch', 'font-pitch-asian', 'font-pitch-complex', 'font-relief',
-       'font-size-asian', 'font-size-complex', 'font-size-rel', 'font-size-rel-asian',
-       'font-size-rel-complex', 'font-style-asian', 'font-style-complex', 'font-style-name',
-       'font-style-name-asian', 'font-style-name-complex', 'font-weight-asian', 'font-weight-complex',
-       'language-asian', 'language-complex', 'letter-kerning', 'rfc-language-tag',
-       'rfc-language-tag-asian', 'rfc-language-tag-complex', 'script-asian', 'script-complex',
-       'script-type', 'text-blinking', 'text-combine', 'text-combine-end-char',
-       'text-combine-start-char', 'text-emphasize', 'text-line-through-color',
-       'text-line-through-mode', 'text-line-through-style', 'text-line-through-text',
-       'text-line-through-text-style', 'text-line-through-type', 'text-line-through-width',
-       'text-outline', 'text-overline-color', 'text-overline-mode', 'text-overline-style',
-       'text-overline-type', 'text-overline-width', 'text-position', 'text-rotation-angle',
-       'text-rotation-scale', 'text-scale', 'text-underline-color', 'text-underline-mode',
-       'text-underline-style', 'text-underline-width', 'use-window-font-color',
-       'border-line-width', 'border-line-width-bottom', 'border-line-width-left',
-       'border-line-width-right', 'border-line-width-top', 'cell-protect', 'decimal-places',
-       'diagonal-bl-tr', 'diagonal-bl-tr-widths', 'diagonal-tl-br', 'diagonal-tl-br-widths',
-       'direction', 'glyph-orientation-vertical', 'print-content', 'repeat-content',
-       'rotation-align', 'shadow', 'shrink-to-fit', 'text-align-source',
-       'vertical-align', 'writing-mode', 'min-row-height', 'use-optimal-row-height',
-       'rel-column-width', 'use-optimal-column-width', 'auto-text-indent', 'background-transparency',
-       'font-independent-line-spacing', 'join-border', 'justify-single-word', 'line-break',
-       'line-height-at-least', 'line-spacing', 'page-number', 'punctuation-wrap', 'register-true',
-       'snap-to-layout-grid', 'text-autospace',
-       'writing-mode-automatic',
-       'first-page-number', 'footnote-max-height', 'layout-grid-base-height', 'layout-grid-base-width',
-       'layout-grid-color', 'layout-grid-display', 'layout-grid-lines', 'layout-grid-mode',
-       'layout-grid-print', 'layout-grid-ruby-below', 'layout-grid-ruby-height', 'layout-grid-snap-to',
-       'layout-grid-standard-mode', 'num-format', 'num-letter-sync', 'num-prefix', 'num-suffix',
-       'paper-tray-name', 'print', 'print-orientation', 'print-page-order',
-       'register-truth-ref-style-name', 'scale-to', 'scale-to-pages', 'table-centering',
-       'dynamic-spacing',
-       'ruby-align', 'ruby-position',
-       'editable', 'protect',
-       'may-break-between-rows', 'rel-width', 'width',
-       'vertical-pos', 'vertical-rel'], 'style'],
-       [['height', 'y'], 'svg'],
-       [['dont-balance-text-columns', 'list-level-position-and-space-mode', 'min-label-distance',
-         'min-label-width', 'space-before'], 'text'],
-       [['align', 'border-model', 'display'], 'table']]
+    ATTRIBUTES_TO_NAMESPACES = [
+      [
+        [
+         'column-width', 'rotation-angle', 'text-underline-type', 'tab-stop-distance',
+         'condition', 'apply-style-name', 'base-cell-address', 'row-height',
+         'country-asian', 'country-complex', 'font-charset', 'font-charset-asian',
+         'font-charset-complex', 'font-family-asian', 'font-family-complex', 'font-family-generic',
+         'font-family-generic-asian', 'font-family-generic-complex', 'font-name', 'font-name-asian',
+         'font-name-complex', 'font-pitch', 'font-pitch-asian', 'font-pitch-complex', 'font-relief',
+         'font-size-asian', 'font-size-complex', 'font-size-rel', 'font-size-rel-asian',
+         'font-size-rel-complex', 'font-style-asian', 'font-style-complex', 'font-style-name',
+         'font-style-name-asian', 'font-style-name-complex', 'font-weight-asian', 'font-weight-complex',
+         'language-asian', 'language-complex', 'letter-kerning', 'rfc-language-tag',
+         'rfc-language-tag-asian', 'rfc-language-tag-complex', 'script-asian', 'script-complex',
+         'script-type', 'text-blinking', 'text-combine', 'text-combine-end-char',
+         'text-combine-start-char', 'text-emphasize', 'text-line-through-color',
+         'text-line-through-mode', 'text-line-through-style', 'text-line-through-text',
+         'text-line-through-text-style', 'text-line-through-type', 'text-line-through-width',
+         'text-outline', 'text-overline-color', 'text-overline-mode', 'text-overline-style',
+         'text-overline-type', 'text-overline-width', 'text-position', 'text-rotation-angle',
+         'text-rotation-scale', 'text-scale', 'text-underline-color', 'text-underline-mode',
+         'text-underline-style', 'text-underline-width', 'use-window-font-color',
+         'border-line-width', 'border-line-width-bottom', 'border-line-width-left',
+         'border-line-width-right', 'border-line-width-top', 'cell-protect', 'decimal-places',
+         'diagonal-bl-tr', 'diagonal-bl-tr-widths', 'diagonal-tl-br', 'diagonal-tl-br-widths',
+         'direction', 'glyph-orientation-vertical', 'print-content', 'repeat-content',
+         'rotation-align', 'shadow', 'shrink-to-fit', 'text-align-source',
+         'vertical-align', 'writing-mode', 'min-row-height', 'use-optimal-row-height',
+         'rel-column-width', 'use-optimal-column-width', 'auto-text-indent', 'background-transparency',
+         'font-independent-line-spacing', 'join-border', 'justify-single-word', 'line-break',
+         'line-height-at-least', 'line-spacing', 'page-number', 'punctuation-wrap', 'register-true',
+         'snap-to-layout-grid', 'text-autospace',
+         'writing-mode-automatic',
+         'first-page-number', 'footnote-max-height', 'layout-grid-base-height', 'layout-grid-base-width',
+         'layout-grid-color', 'layout-grid-display', 'layout-grid-lines', 'layout-grid-mode',
+         'layout-grid-print', 'layout-grid-ruby-below', 'layout-grid-ruby-height', 'layout-grid-snap-to',
+         'layout-grid-standard-mode', 'num-format', 'num-letter-sync', 'num-prefix', 'num-suffix',
+         'paper-tray-name', 'print', 'print-orientation', 'print-page-order',
+         'register-truth-ref-style-name', 'scale-to', 'scale-to-pages', 'table-centering',
+         'dynamic-spacing',
+         'ruby-align', 'ruby-position',
+         'editable', 'protect',
+         'may-break-between-rows', 'rel-width', 'width',
+         'vertical-pos', 'vertical-rel'
+        ], 
+        'style'
+      ],
+      [
+        ['height', 'y'], 
+        'svg'
+      ],
+      [
+        ['dont-balance-text-columns', 'list-level-position-and-space-mode', 'min-label-distance', 'min-label-width', 'space-before'], 
+        'text'
+      ],
+      [
+        ['align', 'border-model', 'display'], 
+        'table'
+      ]
+    ]
 
     def initialize(type, specs={})
       @name = 'style:' + (PROPERTY_NAMES[type] || "#{type}-properties")
+
       @specs = translate(specs).map { |k, v| [k.to_s, v] }
     end
 
@@ -68,25 +84,32 @@ module RODF
       specs = @specs.inject({}) do |acc, kv|
         acc.merge Property.lookup_namespace_for(kv.first) + ':' + kv.first => kv.last
       end
+
       Builder::XmlMarkup.new.tag! @name, specs
     end
 
-    class << self
-      def lookup_namespace_for(property_name)
-        as = ATTRIBUTES_TO_NAMESPACES.select {|a| a[0].include? property_name}
-        as.empty? ? 'fo' : as[0][1]
-      end
+    def self.lookup_namespace_for(property_name)
+      as = ATTRIBUTES_TO_NAMESPACES.select {|a| a[0].include? property_name}
+
+      as.empty? ? 'fo' : as[0][1]
     end
-  private
+
+    private
+
     def translate(specs)
       result = specs.clone
+
       tspecs = specs.select {|k, v| TRANSLATED_SPECS.include? k}
+
       tspecs.map {|k, v| result.delete k}
+
       tspecs = tspecs.inject({}) {|acc, e| acc.merge e.first => e.last}
+
       if tspecs[:border_width] && tspecs[:border_style] && tspecs[:border_color] then
         width = tspecs[:border_width].split
         style = tspecs[:border_style].split
         color = tspecs[:border_color].split
+
         if width.length == 1 && style.length == 1 && color.length == 1 then
           result[:border] = [width[0], style[0], color[0]].join(' ')
         else
@@ -96,13 +119,16 @@ module RODF
           result['border-left'] = cascading_join(width, style, color, 3, 1, 0)
         end
       end
+
       result
     end
 
     def cascading_join(width_parts, style_parts, color_parts, *prefs)
-      [ cascade(width_parts, prefs),
+      [ 
+        cascade(width_parts, prefs),
         cascade(style_parts, prefs),
-        cascade(color_parts, prefs)].join(' ')
+        cascade(color_parts, prefs),
+      ].join(' ')
     end
 
     def cascade(list, prefs)

data/lib/rodf/row.rb

@@ -1,25 +1,54 @@
-require 'builder'
-
-require_relative 'container'
-require_relative 'cell'
-
 module RODF
   class Row < Container
-    contains :cells
     attr_reader :number
     attr_writer :style
 
     def initialize(number=0, opts={})
       @number = number
-      @style = opts[:style]
+
+      @elem_attrs = {}
+
+      @elem_attrs['table:style-name'] = opts[:style] unless opts[:style].nil?
+
+      if opts[:attributes]
+        @elem_attrs.merge!(opts[:attributes])
+      end
 
       super
     end
 
+    def cells
+      @cells ||= []
+    end
+
+    def cell(*args, &block)
+      x = Cell.new(*args, &block)
+
+      cells << x
+
+      return x
+    end
+
+    def cells_xml
+      cells.map(&:xml).join
+    end
+
+    def style=(style_name)
+      @elem_attrs['table:style-name'] = style_name
+    end
+
+    def add_cells(*elements)
+      if elements.first.is_a?(Array)
+        elements = elements.first
+      end
+
+      elements.each do |element|
+        cell(element)
+      end
+    end
+
     def xml
-      elem_attrs = {}
-      elem_attrs['table:style-name'] = @style unless @style.nil?
-      Builder::XmlMarkup.new.tag! 'table:table-row', elem_attrs do |xml|
+      Builder::XmlMarkup.new.tag! 'table:table-row', @elem_attrs do |xml|
         xml << cells_xml
       end
     end

data/lib/rodf/skeleton.rb

@@ -1,5 +1,3 @@
-require 'erb'
-
 module RODF
   class Skeleton
     def manifest(document_type)
@@ -9,7 +7,9 @@ module RODF
     def styles
       template('styles.pxml')
     end
-  private
+
+    private
+
     def template(fname)
       File.open(File.dirname(__FILE__) + '/skeleton/' + fname).read
     end

data/lib/rodf/span.rb

@@ -1,8 +1,3 @@
-require 'builder'
-
-require_relative 'compatibility'
-require_relative 'paragraph_container'
-
 module RODF
   class TextNode
     def initialize(content)
@@ -10,46 +5,41 @@ module RODF
     end
 
     def xml
-      @content.to_s.to_xs
+      Builder::XChar.encode(@content.to_s)
     end
   end
 
   class Span < ParagraphContainer
-    def initialize(first, second = nil)
-      super
+    def initialize(first, second=nil, style: nil, &block)
+      super(first, second, &block)
 
       @style = nil
 
       if first.instance_of?(Symbol)
+        ### Legacy behaviour
+
         @style = first
-        content_parts << TextNode.new(second) unless second.nil?
+
+        if !second.nil?
+          content_parts << TextNode.new(second)
+        end
       else
+        if style
+          @style = style
+        end
+
         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
+      if @style.nil?
+        return 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)
+      Builder::XmlMarkup.new.text(:span, 'text:style-name' => @style) do |xml|
+        xml << content_parts_xml
+      end
     end
   end
 end