prawn-html 0.6.4 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c773502449714d4f0a6f2401721ba67a349731ef9f0c525216864b355fbe76c8
-  data.tar.gz: 8857a7761f343367a4c6496757c767b6b62b46d0d840df96a7d545c3693c744f
+  metadata.gz: 661d2dbfaa7c3d2186ba6e643f552e46031d27571ca0381607202eca3e4cb0ea
+  data.tar.gz: 0ae68c59f5c2efb89f6ae561a50b460d81f50e1b96ae958e2a3602049cd5aed5
 SHA512:
-  metadata.gz: 51be5bfbbf4427f6124a4a00cfb399017d6b806d8d3d2bb228fc81b7547a3cbaffe535767c5270a2666bed0a9abd89099d156dd79b1ea638d39101e528207be0
-  data.tar.gz: 520221561fc067919e098349fe6fab940290f6de419b37722679eacbb959055700620539c067d6a57786e7d4396bd0a4659e0f95428b09a96c3a93c55e174bda
+  metadata.gz: 7ec9c6055dbb336fe9b845ecd274bc6524a0bcaa5a5e0cf2911f01506c4c8d6a6c5c50ab70140f6c8bac134764a79ee46dfa7c80ccadb043d48f656c1f4f3af1
+  data.tar.gz: 4c48e9cca75c7ec86d28c0c9304c1ff92b98f14389007da6e55189092c5e8503d77bd2d5cc379e8f0aa333850d2e6cc79ce19a2a4921778c2289afb1f186cac1

data/README.md

@@ -35,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/attributes.rb

@@ -18,7 +18,7 @@ module PrawnHtml
       # text node styles
       'background' => { key: :callback, set: :callback_background },
       'color' => { key: :color, set: :convert_color },
-      'font-family' => { key: :font, set: :unquote },
+      'font-family' => { key: :font, set: :filter_font_family },
       'font-size' => { key: :size, set: :convert_size },
       'font-style' => { key: :styles, set: :append_styles, values: %i[italic] },
       'font-weight' => { key: :styles, set: :append_styles, values: %i[bold] },

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,8 +108,9 @@ module PrawnHtml
     end
 
     def prepare_text(content)
-      before_content = context.before_content
-      text = before_content ? ::Oga::HTML::Entities.decode(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/utils.rb

@@ -100,6 +100,16 @@ module PrawnHtml
       value
     end
 
+    # Filter font family
+    #
+    # @param value [String] string value
+    #
+    # @return [Symbol] unquoted font family or nil if the input value is 'inherit'
+    def filter_font_family(value, options: nil)
+      result = unquote(value, options: options)
+      result == 'inherit' ? nil : result
+    end
+
     # Normalize a style value
     #
     # @param value [String] string value
@@ -124,6 +134,6 @@ module PrawnHtml
     end
 
     module_function :callback_background, :callback_strike_through, :convert_color, :convert_float, :convert_size,
-                    :convert_symbol, :copy_value, :normalize_style, :unquote
+                    :convert_symbol, :copy_value, :filter_font_family, :normalize_style, :unquote
   end
 end

data/lib/prawn_html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-html
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.1
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-09-05 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