odf-report 0.4.3 → 0.4.4

data/.gitignore

@@ -0,0 +1,4 @@
+pkg
+doc
+*.gem
+test/result/*.odt

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Sandro Duarte
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.textile

@@ -8,9 +8,11 @@ h2. NEW!
 <pre>
 ODF-REPORT have been internally refactored. It now uses Nokogiri for parsing the documents, instead of Regex.
 
-This provides for a much greater flexibility. As a result, I was able to implement nested sections.
+This provides for a much greater flexibility. As a result, it was possible to implement nested sections and tables.
 
-Now sections can be nested inside sections, with fields, tables and others sections.
+Now sections can be nested inside sections, with fields, tables and others sections
+
+And now, tables can also be nested inside tables.
 </pre>
 
 h2. INSTALL

data/lib/odf-report.rb

@@ -4,8 +4,9 @@ require 'fileutils'
 require 'nokogiri'
 
 require File.expand_path('../odf-report/images',    __FILE__)
-require File.expand_path('../odf-report/file_ops',  __FILE__)
-require File.expand_path('../odf-report/hash_gsub', __FILE__)
+require File.expand_path('../odf-report/field',     __FILE__)
+require File.expand_path('../odf-report/file',      __FILE__)
+require File.expand_path('../odf-report/fields',    __FILE__)
 require File.expand_path('../odf-report/nested',    __FILE__)
 require File.expand_path('../odf-report/section',   __FILE__)
 require File.expand_path('../odf-report/table',     __FILE__)

data/lib/odf-report/field.rb

@@ -0,0 +1,56 @@
+module ODFReport
+
+class Field
+
+  DELIMITERS = ['[', ']']
+
+  def initialize(opts, &block)
+    @name = opts[:name]
+    @data_field = opts[:data_field]
+
+    unless @value = opts[:value]
+
+      if block_given?
+        @block = block
+
+      else
+        @block = lambda { |item| self.extract_value(item) }
+      end
+
+    end
+
+  end
+
+  def get_value(data_item = nil)
+    @value || @block.call(data_item) || ''
+  end
+
+  def to_placeholder
+    if DELIMITERS.is_a?(Array)
+      "#{DELIMITERS[0]}#{@name.to_s.upcase}#{DELIMITERS[1]}"
+    else
+      "#{DELIMITERS}#{@name.to_s.upcase}#{DELIMITERS}"
+    end
+  end
+
+  def extract_value(data_item)
+    return unless data_item
+
+    key = @data_field || @name
+
+    if data_item.is_a?(Hash)
+      data_item[key] || data_item[key.to_s.downcase] || data_item[key.to_s.upcase] || data_item[key.to_s.downcase.to_sym]
+
+    elsif data_item.respond_to?(key.to_s.downcase.to_sym)
+      data_item.send(key.to_s.downcase.to_sym)
+
+    else
+      raise "Can't find field [#{key}] in this #{data_item.class}"
+
+    end
+
+  end
+
+end
+
+end

data/lib/odf-report/{hash_gsub.rb → fields.rb}

@@ -1,13 +1,26 @@
 module ODFReport
 
-  module HashGsub
+  module Fields
 
-    def hash_gsub!(_text, hash_of_values)
-      hash_of_values.each do |key, val|
-        txt = html_escape(val)
-        txt = odf_linebreak(txt)
-        _text.gsub!("[#{key.to_s.upcase}]", txt)
+    def field_replace!(_node, data_item = nil)
+
+      txt = _node.inner_html
+
+      @fields.each do |f|
+        val = f.get_value(data_item)
+        txt.gsub!(f.to_placeholder, sanitize(val))
       end
+
+      _node.inner_html = txt
+
+    end
+
+    private
+
+    def sanitize(txt)
+      txt = html_escape(txt)
+      txt = odf_linebreak(txt)
+      txt
     end
 
     HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
@@ -22,12 +35,6 @@ module ODFReport
       s.to_s.gsub("\n", "<text:line-break/>")
     end
 
-    def node_hash_gsub!(_node, hash_of_values)
-      txt = _node.inner_html
-      hash_gsub!(txt, hash_of_values)
-      _node.inner_html = txt
-    end
-
   end
 
 end

data/lib/odf-report/{file_ops.rb → file.rb}

@@ -1,62 +1,61 @@
 module ODFReport
 
-  module FileOps
+  class File
 
-    def create_new_file(dest)
+    attr_accessor :tmp_dir, :path
 
+    def initialize(template)
+
+      raise "Template [#{template}] not found." unless ::File.exists? template
+
+      @template = template
+      @tmp_dir = ::File.join(Dir.tmpdir, random_filename(:prefix=>'odt_'))
+      Dir.mkdir(@tmp_dir) unless ::File.exists? @tmp_dir
+    end
+
+    def create(dest)
       if dest
         FileUtils.cp(@template, dest)
-        new_file = dest
+        @path = dest
       else
         FileUtils.cp(@template, @tmp_dir)
-        new_file = "#{@tmp_dir}/#{File.basename(@template)}"
+        @path = "#{@tmp_dir}/#{::File.basename(@template)}"
       end
-
-      return new_file
     end
 
-    def random_filename(opts={})
-      opts = {:chars => ('0'..'9').to_a + ('A'..'F').to_a + ('a'..'f').to_a,
-              :length => 24, :prefix => '', :suffix => '',
-              :verify => true, :attempts => 10}.merge(opts)
-      opts[:attempts].times do
-        filename = ''
-        opts[:length].times { filename << opts[:chars][rand(opts[:chars].size)] }
-        filename = opts[:prefix] + filename + opts[:suffix]
-        return filename unless opts[:verify] && File.exists?(filename)
-      end
-      nil
-    end
+    def update(*content_files, &block)
 
-    def add_files_to_dir(files, dir)
-      FileUtils.mkdir(dir)
-      files.each do |path|
-        FileUtils.cp(path, File.join(dir, File.basename(path)))
-      end
-    end
+      content_files.each do |content_file|
+
+        update_content_file(content_file) do |txt|
+
+          yield txt
+
+        end
 
-    def add_dir_to_zip(zip_file, dir, entry)
-      Zip::ZipFile.open(zip_file, true) do |z|
-        Dir["#{dir}/**/*"].each { |f| z.add("#{entry}/#{File.basename(f)}", f) }
       end
+
     end
 
-    def update_file_from_zip(zip_file, content_file, &block)
+    private
+
+    def update_content_file(content_file, &block)
+
+      Zip::ZipFile.open(@path) do |z|
 
-      Zip::ZipFile.open(zip_file) do |z|
         cont = "#{@tmp_dir}/#{content_file}"
 
         z.extract(content_file, cont)
 
         txt = ''
 
-        File.open(cont, "r") do |f|
+        ::File.open(cont, "r") do |f|
           txt = f.read
         end
 
         yield(txt)
 
-        File.open(cont, "w") do |f|
+        ::File.open(cont, "w") do |f|
            f.write(txt)
         end
 
@@ -65,6 +64,19 @@ module ODFReport
 
     end
 
+    def random_filename(opts={})
+      opts = {:chars => ('0'..'9').to_a + ('A'..'F').to_a + ('a'..'f').to_a,
+              :length => 24, :prefix => '', :suffix => '',
+              :verify => true, :attempts => 10}.merge(opts)
+      opts[:attempts].times do
+        filename = ''
+        opts[:length].times { filename << opts[:chars][rand(opts[:chars].size)] }
+        filename = opts[:prefix] + filename + opts[:suffix]
+        return filename unless opts[:verify] && ::File.exists?(filename)
+      end
+      nil
+    end
+
   end
 
 end

data/lib/odf-report/images.rb

@@ -2,31 +2,35 @@ module ODFReport
 
   module Images
 
+    IMAGE_DIR_NAME = "Pictures"
+
     def find_image_name_matches(content)
 
       @images.each_pair do |image_name, path|
         if node = content.xpath("//draw:frame[@draw:name='#{image_name}']/draw:image").first
           placeholder_path = node.attribute('href').value
-          @image_names_replacements[path] = File.basename(placeholder_path)
+          @image_names_replacements[path] = ::File.join(IMAGE_DIR_NAME, ::File.basename(placeholder_path))
         end
       end
 
     end
 
-    def replace_images(new_file)
+    def replace_images(file)
+
+      return if @images.empty?
+
+      FileUtils.mkdir(::File.join(file.tmp_dir, IMAGE_DIR_NAME))
+
+      @image_names_replacements.each_pair do |path, template_image|
 
-      unless @images.empty?
-        image_dir_name = "Pictures"
-        FileUtils.mkdir(File.join("#{@tmp_dir}", image_dir_name))
-        @image_names_replacements.each_pair do |path, template_image|
-          template_image_path = File.join(image_dir_name, template_image)
-          update_file_from_zip(new_file, template_image_path) do |content|
-            content.replace File.read(path)
-          end
+        file.update(template_image) do |content|
+          content.replace ::File.read(path)
         end
+
       end
 
-    end
+    end # replace_images
+
 
   end
 

data/lib/odf-report/nested.rb

@@ -2,18 +2,8 @@ module ODFReport
 
   module Nested
 
-    def replace_values!(new_section, data_item)
-      node_hash_gsub!(new_section, get_fields_with_values(data_item))
-    end
-
-    def get_fields_with_values(data_item)
-
-      fields_with_values = {}
-      @fields.each do |field_name, block1|
-        fields_with_values[field_name] = block1.call(data_item) || ''
-      end
-
-      fields_with_values
+    def replace_fields!(new_section, data_item)
+      field_replace!(new_section, data_item)
     end
 
     def get_collection_from_item(item, collection_field)

data/lib/odf-report/report.rb

@@ -1,28 +1,29 @@
 module ODFReport
 
 class Report
-  include HashGsub, FileOps, Images
+  include Fields, Images
 
-  attr_accessor :values, :tables, :images, :sections
+  attr_accessor :fields, :tables, :images, :sections, :file
 
   def initialize(template_name, &block)
-    @template = template_name
 
-    @values = {}
+    @file = ODFReport::File.new(template_name)
+
+    @fields = []
     @tables = []
     @images = {}
     @image_names_replacements = {}
     @sections = []
 
-    @tmp_dir = File.join(Dir.tmpdir, random_filename(:prefix=>'odt_'))
-    Dir.mkdir(@tmp_dir) unless File.exists? @tmp_dir
-
     yield(self)
 
   end
 
-  def add_field(field_tag, value='')
-    @values[field_tag] = value
+  def add_field(field_tag, value='', &block)
+    opts = {:name => field_tag, :value => value}
+    field = Field.new(opts, &block)
+    @fields << field
+
   end
 
   def add_table(table_name, collection, opts={}, &block)
@@ -47,29 +48,25 @@ class Report
 
   def generate(dest = nil)
 
-    new_file = create_new_file(dest)
-
-    %w(content.xml styles.xml).each do |content_file|
-
-      update_file_from_zip(new_file, content_file) do |txt|
+    @file.create(dest)
 
-        parse_document(txt) do |doc|
+    @file.update('content.xml', 'styles.xml') do |txt|
 
-          replace_fields!(doc)
-          replace_sections!(doc)
-          replace_tables!(doc)
+      parse_document(txt) do |doc|
 
-          find_image_name_matches(doc)
+        replace_fields!(doc)
+        replace_sections!(doc)
+        replace_tables!(doc)
 
-        end
+        find_image_name_matches(doc)
 
       end
 
     end
 
-    replace_images(new_file)
+    replace_images(@file)
 
-    new_file
+    @file.path
 
   end
 
@@ -82,7 +79,7 @@ private
   end
 
   def replace_fields!(content)
-    node_hash_gsub!(content, @values)
+    field_replace!(content)
   end
 
   def replace_tables!(content)

data/lib/odf-report/section.rb

@@ -1,7 +1,7 @@
 module ODFReport
 
   class Section
-    include HashGsub, Nested
+    include Fields, Nested
 
     attr_accessor :fields, :tables, :data, :name, :collection_field, :parent
 
@@ -11,20 +11,17 @@ module ODFReport
       @collection       = opts[:collection]
       @parent           = opts[:parent]
 
-      @fields = {}
+      @fields = []
 
       @tables = []
       @sections = []
     end
 
-    def add_field(name, field=nil, &block)
-      if field
-        @fields[name] = lambda { |item| item.send(field)}
-      elsif block_given?
-        @fields[name] = block
-      else
-        @fields[name] = lambda { |item| item.send(name)}
-      end
+    def add_field(name, data_field=nil, &block)
+      opts = {:name => name, :data_field => data_field}
+      field = Field.new(opts, &block)
+      @fields << field
+
     end
 
     def add_table(table_name, collection_field, opts={}, &block)
@@ -58,7 +55,7 @@ module ODFReport
       @collection.each do |data_item|
         new_section = template.dup
 
-        replace_values!(new_section, data_item)
+        replace_fields!(new_section, data_item)
 
         @tables.each do |t|
           t.replace!(new_section, data_item)

data/lib/odf-report/table.rb

@@ -1,7 +1,7 @@
 module ODFReport
 
 class Table
-  include HashGsub, Nested
+  include Fields, Nested
 
   attr_accessor :fields, :rows, :name, :collection_field, :data, :header, :parent, :tables
 
@@ -11,21 +11,19 @@ class Table
     @collection       = opts[:collection]
     @parent           = opts[:parent]
 
-    @fields = {}
+    @fields = []
     @tables = []
 
     @template_rows = []
     @header           = opts[:header] || false
+    @skip_if_empty    = opts[:skip_if_empty] || false
   end
 
-  def add_column(name, field=nil, &block)
-    if field
-      @fields[name] = lambda { |item| item.send(field)}
-    elsif block_given?
-      @fields[name] = block
-    else
-      @fields[name] = lambda { |item| item.send(name)}
-    end
+  def add_column(name, data_field=nil, &block)
+    opts = {:name => name, :data_field => data_field}
+    field = Field.new(opts, &block)
+    @fields << field
+
   end
 
   def add_table(table_name, collection_field, opts={}, &block)
@@ -46,13 +44,18 @@ class Table
 
     populate!(row)
 
+    if (@skip_if_empty || !@header) && @collection.empty?
+      table.remove
+      return
+    end
+
     @template_rows = table.xpath("table:table-row")
 
     @collection.each do |data_item|
 
       new_node = get_next_row
 
-      replace_values!(new_node, data_item)
+      replace_fields!(new_node, data_item)
 
       @tables.each do |t|
         t.replace!(new_node, data_item)

data/lib/odf-report/version.rb

@@ -0,0 +1,3 @@
+module ODFReport
+  VERSION = "0.4.4"
+end

data/odf-report.gemspec

@@ -1,36 +1,25 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "odf-report/version"
 
 Gem::Specification.new do |s|
   s.name = %q{odf-report}
-  s.version = "0.4.3"
+  s.version = ODFReport::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Duarte"]
-  s.date = %q{2011-12-27}
   s.description = %q{Generates ODF files, given a template (.odt) and data, replacing tags}
   s.email = %q{sandrods@gmail.com}
-  s.extra_rdoc_files = ["lib/odf-report.rb", "README.textile"]
-  s.files = %w{lib/odf-report.rb odf-report.gemspec README.textile Manifest lib/odf-report/report.rb lib/odf-report/table.rb lib/odf-report/section.rb lib/odf-report/file_ops.rb lib/odf-report/hash_gsub.rb lib/odf-report/images.rb lib/odf-report/nested.rb }
   s.has_rdoc = false
-  s.homepage = %q{}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Odf-report", "--main", "README.textile"]
-  s.require_paths = ["lib"]
+  s.homepage = %q{https://github.com/sandrods/odf-report}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Generates ODF files, given a template (.odt) and data, replacing tags}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  s.add_runtime_dependency('rubyzip', "~> 0.9.4")
+  s.add_runtime_dependency('nokogiri', "~> 1.5.0")
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubyzip>, [">= 0", ">= 0.9.4"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0", ">= 1.5.0"])
-    else
-      s.add_dependency(%q<rubyzip>, [">= 0", ">= 0.9.4"])
-      s.add_dependency(%q<nokogiri>, [">= 0", ">= 1.5.0"])
-    end
-  else
-    s.add_dependency(%q<rubyzip>, [">= 0", ">= 0.9.4"])
-    s.add_dependency(%q<nokogiri>, [">= 0", ">= 1.5.0"])
-  end
 end

data/test/test_nested_tables.rb

@@ -0,0 +1,39 @@
+require '../lib/odf-report'
+require 'ostruct'
+
+class Item
+  attr_accessor :name, :sid, :children
+  def initialize(_name, _sid, _children=[])
+    @name=_name
+    @sid=_sid
+    @children=_children
+  end
+end
+
+items = []
+items << Item.new("LOST",           '007', %w(sawyer juliet hurley locke jack freckles))
+items << Item.new("ALIAS",          '302', %w(sidney sloane jack michael marshal))
+items << Item.new("GREY'S ANATOMY", '220', %w(meredith christina izzie alex george))
+items << Item.new("BREAKING BAD",   '556', %w(pollos gus mike heisenberg))
+
+report = ODFReport::Report.new("test_nested_tables.odt") do |r|
+
+  r.add_field("TAG_01", Time.now)
+  r.add_field("TAG_02", "TAG-2 -> New tag")
+
+  r.add_table("TABLE_MAIN", items) do |s|
+
+    s.add_column('NAME') { |i| i.name }
+
+    s.add_column('SID', :sid)
+
+    s.add_table('TABLE_S1', :children, :header=>true) do |t|
+      t.add_column('NAME1') { |item| "-> #{item}" }
+      t.add_column('INV')   { |item| item.to_s.reverse.upcase }
+    end
+
+  end
+
+end
+
+report.generate("./result/test_nested_tables.odt")

data/test/test_sections.rb

@@ -0,0 +1,39 @@
+require '../lib/odf-report'
+require 'ostruct'
+
+class Item
+  attr_accessor :name, :sid, :children
+  def initialize(_name, _sid, _children=[])
+    @name=_name
+    @sid=_sid
+    @children=_children
+  end
+end
+
+items = []
+items << Item.new("LOST",           '007', %w(sawyer juliet hurley locke jack freckles))
+items << Item.new("ALIAS",          '302', %w(sidney sloane jack michael marshal))
+items << Item.new("GREY'S ANATOMY", '220', %w(meredith christina izzie alex george))
+items << Item.new("BREAKING BAD",   '556', %w(pollos gus mike heisenberg))
+
+report = ODFReport::Report.new("test_sections.odt") do |r|
+
+  r.add_field("TAG_01", Time.now)
+  r.add_field("TAG_02", "TAG-2 -> New tag")
+
+  r.add_section("SECTION_01", items) do |s|
+
+    s.add_field('NAME') { |i| i.name }
+
+    s.add_field('SID', :sid)
+
+    s.add_table('TABLE_S1', :children, :header=>true) do |t|
+      t.add_column('NAME1') { |item| "-> #{item}" }
+      t.add_column('INV')   { |item| item.to_s.reverse.upcase }
+    end
+
+  end
+
+end
+
+report.generate("./result/test_sections.odt")

data/test/test_sub_sections.rb

@@ -0,0 +1,57 @@
+require '../lib/odf-report'
+require 'ostruct'
+
+class Item
+  attr_accessor :name, :sid, :children, :subs
+  def initialize(_name, _sid, _children=[], _subs=[])
+    @name=_name
+    @sid=_sid
+    @children=_children
+    @subs=_subs
+  end
+end
+
+subs1 = []
+subs1 << Item.new("SAWYER", 1, %w(Your bones don't break))
+subs1 << Item.new("HURLEY", 2, %w(Your cells react to bacteria and viruses))
+subs1 << Item.new("LOCKE",  3, %W(Do you see any Teletubbies in here))
+
+subs2 = []
+subs2 << Item.new("SLOANE",  21, %w(Praesent hendrerit lectus sit amet))
+subs2 << Item.new("JACK",    22, %w(Donec nec est eget dolor laoreet))
+subs2 << Item.new("MICHAEL", 23, %W(Integer elementum massa at nulla placerat varius))
+
+items = []
+items << Item.new("LOST",           '007', %w(sawyer juliet hurley locke jack freckles), subs1)
+items << Item.new("ALIAS",          '302', %w(sidney sloane jack michael marshal))
+items << Item.new("GREY'S ANATOMY", '220', %w(meredith christina izzie alex george), subs2)
+items << Item.new("BREAKING BAD",   '556', %w(pollos gus mike heisenberg))
+
+report = ODFReport::Report.new("test_sub_sections.odt") do |r|
+
+  r.add_field("TAG_01", Time.now)
+  r.add_field("TAG_02", "TAG-2 -> New tag")
+
+  r.add_section("SECTION_01", items) do |s|
+
+    s.add_field('NAME') { |i| i.name }
+
+    s.add_field('SID', :sid)
+
+    s.add_table('TABLE_S1', :children, :header=>true) do |t|
+      t.add_column('NAME1') { |item| "-> #{item}" }
+      t.add_column('INV')   { |item| item.to_s.reverse.upcase }
+    end
+
+    s.add_section('SUB_01', :subs) do |r|
+      r.add_field("FIRST_NAME", :name)
+      r.add_table('IPSUM_TABLE', :children, :header => true) do |t|
+        t.add_column('IPSUM_ITEM') { |i| i }
+      end
+    end
+
+  end
+
+end
+
+report.generate("./result/test_sub_sections.odt")

data/test/test_tables.rb

@@ -0,0 +1,62 @@
+require '../lib/odf-report'
+require 'ostruct'
+
+col1 = []
+(1..40).each do |i|
+  col1 << {:name=>"name #{i}",  :idx=>i,  :address=>"this is address #{i}"}
+end
+
+
+col2 = []
+col2 << OpenStruct.new({:name=>"josh harnet",   :idx=>"02", :address=>"testing <&> ",                 :phone=>99025668, :zip=>"90420-002"})
+col2 << OpenStruct.new({:name=>"sandro duarte", :idx=>"45", :address=>"address with &",               :phone=>88774451, :zip=>"90490-002"})
+col2 << OpenStruct.new({:name=>"ellen bicca",   :idx=>"77", :address=>"<address with escaped html>",  :phone=>77025668, :zip=>"94420-002"})
+col2 << OpenStruct.new({:name=>"luiz garcia",   'idx'=>"88", :address=>"address with\nlinebreak",      :phone=>27025668, :zip=>"94520-025"})
+
+col3, col4, col5 = [], [], []
+
+report = ODFReport::Report.new("test_tables.odt") do |r|
+
+  r.add_field("HEADER_FIELD", "This field was in the HEADER")
+
+  r.add_field("TAG_01", "New tag")
+  r.add_field("TAG_02", "TAG-2 -> New tag")
+
+  r.add_table("TABLE_01", col1, :header=>true) do |t|
+    t.add_column(:field_01, :idx)
+    t.add_column(:field_02, :name)
+    t.add_column(:address)
+  end
+
+  r.add_table("TABLE_02", col2) do |t|
+    t.add_column(:field_04, :idx)
+    t.add_column(:field_05, :name)
+    t.add_column(:field_06, 'address')
+    t.add_column(:field_07, :phone)
+    t.add_column(:field_08, :zip)
+  end
+
+  r.add_table("TABLE_03", col3, :header=>true) do |t|
+    t.add_column(:field_01, :idx)
+    t.add_column(:field_02, :name)
+    t.add_column(:field_03, :address)
+  end
+
+  r.add_table("TABLE_04", col4, :header=>true, :skip_if_empty => true) do |t|
+    t.add_column(:field_01, :idx)
+    t.add_column(:field_02, :name)
+    t.add_column(:field_03, :address)
+  end
+
+  r.add_table("TABLE_05", col5) do |t|
+    t.add_column(:field_01, :idx)
+    t.add_column(:field_02, :name)
+    t.add_column(:field_03, :address)
+  end
+
+  r.add_image("graphics1", File.join(Dir.pwd, 'piriapolis.jpg'))
+  r.add_image("graphics2", File.join(Dir.pwd, 'rails.png'))
+
+end
+
+report.generate("./result/test_tables.odt")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: odf-report
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,65 +9,65 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000Z
+date: 2011-12-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2153159540 !ruby/object:Gem::Requirement
+  requirement: &2153481300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153159540
+  version_requirements: *2153481300
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2153158760 !ruby/object:Gem::Requirement
+  requirement: &2153480700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153158760
+  version_requirements: *2153480700
 description: Generates ODF files, given a template (.odt) and data, replacing tags
 email: sandrods@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- lib/odf-report.rb
-- README.textile
+extra_rdoc_files: []
 files:
-- lib/odf-report.rb
-- odf-report.gemspec
-- README.textile
+- .gitignore
+- MIT-LICENSE
 - Manifest
-- lib/odf-report/report.rb
-- lib/odf-report/table.rb
-- lib/odf-report/section.rb
-- lib/odf-report/file_ops.rb
-- lib/odf-report/hash_gsub.rb
+- README.textile
+- lib/odf-report.rb
+- lib/odf-report/field.rb
+- lib/odf-report/fields.rb
+- lib/odf-report/file.rb
 - lib/odf-report/images.rb
 - lib/odf-report/nested.rb
-homepage: ''
+- lib/odf-report/report.rb
+- lib/odf-report/section.rb
+- lib/odf-report/table.rb
+- lib/odf-report/version.rb
+- odf-report.gemspec
+- test/piriapolis.jpg
+- test/rails.png
+- test/test_nested_tables.odt
+- test/test_nested_tables.rb
+- test/test_sections.odt
+- test/test_sections.rb
+- test/test_sub_sections.odt
+- test/test_sub_sections.rb
+- test/test_tables.odt
+- test/test_tables.rb
+homepage: https://github.com/sandrods/odf-report
 licenses: []
 post_install_message: 
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- Odf-report
-- --main
-- README.textile
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -81,11 +81,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.2'
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Generates ODF files, given a template (.odt) and data, replacing tags
-test_files: []
+test_files:
+- test/piriapolis.jpg
+- test/rails.png
+- test/test_nested_tables.odt
+- test/test_nested_tables.rb
+- test/test_sections.odt
+- test/test_sections.rb
+- test/test_sub_sections.odt
+- test/test_sub_sections.rb
+- test/test_tables.odt
+- test/test_tables.rb