prawn 2.3.0 → 2.4.0

data/lib/prawn/text/formatted/parser.rb

@@ -14,23 +14,24 @@ module Prawn
       class Parser
         # @group Extension API
 
-        PARSER_REGEX = begin
-          regex_string = "\n|" \
-                         '<b>|</b>|' \
-                         '<i>|</i>|' \
-                         '<u>|</u>|' \
-                         '<strikethrough>|</strikethrough>|' \
-                         '<sub>|</sub>|' \
-                         '<sup>|</sup>|' \
-                         '<link[^>]*>|</link>|' \
-                         '<color[^>]*>|</color>|' \
-                         '<font[^>]*>|</font>|' \
-                         '<strong>|</strong>|' \
-                         '<em>|</em>|' \
-                         '<a[^>]*>|</a>|' \
-                         "[^<\n]+"
-          Regexp.new(regex_string, Regexp::MULTILINE)
-        end
+        PARSER_REGEX =
+          begin
+            regex_string = "\n|" \
+                          '<b>|</b>|' \
+                          '<i>|</i>|' \
+                          '<u>|</u>|' \
+                          '<strikethrough>|</strikethrough>|' \
+                          '<sub>|</sub>|' \
+                          '<sup>|</sup>|' \
+                          '<link[^>]*>|</link>|' \
+                          '<color[^>]*>|</color>|' \
+                          '<font[^>]*>|</font>|' \
+                          '<strong>|</strong>|' \
+                          '<em>|</em>|' \
+                          '<a[^>]*>|</a>|' \
+                          "[^<\n]+"
+            Regexp.new(regex_string, Regexp::MULTILINE)
+          end
 
         def self.format(string, *_args)
           tokens = string.gsub(%r{<br\s*/?>}, "\n").scan(PARSER_REGEX)
@@ -54,7 +55,7 @@ module Prawn
             subscript: '</sub>',
             superscript: '</sup>'
           }
-          array.collect do |hash|
+          array.map do |hash|
             prefix = ''
             suffix = ''
             hash[:styles]&.each do |style|
@@ -81,14 +82,15 @@ module Prawn
             end
 
             if hash[:color]
-              prefix += if hash[:color].is_a?(Array)
-                          "<color c='#{hash[:color][0]}'" \
-                                                  " m='#{hash[:color][1]}'" \
-                                                  " y='#{hash[:color][2]}'" \
-                                                  " k='#{hash[:color][3]}'>"
-                        else
-                          "<color rgb='#{hash[:color]}'>"
-                        end
+              prefix +=
+                if hash[:color].is_a?(Array)
+                  "<color c='#{hash[:color][0]}'" \
+                    " m='#{hash[:color][1]}'" \
+                    " y='#{hash[:color][2]}'" \
+                    " k='#{hash[:color][3]}'>"
+                else
+                  "<color rgb='#{hash[:color]}'>"
+                end
               suffix = '</color>'
             end
 

data/lib/prawn/text/formatted/wrap.rb

@@ -98,8 +98,10 @@ module Prawn
           fragments_this_line.each do |fragment_this_line|
             fragment_this_line.default_direction = @direction
             format_and_draw_fragment(
-              fragment_this_line, accumulated_width,
-              @line_wrap.width, word_spacing
+              fragment_this_line,
+              accumulated_width,
+              @line_wrap.width,
+              word_spacing
             )
             accumulated_width += fragment_this_line.width
           end
@@ -122,11 +124,12 @@ module Prawn
           @line_height = @arranger.max_line_height
           @descender = @arranger.max_descender
           @ascender = @arranger.max_ascender
-          diff = if @baseline_y.zero?
-                   @ascender + @descender
-                 else
-                   @descender + @line_height + @leading
-                 end
+          diff =
+            if @baseline_y.zero?
+              @ascender + @descender
+            else
+              @descender + @line_height + @leading
+            end
           require_relatived_total_height = @baseline_y.abs + diff
           if require_relatived_total_height > @height + 0.0001
             # no room for the full height of this line
@@ -152,12 +155,13 @@ module Prawn
           @everything_printed = false
         end
 
-        def format_and_draw_fragment(fragment, accumulated_width,
-          line_width, word_spacing)
+        def format_and_draw_fragment(fragment, accumulated_width, line_width, word_spacing)
           @arranger.apply_color_and_font_settings(fragment) do
             draw_fragment(
-              fragment, accumulated_width,
-              line_width, word_spacing
+              fragment,
+              accumulated_width,
+              line_width,
+              word_spacing
             )
           end
         end

data/lib/prawn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prawn
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

data/lib/prawn/view.rb

@@ -72,11 +72,11 @@ module Prawn
     def method_missing(method_name, *arguments, &block)
       return super unless document.respond_to?(method_name)
 
-      document.send(method_name, *arguments, &block)
+      document.public_send(method_name, *arguments, &block)
     end
 
     def respond_to_missing?(method_name, _include_all = false)
-      document.respond_to?(method_name)
+      document.respond_to?(method_name) || super
     end
 
     # Syntactic sugar that uses +instance_eval+ under the hood to provide

data/manual/basic_concepts/measurement.rb

@@ -18,7 +18,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
   require 'prawn/measurement_extensions'
 
   %i[mm cm dm m in yd ft].each do |measurement|
-    text "1 #{measurement} in PDF Points: #{1.send(measurement)} pt"
+    text "1 #{measurement} in PDF Points: #{1.public_send(measurement)} pt"
     move_down 5.mm
   end
 end

data/manual/bounding_box/canvas.rb

@@ -15,9 +15,9 @@ require_relative '../example_helper'
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   canvas do
-    fill_circle [bounds.left, bounds.top],     30
-    fill_circle [bounds.right, bounds.top],    30
+    fill_circle [bounds.left, bounds.top], 30
+    fill_circle [bounds.right, bounds.top], 30
     fill_circle [bounds.right, bounds.bottom], 30
-    fill_circle [0, 0],                        30
+    fill_circle [0, 0], 30
   end
 end

data/manual/bounding_box/nesting.rb

@@ -3,7 +3,7 @@
 # Normally when we provide the top left corner of a bounding box we
 # express the coordinates relative to the margin box. This is not the
 # case when we have nested bounding boxes. Once nested the inner bounding box
-# coordinates are relative to the outter bounding box.
+# coordinates are relative to the outer bounding box.
 #
 # This example shows some nested bounding boxes with fixed and stretchy heights.
 # Note how the <code>cursor</code> method returns coordinates relative to

data/manual/document_and_page_options/background.rb

@@ -16,10 +16,14 @@ Prawn::Document.generate(filename, background: img, margin: 100) do
   move_down font.height * 2
 
   text 'Here is my text explaning this report. ' * 20,
-    size: 12, align: :left, leading: 2
+    size: 12,
+    align: :left,
+    leading: 2
 
   move_down font.height
 
   text "I'm using a soft background. " * 40,
-    size: 12, align: :left, leading: 2
+    size: 12,
+    align: :left,
+    leading: 2
 end

data/manual/document_and_page_options/document_and_page_options.rb

@@ -7,10 +7,10 @@ require_relative '../example_helper'
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename, page_size: 'FOLIO') do
   package 'document_and_page_options' do |p|
-    p.example 'page_size',    eval_source: false, full_source: true
+    p.example 'page_size', eval_source: false, full_source: true
     p.example 'page_margins', eval_source: false, full_source: true
-    p.example 'background',   eval_source: false, full_source: true
-    p.example 'metadata',     eval_source: false, full_source: true
+    p.example 'background', eval_source: false, full_source: true
+    p.example 'metadata', eval_source: false, full_source: true
     p.example 'print_scaling', eval_source: false, full_source: true
 
     p.intro do

data/manual/document_and_page_options/print_scaling.rb

@@ -15,7 +15,8 @@ require_relative '../example_helper'
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::Document.generate(
   filename,
-  page_layout: :landscape, print_scaling: :none
+  page_layout: :landscape,
+  print_scaling: :none
 ) do
   text 'When you print this document, the scale to fit in print preview '\
     'should be disabled by default.'

data/manual/graphics/common_lines.rb

@@ -22,7 +22,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
     move_down 50
     horizontal_rule
 
-    vertical_line   100, 300, at: 50
+    vertical_line 100, 300, at: 50
 
     horizontal_line 200, 500, at: 150
   end

data/manual/graphics/fill_and_stroke.rb

@@ -33,7 +33,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
 
   # With block
   stroke { line [200, 200], [300, 150] }
-  fill   { rectangle [200, 100], 100, 100 }
+  fill { rectangle [200, 100], 100, 100 }
 
   # Method hook
   stroke_line [400, 200], [500, 150]

data/manual/graphics/fill_rules.rb

@@ -25,9 +25,10 @@ Prawn::ManualBuilder::Example.generate(filename) do
   stroke_color 'ff0000'
   line_width 2
 
-  text_box 'Nonzero Winding Number', at: [50, 215],
-                                     width: 170,
-                                     align: :center
+  text_box 'Nonzero Winding Number',
+    at: [50, 215],
+    width: 170,
+    align: :center
   polygon(*pentagram.map { |x, y| [x + 50, y] })
   fill_and_stroke
 

data/manual/graphics/helper.rb

@@ -17,11 +17,18 @@ filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   stroke_axis
   stroke_axis(
-    at: [70, 70], height: 200, step_length: 50,
-    negative_axes_length: 5, color: '0000FF'
+    at: [70, 70],
+    height: 200,
+    step_length: 50,
+    negative_axes_length: 5,
+    color: '0000FF'
   )
   stroke_axis(
-    at: [140, 140], width: 200, height: cursor.to_i - 140,
-    step_length: 20, negative_axes_length: 40, color: 'FF0000'
+    at: [140, 140],
+    width: 200,
+    height: cursor.to_i - 140,
+    step_length: 20,
+    negative_axes_length: 40,
+    color: 'FF0000'
   )
 end

data/manual/graphics/lines_and_curves.rb

@@ -29,7 +29,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
     line_to 0, 100
 
     curve_to [150, 250], bounds: [[20, 200], [120, 200]]
-    curve_to [200, 0],   bounds: [[150, 200], [450, 10]]
+    curve_to [200, 0], bounds: [[150, 200], [450, 10]]
   end
 
   # line and curve

data/manual/graphics/stroke_dash.rb

@@ -28,16 +28,16 @@ Prawn::ManualBuilder::Example.generate(filename) do
 
   24.times do |i|
     length = (i / 4) + 1
-    space = length            # space between dashes same length as dash
-    phase = 0                 # start with dash
+    space = length # space between dashes same length as dash
+    phase = 0 # start with dash
 
     case i % 4
     when 0 then base_y -= 5
-    when 1 then phase = length       # start with space between dashes
+    when 1 then phase = length # start with space between dashes
     when 2 then space = length * 0.5 # space between dashes half as long as dash
     when 3
-      space = length * 0.5    # space between dashes half as long as dash
-      phase = length          # start with space between dashes
+      space = length * 0.5 # space between dashes half as long as dash
+      phase = length # start with space between dashes
     end
     base_y -= 5
 

data/manual/graphics/translate.rb

@@ -16,7 +16,8 @@ Prawn::ManualBuilder::Example.generate(filename) do
       # Draw a point on the new origin
       fill_circle [0, 0], 2
       draw_text "New origin after translation to [#{x}, #{y}]",
-        at: [5, -2], size: 8
+        at: [5, -2],
+        size: 8
 
       stroke_rectangle [100, 75], 100, 50
       text_box 'Top left corner at [100,75]',

data/manual/images/horizontal.rb

@@ -14,11 +14,11 @@ Prawn::ManualBuilder::Example.generate(filename) do
     stroke_bounds
 
     %i[left center right].each do |position|
-      text  "Image aligned to the #{position}."
+      text "Image aligned to the #{position}."
       image "#{Prawn::DATADIR}/images/stef.jpg", position: position
     end
 
-    text  'The next image has a 50 point offset from the left boundary'
+    text 'The next image has a 50 point offset from the left boundary'
     image "#{Prawn::DATADIR}/images/stef.jpg", position: 50
   end
 end

data/manual/images/scale.rb

@@ -8,14 +8,14 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  text  'Normal size'
+  text 'Normal size'
   image "#{Prawn::DATADIR}/images/stef.jpg"
   move_down 20
 
-  text  'Scaled to 50%'
+  text 'Scaled to 50%'
   image "#{Prawn::DATADIR}/images/stef.jpg", scale: 0.5
   move_down 20
 
-  text  'Scaled to 200%'
+  text 'Scaled to 200%'
   image "#{Prawn::DATADIR}/images/stef.jpg", scale: 2
 end

data/manual/images/vertical.rb

@@ -16,12 +16,15 @@ Prawn::ManualBuilder::Example.generate(filename) do
     %i[top center bottom].each do |vposition|
       text "Image vertically aligned to the #{vposition}.", valign: vposition
       image "#{Prawn::DATADIR}/images/stef.jpg",
-        position: 250, vposition: vposition
+        position: 250,
+        vposition: vposition
     end
 
     text_box 'The next image has a 100 point offset from the top boundary',
-      at: [bounds.width - 110, bounds.top - 10], width: 100
+      at: [bounds.width - 110, bounds.top - 10],
+      width: 100
     image "#{Prawn::DATADIR}/images/stef.jpg",
-      position: :right, vposition: 100
+      position: :right,
+      vposition: 100
   end
 end

data/manual/images/width_and_height.rb

@@ -11,14 +11,14 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  text  'Scale by setting only the width'
+  text 'Scale by setting only the width'
   image "#{Prawn::DATADIR}/images/pigs.jpg", width: 150
   move_down 20
 
-  text  'Scale by setting only the height'
+  text 'Scale by setting only the height'
   image "#{Prawn::DATADIR}/images/pigs.jpg", height: 100
   move_down 20
 
-  text  'Stretch to fit the width and height provided'
+  text 'Stretch to fit the width and height provided'
   image "#{Prawn::DATADIR}/images/pigs.jpg", width: 500, height: 100
 end

data/manual/layout/content.rb

@@ -15,10 +15,10 @@ Prawn::ManualBuilder::Example.generate(filename) do
   define_grid(columns: 5, rows: 8, gutter: 10)
 
   grid([5, 0], [7, 1]).bounding_box do
-    text "Adding some content to this multi_box.\n" + ' _ ' * 200
+    text "Adding some content to this multi_box.\n#{' _ ' * 200}"
   end
 
   grid(6, 3).bounding_box do
-    text "Just a little snippet here.\n" + ' _ ' * 10
+    text "Just a little snippet here.\n#{' _ ' * 10}"
   end
 end

data/manual/outline/outline.rb

@@ -11,7 +11,7 @@ Prawn::ManualBuilder::Example.generate('outline.pdf', page_size: 'FOLIO') do
     end
 
     p.section 'Adding nodes later' do |s|
-      s.example 'add_subsection_to',    eval_source: false
+      s.example 'add_subsection_to', eval_source: false
       s.example 'insert_section_after', eval_source: false
     end
 

data/manual/security/permissions.rb

@@ -21,7 +21,8 @@ require_relative '../example_helper'
 Prawn::ManualBuilder::Example.generate('cannot_print.pdf') do
   text "If you used the user password you won't be able to print the doc."
   encrypt_document(
-    user_password: 'foo', owner_password: 'bar',
+    user_password: 'foo',
+    owner_password: 'bar',
     permissions: { print_document: false }
   )
 end
@@ -30,7 +31,8 @@ end
 Prawn::ManualBuilder::Example.generate('no_permissions.pdf') do
   text "You may only view this and won't be able to use the owner password."
   encrypt_document(
-    user_password: 'foo', owner_password: :random,
+    user_password: 'foo',
+    owner_password: :random,
     permissions: {
       print_document: false,
       modify_contents: false,

data/manual/security/security.rb

@@ -6,7 +6,7 @@ require_relative '../example_helper'
 
 Prawn::ManualBuilder::Example.generate('security.pdf', page_size: 'FOLIO') do
   package 'security' do |p|
-    p.example 'encryption',  eval_source: false, full_source: true
+    p.example 'encryption', eval_source: false, full_source: true
     p.example 'permissions', eval_source: false, full_source: true
 
     p.intro do