prawn-html 0.1.4 → 0.4.0

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,11 +12,11 @@ module PrawnHtml
         true
       end
 
-      def extra_attrs
-        @extra_attrs ||= {
-          'margin-bottom' => MARGIN_BOTTOM.to_s,
-          'margin-top' => MARGIN_TOP.to_s
-        }
+      def tag_styles
+        <<~STYLES
+          margin-bottom: #{MARGIN_BOTTOM}px;
+          margin-top: #{MARGIN_TOP}px;
+        STYLES
       end
     end
   end

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,13 +2,11 @@
 
 module PrawnHtml
   module Tags
-    class U < Base
+    class U < Tag
       ELEMENTS = [:ins, :u].freeze
 
-      def extra_attrs
-        {
-          'text-decoration' => 'underline'
-        }
+      def tag_styles
+        'text-decoration: underline'
       end
     end
   end

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,10 +11,8 @@ module PrawnHtml
         true
       end
 
-      def extra_attrs
-        @extra_attrs ||= {
-          'margin-left' => MARGIN_LEFT.to_s,
-        }
+      def tag_styles
+        "margin-left: #{MARGIN_LEFT}px"
       end
     end
   end

data/lib/prawn_html/utils.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Utils
+    NORMALIZE_STYLES = {
+      'bold' => :bold,
+      'italic' => :italic,
+      'underline' => :underline
+    }.freeze
+
+    # 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 * PrawnHtml::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
+
+    # Normalize a style value
+    #
+    # @param value [String] string value
+    #
+    # @return [Symbol] style value or nil
+    def normalize_style(value)
+      val = value&.strip&.downcase
+      NORMALIZE_STYLES[val]
+    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, :normalize_style,
+                    :unquote
+  end
+end

data/lib/prawn_html/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrawnHtml # :nodoc:
-  VERSION = '0.1.4'
+  VERSION = '0.4.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.4.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -52,10 +52,12 @@ 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/pdf_wrapper.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/blockquote.rb
 - lib/prawn_html/tags/body.rb
 - lib/prawn_html/tags/br.rb
 - lib/prawn_html/tags/del.rb
@@ -66,11 +68,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:

data/lib/prawn_html/html_handler.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require 'oga'
-
-module PrawnHtml
-  class HtmlHandler
-    # Init the HtmlHandler
-    #
-    # @param pdf [Prawn::Document] Target Prawn PDF document
-    def initialize(pdf)
-      @processing = false
-      @renderer = DocumentRenderer.new(pdf)
-    end
-
-    # Processes HTML and renders it on the PDF document
-    #
-    # @param html [String] The HTML content to process
-    def process(html)
-      @processing = !html.include?('<body')
-      doc = Oga.parse_html(html)
-      traverse_nodes(doc.children)
-      renderer.flush
-    end
-
-    private
-
-    attr_reader :processing, :renderer
-
-    def traverse_nodes(nodes)
-      nodes.each do |node|
-        element = node_open(node)
-        traverse_nodes(node.children) if node.children.any?
-        node_close(element) if element
-      end
-    end
-
-    def node_open(node)
-      tag = node.is_a?(Oga::XML::Element) && init_element(node)
-      return unless processing
-      return renderer.on_text_node(node.text) unless tag
-
-      attributes = prepare_attributes(node)
-      renderer.on_tag_open(tag, attributes)
-    end
-
-    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
-      end
-    end
-
-    def extract_styles(text)
-      text.scan(/\s*([^{\s]+)\s*{\s*([^}]*?)\s*}/m).to_h
-    end
-
-    def prepare_attributes(node)
-      node.attributes.each_with_object({}) do |attr, res|
-        res[attr.name] = attr.value
-      end
-    end
-
-    def node_close(element)
-      renderer.on_tag_close(element) if @processing
-      @processing = false if element.tag == :body
-    end
-  end
-end

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