prawn-html 0.1.0 → 0.3.2

data/lib/prawn_html/tags/a.rb

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class A < Base
+    class A < Tag
       ELEMENTS = [:a].freeze
 
-      def styles
-        super.merge(
-          link: attrs.hash.href
-        )
+      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,13 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Br < Base
+    class Br < Tag
       ELEMENTS = [:br].freeze
 
-      BR_SPACING = 12
+      BR_SPACING = Utils.convert_size('12')
 
       def block?
         true
@@ -16,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/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,27 @@ module PrawnHtml
       end
 
       def custom_render(pdf, _context)
-        pdf.stroke_horizontal_rule
+        dash = attrs.data.include?('dash') ? parse_dash_value(attrs.data['dash']) : nil
+        pdf.horizontal_rule(color: attrs.styles[:color], dash: 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)
+        parsed_styles = Attributes.parse_styles(attrs.style)
+        block_styles = context.block_styles
+        evaluated_styles = evaluate_styles(pdf, block_styles.merge(parsed_styles))
+        pdf.image(@attrs.src, evaluated_styles)
       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
+      def evaluate_styles(pdf, img_styles)
+        {}.tap do |result|
+          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
   end

data/lib/prawn_html/tags/li.rb

@@ -1,20 +1,23 @@
 # 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(
-          before_content: '&bullet;  '
-        )
+      def on_context_add(_context)
+        @counter = (parent.counter += 1) if parent.is_a? Ol
+        @symbol = parent.styles[:list_style_type] || '&bullet;' if parent.is_a? Ul
+      end
+
+      def tag_styles
+        {
+          before_content: @counter ? "#{@counter}. " : "#{@symbol} "
+        }
       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/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/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,15 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'base'
-
 module PrawnHtml
   module Tags
-    class Small < Base
+    class Small < Tag
       ELEMENTS = [:small].freeze
 
       def update_styles(styles)
         size = (styles[:size] || Context::DEF_FONT_SIZE) * 0.85
         styles[:size] = size
+        styles
       end
     end
   end

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/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 * 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
+
+    # 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