odf-report 0.5.2 → 0.7.2

data/lib/odf-report/field.rb

@@ -5,56 +5,25 @@ module ODFReport
 
     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
+      @data_source = DataSource.new(opts, &block)
+    end
 
+    def set_source(record)
+      @data_source.set_source(record)
+      self
     end
 
     def replace!(content, data_item = nil)
 
       txt = content.inner_html
 
-      val = get_value(data_item)
-
-      txt.gsub!(to_placeholder, sanitize(val))
+      txt.gsub!(to_placeholder, sanitize(@data_source.value))
 
       content.inner_html = txt
 
     end
 
-    def get_value(data_item = nil)
-      @value || @block.call(data_item) || ''
-    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
-
-    private
+  private
 
     def to_placeholder
       if DELIMITERS.is_a?(Array)
@@ -82,7 +51,5 @@ module ODFReport
       s.to_s.gsub("\n", "<text:line-break/>")
     end
 
-
-
   end
 end

data/lib/odf-report/image.rb

@@ -0,0 +1,57 @@
+module ODFReport
+  class Image < Field
+
+    IMAGE_DIR_NAME = "Pictures"
+
+    attr_reader :files
+
+    def initialize(opts, &block)
+      @files = []
+      super
+    end
+
+    def replace!(doc, data_item = nil)
+
+      frame = doc.xpath("//draw:frame[@draw:name='#{@name}']").first
+      image = doc.xpath("//draw:frame[@draw:name='#{@name}']/draw:image").first
+
+      return unless image
+
+      file = @data_source.value
+
+      if file
+        image.attribute('href').content = File.join(IMAGE_DIR_NAME, File.basename(file))
+        frame.attribute('name').content = SecureRandom.uuid
+
+        @files << file
+      else
+        frame.remove
+      end
+      
+    end
+
+    def self.include_image_file(zip_file, image_file)
+      return unless image_file
+
+      href = File.join(IMAGE_DIR_NAME, File.basename(image_file))
+
+      zip_file.update_file(href, File.read(image_file))
+    end
+
+    def self.include_manifest_entry(content, image_file)
+      return unless image_file
+
+      return unless root_node = content.at("//manifest:manifest")
+
+      href = File.join(IMAGE_DIR_NAME, File.basename(image_file))
+
+      entry = content.create_element('manifest:file-entry')
+      entry['manifest:full-path']  = href
+      entry['manifest:media-type'] = MIME::Types.type_for(href)[0].content_type
+
+      root_node.add_child entry
+
+    end
+
+  end
+end

data/lib/odf-report/nestable.rb

@@ -0,0 +1,65 @@
+module ODFReport
+  class Nestable
+
+    def initialize(opts)
+      @name = opts[:name]
+
+      @data_source = DataSource.new(opts)
+
+      @fields   = []
+      @texts    = []
+      @tables   = []
+      @sections = []
+      @images   = []
+
+    end
+
+    def set_source(data_item)
+      @data_source.set_source(data_item)
+      self
+    end
+
+    def add_field(name, data_field=nil, &block)
+      opts = { name: name, data_field: data_field }
+      @fields << Field.new(opts, &block)
+    end
+    alias_method :add_column, :add_field
+
+    def add_text(name, data_field=nil, &block)
+      opts = {name: name, data_field: data_field}
+      @texts << Text.new(opts, &block)
+    end
+
+    def add_image(name, data_field=nil, &block)
+      opts = {name: name, data_field: data_field}
+      @images << Image.new(opts, &block)
+    end
+
+    def add_table(table_name, collection_field, opts={})
+      opts.merge!(name: table_name, collection_field: collection_field)
+      tab = Table.new(opts)
+      @tables << tab
+
+      yield(tab)
+    end
+
+    def add_section(section_name, collection_field, opts={})
+      opts.merge!(name: section_name, collection_field: collection_field)
+      sec = Section.new(opts)
+      @sections << sec
+
+      yield(sec)
+    end
+
+    def all_images
+      (@images.map(&:files) + @sections.map(&:all_images) + @tables.map(&:all_images)).flatten
+    end
+
+    def wrap_with_ns(node)
+      <<-XML
+       <root xmlns:draw="a" xmlns:xlink="b" xmlns:text="c" xmlns:table="d">#{node.to_xml}</root>
+      XML
+    end
+    
+  end
+end

data/lib/odf-report/report.rb

@@ -1,20 +1,19 @@
 module ODFReport
 
 class Report
-  include Images
 
-  def initialize(template_name, &block)
+  def initialize(template_name = nil, io: nil)
 
-    @file = ODFReport::File.new(template_name)
+    @template = ODFReport::Template.new(template_name, io: io)
 
     @texts = []
     @fields = []
     @tables = []
-    @images = {}
-    @image_names_replacements = {}
     @sections = []
 
-    yield(self)
+    @images      = []
+
+    yield(self) if block_given?
 
   end
 
@@ -46,49 +45,46 @@ class Report
     yield(sec)
   end
 
-  def add_image(name, path)
-    @images[name] = path
+  def add_image(image_name, value=nil)
+    opts = {:name => image_name, :value => value}
+    image = Image.new(opts)
+    @images << image
   end
 
   def generate(dest = nil)
 
-    @file.update_content do |file|
+    @template.update_content do |file|
 
-      file.update_files('content.xml', 'styles.xml') do |txt|
+      file.update_files do |doc|
 
-        parse_document(txt) do |doc|
+        @sections.each { |c| c.replace!(doc) }
+        @tables.each   { |c| c.replace!(doc) }
 
-          @sections.each { |s| s.replace!(doc) }
-          @tables.each   { |t| t.replace!(doc) }
+        @texts.each    { |c| c.replace!(doc) }
+        @fields.each   { |c| c.replace!(doc) }
 
-          @texts.each    { |t| t.replace!(doc) }
-          @fields.each   { |f| f.replace!(doc) }
+        @images.each   { |c| c.replace!(doc) }
 
-          find_image_name_matches(doc)
-          avoid_duplicate_image_names(doc)
+      end
 
-        end
+      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
 
-      replace_images(file)
-
     end
 
     if dest
-      ::File.open(dest, "wb") {|f| f.write(@file.data) }
+      File.open(dest, "wb") { |f| f.write(@template.data) }
     else
-      @file.data
+      @template.data
     end
 
   end
 
-private
-
-  def parse_document(txt)
-    doc = Nokogiri::XML(txt)
-    yield doc
-    txt.replace(doc.to_xml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XML))
+  def all_images
+    @all_images ||= (@images.map(&:files) + @sections.map(&:all_images) + @tables.map(&:all_images)).flatten.uniq
   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