odf-report 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ff3d6495c26d851b5497d740ce9443d69957efa8b6f11e99c9287e68c339147
-  data.tar.gz: 3ffaee2475b15b556c8bdf7f1e15697442c9603e2c8dc09643887c0170effb2c
+  metadata.gz: 14183fe9ba54b5f98cd72cd48aa1277aa9d5b576c7980ae2bbfeef2346c9c49d
+  data.tar.gz: dcf77b2934897f3b490effdd62a1ee1effc2d13898523249b81b4be62be1eea9
 SHA512:
-  metadata.gz: 6eff87a548135805364a1a214687e3b949975184b71bd0ea1796351110e4e142e02e6fda65a45bd039a4825e7bd58f435e2267a040a7ee69c1f8983a956331ce
-  data.tar.gz: 6638443f8259b7b2c8b1fcbee7efa83c935febacbf28141e2392dc2de4a1b67d31caea6726070fe85dfb7eeb1eefb23c39ee57527a8621694252b3a31130ced2
+  metadata.gz: 7eb665c1fe1f414dac1b5e3ef3714b398d207125b00589573f2e2e9a2d4632355f26bf968fe3eec53c7bdcdff92c3fe24f5216fe18a1e160ddd4c8947804390a
+  data.tar.gz: 237f77a79aa11754aff00d0973c696dc9f62a8ce65b6b57c1c101293b632ee0399025f13b04f9649feaeda1d63310b58ac83ac67d5565cc602c9b2bcd5be127c

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,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - None
 
+## 0.8.0
+
+### 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/parser/default.rb

@@ -34,11 +34,9 @@ module Parser
     end
 
     def parse
+      html = Nokogiri::HTML5.fragment(@text)
 
-      xml = @template_node.parse(@text)
-
-      xml.css("p", "h1", "h2").each do |p|
-
+      html.css("p", "h1", "h2").each do |p|
         style = check_style(p)
         text = parse_formatting(p.inner_html)
 
@@ -63,6 +61,7 @@ module Parser
       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.gsub!("\n", "")
       text
     end

data/lib/odf-report/version.rb

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

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.0
 platform: ruby
 authors:
 - Sandro Duarte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2024-03-21 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