flexy-odf-report 0.1.6 → 0.4.2

data/README.textile

@@ -1,13 +1,22 @@
 h1. ODF-REPORT
 
 Gem for generating .odt files by making strings, images, tables and sections replacements in a previously created .odt file.
+This fork matches Sandro's version 0.4.1 but adds support for automatic omitting of empty table rows.
 
+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.
+
+Now sections can be nested inside sections, with fields, tables and others sections.
+</pre>
 
 h2. INSTALL
 
 (sudo) gem install odf-report
 
-
 h2. USAGE
 
 h3. Step 1  --  the template
@@ -96,11 +105,11 @@ end
 </pre>
 
 
-h3. Sections (NEW!)
+h3. Sections
 
 Sometimes, you have to repeat a whole chunk of a document, in a structure a lot more complex than a table. Now you can make a Section in your template and use it in this situations. Creating a Session in OpenOffice is as easy as select menu *Insert* and then *Section...*, and then choose a name for it.
 
-*Section* 's are lot like Tables, in the sense that you can pass a collection and have that section repeated for each member of the collection. *But*, Sections can have anything inside it, even Tables, as long as you pass the appropriate data structure.
+*Section* 's are lot like Tables, in the sense that you can pass a collection and have that section repeated for each member of the collection. *But*, Sections can have anything inside it, even Tables *and nested Sections*, as long as you pass the appropriate data structure.
 
 Let's see an example:
 
@@ -133,6 +142,14 @@ Let's see an example:
         end
       end
 
+      s.add_section("SUB_NOTES", :notes) do |s1|
+
+        s1.add_field(:note_title) { |n| n.title }
+
+        s1.add_table ...
+
+      end
+
     end
 
   end
@@ -208,6 +225,7 @@ report.generate("./documents/")
 h3. REQUIREMENTS
 
 *rubyzip*: for manipulating the contents of the odt file, since it's actually a zip file.
+*nokogiri*: for parsing and manipulating the document xml files.
 
 
 <hr/>

data/lib/odf-report.rb

@@ -1,8 +1,12 @@
 require 'rubygems'
 require 'zip/zipfilesystem'
 require 'fileutils'
-require File.expand_path('../odf-report/file_ops',__FILE__)
-require File.expand_path('../odf-report/hash_gsub',__FILE__)
-require File.expand_path('../odf-report/section',__FILE__)
-require File.expand_path('../odf-report/table',__FILE__)
-require File.expand_path('../odf-report/report',__FILE__)
+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/nested',    __FILE__)
+require File.expand_path('../odf-report/section',   __FILE__)
+require File.expand_path('../odf-report/table',     __FILE__)
+require File.expand_path('../odf-report/report',    __FILE__)

data/lib/odf-report/file_ops.rb

@@ -2,6 +2,19 @@ module ODFReport
 
   module FileOps
 
+    def create_new_file(dest)
+
+      if dest
+        FileUtils.cp(@template, dest)
+        new_file = dest
+      else
+        FileUtils.cp(@template, @tmp_dir)
+        new_file = "#{@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 => '',

data/lib/odf-report/hash_gsub.rb

@@ -22,6 +22,12 @@ 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/images.rb

@@ -0,0 +1,33 @@
+module ODFReport
+
+  module Images
+
+    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)
+        end
+      end
+
+    end
+
+    def replace_images(new_file)
+
+      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
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/odf-report/nested.rb

@@ -0,0 +1,55 @@
+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)
+
+      force_fill_with_empty_string = false
+        
+      fields_with_values = {}
+      2.times.each do
+        @fields.each do |field_name, block1|
+          cell = block1.call(data_item) || ''
+          fields_with_values[field_name] = cell unless !force_fill_with_empty_string && (cell.nil? || cell.strip.blank?) && @skip_empty_rows
+        end
+        if row.empty?
+          break
+        else
+          # If - finally - the row is *not* empty all template variables in
+          # all empty cells must be replaced by the empty string. Otherwise
+          # the template variable is rendered ("[some-template-var]")...
+          force_fill_with_empty_string = true
+        end
+      end
+
+      fields_with_values
+    end
+
+    def get_collection_from_item(item, collection_field)
+
+      if collection_field.is_a?(Array)
+        tmp = item.dup
+        collection_field.each do |f|
+          if f.is_a?(Hash)
+            tmp = tmp.send(f.keys[0], f.values[0])
+          else
+            tmp = tmp.send(f)
+          end
+        end
+        collection = tmp
+      elsif collection_field.is_a?(Hash)
+        collection = item.send(collection_field.keys[0], collection_field.values[0])
+      else
+        collection = item.send(collection_field)
+      end
+
+      return collection
+    end
+
+  end
+
+end

data/lib/odf-report/report.rb

@@ -1,7 +1,7 @@
 module ODFReport
 
 class Report
-  include HashGsub, FileOps
+  include HashGsub, FileOps, Images
 
   attr_accessor :values, :tables, :images, :sections
 
@@ -14,35 +14,31 @@ class Report
     @image_names_replacements = {}
     @sections = []
 
-    @tmp_dir = Dir.tmpdir + "/" + random_filename(:prefix=>'odt_')
+    @tmp_dir = File.join(Dir.tmpdir, random_filename(:prefix=>'odt_'))
     Dir.mkdir(@tmp_dir) unless File.exists? @tmp_dir
 
     yield(self)
 
   end
 
-  def add_section(section_name, collection, &block)
-    sec = Section.new(section_name)
-    @sections << sec
-
-    yield(sec)
-
-    sec.populate(collection)
-
-  end
-
-  def add_field(field_tag, value)
-    @values[field_tag] = value || ''
+  def add_field(field_tag, value='')
+    @values[field_tag] = value
   end
 
   def add_table(table_name, collection, opts={}, &block)
-    opts[:name] = table_name
+    opts.merge!(:name => table_name, :collection => collection)
     tab = Table.new(opts)
-    yield(tab)
     @tables << tab
 
-    tab.populate(collection)
+    yield(tab)
+  end
+
+  def add_section(section_name, collection, opts={}, &block)
+    opts.merge!(:name => section_name, :collection => collection)
+    sec = Section.new(opts)
+    @sections << sec
 
+    yield(sec)
   end
 
   def add_image(name, path)
@@ -51,79 +47,56 @@ class Report
 
   def generate(dest = nil)
 
-    if dest
-
-      FileUtils.cp(@template, dest)
-      new_file = dest
-
-    else
-
-      FileUtils.cp(@template, @tmp_dir)
-      new_file = "#{@tmp_dir}/#{File.basename(@template)}"
-
-    end
+    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|
 
-        replace_fields!(txt)
-        replace_tables!(txt)
-        find_image_name_matches(txt)
-        replace_sections!(txt)
+        parse_document(txt) do |doc|
 
-      end
+          replace_fields!(doc)
+          replace_sections!(doc)
+          replace_tables!(doc)
 
-    end
+          find_image_name_matches(doc)
 
-    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
+
       end
+
     end
 
+    replace_images(new_file)
+
     new_file
 
   end
 
 private
 
+  def parse_document(txt)
+    doc = Nokogiri::XML(txt)
+    yield doc
+    txt.replace(doc.to_s)
+  end
+
   def replace_fields!(content)
-    hash_gsub!(content, @values)
+    node_hash_gsub!(content, @values)
   end
 
   def replace_tables!(content)
-
     @tables.each do |table|
       table.replace!(content)
     end
-
   end
 
   def replace_sections!(content)
-
     @sections.each do |section|
       section.replace!(content)
     end
-
   end
 
-  def find_image_name_matches(content)
-    @images.each_pair do |image_name, path|
-      #Search for the image placeholder path
-      image_rgx = Regexp.new("draw:name=\"#{image_name}\".*?><draw:image.*?xlink:href=\"([^\s]*)\" .*?/></draw:frame>")
-      content_match = content.match(image_rgx)
-      if content_match
-        placeholder_path = content_match[1]
-        @image_names_replacements[path] = File.basename(placeholder_path)
-      end
-    end
-  end
 end
 
 end

data/lib/odf-report/section.rb

@@ -1,113 +1,93 @@
 module ODFReport
 
-class Section
-  include HashGsub
+  class Section
+    include HashGsub, Nested
 
-  attr_accessor :fields, :tables, :data, :name
+    attr_accessor :fields, :tables, :data, :name, :collection_field, :parent
 
-  def initialize(name)
-    @name = name
+    def initialize(opts)
+      @name             = opts[:name]
+      @collection_field = opts[:collection_field]
+      @collection       = opts[:collection]
+      @parent           = opts[:parent]
 
-    @fields = {}
-    @data = []
-    @tables = []
-  end
+      @fields = {}
 
-  def add_field(name, field=nil, &block)
-    if field
-      @fields[name] = lambda { |item| item.send(field)}
-    else
-      @fields[name] = block
+      @tables = []
+      @sections = []
     end
-  end
-
-  def add_table(table_name, collection_field, opts={}, &block)
-    opts.merge!(:name => table_name, :collection_field => collection_field)
-    tab = Table.new(opts)
-    yield(tab)
-    @tables << tab
-
-  end
 
-  def populate(collection)
-
-    collection.each do |item|
-      row = {}
-      @fields.each do |field_name, block1|
-        row[field_name] = block1.call(item)
+    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
+    end
 
-      row[:tables] = {}
-      @tables.each do |table|
-        collection = get_collection_from_item(item, table.collection_field)
-        row[:tables][table.name] = table.values(collection)
-      end
+    def add_table(table_name, collection_field, opts={}, &block)
+      opts.merge!(:name => table_name, :collection_field => collection_field, :parent => self)
+      tab = Table.new(opts)
+      @tables << tab
 
-      @data << row
+      yield(tab)
     end
 
-  end
+    def add_section(section_name, collection_field, opts={}, &block)
+      opts.merge!(:name => section_name, :collection_field => collection_field, :parent => self)
+      sec = Section.new(opts)
+      @sections << sec
 
-  def replace!(content)
+      yield(sec)
+    end
 
-    # search for the table inside the content
-    section_rgx = Regexp.new("(<text:section.*?text:name=\"#{@name}.*?>(.*?)<\/text:section>)", "m")
-    section_match = content.match(section_rgx)
+    def populate!(row)
+      @collection = get_collection_from_item(row, @collection_field) if row
+    end
 
-    if section_match
-      section_full = section_match[0]
-      section_content = section_match[2]
+    def replace!(doc, row = nil)
 
-      # extract the section from the content
-      content.gsub!(section_full, "[SECTION_#{@name}]")
+      return unless section = find_section_node(doc)
 
-      new_content = ""
+      template = section.dup
 
-      # for each record
-      @data.each do |_values|
+      populate!(row)
 
-        # generates one new row (table-row), based in the model extracted
-        # from the original table
-        tmp_row = section_content.dup
+      @collection.each do |data_item|
+        new_section = template.dup
 
-        # replace values in the section_content and stores in new_content
-        hash_gsub!(tmp_row, _values)
+        replace_values!(new_section, data_item)
 
         @tables.each do |t|
-          t.replace!(tmp_row, _values[:tables][t.name])
+          t.replace!(new_section, data_item)
+        end
+
+        @sections.each do |s|
+          s.replace!(new_section, data_item)
         end
 
-        new_content << tmp_row
+        section.before(new_section)
+
       end
 
-      # replace back the table into content
-      content.gsub!("[SECTION_#{@name}]", new_content)
+      section.remove
 
-    end # if table match
+    end # replace_section
 
-  end # replace_section
+  private
 
-private
+    def find_section_node(doc)
 
-  def get_collection_from_item(item, collection_field)
+      prefix = @parent ? "" : "//"
+
+      sections = doc.xpath("#{prefix}text:section[@text:name='#{@name}']")
+
+      sections.empty? ? nil : sections.first
 
-    if collection_field.is_a?(Array)
-      tmp = item.dup
-      collection_field.each do |f|
-        if f.is_a?(Hash)
-          tmp = tmp.send(f.keys[0], f.values[0])
-        else
-          tmp = tmp.send(f)
-        end
-      end
-      collection = tmp
-    else
-      collection = item.send(collection_field)
     end
 
-    return collection
   end
 
-end
-
 end

data/lib/odf-report/table.rb

@@ -1,147 +1,96 @@
 module ODFReport
 
 class Table
-  include HashGsub
+  include HashGsub, Nested
 
-  attr_accessor :fields, :rows, :name, :collection_field, :data, :header
+  attr_accessor :fields, :rows, :name, :collection_field, :data, :header, :parent
 
   def initialize(opts)
     @name             = opts[:name]
     @collection_field = opts[:collection_field]
     @collection       = opts[:collection]
-    @header           = opts[:header] || false
-
-    @skip_empty_rows  = opts[:skip_empty_rows] || false
+    @parent           = opts[:parent]
 
     @fields = {}
-    @rows = []
-    @data = []
+
+    @template_rows = []
+    @header           = opts[:header] || false
   end
 
   def add_column(name, field=nil, &block)
     if field
-      @fields[name] = lambda { |item| item.send(field) }
+      @fields[name] = lambda { |item| item.send(field)}
     elsif block_given?
       @fields[name] = block
     else
-      @fields[name] = lambda { |item| item.send(name) }
+      @fields[name] = lambda { |item| item.send(name)}
     end
   end
 
-  def values(collection)
-    ret = []
-    collection.each do |item|
-      row = {}
-
-      force_fill_with_empty_string = false
-      2.times.each do
-        @fields.each do |field_name, block1|
-          cell = block1.call(item) || ''
-          row[field_name] = cell unless !force_fill_with_empty_string && (cell.nil? || cell.strip.blank?) && @skip_empty_rows
-        end
-        if row.empty?
-          break
-        else
-          # If - finally - the row is *not* empty all template variables in
-          # all empty cells must be replaced by the empty string. Otherwise
-          # the template variable is rendered ("[some-template-var]")...
-          force_fill_with_empty_string = true
-        end
-      end
-
-      ret << row unless row.empty? && @skip_empty_rows
-    end
-    ret
-  end
-
-  def populate(collection)
-    @data = values(collection)
+  def populate!(row)
+    @collection = get_collection_from_item(row, @collection_field) if row
   end
 
-  def replace!(content, rows = nil)
-    @data = rows if rows
-
-    # search for the table inside the content
-    table_rgx = Regexp.new("(<table:table table:name=\"#{@name}.*?>.*?<\/table:table>)", "m")
-    table_match = content.match(table_rgx)
+  def replace!(doc, row = nil)
 
-    if table_match
-      table = table_match[0]
+    return unless table = find_table_node(doc)
 
-      # extract the table from the content
-      content.gsub!(table, "[TABLE_#{@name}]")
+    populate!(row)
 
-      # search for the table:row's
-      row_rgx = Regexp.new("(<table:table-row.*?<\/table:table-row>)", "m")
+    @template_rows = table.xpath("table:table-row")
 
-      # use scan (instead of match) as the table can have more than one table-row (header and data)
-      # and scan returns all matches
-      row_match = table.scan(row_rgx)
+    @collection.each do |data_item|
 
-      unless row_match.empty?
+      new_node = get_next_row
 
-        replace_rows!(table, row_match)
+      replace_values!(new_node, data_item)
 
-        new_rows = ""
+      table.add_child(new_node)
 
-        # for each record
-        @data.each do |_values|
-
-          # generates one new row (table-row), based in the model extracted
-          # from the original table
-          tmp_row = get_next_row.dup
-
-          # replace values in the model_row and stores in new_rows
-          hash_gsub!(tmp_row, _values)
-
-          new_rows << tmp_row
-        end
+    end
 
-        # replace back the lines into the table
-        table.gsub!("[ROW_#{@name}]", new_rows)
+    @template_rows.each_with_index do |r, i|
+      r.remove if (get_start_node..template_length) === i
+    end
 
-      end # unless row_match.empty?
+  end # replace
 
-      # replace back the table into content
-      if @data.empty?
-        content.gsub!("[TABLE_#{@name}]", "")
-      else
-        content.gsub!("[TABLE_#{@name}]", table)
-      end
+private
 
-    end # if table match
+  def get_next_row
+    @row_cursor = get_start_node unless defined?(@row_cursor)
 
-  end # replace
+    ret = @template_rows[@row_cursor]
+    if @template_rows.size == @row_cursor + 1
+      @row_cursor = get_start_node
+    else
+      @row_cursor += 1
+    end
+    return ret.dup
+  end
 
-private
+  def get_start_node
+    @header ? 1 : 0
+  end
 
-  def replace_rows!(table, rows)
+  def reset
+    @row_cursor = get_start_node
+  end
 
-    rows.delete_at(0) if @header # ignore the header
+  def template_length
+    @tl ||= @template_rows.size
+  end
 
-    @rows = rows.dup
-    @row_cursor = 0
+  def find_table_node(doc)
 
-    # extract the rows from the table
-    first = rows.delete_at(0)[0]
-    table.gsub!(first, "[ROW_#{@name}]")
+    prefix = @parent ? "" : "//"
 
-    rows.each do |r|
-      table.gsub!(r[0], "")
-    end
+    tables = doc.xpath("#{prefix}table:table[@table:name='#{@name}']")
 
-  end
+    tables.empty? ? nil : tables.first
 
-  def get_next_row
-    ret = @rows[@row_cursor]
-    if @rows.size == @row_cursor + 1
-      @row_cursor = 0
-    else
-      @row_cursor += 1
-    end
-    return ret[0]
   end
 
 end
 
-end
+end

data/odf-report.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flexy-odf-report}
-  s.version = "0.1.6"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sandro Duarte", "Mark von Zeschau"]
-  s.date = %q{2011-06-07}
-  s.description = %q{Generates ODF files, given a template (.odt) and data, replacing tags. Same as the original odf-report gem but adds some more features.}
+  s.authors = ["Sandro Duarte"]
+  s.date = %q{2011-10-04}
+  s.description = %q{Generates ODF files, given a template (.odt) and data, replacing tags. Matches Sandro's version 0.4.1 but adds support for automatic omitting of empty table rows. }
   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 test/test.odt test/test.rb 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 }
+  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.rubygems_version = %q{1.3.7}
-  s.summary = %q{Generates ODF files, given a template (.odt) and data, replacing tags. Same as the original odf-report gem but adds some more features.}
+  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
@@ -24,10 +24,13 @@ Gem::Specification.new do |s|
 
     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

metadata

@@ -1,86 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flexy-odf-report
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  version: 0.1.6
 platform: ruby
-authors: 
+authors:
 - Sandro Duarte
-- Mark von Zeschau
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-07 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rubyzip
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70232150011140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
-  version_requirements: *id001
-description: Generates ODF files, given a template (.odt) and data, replacing tags. Same as the original odf-report gem but adds some more features.
+  prerelease: false
+  version_requirements: *70232150011140
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70232150010300 !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: *70232150010300
+description: ! 'Generates ODF files, given a template (.odt) and data, replacing tags.
+  Matches Sandro''s version 0.4.1 but adds support for automatic omitting of empty
+  table rows. '
 email: sandrods@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - lib/odf-report.rb
 - README.textile
-files: 
+files:
 - lib/odf-report.rb
 - odf-report.gemspec
 - README.textile
-- test/test.odt
-- test/test.rb
 - 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
-has_rdoc: true
-homepage: ""
+- lib/odf-report/images.rb
+- lib/odf-report/nested.rb
+homepage: ''
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Odf-report
 - --main
 - README.textile
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
-summary: Generates ODF files, given a template (.odt) and data, replacing tags. Same as the original odf-report gem but adds some more features.
+summary: Generates ODF files, given a template (.odt) and data, replacing tags
 test_files: []
-

data/test/test.rb

@@ -1,78 +0,0 @@
-require '../lib/odf-report'
-require 'ostruct'
-
-col1 = []
-(1..15).each do |i|
-  col1 << OpenStruct.new({:name=>"name #{i}",  :id=>i,  :address=>"this is address #{i}"})
-end
-
-
-col2 = []
-col2 << OpenStruct.new({:name=>"josh harnet",   :id=>"02", :address=>"testing <&> ",                 :phone=>99025668, :zip=>"90420-002"})
-col2 << OpenStruct.new({:name=>"sandro duarte", :id=>"45", :address=>"address with &",               :phone=>88774451, :zip=>"90490-002"})
-col2 << OpenStruct.new({:name=>"ellen bicca",   :id=>"77", :address=>"<address with escaped html>",  :phone=>77025668, :zip=>"94420-002"})
-col2 << OpenStruct.new({:name=>"luiz garcia",   :id=>"88", :address=>"address with\nlinebreak",      :phone=>27025668, :zip=>"94520-025"})
-
-report = ODFReport::Report.new("test.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, :id)
-    t.add_column(:field_02, :name)
-    t.add_column(:field_03, :address)
-  end
-
-  r.add_table("TABLE_02", col2) do |t|
-    t.add_column(:field_04, :id)
-    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_image("graphics1", File.join(Dir.pwd, 'piriapolis.jpg'))
-
-end
-
-report.generate("result.odt")
-
-class Item
-  attr_accessor :name, :sid, :children
-  def initialize(_name, _sid, _children=[])
-    @name=_name
-    @sid=_sid
-    @children=_children
-  end
-end
-
-items = []
-items << Item.new("Dexter Morgan",  '007', %w(sawyer juliet hurley locke jack freckles))
-items << Item.new("Danny Crane",   '302', %w(sidney sloane jack michael marshal))
-items << Item.new("Coach Taylor",  '220', %w(meredith christina izzie alex george))
-
-report = ODFReport::Report.new("sections.odt") do |r|
-
-  r.add_field("TAG_01", "New tag")
-  r.add_field("TAG_02", "TAG-2 -> New tag")
-
-  r.add_section("SECTION_01", items) do |s|
-
-    s.add_field('NAME') do |i|
-      i.name
-    end
-
-    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("section_result.odt")