prawn-html 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 105884df1bf42d6aa44ff0a102a025960740c0d5a771c27e75949113cd7b9b70
-  data.tar.gz: abe3998f3f65cd2b421280d99151f18e321ac650dd8abed26260062e6f8e455a
+  metadata.gz: 6d7b30ab7d50313d9b5f16fd37bba84207725c8368ba3370a2ef037bdf871f27
+  data.tar.gz: 730c56224e0961d707db073b550f605e4dd4f39d6a902cbb2af5e9f4533e4785
 SHA512:
-  metadata.gz: 0dc20b1ee2c6bd1321b4359e31e217cea923c68f5f3af242b097d56d9492f198e1df6af263cadcf75978c83700a90cad3cfbae08d25e9b0ebb39ddea6ad2c059
-  data.tar.gz: 88180bff0e1aac88d566911fafac9c6b6ae799eee6c1f77948f0bc811825f03c2e7ca2c8b1bf8962dc60e27ba355904d77289e3870e1c3faecd8c362e6536237
+  metadata.gz: 790833d6338e59019751025c38a1b37ffa44ff583dd3f23771bc1015754cc1f047a6da9aa2d28c975191de8451ecc164d7dda412c2df15ca779c27b5aa1bc27a
+  data.tar.gz: 3ad2faf9178136a477fa4c0952410593219f85e6cacfbc88d1d504fbbe70388184ee62d3a4e84844eb0a8f225ba04845214d41beff68aa665bed12b03f563547

data/README.md

@@ -1,5 +1,7 @@
 # Prawn HTML
 [![gem version](https://badge.fury.io/rb/prawn-html.svg)](https://rubygems.org/gems/prawn-html)
+[![gem downloads](https://badgen.net/rubygems/dt/prawn-html)](https://rubygems.org/gems/prawn-html)
+[![maintainability](https://api.codeclimate.com/v1/badges/db674db00817d56ca1e9/maintainability)](https://codeclimate.com/github/blocknotes/prawn-html/maintainability)
 [![linters](https://github.com/blocknotes/prawn-html/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/prawn-html/actions/workflows/linters.yml)
 [![specs](https://github.com/blocknotes/prawn-html/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/prawn-html/actions/workflows/specs.yml)
 
@@ -33,6 +35,23 @@ pdf.render_file('test.pdf')
 
 To check some examples with the PDF output see [examples](examples/) folder.
 
+Alternative form using _PrawnHtml::Instance_ to preserve the context:
+
+```rb
+require 'prawn-html'
+pdf = Prawn::Document.new(page_size: 'A4')
+phtml = PrawnHtml::Instance.new(pdf)
+css = <<~CSS
+  h1 { color: green }
+  i { color: red }
+CSS
+phtml.append(css: css)
+phtml.append(html: '<h1>Some <i>HTML</i> before</h1>')
+pdf.text 'Some Prawn text'
+phtml.append(html: '<h1>Some <i>HTML</i> after</h1>')
+pdf.render_file('test.pdf')
+```
+
 ## Supported tags & attributes
 
 HTML tags (using MDN definitions):

data/lib/prawn-html.rb

@@ -156,10 +156,7 @@ module PrawnHtml
   }.freeze
 
   def append_html(pdf, html)
-    pdf_wrapper = PdfWrapper.new(pdf)
-    renderer = DocumentRenderer.new(pdf_wrapper)
-    html_parser = PrawnHtml::HtmlParser.new(renderer)
-    html_parser.process(html)
+    PrawnHtml::Instance.new(pdf).append(html: html)
   end
 
   module_function :append_html
@@ -179,3 +176,4 @@ require 'prawn_html/context'
 require 'prawn_html/pdf_wrapper'
 require 'prawn_html/document_renderer'
 require 'prawn_html/html_parser'
+require 'prawn_html/instance'

data/lib/prawn_html/context.rb

@@ -62,6 +62,12 @@ module PrawnHtml
         end
     end
 
+    # :nocov:
+    def inspect
+      map(&:class).map(&:to_s).join(', ')
+    end
+    # :nocov:
+
     # Remove the last element from the context
     def remove_last
       last.on_context_remove(self) if last.respond_to?(:on_context_remove)

data/lib/prawn_html/document_renderer.rb

@@ -9,6 +9,7 @@ module PrawnHtml
     #
     # @param pdf [PdfWrapper] target PDF wrapper
     def initialize(pdf)
+      @before_content = []
       @buffer = []
       @context = Context.new
       @last_margin = 0
@@ -42,6 +43,7 @@ module PrawnHtml
       options = { width: pdf.page_width, height: pdf.page_height }
       tag_class.new(tag_name, attributes: attributes, options: options).tap do |element|
         setup_element(element, element_styles: element_styles)
+        @before_content.push(element.before_content) if element.respond_to?(:before_content)
         @last_tag_open = true
       end
     end
@@ -106,7 +108,9 @@ module PrawnHtml
     end
 
     def prepare_text(content)
-      text = context.before_content ? ::Oga::HTML::Entities.decode(context.before_content) : ''
+      text = @before_content.any? ? ::Oga::HTML::Entities.decode(@before_content.join) : ''
+      @before_content.clear
+
       return (@last_text = text + content) if context.white_space_pre?
 
       content = content.lstrip if @last_text[-1] == ' ' || @last_tag_open

data/lib/prawn_html/html_parser.rb

@@ -15,19 +15,28 @@ module PrawnHtml
       @ignore = false
       @ignore_content_tags = ignore_content_tags
       @renderer = renderer
-      @styles = {}
+      @raw_styles = {}
     end
 
     # Processes HTML and renders it
     #
     # @param html [String] The HTML content to process
     def process(html)
+      @styles = {}
       @processing = !html.include?('<body')
       @document = Oga.parse_html(html)
+      process_styles # apply previously loaded styles
       traverse_nodes(document.children)
       renderer.flush
     end
 
+    # Parses CSS styles
+    #
+    # @param text_styles [String] The CSS styles to evaluate
+    def parse_styles(text_styles)
+      @raw_styles = text_styles.scan(REGEXP_STYLES).to_h
+    end
+
     private
 
     attr_reader :document, :ignore, :processing, :renderer, :styles
@@ -59,9 +68,9 @@ module PrawnHtml
       end
     end
 
-    def process_styles(text_styles)
-      hash_styles = text_styles.scan(REGEXP_STYLES).to_h
-      hash_styles.each do |selector, rule|
+    def process_styles(text_styles = nil)
+      parse_styles(text_styles) if text_styles
+      @raw_styles.each do |selector, rule|
         document.css(selector).each do |node|
           styles[node] = rule
         end

data/lib/prawn_html/instance.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  class Instance
+    attr_reader :html_parser, :pdf_wrapper, :renderer
+
+    def initialize(pdf)
+      @pdf_wrapper = PrawnHtml::PdfWrapper.new(pdf)
+      @renderer = PrawnHtml::DocumentRenderer.new(@pdf_wrapper)
+      @html_parser = PrawnHtml::HtmlParser.new(@renderer)
+    end
+
+    def append(css: nil, html: nil)
+      html_parser.parse_styles(css) if css
+      html_parser.process(html) if html
+    end
+  end
+end

data/lib/prawn_html/tags/li.rb

@@ -13,7 +13,9 @@ module PrawnHtml
       end
 
       def before_content
-        @counter ? "#{@counter}. " : "#{@symbol} "
+        return if @before_content_once
+
+        @before_content_once = @counter ? "#{@counter}. " : "#{@symbol} "
       end
 
       def block_styles

data/lib/prawn_html/utils.rb

@@ -45,7 +45,7 @@ module PrawnHtml
 
       if val.match /\A#([a-f0-9]{3})\Z/ # rubocop:disable Performance/RedundantMatch
         r, g, b = Regexp.last_match[1].chars
-        return r * 2 + g * 2 + b * 2
+        return (r * 2) + (g * 2) + (b * 2)
       end
       if val.match /\Argb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\Z/ # rubocop:disable Performance/RedundantMatch
         r, g, b = Regexp.last_match[1..3].map { |v| v.to_i.to_s(16) }

data/lib/prawn_html/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrawnHtml # :nodoc:
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-html
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -53,6 +53,7 @@ files:
 - lib/prawn_html/context.rb
 - lib/prawn_html/document_renderer.rb
 - lib/prawn_html/html_parser.rb
+- lib/prawn_html/instance.rb
 - lib/prawn_html/pdf_wrapper.rb
 - lib/prawn_html/tag.rb
 - lib/prawn_html/tags/a.rb
@@ -83,7 +84,10 @@ files:
 homepage: https://github.com/blocknotes/prawn-html
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/blocknotes/prawn-html
+  source_code_uri: https://github.com/blocknotes/prawn-html
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -99,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Prawn PDF - HTML renderer