prawn-html 0.3.2 → 0.6.0

data/lib/prawn_html/tags/hr.rb

@@ -18,10 +18,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
 
       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

@@ -12,16 +12,17 @@ module PrawnHtml
       def custom_render(pdf, context)
         parsed_styles = Attributes.parse_styles(attrs.style)
         block_styles = context.block_styles
-        evaluated_styles = evaluate_styles(pdf, block_styles.merge(parsed_styles))
+        evaluated_styles = adjust_styles(pdf, block_styles.merge(parsed_styles))
         pdf.image(@attrs.src, evaluated_styles)
       end
 
       private
 
-      def evaluate_styles(pdf, img_styles)
+      def adjust_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')
+          w, h = img_styles['width'], img_styles['height']
+          result[:width] = Utils.convert_size(w, options: pdf.page_width) if w
+          result[:height] = Utils.convert_size(h, options: pdf.page_height) if h
           result[:position] = img_styles[:align] if %i[left center right].include?(img_styles[:align])
         end
       end

data/lib/prawn_html/tags/li.rb

@@ -5,19 +5,32 @@ module PrawnHtml
     class Li < Tag
       ELEMENTS = [:li].freeze
 
+      INDENT_OL = -12
+      INDENT_UL = -6
+
       def block?
         true
       end
 
-      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
+      def before_content
+        @counter ? "#{@counter}. " : "#{@symbol} "
       end
 
-      def tag_styles
-        {
-          before_content: @counter ? "#{@counter}. " : "#{@symbol} "
-        }
+      def block_styles
+        super.tap do |bs|
+          bs[:indent_paragraphs] = @indent
+        end
+      end
+
+      def on_context_add(_context)
+        case parent.class.to_s
+        when 'PrawnHtml::Tags::Ol'
+          @indent = INDENT_OL
+          @counter = (parent.counter += 1)
+        when 'PrawnHtml::Tags::Ul'
+          @indent = INDENT_UL
+          @symbol = parent.styles[:list_style_type] || '&bullet;'
+        end
       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
-        }
+        'background: #ff0'
       end
     end
   end

data/lib/prawn_html/tags/ol.rb

@@ -5,23 +5,38 @@ module PrawnHtml
     class Ol < Tag
       ELEMENTS = [:ol].freeze
 
-      MARGIN_LEFT = 25
+      MARGIN_TOP = 15
+      MARGIN_LEFT = 40
+      MARGIN_BOTTOM = 15
 
       attr_accessor :counter
 
-      def initialize(*_args)
+      def initialize(tag, attributes: {}, options: {})
         super
         @counter = 0
+        @first_level = false
       end
 
       def block?
         true
       end
 
+      def on_context_add(context)
+        return if context.map(&:tag).count { |el| el == :ol } > 1
+
+        @first_level = true
+      end
+
       def tag_styles
-        @tag_styles ||= {
-          'margin-left' => MARGIN_LEFT.to_s,
-        }
+        if @first_level
+          <<~STYLES
+            margin-top: #{MARGIN_TOP}px;
+            margin-left: #{MARGIN_LEFT}px;
+            margin-bottom: #{MARGIN_BOTTOM}px;
+          STYLES
+        else
+          "margin-left: #{MARGIN_LEFT}px"
+        end
       end
     end
   end

data/lib/prawn_html/tags/p.rb

@@ -5,18 +5,18 @@ module PrawnHtml
     class P < Tag
       ELEMENTS = [:p].freeze
 
-      MARGIN_BOTTOM = 6
-      MARGIN_TOP = 6
+      MARGIN_BOTTOM = 12.5
+      MARGIN_TOP = 12.5
 
       def block?
         true
       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/small.rb

@@ -5,10 +5,10 @@ module PrawnHtml
     class Small < Tag
       ELEMENTS = [:small].freeze
 
-      def update_styles(styles)
-        size = (styles[:size] || Context::DEF_FONT_SIZE) * 0.85
-        styles[:size] = size
-        styles
+      def update_styles(context_styles)
+        size = (context_styles[:size] || Context::DEFAULT_STYLES[:size]) * 0.85
+        context_styles[:size] = size
+        super(context_styles)
       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

@@ -5,16 +5,35 @@ module PrawnHtml
     class Ul < Tag
       ELEMENTS = [:ul].freeze
 
-      MARGIN_LEFT = 25
+      MARGIN_TOP = 15
+      MARGIN_LEFT = 40
+      MARGIN_BOTTOM = 15
+
+      def initialize(tag, attributes: {}, options: {})
+        super
+        @first_level = false
+      end
 
       def block?
         true
       end
 
+      def on_context_add(context)
+        return if context.map(&:tag).count { |el| el == :ul } > 1
+
+        @first_level = true
+      end
+
       def tag_styles
-        @tag_styles ||= {
-          'margin-left' => MARGIN_LEFT.to_s,
-        }
+        if @first_level
+          <<~STYLES
+            margin-top: #{MARGIN_TOP}px;
+            margin-left: #{MARGIN_LEFT}px;
+            margin-bottom: #{MARGIN_BOTTOM}px;
+          STYLES
+        else
+          "margin-left: #{MARGIN_LEFT}px"
+        end
       end
     end
   end

data/lib/prawn_html/utils.rb

@@ -2,6 +2,32 @@
 
 module PrawnHtml
   module Utils
+    NORMALIZE_STYLES = {
+      'bold' => :bold,
+      'italic' => :italic,
+      'sub' => :subscript,
+      'super' => :superscript,
+      'underline' => :underline
+    }.freeze
+
+    # Setup a background callback
+    #
+    # @param value [String] HTML string color
+    #
+    # @return [Array] callback name and argument value
+    def callback_background(value, options: nil)
+      ['Background', convert_color(value, options: options)]
+    end
+
+    # Setup a strike through callback
+    #
+    # @param value [String] unused
+    #
+    # @return [Array] callback name and argument value
+    def callback_strike_through(value, options: nil)
+      ['StrikeThrough', nil]
+    end
+
     # Converts a color string
     #
     # Supported formats:
@@ -13,7 +39,7 @@ module PrawnHtml
     # @param value [String] HTML string color
     #
     # @return [String] adjusted string color or nil if value is invalid
-    def convert_color(value)
+    def convert_color(value, options: nil)
       val = value.to_s.strip.downcase
       return Regexp.last_match[1] if val.match /\A#([a-f0-9]{6})\Z/ # rubocop:disable Performance/RedundantMatch
 
@@ -34,7 +60,7 @@ module PrawnHtml
     # @param value [String] string decimal
     #
     # @return [Float] converted and rounded float number
-    def convert_float(value)
+    def convert_float(value, options: nil)
       val = value&.gsub(/[^0-9.]/, '') || ''
       val.to_f.round(4)
     end
@@ -42,14 +68,14 @@ module PrawnHtml
     # Converts a size string
     #
     # @param value [String] size string
-    # @param container_size [Numeric] container size
+    # @param options [Numeric] container size
     #
     # @return [Float] converted and rounded size
-    def convert_size(value, container_size = nil)
+    def convert_size(value, options: nil)
       val = value&.gsub(/[^0-9.]/, '') || ''
       val =
-        if container_size && value.include?('%')
-          val.to_f * container_size * 0.01
+        if options && value&.include?('%')
+          val.to_f * options * 0.01
         else
           val.to_f * PrawnHtml::PX
         end
@@ -61,7 +87,7 @@ module PrawnHtml
     # @param value [String] string
     #
     # @return [Symbol] symbol
-    def convert_symbol(value)
+    def convert_symbol(value, options: nil)
       value.to_sym if value && !value.match?(/\A\s*\Z/)
     end
 
@@ -70,21 +96,32 @@ module PrawnHtml
     # @param value
     #
     # @return value
-    def copy_value(value)
+    def copy_value(value, options: nil)
       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)
+    def unquote(value, options: nil)
       (value&.strip || +'').tap do |val|
         val.gsub!(/\A['"]|["']\Z/, '')
       end
     end
 
-    module_function :convert_color, :convert_float, :convert_size, :convert_symbol, :copy_value, :unquote
+    module_function :callback_background, :callback_strike_through, :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.3.2'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-html
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oga
@@ -48,7 +48,7 @@ files:
 - README.md
 - lib/prawn-html.rb
 - lib/prawn_html/attributes.rb
-- lib/prawn_html/callbacks/highlight.rb
+- lib/prawn_html/callbacks/background.rb
 - lib/prawn_html/callbacks/strike_through.rb
 - lib/prawn_html/context.rb
 - lib/prawn_html/document_renderer.rb
@@ -57,8 +57,10 @@ files:
 - lib/prawn_html/tag.rb
 - lib/prawn_html/tags/a.rb
 - lib/prawn_html/tags/b.rb
+- lib/prawn_html/tags/blockquote.rb
 - lib/prawn_html/tags/body.rb
 - lib/prawn_html/tags/br.rb
+- lib/prawn_html/tags/code.rb
 - lib/prawn_html/tags/del.rb
 - lib/prawn_html/tags/div.rb
 - lib/prawn_html/tags/h.rb
@@ -69,8 +71,11 @@ files:
 - lib/prawn_html/tags/mark.rb
 - lib/prawn_html/tags/ol.rb
 - lib/prawn_html/tags/p.rb
+- lib/prawn_html/tags/pre.rb
 - lib/prawn_html/tags/small.rb
 - lib/prawn_html/tags/span.rb
+- lib/prawn_html/tags/sub.rb
+- lib/prawn_html/tags/sup.rb
 - lib/prawn_html/tags/u.rb
 - lib/prawn_html/tags/ul.rb
 - lib/prawn_html/utils.rb