prawn-styled-text 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c73fb17ed91bd33843991a644f9c635c2d2cfaa5
-  data.tar.gz: 57aad42cddc27f7302df26aba88ae5379a3c1f5e
+SHA256:
+  metadata.gz: c4d9cebb86cc3f9c771ea5b309c8905cc28851eb0b3d5def9290c06050424208
+  data.tar.gz: a9a601e1bf00a37dcd3f5bb93d79ec09191cd91fcf1eafd664de456b3903ae92
 SHA512:
-  metadata.gz: 1fbcaead4bdf4d53477cd4195b62032492056a29d5a33e78cf13c9c878814b2d798df50e872fdbaa29a768e5cf085bdb7592d75298ac86fd6b30914416312c87
-  data.tar.gz: b90e425105862e661321e3dd54295d73e9cf3ba0e3cab74a41f4a4dbcb31a0c6752537cb7d31a747762b7e1c1ac3cb50a1a205e2f94b9c131fcdd9364a64552e
+  metadata.gz: e7ee55a9586cc519144be5576caab20f30348461dc0ff32deb15eff03a004a5d35ec13f94ab02544a54da4496e22131b81440842ca84e0c289ace2e594690e12
+  data.tar.gz: 12ad62b6582c0611c3be916fe56853c83d227d37a7769ea5ffa63e0014fc35a834c5d22037bbfc8718ed038ff7b1ba9c9069b78e8bfc708b3c012d6f5e3fdd04

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -20,50 +20,50 @@ For more examples see this [folder](https://github.com/blocknotes/prawn-styled-t
 ## Supported tags & attributes
 
 HTML tags:
-- a (link)
-- b (bold)
-- br (new line)
-- del (strike-through)
-- div (block element)
-- em (italic)
-- h1 - h6 (headings)
-- hr (horizontal line)
-- i (italic)
-- ins (underline)
-- img (image)
-- li (list item)
-- mark (highlight)
-- p (block element)
-- s (strike-through)
-- small (smaller text)
-- span (inline element)
-- strong (bold)
-- u (underline)
-- ul (list)
+- **a**: link
+- **b**: bold
+- **br**: new line
+- **del**: strike-through
+- **div**: block element
+- **em**: italic
+- **h1** - **h6**: headings
+- **hr**: horizontal line
+- **i**: italic
+- **ins**: underline
+- **img**: image
+- **li**: list item
+- **mark**: highlight
+- **p**: block element
+- **s**: strike-through
+- **small**: smaller text
+- **span**: inline element
+- **strong**: bold
+- **u**: underline
+- **ul**: list
 
 CSS attributes:
-- background (for *mark* tag, only 6 hex digits format, # is ignored - ex. `style="background: #FFCC00"`)
-- color (only 6 hex digits format, # is ignored - ex. `style="color: #FFBB11"`)
-- font-family (ex. `style="font: Courier"`)
-- font-size (units are ignored - ex. `style="font-size: 20px"`)
-- font-style (*:bold*, *:bold_italic*, *:italic*, *:normal*; accepts list of values - ex. `style="font-style: bold, italic"`)
-- height (for *img* tag, ex. `<img src="test.jpg" style="width: 50%; height: 200"/>`)
-- href (for *a* tag, ex. `<a href="http://www.google.com/">Google</a>`)
-- letter-spacing (ex. `style="letter-spacing: 1.5"`)
-- line-height (heading, units are ignored - ex. `style="line-height: 10"`)
-- margin-left (units are ignored - ex. `style="margin-left: 15"`)
-- margin-top (units are ignored - ex. `style="margin-top: 20"`)
-- src (for *img* tag, ex. `<img src="test.jpg"/>`)
-- text-align (ex. `style="text-align: center"`)
-- width (for *img* tag, ex. `<img src="test.jpg" style="width: 50%; height: 200"/>`)
+- **background**: for *mark* tag, only 6 hex digits format, # is ignored - ex. `style="background: #FFCC00"`
+- **color**: only 6 hex digits format, # is ignored - ex. `style="color: #FFBB11"`
+- **font-family**: font must be registered, quotes are optional, ex. `style="font: Courier"`
+- **font-size**: units are ignored - ex. `style="font-size: 20px"`
+- **font-style**: values: *:bold*, *:bold_italic*, *:italic*, *:normal*; string or comma separated strings - ex. `style="font-style: bold, italic"`
+- **height**: for *img* tag, ex. `<img src="test.jpg" style="width: 50%; height: 200"/>`
+- **href**: for *a* tag, ex. `<a href="http://www.google.com/">Google</a>`
+- **letter-spacing**: ex. `style="letter-spacing: 1.5"`
+- **line-height**: heading, units are ignored - ex. `style="line-height: 10"`
+- **margin-left**: units are ignored - ex. `style="margin-left: 15"`
+- **margin-top**: units are ignored - ex. `style="margin-top: 20"`
+- **src**: for *img* tag, ex. `<img src="test.jpg"/>`
+- **text-align**: ex. `style="text-align: center"`
+- **width**: for *img* tag, ex. `<img src="test.jpg" style="width: 50%; height: 200"/>`
 
 Olther attributes:
-- dash (for *hr* tag, ex. `<hr style="dash: 4"/>`)
-- image-at (for *img* tag, origin (0, 0) is left bottom, ex. `<img src="image.jpg" style="image-at: 100, 600" />`)
-- image-position (for *img* tag, ex. `<img src="image.jpg" style="image-position: center" />`)
-- image-scale (for *img* tag, ex. `<img src="image.jpg" style="image-scale: 0.3" />`)
-- list-symbol (for *ul* tag, ex. `<ul style="list-symbol: -">`)
-- mode (ex. `<h3 style="mode: stroke">Stroke text</h3>`)
+- **dash**: for *hr* tag, dash types, integer or comma separated integers, ex. `<hr style="dash: 4"/>`
+- **image-at**: for *img* tag, origin (0, 0) is left bottom, ex. `<img src="image.jpg" style="image-at: 100, 600" />`
+- **image-position**: for *img* tag, ex. `<img src="image.jpg" style="image-position: center" />`
+- **image-scale**: for *img* tag, ex. `<img src="image.jpg" style="image-scale: 0.3" />`
+- **list-symbol**: for *ul* tag, ex. `<ul style="list-symbol: -">`
+- **mode**: text mode, values: *:clip*, *:fill*, *:fill_clip*, *:fill_stroke*, *:fill_stroke_clip*, *:invisible*, *:stroke*, *:stroke_clip*, ex. `<h3 style="mode: stroke">Stroke text</h3>`
 
 See [Prawn documentation](https://github.com/prawnpdf/prawn-table#documentation) for PDF options details.
 

data/examples/basic.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+$LOAD_PATH << '../lib'
+
 require 'prawn'
 require 'prawn-styled-text'
 require 'oga'
@@ -5,5 +9,5 @@ require 'oga'
 Prawn::Font::AFM.hide_m17n_warning = true
 
 pdf = Prawn::Document.new
-pdf.styled_text File.read( 'test.html' )
-pdf.render_file 'test.pdf'
+pdf.styled_text(File.read('test.html'))
+pdf.render_file('basic.pdf')

data/examples/columns.rb

@@ -1,16 +1,20 @@
+# frozen_string_literal: true
+
+$LOAD_PATH << '../lib'
+
 require 'prawn'
 require 'prawn-styled-text'
 require 'oga'
 
-html = <<~EOL
+html = <<~CONTENT
   <div style="font-size: 16px; text-align: justify">Lorem ipsum dolor sit <b>amet</b>, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud <i>exercitation</i> ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in <u>reprehenderit</u> in voluptate velit esse cillum dolore eu fugiat nulla pariatur.<br/>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
     <br/>
   </div>
-EOL
+CONTENT
 
 pdf = Prawn::Document.new
 pdf.styled_text '<h1 style="text-align: center">2 columns</h1>'
-pdf.column_box( [ 0, pdf.cursor ], columns: 2, width: pdf.bounds.width ) do
-  pdf.styled_text html * 4
+pdf.column_box([0, pdf.cursor], columns: 2, width: pdf.bounds.width) do
+  pdf.styled_text(html * 4)
 end
-pdf.render_file 'test.pdf'
+pdf.render_file('columns.pdf')

data/examples/erb.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+$LOAD_PATH << '../lib'
+
 require 'erb'
 require 'prawn'
 require 'prawn-styled-text'
@@ -8,6 +12,6 @@ ERB_FILE = 'test.html.erb'
 Prawn::Font::AFM.hide_m17n_warning = true
 
 pdf = Prawn::Document.new
-pdf.text "\nA test document\n", align: :center, size: 18
-pdf.styled_text ERB.new( File.read( ERB_FILE ) ).result( binding )
-pdf.render_file 'test.pdf'
+pdf.text("\nA test document\n", align: :center, size: 18)
+pdf.styled_text ERB.new(File.read(ERB_FILE)).result(binding)
+pdf.render_file('erb.pdf')

data/examples/grid.rb

@@ -1,13 +1,17 @@
+# frozen_string_literal: true
+
+$LOAD_PATH << '../lib'
+
 require 'prawn'
 require 'prawn-styled-text'
 require 'oga'
 
-html = <<~EOL
+html = <<~CONTENT
   <h4 style="text-align: center">Some text</h4>
   <div style="font-size: 10px; text-align: justify">Lorem ipsum dolor sit <b>amet</b>, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud <i>exercitation</i> ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in <u>reprehenderit</u> in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
-EOL
+CONTENT
 
-# html = <<~EOL
+# html = <<~CONTENT
 #   <span>span 1</span>
 #   <div>div 1</div>
 #   <span>span 2</span>
@@ -16,11 +20,11 @@ EOL
 #   <span>span 4</span>
 #   <div>div 3</div>
 #   <div>div 4</div>
-# EOL
+# CONTENT
 
 pdf = Prawn::Document.new
-pdf.define_grid(:columns => 3, :rows => 3, :gutter => 10)
-pdf.grid( 1, 1 ).bounding_box do
-  pdf.styled_text html
+pdf.define_grid(columns: 3, rows: 3, gutter: 10)
+pdf.grid(1, 1).bounding_box do
+  pdf.styled_text(html)
 end
-pdf.render_file 'test.pdf'
+pdf.render_file('grid.pdf')

data/examples/slim.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+$LOAD_PATH << '../lib'
+
 require 'prawn'
 require 'prawn-styled-text'
 require 'oga'
@@ -8,7 +12,7 @@ SLIM_FILE = 'test.html.slim'
 Prawn::Font::AFM.hide_m17n_warning = true
 
 pdf = Prawn::Document.new
-pdf.text "\nA test document\n", align: :center, size: 18
+pdf.text("\nA test document\n", align: :center, size: 18)
 # Slim::Template.new{ 'h1 A test document' }.render
-pdf.styled_text Slim::Template.new( SLIM_FILE ).render
-pdf.render_file 'test.pdf'
+pdf.styled_text(Slim::Template.new(SLIM_FILE).render)
+pdf.render_file('slim.pdf')

data/examples/test.html

@@ -36,6 +36,18 @@ Some HTML entities: € × ÷ ½ « » ©
 <br/>
 
 A span with a color: <span style="color: #4488CC">this is <span style="color: #ff0000; font-family: 'Courier'; font-size: 20px">courier red 20</span>, this is <span style="color: #008800; font-style: bold, italic">green bold italic</span>, this is <span style="letter-spacing: 2">character spacing 2</span>, this is <a href="http://www.google.com">a Google link</a></span>
+
+<br/>
+Line1<br/>Line2<br/>Line3
+<br />
+Word1
+Word2
+
+Word3
+<br/>
+<br/>
+Line4
+
 <h3 style="mode: stroke">Stroke mode</h3>
 <div style="font-size: 14px; line-height: 12px; text-align: justify">line-height test... Lorem ipsum dolor sit amet, consectetur <small>adipisicing</small> elit, sed do eiusmod <em>tempor</em> incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure <strong>dolor</strong> in reprehenderit in voluptate velit.</div>
 <hr/>

data/lib/prawn-styled-text.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'prawn-styled-text/prawn-styled-text'

data/lib/prawn-styled-text/callbacks.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module PrawnStyledText
   class HighlightCallback
-    def initialize( pdf )
+    def initialize(pdf)
       @document = pdf
     end
 
-    def set_color( color )
-      @color = color ? color : DEF_BG_MARK
+    def set_color(color) # rubocop:disable Naming/AccessorMethodName
+      @color = color || DEF_BG_MARK
     end
 
-    def render_behind( fragment )
+    def render_behind(fragment)
       original_color       = @document.fill_color
       @document.fill_color = @color
       @document.fill_rectangle(fragment.top_left, fragment.width, fragment.height)
@@ -17,14 +19,14 @@ module PrawnStyledText
   end
 
   class StrikeThroughCallback
-    def initialize( pdf )
+    def initialize(pdf)
       @document = pdf
     end
 
-    def render_in_front( fragment )
-      y = ( fragment.top_left[1] + fragment.bottom_left[1] ) / 2
+    def render_in_front(fragment)
+      y = (fragment.top_left[1] + fragment.bottom_left[1]) / 2
       @document.stroke do
-        @document.line [ fragment.top_left[0], y ], [ fragment.top_right[0], y ]
+        @document.line [fragment.top_left[0], y], [fragment.top_right[0], y]
       end
     end
   end

data/lib/prawn-styled-text/prawn-document.rb

@@ -1,18 +1,21 @@
+# frozen_string_literal: true
+
 require 'prawn'
 
 Prawn::Document.class_eval do
-  def styled_text( data )
+  def styled_text(data)
     parts = []
     text_options = {}
     extra_options = { margin_left: 0 }
     oga = Oga.parse_html data
     PrawnStyledText::traverse oga.children do |type, text, data|
-      context = if type == :text_node
-          PrawnStyledText::text_node( self, data )
+      context =
+        if type == :text_node
+          PrawnStyledText::text_node(self, data)
         elsif type == :opening_tag
-          PrawnStyledText::opening_tag( self, data )
+          PrawnStyledText::opening_tag(self, data)
         else
-          PrawnStyledText::closing_tag( self, data )
+          PrawnStyledText::closing_tag(self, data)
         end
       if context[:flush] && parts.any? # flush current parts
         parts[0][:text] = parts[0][:text].lstrip
@@ -23,8 +26,8 @@ Prawn::Document.class_eval do
         end
         if parts.any?
           parts[0][:text] = extra_options[:pre] + parts[0][:text] if extra_options[:pre]
-          self.indent( extra_options[:margin_left] ) do
-            self.formatted_text parts, text_options
+          indent(extra_options[:margin_left]) do
+            formatted_text(parts, text_options)
           end
         end
         parts = []
@@ -34,44 +37,44 @@ Prawn::Document.class_eval do
       options = context[:options]
       if type == :text_node
         text_options[:align] = options[:'text-align'].to_sym if options[:'text-align']
-        margin_top = options.delete( :'margin-top' ).to_i
-        self.move_down( margin_top ) if margin_top > 0
-        margin_left = options.delete( :'margin-left' ).to_i
-        extra_options[:margin_left] = margin_left if margin_left > 0
-        if !text_options[:leading] && ( leading = options.delete( :'line-height' ).to_i ) > 0
+        margin_top = options.delete(:'margin-top').to_i
+        move_down(margin_top) if margin_top.positive?
+        margin_left = options.delete(:'margin-left').to_i
+        extra_options[:margin_left] = margin_left if margin_left.positive?
+        if !text_options[:leading] && (leading = options.delete(:'line-height').to_i).positive?
           text_options[:leading] = leading
         end
         text_options[:mode] = options[:mode].to_sym if options[:mode]
         extra_options[:pre] = context[:pre] if context[:pre]
-        parts << { text: text }.merge( options ) # push the data
+        parts << { text: text }.merge(options) # push the data
       elsif type == :closing_tag
-        self.formatted_text( context[:text] ) if context[:text]
+        formatted_text(context[:text]) if context[:text]
         if context[:tag] == :hr
-          self.dash( options[:dash].include?( ',' ) ? options[:dash].split( ',' ).map( &:to_i ) : options[:dash].to_i ) if options[:dash]
+          dash(options[:dash].include?(',') ? options[:dash].split(',').map(&:to_i) : options[:dash].to_i) if options[:dash]
           if options[:color]
-            last_stroke_color = self.stroke_color
-            self.stroke_color( options[:color] )
+            last_stroke_color = stroke_color
+            stroke_color(options[:color])
           end
-          self.stroke_horizontal_rule
-          self.stroke_color( last_stroke_color ) if options[:color]
-          self.undash if options[:dash]
+          stroke_horizontal_rule
+          stroke_color(last_stroke_color) if options[:color]
+          undash if options[:dash]
         elsif context[:tag] == :img && context[:src]
           image_options = {}
           image_options[:scale] = options[:'image-scale'].to_f if options[:'image-scale']
           if options[:'image-at']
-            xy = options[:'image-at'].split( ',' ).map &:to_i
+            xy = options[:'image-at'].split(',').map &:to_i
             image_options[:at] = xy if xy.count == 2
           end
           if options[:'image-position']
             pos = options[:'image-position'].to_i
-            image_options[:position] = pos > 0 ? pos : options[:'image-position']
+            image_options[:position] = pos.positive? ? pos : options[:'image-position']
           end
           image_options[:width]  = options[:width]  if options[:width]
           image_options[:height] = options[:height] if options[:height]
-          self.image context[:src], image_options
+          image context[:src], image_options
         end
       end
     end
-    self.formatted_text parts, text_options
+    formatted_text(parts, text_options)
   end
 end

data/lib/prawn-styled-text/prawn-styled-text.rb

@@ -1,26 +1,30 @@
+# frozen_string_literal: true
+
 require 'oga'
 require_relative 'callbacks'
 require_relative 'prawn-document'
 
 module PrawnStyledText
-  BLOCK_TAGS = [ :br, :div, :h1, :h2, :h3, :h4, :h5, :h6, :hr, :li, :p, :ul ]
+  BLOCK_TAGS = [:br, :div, :h1, :h2, :h3, :h4, :h5, :h6, :hr, :li, :p, :ul].freeze
   DEF_BG_MARK = 'ffff00'
   DEF_HEADING_T = 16
   DEF_HEADING_H = 8
   DEF_MARGIN_UL = 15
   DEF_SYMBOL_UL = "\x95 "
-  HEADINGS = { h1: 32, h2: 24, h3: 20, h4: 16, h5: 14, h6: 13 }
-  RENAME = { 'font-family': :font, 'font-size': :size, 'font-style': :styles, 'letter-spacing': :character_spacing }
+  HEADINGS = { h1: 32, h2: 24, h3: 20, h4: 16, h5: 14, h6: 13 }.freeze
+  RENAME = { 'font-family': :font, 'font-size': :size, 'font-style': :styles, 'letter-spacing': :character_spacing }.freeze
 
   @@margin_ul = 0
   @@symbol_ul = ''
+  @@last_el = nil
 
-  def self.adjust_values( pdf, values )
+  def self.adjust_values(pdf, values)
     ret = {}
     values.each do |k, v|
       key = k.to_sym
-      key = RENAME[key] if RENAME.include?( key )
-      ret[key] = case key
+      key = RENAME[key] if RENAME.include?(key)
+      ret[key] =
+        case key
         when :character_spacing
           v.to_f
         when :color
@@ -30,14 +34,14 @@ module PrawnStyledText
           matches[3] || matches[2] || matches[1] || ''
         when :height
           i = v.to_i
-          v.include?( '%' ) ? ( i * pdf.bounds.height * 0.01 ) : i
+          v.include?('%') ? (i * pdf.bounds.height * 0.01) : i
         when :size
           v.to_i
         when :styles
-          v.split( ',' ).map { |s| s.strip.to_sym }
+          v.split(',').map { |s| s.strip.to_sym }
         when :width
           i = v.to_i
-          v.include?( '%' ) ? ( i * pdf.bounds.width * 0.01 ) : i
+          v.include?('%') ? (i * pdf.bounds.width * 0.01) : i
         else
           v
         end
@@ -45,13 +49,13 @@ module PrawnStyledText
     ret
   end
 
-  def self.closing_tag( pdf, data )
+  def self.closing_tag(pdf, data)
     context = { tag: data[:name], options: {} }
     context[:flush] ||= true if BLOCK_TAGS.include? data[:name]
     # Evalutate tag
     case data[:name]
     when :br # new line
-      context[:text] ||= [ { text: "\n" } ]
+      context[:text] ||= [ { text: "\n" } ] if @@last_el == :br
     when :img # image
       context[:flush] ||= true
       context[:src] = data[:node].get 'src'
@@ -60,29 +64,29 @@ module PrawnStyledText
     end
     # Evalutate attributes
     attributes = data[:node].get 'style'
-    context[:options] = adjust_values( pdf, attributes.scan( /\s*([^:]+):\s*([^;]+)[;]*/ ) ) if attributes
+    context[:options] = adjust_values(pdf, attributes.scan(/\s*([^:]+):\s*([^;]+)[;]*/)) if attributes
     context
   end
 
-  def self.opening_tag( pdf, data )
+  def self.opening_tag(pdf, data)
     context = { tag: data[:name], options: {} }
     context[:flush] ||= true if BLOCK_TAGS.include? data[:name]
     # Evalutate attributes
     attributes = data[:node].get 'style'
-    context[:options].merge!( adjust_values( pdf, attributes.scan( /\s*([^:]+):\s*([^;]+)[;]*/ ) ) ) if attributes
+    context[:options].merge!(adjust_values(pdf, attributes.scan(/\s*([^:]+):\s*([^;]+)[;]*/))) if attributes
     if data[:name] == :ul
-      @@margin_ul += ( context[:options][:'margin-left'] ? context[:options][:'margin-left'].to_i : DEF_MARGIN_UL )
+      @@margin_ul += (context[:options][:'margin-left'] ? context[:options][:'margin-left'].to_i : DEF_MARGIN_UL)
       @@symbol_ul = if context[:options][:'list-symbol']
           matches = context[:options][:'list-symbol'].match /'([^']*)'|"([^"]*)"|(.*)/
           matches[3] || matches[2] || matches[1] || ''
         else
-          DEF_SYMBOL_UL
+          DEF_SYMBOL_UL.dup
         end
     end
     context
   end
 
-  def self.text_node( pdf, data )
+  def self.text_node(pdf, data)
     context = { pre: '', options: {} }
     styles = []
     font_size = pdf.font_size
@@ -96,7 +100,7 @@ module PrawnStyledText
       when :b, :strong # bold
         styles.push :bold
       when :del, :s
-        @@strike_through ||= StrikeThroughCallback.new( pdf )
+        @@strike_through ||= StrikeThroughCallback.new(pdf)
         context[:options][:callback] = @@strike_through
       when :h1, :h2, :h3, :h4, :h5, :h6
         context[:options][:size] = HEADINGS[tag]
@@ -106,9 +110,9 @@ module PrawnStyledText
         styles.push :italic
       when :li # list item
         context[:options][:'margin-left'] = @@margin_ul
-        context[:pre] = @@symbol_ul.force_encoding( 'windows-1252' ).encode( 'UTF-8' )
+        context[:pre] = @@symbol_ul.force_encoding('windows-1252').encode('UTF-8')
       when :mark
-        @@highlight ||= HighlightCallback.new( pdf )
+        @@highlight ||= HighlightCallback.new(pdf)
         @@highlight.set_color nil
         context[:options][:callback] = @@highlight
       when :small
@@ -120,8 +124,8 @@ module PrawnStyledText
       # Evalutate attributes
       attributes = part[:node].get 'style'
       if attributes
-        values = adjust_values( pdf, attributes.scan( /\s*([^:]+):\s*([^;]+)[;]*/ ) )
-        @@highlight.set_color( values[:background].delete( '#' ) ) if tag == :mark && values[:background]
+        values = adjust_values(pdf, attributes.scan(/\s*([^:]+):\s*([^;]+)[;]*/))
+        @@highlight.set_color(values[:background].delete('#')) if tag == :mark && values[:background]
         context[:options].merge! values
       end
       font_size = context[:options][:size] if font_size
@@ -129,16 +133,19 @@ module PrawnStyledText
     context
   end
 
-  def self.traverse( nodes, context = [], &block )
+  def self.traverse(nodes, context = [], &block)
     nodes.each do |node|
       if node.is_a? Oga::XML::Text
-        yield :text_node, node.text.delete( "\n\r" ), context
+        text = node.text.delete("\n\r")
+        yield :text_node, text, context
+        @@last_el = nil unless text.empty?
       elsif node.is_a? Oga::XML::Element
         element = { name: node.name.to_sym, node: node }
         yield :opening_tag, element[:name], element
-        context.push( element )
-        traverse( node.children, context, &block ) if node.children.count > 0
+        context.push(element)
+        traverse(node.children, context, &block) if node.children.count > 0
         yield :closing_tag, element[:name], context.pop
+        @@last_el = element[:name]
       end
     end
   end

data/lib/prawn-styled-text/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PrawnStyledText
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/prawn-styled-text.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'prawn-styled-text/version'
@@ -15,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'prawn', '~> 2'
-  spec.add_runtime_dependency 'oga', '~> 2'
+  spec.add_runtime_dependency 'oga', '~> 2.16'
+  spec.add_runtime_dependency 'prawn', '~> 2.2.2'
+
+  spec.add_development_dependency 'rubocop', '~> 0.76'
 end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: prawn-styled-text
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2019-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: prawn
+  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.16'
 - !ruby/object:Gem::Dependency
-  name: oga
+  name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.76'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.76'
 description: A Prawn PDF component which adds basic HTML support
 email: mat@blocknot.es
 executables: []
@@ -82,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Prawn PDF styled text