prawn-html 0.2.0 → 0.4.2

data/lib/prawn_html/tags/b.rb

@@ -6,9 +6,7 @@ module PrawnHtml
       ELEMENTS = [:b, :strong].freeze
 
       def tag_styles
-        {
-          'font-weight' => 'bold'
-        }
+        'font-weight: bold'
       end
     end
   end

data/lib/prawn_html/tags/blockquote.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Blockquote < Tag
+      ELEMENTS = [:blockquote].freeze
+
+      MARGIN_BOTTOM = 10
+      MARGIN_LEFT = 25
+      MARGIN_TOP = 10
+
+      def block?
+        true
+      end
+
+      def tag_styles
+        <<~STYLES
+          margin-bottom: #{MARGIN_BOTTOM}px;
+          margin-left: #{MARGIN_LEFT}px;
+          margin-top: #{MARGIN_TOP}px;
+        STYLES
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/br.rb

@@ -5,7 +5,7 @@ module PrawnHtml
     class Br < Tag
       ELEMENTS = [:br].freeze
 
-      BR_SPACING = 12
+      BR_SPACING = Utils.convert_size('12')
 
       def block?
         true
@@ -14,8 +14,7 @@ module PrawnHtml
       def custom_render(pdf, context)
         return if context.last_text_node
 
-        @spacing ||= Attributes.convert_size(BR_SPACING.to_s)
-        pdf.move_down(@spacing)
+        pdf.advance_cursor(BR_SPACING)
       end
     end
   end

data/lib/prawn_html/tags/code.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Code < Tag
+      ELEMENTS = [:code].freeze
+
+      def tag_styles
+        'font-family: Courier'
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/del.rb

@@ -6,9 +6,7 @@ module PrawnHtml
       ELEMENTS = [:del, :s].freeze
 
       def tag_styles
-        {
-          'callback' => Callbacks::StrikeThrough
-        }
+        'callback: StrikeThrough'
       end
     end
   end

data/lib/prawn_html/tags/h.rb

@@ -37,12 +37,12 @@ module PrawnHtml
       end
 
       def tag_styles
-        @tag_styles ||= {
-          'font-size' => SIZES[tag].to_s,
-          'font-weight' => 'bold',
-          'margin-bottom' => MARGINS_BOTTOM[tag].to_s,
-          'margin-top' => MARGINS_TOP[tag].to_s
-        }
+        <<~STYLES
+          font-size: #{SIZES[tag]}px;
+          font-weight: bold;
+          margin-bottom: #{MARGINS_BOTTOM[tag]}px;
+          margin-top: #{MARGINS_TOP[tag]}px;
+        STYLES
       end
     end
   end

data/lib/prawn_html/tags/hr.rb

@@ -13,17 +13,15 @@ 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
+        dash = attrs.data.include?('dash') ? parse_dash_value(attrs.data['dash']) : nil
+        pdf.horizontal_rule(color: attrs.styles[:color], dash: dash)
       end
 
       def tag_styles
-        @tag_styles ||= {
-          'margin-bottom' => MARGIN_BOTTOM.to_s,
-          'margin-top' => MARGIN_TOP.to_s,
-        }
+        <<~STYLES
+          margin-bottom: #{MARGIN_BOTTOM}px;
+          margin-top: #{MARGIN_TOP}px;
+        STYLES
       end
 
       private

data/lib/prawn_html/tags/i.rb

@@ -6,9 +6,7 @@ module PrawnHtml
       ELEMENTS = [:i, :em].freeze
 
       def tag_styles
-        {
-          'font-style' => 'italic'
-        }
+        'font-style: italic'
       end
     end
   end

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))
-        pdf.image(@attrs.src, evaluated_styles) if @attrs.src
+        evaluated_styles = evaluate_styles(pdf, block_styles.merge(parsed_styles))
+        pdf.image(@attrs.src, evaluated_styles)
       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,10 +9,13 @@ module PrawnHtml
         true
       end
 
-      def tag_styles
-        {
-          before_content: '•  '
-        }
+      def before_content
+        @counter ? "#{@counter}. " : "#{@symbol} "
+      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
     end
   end

data/lib/prawn_html/tags/mark.rb

@@ -6,9 +6,7 @@ module PrawnHtml
       ELEMENTS = [:mark].freeze
 
       def tag_styles
-        {
-          'callback' => Callbacks::Highlight
-        }
+        'callback: Highlight'
       end
     end
   end

data/lib/prawn_html/tags/ol.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Ol < Tag
+      ELEMENTS = [:ol].freeze
+
+      MARGIN_LEFT = 25
+
+      attr_accessor :counter
+
+      def initialize(tag, attributes: {}, element_styles: '')
+        super
+        @counter = 0
+      end
+
+      def block?
+        true
+      end
+
+      def tag_styles
+        "margin-left: #{MARGIN_LEFT}px"
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/p.rb

@@ -13,10 +13,10 @@ module PrawnHtml
       end
 
       def tag_styles
-        @tag_styles ||= {
-          'margin-bottom' => MARGIN_BOTTOM.to_s,
-          'margin-top' => MARGIN_TOP.to_s
-        }
+        <<~STYLES
+          margin-bottom: #{MARGIN_BOTTOM}px;
+          margin-top: #{MARGIN_TOP}px;
+        STYLES
       end
     end
   end

data/lib/prawn_html/tags/pre.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Pre < Tag
+      ELEMENTS = [:pre].freeze
+
+      MARGIN_BOTTOM = 14
+      MARGIN_TOP = 14
+
+      def block?
+        true
+      end
+
+      def tag_styles
+        <<~STYLES
+          font-family: Courier;
+          margin-bottom: #{MARGIN_BOTTOM}px;
+          margin-top: #{MARGIN_TOP}px;
+          white-space: pre;
+        STYLES
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/sub.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Sub < Tag
+      ELEMENTS = [:sub].freeze
+
+      def tag_styles
+        'vertical-align: sub'
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/sup.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Tags
+    class Sup < Tag
+      ELEMENTS = [:sup].freeze
+
+      def tag_styles
+        'vertical-align: super'
+      end
+    end
+  end
+end

data/lib/prawn_html/tags/u.rb

@@ -6,9 +6,7 @@ module PrawnHtml
       ELEMENTS = [:ins, :u].freeze
 
       def tag_styles
-        {
-          'text-decoration' => 'underline'
-        }
+        'text-decoration: underline'
       end
     end
   end

data/lib/prawn_html/tags/ul.rb

@@ -12,9 +12,7 @@ module PrawnHtml
       end
 
       def tag_styles
-        @tag_styles ||= {
-          'margin-left' => MARGIN_LEFT.to_s,
-        }
+        "margin-left: #{MARGIN_LEFT}px"
       end
     end
   end

data/lib/prawn_html/utils.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+module PrawnHtml
+  module Utils
+    NORMALIZE_STYLES = {
+      'bold' => :bold,
+      'italic' => :italic,
+      'sub' => :subscript,
+      'super' => :superscript,
+      '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.2.0'
+  VERSION = '0.4.2'
 end