prawn-html 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 319cd3772829ddae0d52b3228b8544cb3906c32c58725082ce95da675bdb841f
-  data.tar.gz: e4cc3ec1cdbbe8ad655ef236d44a2c179178cf913d83f7bb307b2fe529927ae1
+  metadata.gz: c519c9608664ef77b5b4489752f49d29ae4dfda7ee42e43685ee5951524bd1e3
+  data.tar.gz: c768fa73bc5601bec246a963153a3d20f0d6712fa72dea6441a27495dc374cee
 SHA512:
-  metadata.gz: 58b388050c3f8c94075bab09353ca3974956b9eebb3fa1a7fdfff488ced919dc8182d744c620d2c2268b4fd26b76bbeaacfcb58717fdeee7c16862665176e66c
-  data.tar.gz: 386d529584f5cc8b9b6c326500270761c3a53f859243714980cb188d9496f820158ed83e1d399dc361e368b0a63b2eeaa585843719d83ca2fa75729b6ebffef4
+  metadata.gz: b62ed1e07608cdb62829fe50ae708c16d55b1510c49ff8e02eb47442dca105cfeb2b18e751dd5f84e421687ba970fecb3078db904d3fc867af93ecbe67361e07
+  data.tar.gz: 503c65d6d22d496c634634dca3c57eda3e864ce91448ad2c119e0cb89857e7731cdef7fd209a1f48d8bda82ad0dc8eff724e407a957bd4d8323f410385ebc906

data/README.md

@@ -11,7 +11,7 @@ Features:
 - 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.
+**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* or *PDFKit*.
 
 > [prawn-styled-text](https://github.com/blocknotes/prawn-styled-text) rewritten from scratch, finally!
 
@@ -50,34 +50,45 @@ HTML tags:
 - **img**: image
 - **li**: list item
 - **mark**: highlight
+- **ol**: ordered list
 - **p**: block element
 - **s**: strike-through
 - **small**: smaller text
 - **span**: inline element
 - **strong**: bold
 - **u**: underline
-- **ul**: list
+- **ul**: unordered list
 
 CSS attributes (dimensional units are ignored and considered in pixel):
 
-- **background**: for *mark* tag, only 3 or 6 hex digits format, ex. `style="background: #FECD08"`
-- **color**: only 3 or 6 hex digits format - ex. `style="color: #FB1"`
+- **background**: for *mark* tag (3/6 hex digits or RGB or color name), ex. `style="background: #FECD08"`
+- **color**: (3/6 hex digits or RGB or color name) ex. `style="color: #FB1"`
 - **font-family**: font must be registered, quotes are optional, ex. `style="font-family: Courier"`
 - **font-size**: ex. `style="font-size: 20px"`
 - **font-style**: values: *:italic*, ex. `style="font-style: italic"`
 - **font-weight**: values: *:bold*, ex. `style="font-weight: bold"`
 - **height**: for *img* tag, ex. `<img src="image.jpg" style="height: 200px"/>`
 - **href**: for *a* tag, ex. `<a href="http://www.google.com/">Google</a>`
+- **left**: see *position (absolute)*
 - **letter-spacing**: ex. `style="letter-spacing: 1.5"`
 - **line-height**: ex. `style="line-height: 10px"`
+- **list-style-type**: for *ul*, a string, ex. `style="list-style-type: '- '"`
 - **margin-bottom**: ex. `style="margin-bottom: 10px"`
 - **margin-left**: ex. `style="margin-left: 15px"`
 - **margin-top**: ex. `style="margin-top: 20px"`
+- **position**: `absolute`, ex. `style="position: absolute; left: 20px; top: 100px"`
 - **src**: for *img* tag, ex. `<img src="image.jpg"/>`
 - **text-align**: `left` | `center` | `right` | `justify`, ex. `style="text-align: center"`
 - **text-decoration**: `underline`, ex. `style="text-decoration: underline"`
+- **top**: see *position (absolute)*
 - **width**: for *img* tag, support also percentage, ex. `<img src="image.jpg" style="width: 50%; height: 200px"/>`
 
+For colors, the supported formats are:
+- 3 hex digits, ex. `color: #FB1`;
+- 6 hex digits, ex. `color: #abcdef`;
+- RGB, ex. `color: RGB(64, 0, 128)`;
+- color name, ex. `color: yellow`.
+
 ## Data attributes
 
 Some custom data attributes are used to pass options:
@@ -113,6 +124,28 @@ Only single CSS selectors and basic ones are supported. Example:
 </html>
 ```
 
+## Additional notes
+
+### Rails: generate PDF on the fly
+
+Sample controller's action to create a PDF from Rails:
+
+```rb
+class SomeController < ApplicationController
+  def sample_action
+    respond_to do |format|
+      format.pdf do
+        pdf = Prawn::Document.new
+        PrawnHtml.append_html(pdf, '<h1 style="text-align: center">Just a test</h1>')
+        send_data(pdf.render, filename: 'sample.pdf', type: 'application/pdf')
+      end
+    end
+  end
+end
+```
+
+More details in this blogpost: [generate PDF from HTML](https://www.blocknot.es/2021-08-20-rails-generate-pdf-from-html/)
+
 ## Do you like it? Star it!
 
 If you use this component just star it. A developer is more motivated to improve a project when there is some interest.

data/lib/prawn-html.rb

@@ -1,25 +1,176 @@
 # frozen_string_literal: true
 
-require 'oga'
 require 'prawn'
 
-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 }
-
-require 'prawn_html/attributes'
-require 'prawn_html/context'
-require 'prawn_html/document_renderer'
-require 'prawn_html/html_handler'
-
 module PrawnHtml
   PX = 0.66 # conversion constant for pixel sixes
 
+  COLORS = {
+    'aliceblue' => 'f0f8ff',
+    'antiquewhite' => 'faebd7',
+    'aqua' => '00ffff',
+    'aquamarine' => '7fffd4',
+    'azure' => 'f0ffff',
+    'beige' => 'f5f5dc',
+    'bisque' => 'ffe4c4',
+    'black' => '000000',
+    'blanchedalmond' => 'ffebcd',
+    'blue' => '0000ff',
+    'blueviolet' => '8a2be2',
+    'brown' => 'a52a2a',
+    'burlywood' => 'deb887',
+    'cadetblue' => '5f9ea0',
+    'chartreuse' => '7fff00',
+    'chocolate' => 'd2691e',
+    'coral' => 'ff7f50',
+    'cornflowerblue' => '6495ed',
+    'cornsilk' => 'fff8dc',
+    'crimson' => 'dc143c',
+    'cyan' => '00ffff',
+    'darkblue' => '00008b',
+    'darkcyan' => '008b8b',
+    'darkgoldenrod' => 'b8860b',
+    'darkgray' => 'a9a9a9',
+    'darkgreen' => '006400',
+    'darkgrey' => 'a9a9a9',
+    'darkkhaki' => 'bdb76b',
+    'darkmagenta' => '8b008b',
+    'darkolivegreen' => '556b2f',
+    'darkorange' => 'ff8c00',
+    'darkorchid' => '9932cc',
+    'darkred' => '8b0000',
+    'darksalmon' => 'e9967a',
+    'darkseagreen' => '8fbc8f',
+    'darkslateblue' => '483d8b',
+    'darkslategray' => '2f4f4f',
+    'darkslategrey' => '2f4f4f',
+    'darkturquoise' => '00ced1',
+    'darkviolet' => '9400d3',
+    'deeppink' => 'ff1493',
+    'deepskyblue' => '00bfff',
+    'dimgray' => '696969',
+    'dimgrey' => '696969',
+    'dodgerblue' => '1e90ff',
+    'firebrick' => 'b22222',
+    'floralwhite' => 'fffaf0',
+    'forestgreen' => '228b22',
+    'fuchsia' => 'ff00ff',
+    'gainsboro' => 'dcdcdc',
+    'ghostwhite' => 'f8f8ff',
+    'gold' => 'ffd700',
+    'goldenrod' => 'daa520',
+    'gray' => '808080',
+    'green' => '008000',
+    'greenyellow' => 'adff2f',
+    'grey' => '808080',
+    'honeydew' => 'f0fff0',
+    'hotpink' => 'ff69b4',
+    'indianred' => 'cd5c5c',
+    'indigo' => '4b0082',
+    'ivory' => 'fffff0',
+    'khaki' => 'f0e68c',
+    'lavender' => 'e6e6fa',
+    'lavenderblush' => 'fff0f5',
+    'lawngreen' => '7cfc00',
+    'lemonchiffon' => 'fffacd',
+    'lightblue' => 'add8e6',
+    'lightcoral' => 'f08080',
+    'lightcyan' => 'e0ffff',
+    'lightgoldenrodyellow' => 'fafad2',
+    'lightgray' => 'd3d3d3',
+    'lightgreen' => '90ee90',
+    'lightgrey' => 'd3d3d3',
+    'lightpink' => 'ffb6c1',
+    'lightsalmon' => 'ffa07a',
+    'lightseagreen' => '20b2aa',
+    'lightskyblue' => '87cefa',
+    'lightslategray' => '778899',
+    'lightslategrey' => '778899',
+    'lightsteelblue' => 'b0c4de',
+    'lightyellow' => 'ffffe0',
+    'lime' => '00ff00',
+    'limegreen' => '32cd32',
+    'linen' => 'faf0e6',
+    'magenta' => 'ff00ff',
+    'maroon' => '800000',
+    'mediumaquamarine' => '66cdaa',
+    'mediumblue' => '0000cd',
+    'mediumorchid' => 'ba55d3',
+    'mediumpurple' => '9370db',
+    'mediumseagreen' => '3cb371',
+    'mediumslateblue' => '7b68ee',
+    'mediumspringgreen' => '00fa9a',
+    'mediumturquoise' => '48d1cc',
+    'mediumvioletred' => 'c71585',
+    'midnightblue' => '191970',
+    'mintcream' => 'f5fffa',
+    'mistyrose' => 'ffe4e1',
+    'moccasin' => 'ffe4b5',
+    'navajowhite' => 'ffdead',
+    'navy' => '000080',
+    'oldlace' => 'fdf5e6',
+    'olive' => '808000',
+    'olivedrab' => '6b8e23',
+    'orange' => 'ffa500',
+    'orangered' => 'ff4500',
+    'orchid' => 'da70d6',
+    'palegoldenrod' => 'eee8aa',
+    'palegreen' => '98fb98',
+    'paleturquoise' => 'afeeee',
+    'palevioletred' => 'db7093',
+    'papayawhip' => 'ffefd5',
+    'peachpuff' => 'ffdab9',
+    'peru' => 'cd853f',
+    'pink' => 'ffc0cb',
+    'plum' => 'dda0dd',
+    'powderblue' => 'b0e0e6',
+    'purple' => '800080',
+    'rebeccapurple' => '663399',
+    'red' => 'ff0000',
+    'rosybrown' => 'bc8f8f',
+    'royalblue' => '4169e1',
+    'saddlebrown' => '8b4513',
+    'salmon' => 'fa8072',
+    'sandybrown' => 'f4a460',
+    'seagreen' => '2e8b57',
+    'seashell' => 'fff5ee',
+    'sienna' => 'a0522d',
+    'silver' => 'c0c0c0',
+    'skyblue' => '87ceeb',
+    'slateblue' => '6a5acd',
+    'slategray' => '708090',
+    'slategrey' => '708090',
+    'snow' => 'fffafa',
+    'springgreen' => '00ff7f',
+    'steelblue' => '4682b4',
+    'tan' => 'd2b48c',
+    'teal' => '008080',
+    'thistle' => 'd8bfd8',
+    'tomato' => 'ff6347',
+    'turquoise' => '40e0d0',
+    'violet' => 'ee82ee',
+    'wheat' => 'f5deb3',
+    'white' => 'ffffff',
+    'whitesmoke' => 'f5f5f5',
+    'yellow' => 'ffff00',
+    'yellowgreen' => '9acd32'
+  }.freeze
+
   def append_html(pdf, html)
-    handler = PrawnHtml::HtmlHandler.new(pdf)
-    handler.process(html)
+    html_parser = PrawnHtml::HtmlParser.new(pdf)
+    html_parser.process(html)
   end
 
   module_function :append_html
 end
+
+require 'prawn_html/utils'
+
+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 }
+
+require 'prawn_html/attributes'
+require 'prawn_html/context'
+require 'prawn_html/document_renderer'
+require 'prawn_html/html_parser'

data/lib/prawn_html/attributes.rb

@@ -7,23 +7,24 @@ module PrawnHtml
     attr_reader :styles
 
     STYLES_APPLY = {
-      block: %i[align leading margin_left padding_left],
+      block: %i[align leading left margin_left padding_left position top],
       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]
+      text_node: %i[background callback character_spacing color font link list_style_type size styles]
     }.freeze
 
     STYLES_LIST = {
       # text node styles
       'background' => { key: :background, set: :convert_color },
-      'callback' => { key: :callback, set: :copy },
+      'callback' => { key: :callback, set: :copy_value },
       '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 },
+      'href' => { key: :link, set: :copy_value },
       'letter-spacing' => { key: :character_spacing, set: :convert_float },
+      'list-style-type' => { key: :list_style_type, set: :unquote },
       'text-decoration' => { key: :styles, set: :append_symbol },
       # tag opening styles
       'margin-top' => { key: :margin_top, set: :convert_size },
@@ -32,10 +33,13 @@ module PrawnHtml
       'margin-bottom' => { key: :margin_bottom, set: :convert_size },
       'padding-bottom' => { key: :padding_bottom, set: :convert_size },
       # block styles
+      'left' => { key: :left, set: :convert_size },
       '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 }
+      'position' => { key: :position, set: :convert_symbol },
+      'text-align' => { key: :align, set: :convert_symbol },
+      'top' => { key: :top, set: :convert_size }
     }.freeze
 
     STYLES_MERGE = %i[margin_left padding_left].freeze
@@ -78,65 +82,6 @@ module PrawnHtml
     end
 
     class << self
-      # Converts a color string
-      #
-      # @param value [String] HTML string color
-      #
-      # @return [String] adjusted string color
-      def convert_color(value)
-        val = value&.downcase || +''
-        val.gsub!(/[^a-f0-9]/, '')
-        return val unless val.size == 3
-
-        a, b, c = val.chars
-        a * 2 + b * 2 + c * 2
-      end
-
-      # Converts a decimal number string
-      #
-      # @param value [String] string decimal
-      #
-      # @return [Float] converted and rounded float number
-      def convert_float(value)
-        val = value&.gsub(/[^0-9.]/, '') || ''
-        val.to_f.round(4)
-      end
-
-      # Converts a size string
-      #
-      # @param value [String] size string
-      # @param container_size [Numeric] container size
-      #
-      # @return [Float] converted and rounded size
-      def convert_size(value, container_size = nil)
-        val = value&.gsub(/[^0-9.]/, '') || ''
-        val =
-          if container_size && value.include?('%')
-            val.to_f * container_size * 0.01
-          else
-            val.to_f * PX
-          end
-        val.round(4)
-      end
-
-      # Converts a string to symbol
-      #
-      # @param value [String] string
-      #
-      # @return [Symbol] symbol
-      def convert_symbol(value)
-        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 attributes [Hash] target attributes hash
@@ -160,17 +105,6 @@ module PrawnHtml
       def parse_styles(styles)
         (styles || '').scan(/\s*([^:;]+)\s*:\s*([^;]+)\s*/).to_h
       end
-
-      # Unquotes a string
-      #
-      # @param value [String] string
-      #
-      # @return [String] string without quotes at the beginning/ending
-      def unquote(value)
-        (value&.strip || +'').tap do |val|
-          val.gsub!(/\A['"]|["']\Z/, '')
-        end
-      end
     end
 
     private
@@ -179,9 +113,9 @@ module PrawnHtml
       return unless rule
 
       if rule[:set] == :append_symbol
-        (result[rule[:key]] ||= []) << Attributes.convert_symbol(value)
+        (result[rule[:key]] ||= []) << Utils.convert_symbol(value)
       else
-        result[rule[:key]] = Attributes.send(rule[:set], value)
+        result[rule[:key]] = Utils.send(rule[:set], value)
       end
     end
   end

data/lib/prawn_html/context.rb

@@ -13,6 +13,21 @@ module PrawnHtml
       @last_text_node = false
     end
 
+    # Add an element to the context
+    #
+    # Set the parent for the previous element in the chain.
+    # Run `on_context_add` callback method on the added element.
+    #
+    # @param element [Tag] the element to add
+    #
+    # @return [Context] the context updated
+    def add(element)
+      element.parent = last
+      push(element)
+      element.on_context_add(self) if element.respond_to?(:on_context_add)
+      self
+    end
+
     # Evaluate before content
     #
     # @return [String] before content string

data/lib/prawn_html/document_renderer.rb

@@ -19,9 +19,11 @@ module PrawnHtml
     #
     # @param styles [Hash] styles hash with CSS selectors as keys and rules as values
     def assign_document_styles(styles)
-      @document_styles = styles.transform_values do |style_rules|
-        Attributes.new(style: style_rules).styles
-      end
+      @document_styles.merge!(
+        styles.transform_values do |style_rules|
+          Attributes.new(style: style_rules).styles
+        end
+      )
     end
 
     # On tag close callback
@@ -68,8 +70,7 @@ module PrawnHtml
     def render
       return if buffer.empty?
 
-      options = context.block_styles.slice(:align, :leading, :margin_left, :mode, :padding_left)
-      output_content(buffer.dup, options)
+      output_content(buffer.dup, context.block_styles)
       buffer.clear
       context.last_margin = 0
     end
@@ -83,7 +84,7 @@ module PrawnHtml
     def setup_element(element)
       add_space_if_needed unless render_if_needed(element)
       apply_tag_open_styles(element)
-      context.push(element)
+      context.add(element)
       element.custom_render(pdf, context) if element.respond_to?(:custom_render)
     end
 
@@ -112,11 +113,30 @@ module PrawnHtml
       pdf.move_down(move_down) if move_down > 0
     end
 
-    def output_content(buffer, options)
+    def output_content(buffer, block_styles)
       buffer.each { |item| item[:callback] = item[:callback].new(pdf, item) if item[:callback] }
-      left_indent = options.delete(:margin_left).to_f + options.delete(:padding_left).to_f
+      left_indent = block_styles[:margin_left].to_f + block_styles[:padding_left].to_f
+      options = block_styles.slice(:align, :leading, :mode, :padding_left)
       options[:indent_paragraphs] = left_indent if left_indent > 0
-      pdf.formatted_text(buffer, options)
+      formatted_text(buffer, options, bounding_box: bounds(block_styles))
+    end
+
+    def formatted_text(buffer, options, bounding_box: nil)
+      return pdf.formatted_text(buffer, options) unless bounding_box
+
+      current_y = pdf.cursor
+      pdf.bounding_box(*bounding_box) do
+        pdf.formatted_text(buffer, options)
+      end
+      pdf.move_cursor_to(current_y)
+    end
+
+    def bounds(block_styles)
+      return unless block_styles[:position] == :absolute
+
+      y = pdf.bounds.height - (block_styles[:top] || 0)
+      w = pdf.bounds.width - (block_styles[:left] || 0)
+      [[block_styles[:left] || 0, y], { width: w }]
     end
   end
 end

data/lib/prawn_html/{html_handler.rb → html_parser.rb}

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require 'oga'
+
 module PrawnHtml
-  class HtmlHandler
-    # Init the HtmlHandler
+  class HtmlParser
+    # Init the HtmlParser
     #
     # @param pdf [Prawn::Document] Target Prawn PDF document
     def initialize(pdf)
@@ -44,7 +46,7 @@ module PrawnHtml
     def init_element(node)
       node.name.downcase.to_sym.tap do |tag_name|
         @processing = true if tag_name == :body
-        renderer.assign_document_styles(extract_styles(node.text)) if tag_name == :style && !@processing
+        renderer.assign_document_styles(extract_styles(node.text)) if tag_name == :style
       end
     end
 
@@ -63,4 +65,6 @@ module PrawnHtml
       @processing = false if element.tag == :body
     end
   end
+
+  HtmlHandler = HtmlParser
 end

data/lib/prawn_html/tag.rb

@@ -2,8 +2,9 @@
 
 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
+    TAG_CLASSES = %w[A B Body Br Del Div H Hr I Img Li Mark Ol P Small Span U Ul].freeze
 
+    attr_accessor :parent
     attr_reader :attrs, :tag
 
     # Init the Tag

data/lib/prawn_html/tags/br.rb

@@ -14,7 +14,7 @@ module PrawnHtml
       def custom_render(pdf, context)
         return if context.last_text_node
 
-        @spacing ||= Attributes.convert_size(BR_SPACING.to_s)
+        @spacing ||= Utils.convert_size(BR_SPACING.to_s)
         pdf.move_down(@spacing)
       end
     end

data/lib/prawn_html/tags/hr.rb

@@ -14,9 +14,9 @@ module PrawnHtml
 
       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
+        around_stroke(pdf, old_color: pdf.stroke_color, new_color: attrs.styles[:color], dash: dash) do
+          pdf.stroke_horizontal_rule
+        end
       end
 
       def tag_styles
@@ -28,6 +28,14 @@ module PrawnHtml
 
       private
 
+      def around_stroke(pdf, old_color:, new_color:, dash:)
+        pdf.dash(dash) if dash
+        pdf.stroke_color = new_color if new_color
+        yield
+        pdf.stroke_color = old_color if new_color
+        pdf.undash if dash
+      end
+
       def parse_dash_value(dash_string)
         if dash_string.match? /\A\d+\Z/
           dash_string.to_i

data/lib/prawn_html/tags/img.rb

@@ -10,19 +10,19 @@ module PrawnHtml
       end
 
       def custom_render(pdf, context)
-        styles = Attributes.parse_styles(attrs.style)
+        parsed_styles = Attributes.parse_styles(attrs.style)
         block_styles = context.block_styles
-        evaluated_styles = evaluate_styles(pdf, block_styles.merge(styles))
+        evaluated_styles = evaluate_styles(pdf, block_styles.merge(parsed_styles))
         pdf.image(@attrs.src, evaluated_styles) if @attrs.src
       end
 
       private
 
-      def evaluate_styles(pdf, styles)
+      def evaluate_styles(pdf, img_styles)
         {}.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])
+          result[:width] = Utils.convert_size(img_styles['width'], pdf.bounds.width) if img_styles.include?('width')
+          result[:height] = Utils.convert_size(img_styles['height'], pdf.bounds.height) if img_styles.include?('height')
+          result[:position] = img_styles[:align] if %i[left center right].include?(img_styles[:align])
         end
       end
     end

data/lib/prawn_html/tags/li.rb

@@ -9,9 +9,14 @@ module PrawnHtml
         true
       end
 
+      def on_context_add(_context)
+        @counter = (parent.counter += 1) if parent.is_a? Ol
+        @symbol = parent.styles[:list_style_type] || '•' if parent.is_a? Ul
+      end
+
       def tag_styles
         {
-          before_content: '•  '
+          before_content: @counter ? "#{@counter}. " : "#{@symbol} "
         }
       end
     end

data/lib/prawn_html/tags/ol.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Ol < Tag
+      ELEMENTS = [:ol].freeze
+
+      MARGIN_LEFT = 25
+
+      attr_accessor :counter
+
+      def initialize(*_args)
+        super
+        @counter = 0
+      end
+
+      def block?
+        true
+      end
+
+      def tag_styles
+        @tag_styles ||= {
+          'margin-left' => MARGIN_LEFT.to_s,
+        }
+      end
+    end
+  end
+end

data/lib/prawn_html/utils.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Utils
+    # Converts a color string
+    #
+    # Supported formats:
+    # - 3 hex digits, ex. `color: #FB1`;
+    # - 6 hex digits, ex. `color: #abcdef`;
+    # - RGB, ex. `color: RGB(64, 0, 128)`;
+    # - color name, ex. `color: red`.
+    #
+    # @param value [String] HTML string color
+    #
+    # @return [String] adjusted string color or nil if value is invalid
+    def convert_color(value)
+      val = value.to_s.strip.downcase
+      return Regexp.last_match[1] if val.match /\A#([a-f0-9]{6})\Z/ # rubocop:disable Performance/RedundantMatch
+
+      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
+      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) }
+        return "#{r.rjust(2, '0')}#{g.rjust(2, '0')}#{b.rjust(2, '0')}"
+      end
+
+      COLORS[val]
+    end
+
+    # Converts a decimal number string
+    #
+    # @param value [String] string decimal
+    #
+    # @return [Float] converted and rounded float number
+    def convert_float(value)
+      val = value&.gsub(/[^0-9.]/, '') || ''
+      val.to_f.round(4)
+    end
+
+    # Converts a size string
+    #
+    # @param value [String] size string
+    # @param container_size [Numeric] container size
+    #
+    # @return [Float] converted and rounded size
+    def convert_size(value, container_size = nil)
+      val = value&.gsub(/[^0-9.]/, '') || ''
+      val =
+        if container_size && value.include?('%')
+          val.to_f * container_size * 0.01
+        else
+          val.to_f * PX
+        end
+      val.round(4)
+    end
+
+    # Converts a string to symbol
+    #
+    # @param value [String] string
+    #
+    # @return [Symbol] symbol
+    def convert_symbol(value)
+      value.to_sym if value && !value.match?(/\A\s*\Z/)
+    end
+
+    # Copy a value without conversion
+    #
+    # @param value
+    #
+    # @return value
+    def copy_value(value)
+      value
+    end
+
+    # Unquotes a string
+    #
+    # @param value [String] string
+    #
+    # @return [String] string without quotes at the beginning/ending
+    def unquote(value)
+      (value&.strip || +'').tap do |val|
+        val.gsub!(/\A['"]|["']\Z/, '')
+      end
+    end
+
+    module_function :convert_color, :convert_float, :convert_size, :convert_symbol, :copy_value, :unquote
+  end
+end

data/lib/prawn_html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-html
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -52,7 +52,7 @@ files:
 - lib/prawn_html/callbacks/strike_through.rb
 - lib/prawn_html/context.rb
 - lib/prawn_html/document_renderer.rb
-- lib/prawn_html/html_handler.rb
+- lib/prawn_html/html_parser.rb
 - lib/prawn_html/tag.rb
 - lib/prawn_html/tags/a.rb
 - lib/prawn_html/tags/b.rb
@@ -66,11 +66,13 @@ files:
 - lib/prawn_html/tags/img.rb
 - lib/prawn_html/tags/li.rb
 - lib/prawn_html/tags/mark.rb
+- lib/prawn_html/tags/ol.rb
 - lib/prawn_html/tags/p.rb
 - lib/prawn_html/tags/small.rb
 - lib/prawn_html/tags/span.rb
 - lib/prawn_html/tags/u.rb
 - lib/prawn_html/tags/ul.rb
+- lib/prawn_html/utils.rb
 - lib/prawn_html/version.rb
 homepage: https://github.com/blocknotes/prawn-html
 licenses: