odf-report 0.6.1 → 0.7.0

data/lib/odf-report/report.rb

@@ -1,7 +1,6 @@
 module ODFReport
 
 class Report
-  include Images
 
   def initialize(template_name = nil, io: nil)
 
@@ -10,10 +9,10 @@ class Report
     @texts = []
     @fields = []
     @tables = []
-    @images = {}
-    @image_names_replacements = {}
     @sections = []
 
+    @images      = []
+
     yield(self) if block_given?
 
   end
@@ -46,8 +45,10 @@ class Report
     yield(sec)
   end
 
-  def add_image(name, path)
-    @images[name] = path
+  def add_image(image_name, value='')
+    opts = {:name => image_name, :value => value}
+    image = Image.new(opts)
+    @images << image
   end
 
   def generate(dest = nil)
@@ -56,29 +57,36 @@ class Report
 
       file.update_files do |doc|
 
-        @sections.each { |s| s.replace!(doc) }
-        @tables.each   { |t| t.replace!(doc) }
+        @sections.each { |c| c.replace!(doc) }
+        @tables.each   { |c| c.replace!(doc) }
 
-        @texts.each    { |t| t.replace!(doc) }
-        @fields.each   { |f| f.replace!(doc) }
+        @texts.each    { |c| c.replace!(doc) }
+        @fields.each   { |c| c.replace!(doc) }
 
-        find_image_name_matches(doc)
-        avoid_duplicate_image_names(doc)
+        @images.each   { |c| c.replace!(doc) }
 
       end
 
-      include_image_files(file)
+      all_images.each { |i| Image.include_image_file(file, i) }
+
+      file.update_manifest do |content|
+        all_images.each { |i| Image.include_manifest_entry(content, i) }
+      end
 
     end
 
     if dest
-      ::File.open(dest, "wb") {|f| f.write(@template.data) }
+      File.open(dest, "wb") { |f| f.write(@template.data) }
     else
       @template.data
     end
 
   end
 
+  def all_images
+    @all_images ||= (@images.map(&:files) + @sections.map(&:all_images) + @tables.map(&:all_images)).flatten.uniq
+  end
+
 end
 
 end

data/lib/odf-report/section.rb

@@ -1,39 +1,21 @@
 module ODFReport
+  class Section < Nestable
 
-  class Section
-    include Nested
+    def replace!(doc)
 
-    def initialize(opts)
-      @name             = opts[:name]
-      @collection_field = opts[:collection_field]
-      @collection       = opts[:collection]
+      return unless find_section_node(doc)
 
-      @fields = []
-      @texts = []
-      @tables = []
-      @sections = []
+      @data_source.each do |record|
 
-    end
-
-    def replace!(doc, row = nil)
-
-      return unless @section_node = find_section_node(doc)
-
-      @collection = get_collection_from_item(row, @collection_field) if row
-
-      @collection.each do |data_item|
-
-        new_section = get_section_node
-
-        @tables.each    { |t| t.replace!(new_section, data_item) }
+        new_section = deep_clone(@section_node)
 
-        @sections.each  { |s| s.replace!(new_section, data_item) }
+        @tables.each    { |t| t.set_source(record).replace!(new_section) }
+        @sections.each  { |s| s.set_source(record).replace!(new_section) }
+        @texts.each     { |t| t.set_source(record).replace!(new_section) }
+        @fields.each    { |f| f.set_source(record).replace!(new_section) }
+        @images.each    { |i| i.set_source(record).replace!(new_section) }
 
-        @texts.each     { |t| t.replace!(new_section, data_item) }
-
-        @fields.each    { |f| f.replace!(new_section, data_item) }
-
-        @section_node.before(new_section)
+        @section_node.before(new_section.to_xml)
 
       end
 
@@ -44,23 +26,14 @@ module ODFReport
   private
 
     def find_section_node(doc)
-
-      sections = doc.xpath(".//text:section[@text:name='#{@name}']")
-
-      sections.empty? ? nil : sections.first
-
+      @section_node = doc.at_css("text|section[@text|name='#{@name}']")
     end
 
-    def get_section_node
-      node = @section_node.dup
-
-      name = node.get_attribute('text:name').to_s
-      @idx ||=0; @idx +=1
-      node.set_attribute('text:name', "#{name}_#{@idx}")
+    def deep_clone(node)
+      Nokogiri::XML(wrap_with_ns(node)).at("text|section")
+                                       .tap { |n| n.attribute('name').content = SecureRandom.uuid }
 
-      node
     end
 
   end
-
 end

data/lib/odf-report/table.rb

@@ -1,88 +1,83 @@
 module ODFReport
+  class Table < Nestable
 
-class Table
-  include Nested
+    def initialize(opts)
+      super(opts)
 
-  def initialize(opts)
-    @name             = opts[:name]
-    @collection_field = opts[:collection_field]
-    @collection       = opts[:collection]
+      @template_rows = []
+      @header           = opts[:header] || false
+      @skip_if_empty    = opts[:skip_if_empty] || false
+    end
 
-    @fields = []
-    @texts = []
-    @tables = []
+    def replace!(doc)
+      return unless table = find_table_node(doc)
 
-    @template_rows = []
-    @header           = opts[:header] || false
-    @skip_if_empty    = opts[:skip_if_empty] || false
-  end
+      @template_rows = table.xpath("table:table-row")
 
-  def replace!(doc, row = nil)
+      @header = table.xpath("table:table-header-rows").empty? ? @header : false
 
-    return unless table = find_table_node(doc)
+      if @skip_if_empty && @data_source.empty?
+        table.remove
+        return
+      end
 
-    @template_rows = table.xpath("table:table-row")
+      @data_source.each do |record|
 
-    @header = table.xpath("table:table-header-rows").empty? ? @header : false
+        new_node = get_next_row
 
+        @tables.each    { |n| n.set_source(record).replace!(new_node) }
+        @sections.each  { |n| n.set_source(record).replace!(new_node) }
+        @texts.each     { |n| n.set_source(record).replace!(new_node) }
+        @fields.each    { |n| n.set_source(record).replace!(new_node) }
+        @images.each    { |n| n.set_source(record).replace!(new_node) }
 
-    @collection = get_collection_from_item(row, @collection_field) if row
+        table.add_child(new_node.to_xml)
 
-    if @skip_if_empty && @collection.empty?
-      table.remove
-      return
-    end
+      end
 
-    @collection.each do |data_item|
+      @template_rows.each_with_index do |r, i|
+        r.remove if (get_start_node..template_length) === i
+      end
 
-      new_node = get_next_row
+    end # replace
 
-      @tables.each    { |t| t.replace!(new_node, data_item) }
+  private
 
-      @texts.each     { |t| t.replace!(new_node, data_item) }
+    def get_next_row
+      if @template_rows.size == 1
 
-      @fields.each    { |f| f.replace!(new_node, data_item) }
+        ret = @template_rows.first
 
-      table.add_child(new_node)
+      else
+        @row_cursor = get_start_node unless defined?(@row_cursor)
 
-    end
+        ret = @template_rows[@row_cursor]
+        if @template_rows.size == @row_cursor + 1
+          @row_cursor = get_start_node
+        else
+          @row_cursor += 1
+        end
+      end
 
-    @template_rows.each_with_index do |r, i|
-      r.remove if (get_start_node..template_length) === i
+      return deep_clone(ret)
+      # return ret.dup
     end
 
-  end # replace
-
-private
-
-  def get_next_row
-    @row_cursor = get_start_node unless defined?(@row_cursor)
-
-    ret = @template_rows[@row_cursor]
-    if @template_rows.size == @row_cursor + 1
-      @row_cursor = get_start_node
-    else
-      @row_cursor += 1
+    def get_start_node
+      @header ? 1 : 0
     end
-    return ret.dup
-  end
-
-  def get_start_node
-    @header ? 1 : 0
-  end
-
-  def template_length
-    @tl ||= @template_rows.size
-  end
 
-  def find_table_node(doc)
+    def template_length
+      @tl ||= @template_rows.size
+    end
 
-    tables = doc.xpath(".//table:table[@table:name='#{@name}']")
+    def find_table_node(doc)
+      doc.at_css("table|table[@table|name='#{@name}']")
+    end
 
-    tables.empty? ? nil : tables.first
+    def deep_clone(node)
+      Nokogiri::XML(wrap_with_ns(node)).at("table|table-row")
+    end
 
   end
-
-end
-
 end

data/lib/odf-report/template.rb

@@ -2,6 +2,7 @@ module ODFReport
   class Template
 
     CONTENT_FILES = ['content.xml', 'styles.xml']
+    MANIFEST_FILE = "META-INF/manifest.xml"
 
     attr_accessor :output_stream
 
@@ -34,18 +35,37 @@ module ODFReport
             process_entry(data, &block)
           end
 
-          @output_stream.put_next_entry(entry.name)
-          @output_stream.write data
+          update_file(entry.name, data)
 
         end
       end
 
     end
 
+    def update_manifest(&block)
+      entry = get_template_entries.find_entry(MANIFEST_FILE)
+
+      entry.get_input_stream do |is|
+
+        data = is.sysread
+
+        process_entry(data, &block)
+
+        update_file(MANIFEST_FILE, data)
+
+      end
+
+    end
+
     def data
       @buffer.string
     end
 
+    def update_file(name, data)
+      @output_stream.put_next_entry(name)
+      @output_stream.write data
+    end
+
     private
 
     def get_template_entries
@@ -59,7 +79,7 @@ module ODFReport
     end
 
     def process_entry(entry)
-      doc = Nokogiri::XML(entry)
+      doc = Nokogiri::XML(entry, &:noblanks)
       yield doc
       entry.replace(doc.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML))
     end

data/lib/odf-report/text.rb

@@ -8,9 +8,7 @@ module ODFReport
 
       return unless node = find_text_node(doc)
 
-      text_value = get_value(data_item)
-
-      @parser = Parser::Default.new(text_value, node)
+      @parser = Parser::Default.new(@data_source.value, node)
 
       @parser.paragraphs.each do |p|
         node.before(p)

data/lib/odf-report/version.rb

@@ -1,3 +1,3 @@
 module ODFReport
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/odf-report.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "launchy"
 
   s.add_runtime_dependency('rubyzip', ">= 1.3.0")
-  s.add_runtime_dependency('nokogiri', ">= 1.5.0")
+  s.add_runtime_dependency('nokogiri', ">= 1.10.0")
+  s.add_runtime_dependency('mime-types')
 
 end

data/spec/fields_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe "Fields" do
 
     @itens_01 = Item.get_list(3)
 
-    report = ODFReport::Report.new("spec/specs.odt") do |r|
+    report = ODFReport::Report.new("spec/templates/specs.odt") do |r|
 
       r.add_field(:field_01, @field_01)
       r.add_field(:field_02, @field_02)
@@ -65,7 +65,7 @@ RSpec.describe "Fields" do
 
     @itens_01.each_with_index do |item, idx|
 
-      section = @data.xml.xpath(".//text:section[@text:name='SECTION_01_#{idx+1}']").to_s
+      section = @data.xml.at_xpath(".//text:section[#{idx+1}]").to_s
 
       expect(section).to match(item.id.to_s)
       expect(section).to match(item.name)

data/spec/images_spec.rb

@@ -0,0 +1,80 @@
+RSpec.describe "Images" do
+
+  before(:context) do
+
+    @list = []
+    @list << OpenStruct.new({ name: "IMG - [1, 1]", path: 'spec/images/image_1.jpg', path2: 'spec/images/image_1.jpg' })
+    @list << OpenStruct.new({ name: "IMG - [2, 1]", path: 'spec/images/image_2.jpg', path2: 'spec/images/image_1.jpg' })
+    @list << OpenStruct.new({ name: "IMG - [3, 2]", path: 'spec/images/image_3.jpg', path2: 'spec/images/image_2.jpg' })
+    @list << OpenStruct.new({ name: "IMG - [1, 3]", path: 'spec/images/image_1.jpg', path2: 'spec/images/image_3.jpg' })
+    @list << OpenStruct.new({ name: "IMG - [2, 2]", path: 'spec/images/image_2.jpg', path2: 'spec/images/image_2.jpg' })
+
+
+    report = ODFReport::Report.new("spec/templates/images.odt") do |r|
+
+      r.add_image("IMAGE_01", 'spec/images/rails.png')
+      r.add_image("IMAGE_02", 'spec/images/piriapolis.jpg')
+
+      r.add_table('IMAGE_TABLE', @list) do |t|
+        t.add_column(:image_name, :name)
+        t.add_image('IMAGE_IN_TABLE_01', :path)
+        t.add_image('IMAGE_IN_TABLE_02', :path2)
+      end
+
+      r.add_section('SECTION', @list) do |t|
+        t.add_field(:image_name, :name)
+        t.add_image('IMAGE_IN_SECTION_01', :path2)
+        t.add_image('IMAGE_IN_SECTION_02', :path)
+      end
+
+    end
+
+    report.generate("spec/result/images.odt")
+
+    @data = Inspector.new("spec/result/images.odt")
+
+  end
+
+
+  it "simple image replacement" do
+
+    images = @data.xml.xpath("//draw:image")
+
+    expect(images[0].attribute('href').value).to eq "Pictures/rails.png"
+    expect(images[1].attribute('href').value).to eq "Pictures/piriapolis.jpg"
+
+  end
+
+  it "table columns replacement" do
+
+    table = @data.xml.at_xpath(".//table:table[@table:name='IMAGE_TABLE']")
+
+    @list.each_with_index do |item, idx|
+
+      row = table.xpath(".//table:table-row[#{idx+1}]")
+
+      images = row.xpath(".//draw:image")
+
+      expect(File.basename(images[0].attribute('href').value)).to eq File.basename(item.path)
+      expect(File.basename(images[1].attribute('href').value)).to eq File.basename(item.path2)
+
+    end
+
+  end
+
+  it "section fields replacement" do
+
+    @list.each_with_index do |item, idx|
+
+      section = @data.xml.at_xpath(".//text:section[#{idx+1}]")
+
+      images = section.xpath(".//draw:image")
+
+      expect(File.basename(images[0].attribute('href').value)).to eq File.basename(item.path)
+      expect(File.basename(images[1].attribute('href').value)).to eq File.basename(item.path2)
+
+    end
+
+  end
+
+end