odf-report 0.7.3 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ff3d6495c26d851b5497d740ce9443d69957efa8b6f11e99c9287e68c339147
-  data.tar.gz: 3ffaee2475b15b556c8bdf7f1e15697442c9603e2c8dc09643887c0170effb2c
+  metadata.gz: 65db96f6bec66147072afafb0d4193df34d188f4c0479361c7dfb34b36300930
+  data.tar.gz: c7f903e4fa5cb6a5fa811da28339fb3a27d0f9a7d9d2910107efb9cc941823e0
 SHA512:
-  metadata.gz: 6eff87a548135805364a1a214687e3b949975184b71bd0ea1796351110e4e142e02e6fda65a45bd039a4825e7bd58f435e2267a040a7ee69c1f8983a956331ce
-  data.tar.gz: 6638443f8259b7b2c8b1fcbee7efa83c935febacbf28141e2392dc2de4a1b67d31caea6726070fe85dfb7eeb1eefb23c39ee57527a8621694252b3a31130ced2
+  metadata.gz: 82b5cf956e054ed3eec7d93e3b1bcb2244a3922df1faa3d7145a00fbca4a79d7c0d0a7cbb0dd05916dcd020f38305aa33083564812eb1d2417050c26010dc4cd
+  data.tar.gz: f0850ee3d3fa433cc55d38136f78c269796159feb07307a39c996af80da6f2597fe6928ec0cdcb38174044ba3899c399e73e6f0fd714df518f316a618ca7b912

data/.github/workflows/gem-push.yml

@@ -8,13 +8,16 @@ jobs:
   build:
     name: Build + Publish
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
       with:
-        version: 2.6.x
+        ruby-version: '3.2' 
+        bundler-cache: true
 
 #     - name: Publish to GPR
 #       run: |

data/CHANGELOG.md

@@ -18,10 +18,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - None
 
+## 0.8.1
+
+### Fixed
+- \<br\> replacement in default text parser #130
+
+## 0.8.0
+
+### Fixed
+- Use Nokogiri HTML5 parser for text nodes parsing #129
+
+### Dependencies
+- nokogiri >= 1.12.0 (was >= 1.10.0)
+
 ## 0.7.3
 
 ### Fixed
-- newer versions (> 1.3.0) of Nokogiri where presenting "Nokogiri::CSS::SyntaxError: unexpected '|'" #120
+- newer versions (> 1.13.0) of Nokogiri where presenting "Nokogiri::CSS::SyntaxError: unexpected '|'" #120
 - prevent unnecessary memory expensive operations with missing placeholders #117
 
 ## 0.7.2

data/README.md

@@ -56,7 +56,7 @@ report = ODFReport::Report.new("Users/john/my_template.odt") do |r|
   r.add_field "USER_NAME", @user.nome
   r.add_field "ADDRESS", @user.address
 
-  r.add_table("TABLE_1", @list_of_itens, :header=>true) do |t|
+  r.add_table("TABLE_1", @list_of_items, :header=>true) do |t|
     t.add_column(:item_id, :id)
     t.add_column(:description) { |item| "==> #{item.description}" }
   end
@@ -71,7 +71,7 @@ and considering you have a table like this in your template
 | [ITEM_ID] | [DESCRIPTION] |
 
 
-and a collection `@list_of_itens`, it will create one row for each item in the collection, and the replacement will take place accordingly.
+and a collection `@list_of_items`, it will create one row for each item in the collection, and the replacement will take place accordingly.
 
 Any format applied to the fields in the template will be preserved.
 

data/lib/odf-report/data_source.rb

@@ -1,12 +1,11 @@
 module ODFReport
   class DataSource
-
     attr_reader :value
 
     def initialize(opts, &block)
-      @value      = opts[:value]      || opts[:collection]
+      @value = opts[:value] || opts[:collection]
       @data_field = opts[:data_field] || opts[:collection_field] || opts[:name]
-      @block      = block
+      @block = block
     end
 
     def set_source(record)
@@ -25,7 +24,6 @@ module ODFReport
     private
 
     def extract_value_from_item(record)
-
       if @block
         @block.call(record)
 
@@ -43,23 +41,21 @@ module ODFReport
         record.send(@data_field)
 
       else
-        raise "Can't find [#{@data_field.to_s}] in this #{record.class}"
+        raise "Can't find [#{@data_field}] in this #{record.class}"
 
       end
-
     end
 
     def execute_methods_on_item(record)
       tmp = record.dup
       @data_field.each do |f|
-        if f.is_a?(Hash)
-          tmp = tmp.send(f.keys[0], f.values[0])
+        tmp = if f.is_a?(Hash)
+          tmp.send(f.keys[0], f.values[0])
         else
-          tmp = tmp.send(f)
+          tmp.send(f)
         end
       end
       tmp
     end
-
   end
 end

data/lib/odf-report/field.rb

@@ -1,6 +1,5 @@
 module ODFReport
   class Field
-
     DELIMITERS = %w([ ])
 
     def initialize(opts, &block)
@@ -14,16 +13,14 @@ module ODFReport
     end
 
     def replace!(content, data_item = nil)
-
       txt = content.inner_html
 
       if txt.gsub!(to_placeholder, sanitize(@data_source.value))
         content.inner_html = txt
       end
-
     end
 
-  private
+    private
 
     def to_placeholder
       if DELIMITERS.is_a?(Array)
@@ -35,11 +32,10 @@ module ODFReport
 
     def sanitize(txt)
       txt = html_escape(txt)
-      txt = odf_linebreak(txt)
-      txt
+      odf_linebreak(txt)
     end
 
-    HTML_ESCAPE = { '&' => '&amp;',  '>' => '&gt;',   '<' => '&lt;', '"' => '&quot;' }
+    HTML_ESCAPE = {"&" => "&amp;", ">" => "&gt;", "<" => "&lt;", '"' => "&quot;"}
 
     def html_escape(s)
       return "" unless s
@@ -50,6 +46,5 @@ module ODFReport
       return "" unless s
       s.to_s.gsub("\n", "<text:line-break/>")
     end
-
   end
 end

data/lib/odf-report/image.rb

@@ -1,6 +1,5 @@
 module ODFReport
   class Image < Field
-
     IMAGE_DIR_NAME = "Pictures"
 
     attr_reader :files
@@ -11,7 +10,6 @@ module ODFReport
     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
 
@@ -20,14 +18,13 @@ module ODFReport
       file = @data_source.value
 
       if file
-        image.attribute('href').content = File.join(IMAGE_DIR_NAME, File.basename(file))
-        frame.attribute('name').content = SecureRandom.uuid
+        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)
@@ -41,17 +38,15 @@ module ODFReport
     def self.include_manifest_entry(content, image_file)
       return unless image_file
 
-      return unless root_node = content.at("//manifest:manifest")
+      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
+      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

@@ -1,17 +1,15 @@
 module ODFReport
   class Nestable
-
     def initialize(opts)
       @name = opts[:name]
 
       @data_source = DataSource.new(opts)
 
-      @fields   = []
-      @texts    = []
-      @tables   = []
+      @fields = []
+      @texts = []
+      @tables = []
       @sections = []
-      @images   = []
-
+      @images = []
     end
 
     def set_source(data_item)
@@ -19,32 +17,36 @@ module ODFReport
       self
     end
 
-    def add_field(name, data_field=nil, &block)
-      opts = { name: name, data_field: data_field }
+    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)
+    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)
+    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)
+    def add_table(table_name, collection_field, opts = {})
+      opts[:name] = table_name
+      opts[: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)
+    def add_section(section_name, collection_field, opts = {})
+      opts[:name] = section_name
+      opts[:collection_field] = collection_field
+
       sec = Section.new(opts)
       @sections << sec
 
@@ -60,6 +62,5 @@ module ODFReport
        <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/parser/default.rb

@@ -1,91 +1,82 @@
 module ODFReport
+  module Parser
+    # Default HTML parser
+    #
+    # sample HTML
+    #
+    # <p> first paragraph </p>
+    # <p> second <strong>paragraph</strong> </p>
+    # <blockquote>
+    #     <p> first <em>quote paragraph</em> </p>
+    #     <p> first quote paragraph </p>
+    #     <p> first quote paragraph </p>
+    # </blockquote>
+    # <p> third <strong>paragraph</strong> </p>
+    #
+    # <p style="margin: 100px"> fourth <em>paragraph</em> </p>
+    # <p style="margin: 120px"> fifth paragraph </p>
+    # <p> sixth <strong>paragraph</strong> </p>
+    #
+
+    class Default
+      attr_accessor :paragraphs
+
+      def initialize(text, template_node)
+        @text = text
+        @paragraphs = []
+        @template_node = template_node
+
+        parse
+      end
 
-module Parser
-
-
-  # Default HTML parser
-  #
-  # sample HTML
-  #
-  # <p> first paragraph </p>
-  # <p> second <strong>paragraph</strong> </p>
-  # <blockquote>
-  #     <p> first <em>quote paragraph</em> </p>
-  #     <p> first quote paragraph </p>
-  #     <p> first quote paragraph </p>
-  # </blockquote>
-  # <p> third <strong>paragraph</strong> </p>
-  #
-  # <p style="margin: 100px"> fourth <em>paragraph</em> </p>
-  # <p style="margin: 120px"> fifth paragraph </p>
-  # <p> sixth <strong>paragraph</strong> </p>
-  #
-
-  class Default
-
-    attr_accessor :paragraphs
-
-    def initialize(text, template_node)
-      @text = text
-      @paragraphs = []
-      @template_node = template_node
-
-      parse
-    end
-
-    def parse
-
-      xml = @template_node.parse(@text)
-
-      xml.css("p", "h1", "h2").each do |p|
+      def parse
+        html = Nokogiri::HTML5.fragment(@text)
 
-        style = check_style(p)
-        text = parse_formatting(p.inner_html)
+        html.css("p", "h1", "h2").each do |p|
+          style = check_style(p)
+          text = parse_formatting(p.inner_html)
 
-        add_paragraph(text, style)
+          add_paragraph(text, style)
+        end
       end
-    end
 
-    def add_paragraph(text, style)
+      def add_paragraph(text, style)
+        node = @template_node.dup
 
-      node = @template_node.dup
+        node["text:style-name"] = style if style
+        node.children = text
 
-      node['text:style-name'] = style if style
-      node.children = text
+        @paragraphs << node
+      end
 
-      @paragraphs << node
-    end
+      private
 
-    private
+      def parse_formatting(text)
+        text.strip!
+        text.gsub!(/<strong.*?>(.+?)<\/strong>/) { "<text:span text:style-name=\"bold\">#{$1}</text:span>" }
+        text.gsub!(/<em.*?>(.+?)<\/em>/) { "<text:span text:style-name=\"italic\">#{$1}</text:span>" }
+        text.gsub!(/<u.*?>(.+?)<\/u>/) { "<text:span text:style-name=\"underline\">#{$1}</text:span>" }
+        text.gsub!(/<br\/?>/, "<text:line-break/>")
+        text.delete!("\n")
+        text
+      end
 
-    def parse_formatting(text)
-      text.strip!
-      text.gsub!(/<strong.*?>(.+?)<\/strong>/)  { "<text:span text:style-name=\"bold\">#{$1}<\/text:span>" }
-      text.gsub!(/<em.*?>(.+?)<\/em>/)          { "<text:span text:style-name=\"italic\">#{$1}<\/text:span>" }
-      text.gsub!(/<u.*?>(.+?)<\/u>/)            { "<text:span text:style-name=\"underline\">#{$1}<\/text:span>" }
-      text.gsub!("\n", "")
-      text
-    end
+      def check_style(node)
+        style = nil
 
-    def check_style(node)
-      style = nil
+        if /h\d/i.match?(node.name)
+          style = "title"
 
-      if node.name =~ /h\d/i
-        style = "title"
+        elsif node.parent && node.parent.name == "blockquote"
+          style = "quote"
 
-      elsif node.parent && node.parent.name == "blockquote"
-        style = "quote"
+        elsif /margin/.match?(node["style"])
+          style = "quote"
 
-      elsif node['style'] =~ /margin/
-        style = "quote"
+        end
 
+        style
       end
-
-      style
     end
-
   end
-
-end
-
 end

data/lib/odf-report/report.rb

@@ -1,92 +1,84 @@
 module ODFReport
+  class Report
+    def initialize(template_name = nil, io: nil)
+      @template = ODFReport::Template.new(template_name, io: io)
 
-class Report
+      @texts = []
+      @fields = []
+      @tables = []
+      @sections = []
 
-  def initialize(template_name = nil, io: nil)
+      @images = []
 
-    @template = ODFReport::Template.new(template_name, io: io)
-
-    @texts = []
-    @fields = []
-    @tables = []
-    @sections = []
-
-    @images      = []
-
-    yield(self) if block_given?
-
-  end
+      yield(self) if block_given?
+    end
 
-  def add_field(field_tag, value='')
-    opts = {:name => field_tag, :value => value}
-    field = Field.new(opts)
-    @fields << field
-  end
+    def add_field(field_tag, value = "")
+      opts = {name: field_tag, value: value}
+      field = Field.new(opts)
+      @fields << field
+    end
 
-  def add_text(field_tag, value='')
-    opts = {:name => field_tag, :value => value}
-    text = Text.new(opts)
-    @texts << text
-  end
+    def add_text(field_tag, value = "")
+      opts = {name: field_tag, value: value}
+      text = Text.new(opts)
+      @texts << text
+    end
 
-  def add_table(table_name, collection, opts={})
-    opts.merge!(:name => table_name, :collection => collection)
-    tab = Table.new(opts)
-    @tables << tab
+    def add_table(table_name, collection, opts = {})
+      opts[:name] = table_name
+      opts[:collection] = collection
 
-    yield(tab)
-  end
+      tab = Table.new(opts)
+      @tables << tab
 
-  def add_section(section_name, collection, opts={})
-    opts.merge!(:name => section_name, :collection => collection)
-    sec = Section.new(opts)
-    @sections << sec
+      yield(tab)
+    end
 
-    yield(sec)
-  end
+    def add_section(section_name, collection, opts = {})
+      opts[:name] = section_name
+      opts[:collection] = collection
 
-  def add_image(image_name, value=nil)
-    opts = {:name => image_name, :value => value}
-    image = Image.new(opts)
-    @images << image
-  end
+      sec = Section.new(opts)
+      @sections << sec
 
-  def generate(dest = nil)
+      yield(sec)
+    end
 
-    @template.update_content do |file|
+    def add_image(image_name, value = nil)
+      opts = {name: image_name, value: value}
+      image = Image.new(opts)
+      @images << image
+    end
 
-      file.update_files do |doc|
+    def generate(dest = nil)
+      @template.update_content do |file|
+        file.update_files do |doc|
+          @sections.each { |c| c.replace!(doc) }
+          @tables.each { |c| c.replace!(doc) }
 
-        @sections.each { |c| c.replace!(doc) }
-        @tables.each   { |c| c.replace!(doc) }
+          @texts.each { |c| c.replace!(doc) }
+          @fields.each { |c| c.replace!(doc) }
 
-        @texts.each    { |c| c.replace!(doc) }
-        @fields.each   { |c| c.replace!(doc) }
+          @images.each { |c| c.replace!(doc) }
+        end
 
-        @images.each   { |c| c.replace!(doc) }
+        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
 
-      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) }
+      if dest
+        File.binwrite(dest, @template.data)
+      else
+        @template.data
       end
-
     end
 
-    if dest
-      File.open(dest, "wb") { |f| f.write(@template.data) }
-    else
-      @template.data
+    def all_images
+      @all_images ||= (@images.map(&:files) + @sections.map(&:all_images) + @tables.map(&:all_images)).flatten.uniq
     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,29 +1,24 @@
 module ODFReport
   class Section < Nestable
-
     def replace!(doc)
-
       return unless find_section_node(doc)
 
       @data_source.each do |record|
-
         new_section = deep_clone(@section_node)
 
-        @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) }
+        @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) }
 
         @section_node.before(new_section.to_xml)
-
       end
 
       @section_node.remove
-
     end # replace_section
 
-  private
+    private
 
     def find_section_node(doc)
       @section_node = doc.at_xpath("//text:section[@text:name='#{@name}']")
@@ -31,9 +26,7 @@ module ODFReport
 
     def deep_clone(node)
       Nokogiri::XML(wrap_with_ns(node)).at_xpath("//text:section")
-                                       .tap { |n| n.attribute('name').content = SecureRandom.uuid }
-
+        .tap { |n| n.attribute("name").content = SecureRandom.uuid }
     end
-
   end
 end

data/lib/odf-report/table.rb

@@ -1,16 +1,15 @@
 module ODFReport
   class Table < Nestable
-
     def initialize(opts)
       super(opts)
 
       @template_rows = []
-      @header           = opts[:header] || false
-      @skip_if_empty    = opts[:skip_if_empty] || false
+      @header = opts[:header] || false
+      @skip_if_empty = opts[:skip_if_empty] || false
     end
 
     def replace!(doc)
-      return unless table = find_table_node(doc)
+      return unless (table = find_table_node(doc))
 
       @template_rows = table.xpath("table:table-row")
 
@@ -22,26 +21,23 @@ module ODFReport
       end
 
       @data_source.each do |record|
-
         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) }
+        @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) }
 
         table.add_child(new_node.to_xml)
-
       end
 
       @template_rows.each_with_index do |r, i|
         r.remove if (get_start_node..template_length) === i
       end
-
     end # replace
 
-  private
+    private
 
     def get_next_row
       if @template_rows.size == 1
@@ -59,7 +55,7 @@ module ODFReport
         end
       end
 
-      return deep_clone(ret)
+      deep_clone(ret)
     end
 
     def get_start_node
@@ -77,6 +73,5 @@ module ODFReport
     def deep_clone(node)
       Nokogiri::XML(wrap_with_ns(node)).at_xpath("//table:table-row")
     end
-
   end
 end

data/lib/odf-report/template.rb

@@ -1,7 +1,6 @@
 module ODFReport
   class Template
-
-    CONTENT_FILES = ['content.xml', 'styles.xml']
+    CONTENT_FILES = ["content.xml", "styles.xml"]
     MANIFEST_FILE = "META-INF/manifest.xml"
 
     attr_accessor :output_stream
@@ -22,13 +21,10 @@ module ODFReport
     end
 
     def update_files(&block)
-
       get_template_entries.each do |entry|
-
         next if entry.directory?
 
         entry.get_input_stream do |is|
-
           data = is.sysread
 
           if CONTENT_FILES.include?(entry.name)
@@ -36,25 +32,20 @@ module ODFReport
           end
 
           update_file(entry.name, data) unless entry.name == MANIFEST_FILE
-
         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
@@ -69,13 +60,11 @@ module ODFReport
     private
 
     def get_template_entries
-
       if @template
         Zip::File.open(@template)
       else
         Zip::File.open_buffer(@io.force_encoding("ASCII-8BIT"))
       end
-
     end
 
     def process_entry(entry)
@@ -83,6 +72,5 @@ module ODFReport
       yield doc
       entry.replace(doc.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML))
     end
-
   end
 end

data/lib/odf-report/text.rb

@@ -1,12 +1,9 @@
 module ODFReport
-
   class Text < Field
-
     attr_accessor :parser
 
     def replace!(doc, data_item = nil)
-
-      return unless node = find_text_node(doc)
+      return unless (node = find_text_node(doc))
 
       @parser = Parser::Default.new(@data_source.value, node)
 
@@ -15,7 +12,6 @@ module ODFReport
       end
 
       node.remove
-
     end
 
     private
@@ -24,10 +20,10 @@ module ODFReport
       texts = doc.xpath(".//text:p[text()='#{to_placeholder}']")
       if texts.empty?
         texts = doc.xpath(".//text:p/text:span[text()='#{to_placeholder}']")
-        if texts.empty?
-          texts = nil
+        texts = if texts.empty?
+          nil
         else
-          texts = texts.first.parent
+          texts.first.parent
         end
       else
         texts = texts.first
@@ -35,7 +31,5 @@ module ODFReport
 
       texts
     end
-
   end
-
 end

data/lib/odf-report/version.rb

@@ -1,3 +1,3 @@
 module ODFReport
-  VERSION = "0.7.3"
+  VERSION = "0.8.1"
 end

data/lib/odf-report.rb

@@ -1,18 +1,18 @@
-require 'rubygems'
-require 'zip'
-require 'fileutils'
-require 'nokogiri'
-require 'mime/types'
-require 'securerandom'
+require "rubygems"
+require "zip"
+require "fileutils"
+require "nokogiri"
+require "mime/types"
+require "securerandom"
 
-require File.expand_path('../odf-report/parser/default',  __FILE__)
+require File.expand_path("../odf-report/parser/default", __FILE__)
 
-require File.expand_path('../odf-report/data_source',  __FILE__)
-require File.expand_path('../odf-report/field',        __FILE__)
-require File.expand_path('../odf-report/text',         __FILE__)
-require File.expand_path('../odf-report/template',     __FILE__)
-require File.expand_path('../odf-report/image',        __FILE__)
-require File.expand_path('../odf-report/nestable',     __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 File.expand_path("../odf-report/data_source", __FILE__)
+require File.expand_path("../odf-report/field", __FILE__)
+require File.expand_path("../odf-report/text", __FILE__)
+require File.expand_path("../odf-report/template", __FILE__)
+require File.expand_path("../odf-report/image", __FILE__)
+require File.expand_path("../odf-report/nestable", __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/odf-report.gemspec

@@ -25,7 +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.10.0")
+  s.add_runtime_dependency('nokogiri', ">= 1.12.0")
   s.add_runtime_dependency('mime-types')
 
 end

data/spec/texts_spec.rb

@@ -0,0 +1,48 @@
+RSpec.describe "Texts" do
+   before(:context) do
+
+    @text1 = <<-HTML
+      <p>This is some text in a paragraph</p>
+    HTML
+
+    @text2 = <<-HTML
+      <p>Text before line break <br> text after line break</p>
+    HTML
+
+    @text3 = <<-HTML
+      <p>Text before entities
+         Maur&iacute;cio
+         Text after entities</p>
+    HTML
+
+
+    report = ODFReport::Report.new("spec/templates/specs.odt") do |r|
+
+      r.add_text(:text1, @text1)
+      r.add_text(:text2, @text2)
+      r.add_text(:text3, @text3)
+
+    end
+
+    report.generate("spec/result/specs.odt")
+
+    @data = Inspector.new("spec/result/specs.odt")
+
+  end
+
+  it "simple text replacement" do
+    expect(@data.text).to include "This is some text in a paragraph"
+  end
+
+  it "text replacement with <br>" do
+    expect(@data.text).to include "Text before line break"
+    expect(@data.text).to include "text after line break"
+  end
+
+  it "text replacement with html entities" do
+    expect(@data.text).to include "Text before entities"
+    expect(@data.text).to include "Maurício"
+    expect(@data.text).to include "Text after entities"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odf-report
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.1
 platform: ruby
 authors:
 - Sandro Duarte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - spec/template_spec.rb
 - spec/templates/images.odt
 - spec/templates/specs.odt
+- spec/texts_spec.rb
 - test/fields_inside_text_test.rb
 - test/images_test.rb
 - test/nested_tables_test.rb
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Generates ODF files, given a template (.odt) and data, replacing tags
@@ -230,6 +231,7 @@ test_files:
 - spec/template_spec.rb
 - spec/templates/images.odt
 - spec/templates/specs.odt
+- spec/texts_spec.rb
 - test/fields_inside_text_test.rb
 - test/images_test.rb
 - test/nested_tables_test.rb