prawn-html 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a2fb462a91991cadb770f8bbee7d07c99f670d46eeb62d2a3b467b1839e5364
-  data.tar.gz: 1710135c8ca94e2de836e913ce8e177b9bc47b4ee37725a23729912b086aff25
+  metadata.gz: 319cd3772829ddae0d52b3228b8544cb3906c32c58725082ce95da675bdb841f
+  data.tar.gz: e4cc3ec1cdbbe8ad655ef236d44a2c179178cf913d83f7bb307b2fe529927ae1
 SHA512:
-  metadata.gz: ceec4ef90b155ea23f659771ab4e6275f12c9c5d4dd29a5da11b4d7f23512320ec71246623ff3c0eb82e0bed9a5e837292c40ac5a8d82585eaa4cb64cdc0653b
-  data.tar.gz: efea6fe48069d63b56c8c2e7a0142ed959af8cb200e8bc6ff03f8b252614379130feed7bd54942d59a97689c43f3b8a407e739db2b3c9fd1087f10c75fe0ca35
+  metadata.gz: 58b388050c3f8c94075bab09353ca3974956b9eebb3fa1a7fdfff488ced919dc8182d744c620d2c2268b4fd26b76bbeaacfcb58717fdeee7c16862665176e66c
+  data.tar.gz: 386d529584f5cc8b9b6c326500270761c3a53f859243714980cb188d9496f820158ed83e1d399dc361e368b0a63b2eeaa585843719d83ca2fa75729b6ebffef4

data/README.md

@@ -1,5 +1,5 @@
 # Prawn HTML
-[![gem version](https://badge.fury.io/rb/prawn-html.svg)](https://badge.fury.io/rb/prawn-html)
+[![gem version](https://badge.fury.io/rb/prawn-html.svg)](https://rubygems.org/gems/prawn-html)
 [![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)
 
@@ -8,7 +8,8 @@ HTML to PDF renderer using [Prawn PDF](https://github.com/prawnpdf/prawn).
 Features:
 - support a [good set](#supported-tags--attributes) of HTML tags and CSS properties;
 - handle [document styles](#document-styles);
-- no extra settings: it just parses an input HTML and output to a Prawn PDF document.
+- custom [data attributes](#data-attributes) for Prawn PDF features;
+- no extra settings: it just parses an input HTML and outputs to a Prawn PDF document.
 
 **Notice**: render HTML documents properly is not an easy task, this gem support only some HTML tags and a small set of CSS attributes. If you need more rendering accuracy take a look at other projects like WickedPDF.
 
@@ -77,6 +78,13 @@ CSS attributes (dimensional units are ignored and considered in pixel):
 - **text-decoration**: `underline`, ex. `style="text-decoration: underline"`
 - **width**: for *img* tag, support also percentage, ex. `<img src="image.jpg" style="width: 50%; height: 200px"/>`
 
+## Data attributes
+
+Some custom data attributes are used to pass options:
+
+- **dash**: for *hr* tag, accepts an integer or a list of integers), ex. `data-data="2, 4, 3"`
+- **mode**: allow to specify the text mode (stroke|fill||fill_stroke), ex. `data-mode="stroke"`
+
 ## Document styles
 
 [Experimental feature] You can define document CSS rules inside an _head_ tag, but with a limited support for now.

data/lib/prawn-html.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+require 'oga'
 require 'prawn'
 
-require 'prawn_html/tags/base'
+require 'prawn_html/tag'
 Dir["#{__dir__}/prawn_html/tags/*.rb"].sort.each { |f| require f }
 
 Dir["#{__dir__}/prawn_html/callbacks/*.rb"].sort.each { |f| require f }

data/lib/prawn_html/attributes.rb

@@ -3,57 +3,78 @@
 require 'ostruct'
 
 module PrawnHtml
-  class Attributes
-    attr_reader :hash, :options, :post_styles, :pre_styles, :styles
+  class Attributes < OpenStruct
+    attr_reader :styles
+
+    STYLES_APPLY = {
+      block: %i[align leading margin_left padding_left],
+      tag_close: %i[margin_bottom padding_bottom],
+      tag_open: %i[margin_top padding_top],
+      text_node: %i[background callback character_spacing color font link size styles]
+    }.freeze
 
     STYLES_LIST = {
-      # styles
-      'background' => { key: :background, set: :convert_color, dest: :styles },
-      'color' => { key: :color, set: :convert_color, dest: :styles },
-      'font-family' => { key: :font, set: :unquote, dest: :styles },
-      'font-size' => { key: :size, set: :convert_size, dest: :styles },
-      'font-style' => { key: :styles, set: :append_symbol, dest: :styles },
-      'font-weight' => { key: :styles, set: :append_symbol, dest: :styles },
-      'letter-spacing' => { key: :character_spacing, set: :convert_float, dest: :styles },
-      # pre styles
-      'margin-top' => { key: :margin_top, set: :convert_size, dest: :pre_styles },
-      # post styles
-      'margin-bottom' => { key: :margin_bottom, set: :convert_size, dest: :post_styles },
-      'padding-bottom' => { key: :padding_bottom, set: :convert_size, dest: :post_styles },
-      # options
-      'line-height' => { key: :leading, set: :convert_size, dest: :options },
-      'margin-left' => { key: :margin_left, set: :convert_size, dest: :options },
-      'padding-left' => { key: :padding_left, set: :convert_size, dest: :options },
-      'padding-top' => { key: :padding_top, set: :convert_size, dest: :options },
-      'text-align' => { key: :align, set: :convert_symbol, dest: :options },
-      'text-decoration' => { key: :styles, set: :append_symbol, dest: :styles }
+      # text node styles
+      'background' => { key: :background, set: :convert_color },
+      'callback' => { key: :callback, set: :copy },
+      'color' => { key: :color, set: :convert_color },
+      'font-family' => { key: :font, set: :unquote },
+      'font-size' => { key: :size, set: :convert_size },
+      'font-style' => { key: :styles, set: :append_symbol },
+      'font-weight' => { key: :styles, set: :append_symbol },
+      'href' => { key: :link, set: :copy },
+      'letter-spacing' => { key: :character_spacing, set: :convert_float },
+      'text-decoration' => { key: :styles, set: :append_symbol },
+      # tag opening styles
+      'margin-top' => { key: :margin_top, set: :convert_size },
+      'padding-top' => { key: :padding_top, set: :convert_size },
+      # tag closing styles
+      'margin-bottom' => { key: :margin_bottom, set: :convert_size },
+      'padding-bottom' => { key: :padding_bottom, set: :convert_size },
+      # block styles
+      'line-height' => { key: :leading, set: :convert_size },
+      'margin-left' => { key: :margin_left, set: :convert_size },
+      'padding-left' => { key: :padding_left, set: :convert_size },
+      'text-align' => { key: :align, set: :convert_symbol }
     }.freeze
 
     STYLES_MERGE = %i[margin_left padding_left].freeze
 
     # Init the Attributes
-    #
-    # @param attributes [Hash] hash of attributes to parse
-    def initialize(attributes)
-      @hash = ::OpenStruct.new(attributes)
-      @options = {}
-      @post_styles = {}
-      @pre_styles = {}
+    def initialize(attributes = {})
+      super
       @styles = {} # result styles
-      parsed_styles = Attributes.parse_styles(hash.style)
-      process_styles(parsed_styles)
+      return unless style
+
+      styles_hash = Attributes.parse_styles(style)
+      process_styles(styles_hash)
     end
 
-    # Processes the styles attributes
+    # Processes the data attributes
     #
-    # @param attributes [Hash] hash of styles attributes
-    def process_styles(styles)
-      styles.each do |key, value|
-        rule = STYLES_LIST[key]
-        next unless rule
+    # @return [Hash] hash of data attributes with 'data-' prefix removed and stripped values
+    def data
+      to_h.each_with_object({}) do |(key, value), res|
+        data_key = key.match /\Adata-(.+)/
+        res[data_key[1]] = value.strip if data_key
+      end
+    end
+
+    # Merge already parsed styles
+    #
+    # @param parsed_styles [Hash] hash of parsed styles
+    def merge_styles!(parsed_styles)
+      @styles.merge!(parsed_styles)
+    end
 
-        apply_rule(rule, value)
+    # Processes the styles attributes
+    #
+    # @param styles_hash [Hash] hash of styles attributes
+    def process_styles(styles_hash)
+      styles_hash.each do |key, value|
+        apply_rule!(@styles, STYLES_LIST[key], value)
       end
+      @styles
     end
 
     class << self
@@ -95,7 +116,6 @@ module PrawnHtml
           else
             val.to_f * PX
           end
-        # pdf.bounds.height
         val.round(4)
       end
 
@@ -108,19 +128,28 @@ module PrawnHtml
         value.to_sym if value && !value.match?(/\A\s*\Z/)
       end
 
+      # Copy a value without conversion
+      #
+      # @param value
+      #
+      # @return value
+      def copy(value)
+        value
+      end
+
       # Merges attributes
       #
-      # @param hash [Hash] target attributes hash
+      # @param attributes [Hash] target attributes hash
       # @param key [Symbol] key
       # @param value
       #
       # @return [Hash] the updated hash of attributes
-      def merge_attr!(hash, key, value)
+      def merge_attr!(attributes, key, value)
         return unless key
-        return (hash[key] = value) unless Attributes::STYLES_MERGE.include?(key)
+        return (attributes[key] = value) unless Attributes::STYLES_MERGE.include?(key)
 
-        hash[key] ||= 0
-        hash[key] += value
+        attributes[key] ||= 0
+        attributes[key] += value
       end
 
       # Parses a string of styles
@@ -146,11 +175,13 @@ module PrawnHtml
 
     private
 
-    def apply_rule(rule, value)
+    def apply_rule!(result, rule, value)
+      return unless rule
+
       if rule[:set] == :append_symbol
-        (send(rule[:dest])[rule[:key]] ||= []) << Attributes.convert_symbol(value)
+        (result[rule[:key]] ||= []) << Attributes.convert_symbol(value)
       else
-        send(rule[:dest])[rule[:key]] = Attributes.send(rule[:set], value)
+        result[rule[:key]] = Attributes.send(rule[:set], value)
       end
     end
   end

data/lib/prawn_html/context.rb

@@ -10,34 +10,37 @@ module PrawnHtml
     def initialize(*_args)
       super
       @last_margin = 0
+      @last_text_node = false
     end
 
+    # Evaluate before content
+    #
+    # @return [String] before content string
     def before_content
-      return '' if empty?
+      return '' if empty? || !last.respond_to?(:tag_styles)
 
-      last.options[:before_content].to_s
+      last.tag_styles[:before_content].to_s
     end
 
-    # Merges the context options
+    # Merges the context block styles
     #
-    # @return [Hash] the hash of merged options
-    def merge_options
+    # @return [Hash] the hash of merged styles
+    def block_styles
       each_with_object({}) do |element, res|
-        element.options.each do |key, value|
+        element.block_styles.each do |key, value|
           Attributes.merge_attr!(res, key, value)
         end
       end
     end
 
-    # Merge the context styles
+    # Merge the context styles for text nodes
     #
     # @return [Hash] the hash of merged styles
-    def merge_styles
-      context_styles = each_with_object({}) do |element, res|
+    def text_node_styles
+      each_with_object(base_styles) do |element, res|
         evaluate_element_styles(element, res)
         element.update_styles(res) if element.respond_to?(:update_styles)
       end
-      base_styles.merge(context_styles)
     end
 
     private
@@ -49,7 +52,8 @@ module PrawnHtml
     end
 
     def evaluate_element_styles(element, res)
-      element.styles.each do |key, val|
+      styles = element.styles.slice(*Attributes::STYLES_APPLY[:text_node])
+      styles.each do |key, val|
         if res.include?(key) && res[key].is_a?(Array)
           res[key] += val
         else

data/lib/prawn_html/document_renderer.rb

@@ -4,7 +4,6 @@ module PrawnHtml
   class DocumentRenderer
     NEW_LINE = { text: "\n" }.freeze
     SPACE = { text: ' ' }.freeze
-    TAG_CLASSES = [Tags::A, Tags::B, Tags::Body, Tags::Br, Tags::Del, Tags::Div, Tags::H, Tags::Hr, Tags::I, Tags::Img, Tags::Li, Tags::Mark, Tags::P, Tags::Small, Tags::Span, Tags::U, Tags::Ul].freeze
 
     # Init the DocumentRenderer
     #
@@ -12,40 +11,40 @@ module PrawnHtml
     def initialize(pdf)
       @buffer = []
       @context = Context.new
-      @doc_styles = {}
+      @document_styles = {}
       @pdf = pdf
     end
 
-    # Assigns the document styles
+    # Evaluate the document styles and store the internally
     #
     # @param styles [Hash] styles hash with CSS selectors as keys and rules as values
     def assign_document_styles(styles)
-      @doc_styles = styles.transform_values do |style_rules|
+      @document_styles = styles.transform_values do |style_rules|
         Attributes.new(style: style_rules).styles
       end
     end
 
     # On tag close callback
     #
-    # @param element [Tags::Base] closing element wrapper
+    # @param element [Tag] closing element wrapper
     def on_tag_close(element)
       render_if_needed(element)
-      apply_post_styles(element&.post_styles)
+      apply_tag_close_styles(element)
       context.last_text_node = false
       context.pop
     end
 
     # On tag open callback
     #
-    # @param tag [String] the tag name of the opening element
+    # @param tag_name [String] the tag name of the opening element
     # @param attributes [Hash] an hash of the element attributes
     #
-    # @return [Tags::Base] the opening element wrapper
-    def on_tag_open(tag, attributes)
-      tag_class = tag_classes[tag]
+    # @return [Tag] the opening element wrapper
+    def on_tag_open(tag_name, attributes)
+      tag_class = Tag.class_for(tag_name)
       return unless tag_class
 
-      tag_class.new(tag, attributes).tap do |element|
+      tag_class.new(tag_name, attributes, document_styles).tap do |element|
         setup_element(element)
       end
     end
@@ -58,8 +57,9 @@ module PrawnHtml
     def on_text_node(content)
       return if content.match?(/\A\s*\Z/)
 
-      text = content.gsub(/\A\s*\n\s*|\s*\n\s*\Z/, '').delete("\n").squeeze(' ')
-      buffer << context.merge_styles.merge(text: ::Oga::HTML::Entities.decode(context.before_content) + text)
+      text = ::Oga::HTML::Entities.decode(context.before_content)
+      text += content.gsub(/\A\s*\n\s*|\s*\n\s*\Z/, '').delete("\n").squeeze(' ')
+      buffer << context.text_node_styles.merge(text: text)
       context.last_text_node = true
       nil
     end
@@ -68,7 +68,7 @@ module PrawnHtml
     def render
       return if buffer.empty?
 
-      options = context.merge_options.slice(:align, :leading, :margin_left, :padding_left)
+      options = context.block_styles.slice(:align, :leading, :margin_left, :mode, :padding_left)
       output_content(buffer.dup, options)
       buffer.clear
       context.last_margin = 0
@@ -78,18 +78,11 @@ module PrawnHtml
 
     private
 
-    attr_reader :buffer, :context, :doc_styles, :pdf
-
-    def tag_classes
-      @tag_classes ||= TAG_CLASSES.each_with_object({}) do |klass, res|
-        res.merge!(klass.elements)
-      end
-    end
+    attr_reader :buffer, :context, :document_styles, :pdf
 
     def setup_element(element)
       add_space_if_needed unless render_if_needed(element)
-      apply_pre_styles(element)
-      element.apply_doc_styles(doc_styles)
+      apply_tag_open_styles(element)
       context.push(element)
       element.custom_render(pdf, context) if element.respond_to?(:custom_render)
     end
@@ -106,29 +99,24 @@ module PrawnHtml
       true
     end
 
-    def apply_post_styles(styles)
-      context.last_margin = styles[:margin_bottom].to_f
-      return if !styles || styles.empty?
-
-      pdf.move_down(context.last_margin.round(4)) if context.last_margin > 0
-      pdf.move_down(styles[:padding_bottom].round(4)) if styles[:padding_bottom].to_f > 0
+    def apply_tag_close_styles(element)
+      tag_styles = element.tag_close_styles
+      context.last_margin = tag_styles[:margin_bottom].to_f
+      move_down = context.last_margin + tag_styles[:padding_bottom].to_f
+      pdf.move_down(move_down) if move_down > 0
     end
 
-    def apply_pre_styles(element)
-      pdf.move_down(element.options[:padding_top].round(4)) if element.options.include?(:padding_top)
-      return if !element.pre_styles || element.pre_styles.empty?
-
-      margin = (element.pre_styles[:margin_top] - context.last_margin).round(4)
-      pdf.move_down(margin) if margin > 0
+    def apply_tag_open_styles(element)
+      tag_styles = element.tag_open_styles
+      move_down = (tag_styles[:margin_top].to_f - context.last_margin) + tag_styles[:padding_top].to_f
+      pdf.move_down(move_down) if move_down > 0
     end
 
     def output_content(buffer, options)
       buffer.each { |item| item[:callback] = item[:callback].new(pdf, item) if item[:callback] }
-      if (left = options.delete(:margin_left).to_f + options.delete(:padding_left).to_f) > 0
-        pdf.indent(left) { pdf.formatted_text(buffer, options) }
-      else
-        pdf.formatted_text(buffer, options)
-      end
+      left_indent = options.delete(:margin_left).to_f + options.delete(:padding_left).to_f
+      options[:indent_paragraphs] = left_indent if left_indent > 0
+      pdf.formatted_text(buffer, options)
     end
   end
 end

data/lib/prawn_html/html_handler.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'oga'
-
 module PrawnHtml
   class HtmlHandler
     # Init the HtmlHandler

data/lib/prawn_html/tag.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  class Tag
+    TAG_CLASSES = %w[A B Body Br Del Div H Hr I Img Li Mark P Small Span U Ul].freeze
+
+    attr_reader :attrs, :tag
+
+    # Init the Tag
+    #
+    # @param tag [Symbol] tag name
+    # @param attributes [Hash] hash of element attributes
+    # @param document_styles [Hash] hash of document styles
+    def initialize(tag, attributes = {}, document_styles = {})
+      @tag = tag
+      element_styles = attributes.delete(:style)
+      @attrs = Attributes.new(attributes)
+      process_styles(document_styles, element_styles)
+    end
+
+    # Is a block tag?
+    #
+    # @return [Boolean] true if the type of the tag is block, false otherwise
+    def block?
+      false
+    end
+
+    # Styles to apply to the block
+    #
+    # @return [Hash] hash of styles to apply
+    def block_styles
+      block_styles = styles.slice(*Attributes::STYLES_APPLY[:block])
+      block_styles[:mode] = attrs.data['mode'].to_sym if attrs.data.include?('mode')
+      block_styles
+    end
+
+    # Styles to apply on tag closing
+    #
+    # @return [Hash] hash of styles to apply
+    def tag_close_styles
+      styles.slice(*Attributes::STYLES_APPLY[:tag_close])
+    end
+
+    # Styles hash
+    #
+    # @return [Hash] hash of styles
+    def styles
+      attrs.styles
+    end
+
+    # Styles to apply on tag opening
+    #
+    # @return [Hash] hash of styles to apply
+    def tag_open_styles
+      styles.slice(*Attributes::STYLES_APPLY[:tag_open])
+    end
+
+    class << self
+      # Evaluate the Tag class from a tag name
+      #
+      # @params tag_name [Symbol] the tag name
+      #
+      # @return [Tag] the class for the tag if available or nil
+      def class_for(tag_name)
+        @tag_classes ||= TAG_CLASSES.each_with_object({}) do |tag_class, res|
+          klass = const_get("PrawnHtml::Tags::#{tag_class}")
+          k = [klass] * klass::ELEMENTS.size
+          res.merge!(klass::ELEMENTS.zip(k).to_h)
+        end
+        @tag_classes[tag_name]
+      end
+    end
+
+    private
+
+    def evaluate_document_styles(document_styles)
+      selectors = [
+        tag.to_s,
+        attrs['class'] ? ".#{attrs['class']}" : nil,
+        attrs['id'] ? "##{attrs['id']}" : nil
+      ].compact!
+      document_styles.each_with_object({}) do |(sel, attributes), res|
+        res.merge!(attributes) if selectors.include?(sel)
+      end
+    end
+
+    def process_styles(document_styles, element_styles)
+      attrs.merge_styles!(attrs.process_styles(tag_styles)) if respond_to?(:tag_styles)
+      doc_styles = evaluate_document_styles(document_styles)
+      attrs.merge_styles!(doc_styles)
+      el_styles = Attributes.parse_styles(element_styles)
+      attrs.merge_styles!(attrs.process_styles(el_styles)) if el_styles
+    end
+  end
+end

data/lib/prawn_html/tags/a.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class A < Base
+    class A < Tag
       ELEMENTS = [:a].freeze
 
-      def styles
-        attrs.hash.href ? super.merge(link: attrs.hash.href) : super
+      def tag_styles
+        attrs.href ? { 'href' => attrs.href } : {}
       end
     end
   end

data/lib/prawn_html/tags/b.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class B < Base
+    class B < Tag
       ELEMENTS = [:b, :strong].freeze
 
-      def extra_attrs
+      def tag_styles
         {
           'font-weight' => 'bold'
         }

data/lib/prawn_html/tags/body.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Body < Base
+    class Body < Tag
       ELEMENTS = [:body].freeze
     end
   end

data/lib/prawn_html/tags/br.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Br < Base
+    class Br < Tag
       ELEMENTS = [:br].freeze
 
       BR_SPACING = 12

data/lib/prawn_html/tags/del.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Del < Base
+    class Del < Tag
       ELEMENTS = [:del, :s].freeze
 
-      def styles
-        super.merge(
-          callback: Callbacks::StrikeThrough
-        )
+      def tag_styles
+        {
+          'callback' => Callbacks::StrikeThrough
+        }
       end
     end
   end

data/lib/prawn_html/tags/div.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Div < Base
+    class Div < Tag
       ELEMENTS = [:div].freeze
 
       def block?

data/lib/prawn_html/tags/h.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class H < Base
+    class H < Tag
       ELEMENTS = [:h1, :h2, :h3, :h4, :h5, :h6].freeze
 
       MARGINS_TOP = {
@@ -38,8 +36,8 @@ module PrawnHtml
         true
       end
 
-      def extra_attrs
-        @extra_attrs ||= {
+      def tag_styles
+        @tag_styles ||= {
           'font-size' => SIZES[tag].to_s,
           'font-weight' => 'bold',
           'margin-bottom' => MARGINS_BOTTOM[tag].to_s,

data/lib/prawn_html/tags/hr.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Hr < Base
+    class Hr < Tag
       ELEMENTS = [:hr].freeze
 
       MARGIN_BOTTOM = 12
@@ -15,15 +13,29 @@ module PrawnHtml
       end
 
       def custom_render(pdf, _context)
+        dash = parse_dash_value(attrs.data['dash']) if attrs.data.include?('dash')
+        pdf.dash(dash) if dash
         pdf.stroke_horizontal_rule
+        pdf.undash if dash
       end
 
-      def extra_attrs
-        @extra_attrs ||= {
+      def tag_styles
+        @tag_styles ||= {
           'margin-bottom' => MARGIN_BOTTOM.to_s,
           'margin-top' => MARGIN_TOP.to_s,
         }
       end
+
+      private
+
+      def parse_dash_value(dash_string)
+        if dash_string.match? /\A\d+\Z/
+          dash_string.to_i
+        else
+          dash_array = dash_string.split(',')
+          dash_array.map(&:to_i) if dash_array.any?
+        end
+      end
     end
   end
 end

data/lib/prawn_html/tags/i.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class I < Base
+    class I < Tag
       ELEMENTS = [:i, :em].freeze
 
-      def extra_attrs
+      def tag_styles
         {
           'font-style' => 'italic'
         }

data/lib/prawn_html/tags/img.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Img < Base
+    class Img < Tag
       ELEMENTS = [:img].freeze
 
       def block?
@@ -12,20 +10,20 @@ module PrawnHtml
       end
 
       def custom_render(pdf, context)
-        styles = Attributes.parse_styles(attrs.hash.style)
-        context_options = context.merge_options
-        options = evaluate_styles(pdf, context_options.merge(styles))
-        pdf.image(@attrs.hash.src, options)
+        styles = Attributes.parse_styles(attrs.style)
+        block_styles = context.block_styles
+        evaluated_styles = evaluate_styles(pdf, block_styles.merge(styles))
+        pdf.image(@attrs.src, evaluated_styles) if @attrs.src
       end
 
       private
 
       def evaluate_styles(pdf, styles)
-        options = {}
-        options[:width] = Attributes.convert_size(styles['width'], pdf.bounds.width) if styles.include?('width')
-        options[:height] = Attributes.convert_size(styles['height'], pdf.bounds.height) if styles.include?('height')
-        options[:position] = styles[:align] if %i[left center right].include?(styles[:align])
-        options
+        {}.tap do |result|
+          result[:width] = Attributes.convert_size(styles['width'], pdf.bounds.width) if styles.include?('width')
+          result[:height] = Attributes.convert_size(styles['height'], pdf.bounds.height) if styles.include?('height')
+          result[:position] = styles[:align] if %i[left center right].include?(styles[:align])
+        end
       end
     end
   end

data/lib/prawn_html/tags/li.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Li < Base
+    class Li < Tag
       ELEMENTS = [:li].freeze
 
       def block?
         true
       end
 
-      def options
-        super.merge(
+      def tag_styles
+        {
           before_content: '&bullet;  '
-        )
+        }
       end
     end
   end

data/lib/prawn_html/tags/mark.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Mark < Base
+    class Mark < Tag
       ELEMENTS = [:mark].freeze
 
-      def styles
-        super.merge(
-          callback: Callbacks::Highlight
-        )
+      def tag_styles
+        {
+          'callback' => Callbacks::Highlight
+        }
       end
     end
   end

data/lib/prawn_html/tags/p.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class P < Base
+    class P < Tag
       ELEMENTS = [:p].freeze
 
       MARGIN_BOTTOM = 6
@@ -14,8 +12,8 @@ module PrawnHtml
         true
       end
 
-      def extra_attrs
-        @extra_attrs ||= {
+      def tag_styles
+        @tag_styles ||= {
           'margin-bottom' => MARGIN_BOTTOM.to_s,
           'margin-top' => MARGIN_TOP.to_s
         }

data/lib/prawn_html/tags/small.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Small < Base
+    class Small < Tag
       ELEMENTS = [:small].freeze
 
       def update_styles(styles)

data/lib/prawn_html/tags/span.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Span < Base
+    class Span < Tag
       ELEMENTS = [:span].freeze
     end
   end

data/lib/prawn_html/tags/u.rb

@@ -2,10 +2,10 @@
 
 module PrawnHtml
   module Tags
-    class U < Base
+    class U < Tag
       ELEMENTS = [:ins, :u].freeze
 
-      def extra_attrs
+      def tag_styles
         {
           'text-decoration' => 'underline'
         }

data/lib/prawn_html/tags/ul.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Ul < Base
+    class Ul < Tag
       ELEMENTS = [:ul].freeze
 
       MARGIN_LEFT = 25
@@ -13,8 +11,8 @@ module PrawnHtml
         true
       end
 
-      def extra_attrs
-        @extra_attrs ||= {
+      def tag_styles
+        @tag_styles ||= {
           'margin-left' => MARGIN_LEFT.to_s,
         }
       end

data/lib/prawn_html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-html
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -53,9 +53,9 @@ files:
 - lib/prawn_html/context.rb
 - lib/prawn_html/document_renderer.rb
 - lib/prawn_html/html_handler.rb
+- lib/prawn_html/tag.rb
 - lib/prawn_html/tags/a.rb
 - lib/prawn_html/tags/b.rb
-- lib/prawn_html/tags/base.rb
 - lib/prawn_html/tags/body.rb
 - lib/prawn_html/tags/br.rb
 - lib/prawn_html/tags/del.rb

data/lib/prawn_html/tags/base.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module PrawnHtml
-  module Tags
-    class Base
-      attr_reader :attrs, :styles, :tag
-
-      def initialize(tag, attributes = {})
-        @attrs = Attributes.new(attributes)
-        @styles = attrs.styles
-        @tag = tag
-        attrs.process_styles(extra_attrs) unless extra_attrs.empty?
-      end
-
-      def apply_doc_styles(document_styles)
-        selectors = [
-          tag.to_s,
-          attrs.hash['class'] ? ".#{attrs.hash['class']}" : nil,
-          attrs.hash['id'] ? "##{attrs.hash['id']}" : nil
-        ].compact!
-        merged_styles = document_styles.each_with_object({}) do |(sel, attributes), res|
-          res.merge!(attributes) if selectors.include?(sel)
-        end
-        @styles = merged_styles.merge(styles)
-      end
-
-      def block?
-        false
-      end
-
-      def extra_attrs
-        {}
-      end
-
-      def options
-        attrs.options
-      end
-
-      def post_styles
-        attrs.post_styles
-      end
-
-      def pre_styles
-        attrs.pre_styles
-      end
-
-      class << self
-        def elements
-          self::ELEMENTS.each_with_object({}) { |el, list| list[el] = self }
-        end
-      end
-    end
-  end
-end