prawn 2.2.2 → 2.3.0

data/manual/text/font_style.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Most font families come with some styles other than normal. Most common are
 # <code>bold</code>, <code>italic</code> and <code>bold_italic</code>.
 #
@@ -9,10 +11,10 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  ['Courier', 'Helvetica', 'Times-Roman'].each do |example_font|
+  %w[Courier Helvetica Times-Roman].each do |example_font|
     move_down 20
 
-    [:bold, :bold_italic, :italic, :normal].each do |style|
+    %i[bold bold_italic italic normal].each do |style|
       font example_font, style: style
       text "I'm writing in #{example_font} (#{style})"
     end

data/manual/text/formatted_callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The <code>:callback</code> option is also available for the formatted text
 # methods.
 #

data/manual/text/formatted_text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # There are two other text methods available: <code>formatted_text</code> and
 # <code>formatted_text_box</code>.
 #
@@ -25,7 +27,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
   formatted_text [
     { text: 'Some bold. ', styles: [:bold] },
     { text: 'Some italic. ', styles: [:italic] },
-    { text: 'Bold italic. ', styles: [:bold, :italic] },
+    { text: 'Bold italic. ', styles: %i[bold italic] },
     { text: 'Bigger Text. ', size: 20 },
     { text: 'More spacing. ', character_spacing: 3 },
     { text: 'Different Font. ', font: 'Courier' },

data/manual/text/free_flowing_text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Text rendering can be as simple or as complex as you want.
 #
 # This example covers the most basic method: <code>text</code>. It is meant for

data/manual/text/inline.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Inline formatting gives you the option to format specific portions of a text.
 # It uses HTML-esque syntax inside the text string. Supported tags are:
 # <code>b</code> (bold), <code>i</code> (italic), <code>u</code> (underline),

data/manual/text/kerning_and_character_spacing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Kerning is the process of adjusting the spacing between characters in a
 # proportional font. It is usually done with specific letter pairs. We can
 # switch it on and off if it is available with the current font. Just pass a

data/manual/text/leading.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Leading is the additional space between lines of text.
 #
 # The leading can be set using the <code>default_leading</code> method which

data/manual/text/line_wrapping.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 # Line wrapping happens on white space or hyphens. Soft hyphens can be used to
 # indicate where words can be hyphenated. Non-breaking spaces can be used to
 # display space without allowing for a break.
 #
 # For writing styles that do not make use of spaces, the zero width space serves
-# to mark word boundaries. Zero width spaces are available only with TTF fonts.
+# to mark word boundaries. Zero width spaces are available only with external
+# fonts.
 
 require_relative '../example_helper'
 

data/manual/text/paragraph_indentation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Prawn strips all whitespace from the beginning and the end of strings so there
 # are two ways to indent paragraphs:
 #

data/manual/text/positioned_text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Sometimes we want the text on a specific position on the page. The
 # <code>text</code> method just won't help us.
 #

data/manual/text/registering_families.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Registering font families will help you when you want to use a font over and
 # over or if you would like to take advantage of the <code>:style</code> option
 # of the text methods and the <code>b</code> and <code>i</code> tags when using
@@ -10,7 +12,7 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  # Registering a single TTF font
+  # Registering a single external font
   font_families.update(
     'DejaVu Sans' => {
       normal: "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
@@ -41,7 +43,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
     inline_format: true
   move_down 20
 
-  [:bold, :bold_italic, :italic, :normal].each do |style|
+  %i[bold bold_italic italic normal].each do |style|
     text "Using the #{style} style option.",
       style: style
     move_down 10

data/manual/text/rendering_and_color.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # You have already seen how to set the text color using both inline formatting
 # and the format text methods. There is another way by using the graphics
 # methods <code>fill_color</code> and <code>stroke_color</code>.

data/manual/text/right_to_left_text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Prawn can be used with right-to-left text. The direction can be set
 # document-wide, on particular text, or on a text-box. Setting the direction to
 # <code>:rtl</code> automatically changes the default alignment to

data/manual/text/rotation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Rotating text is best avoided on free flowing text, so this example
 # will only use the <code>text_box</code> method as we can have much more
 # control over its output.
@@ -29,7 +31,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
     rotate: angle, rotate_around: :center
   )
 
-  [:lower_left, :upper_left, :lower_right, :upper_right]
+  %i[lower_left upper_left lower_right upper_right]
     .each_with_index do |corner, index|
     y -= 100 if index == 2
     stroke_rectangle [x + (index % 2) * 200, y], width, height

data/manual/text/single_usage.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The PDF format has some built-in font support. If you want to use other fonts
 # in Prawn you need to embed the font file.
 #

data/manual/text/text.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 # Examples for text rendering.
 
 require '../example_helper'
 
-# rubocop: disable Metrics/LineLength
 Prawn::ManualBuilder::Example.generate('text.pdf', page_size: 'FOLIO') do
   package 'text' do |p|
     p.section 'Basics' do |s|
@@ -47,14 +48,14 @@ Prawn::ManualBuilder::Example.generate('text.pdf', page_size: 'FOLIO') do
     end
 
     p.intro do
-      prose <<-END
+      prose <<-TEXT
         This is probably the feature people will use the most. There is no
         shortage of options when it comes to text. You'll be hard pressed to
         find a use case that is not covered by one of the text methods and
         configurable options.
 
         The examples show:
-      END
+      TEXT
 
       list(
         'Text that flows from page to page automatically starting new pages when necessary',

data/manual/text/text_box_excess.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Whenever the <code>text_box</code> method truncates text, this truncated bit
 # is not lost, it is the method return value and we can take advantage of that.
 #

data/manual/text/text_box_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # We've already seen one way of using text boxes with the <code>text_box</code>
 # method. Turns out this method is just a convenience for using the
 # <code>Prawn::Text::Box</code> class as it creates a new object and call

data/manual/text/text_box_overflow.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The <code>text_box</code> method accepts both <code>:width</code> and
 # <code>:height</code> options. So what happens if the text doesn't fit the box?
 #
@@ -24,7 +26,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
   text string
 
   y_position = cursor - 20
-  [:truncate, :expand, :shrink_to_fit].each_with_index do |mode, i|
+  %i[truncate expand shrink_to_fit].each_with_index do |mode, i|
     text_box string, at: [i * 150, y_position],
                      width: 100,
                      height: 50,

data/manual/text/utf8.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Multilingualization isn't much of a problem on Prawn as its default encoding
 # is UTF-8. The only thing you need to worry about is if the font support the
 # glyphs of your language.
@@ -15,7 +17,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
 
   move_down 20
 
-  text 'For full internationalized text support, we need to use TTF fonts:'
+  text 'For full internationalized text support, we need to use external fonts:'
   move_down 20
 
   font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf") do

data/manual/text/win_ansi_charset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Prints a list of all of the glyphs that can be rendered by Adobe's built
 # in fonts, along with their character widths and WinAnsi codes.  Be sure
 # to pass these glyphs as UTF-8, and Prawn will transcode them for you.
@@ -22,6 +24,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
 
   Prawn::Encoding::WinAnsi::CHARACTERS.each_with_index do |name, index|
     next if name == '.notdef'
+
     y -= FONT_SIZE
 
     if y < FONT_SIZE
@@ -29,11 +32,11 @@ Prawn::ManualBuilder::Example.generate(filename) do
       x += 170
     end
 
-    code = format('%d.', index)
+    code = format('%<index>d.', index: index)
     char = index.chr.force_encoding(::Encoding::Windows_1252)
 
     width = 1000 * width_of(char, size: FONT_SIZE) / FONT_SIZE
-    size = format('%d', width)
+    size = format('%<width>d', width: width)
 
     data = [code, nil, char, size, nil, name]
     dx = x
@@ -48,7 +51,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
         end
 
         text_box(
-          field.force_encoding('windows-1252').encode('UTF-8'),
+          field.dup.force_encoding('windows-1252').encode('UTF-8'),
           at: [dx + offset, y]
         )
       end

data/prawn.gemspec

@@ -1,4 +1,6 @@
-basedir = File.expand_path(File.dirname(__FILE__))
+# frozen_string_literal: true
+
+basedir = __dir__
 
 require "#{basedir}/lib/prawn/version"
 
@@ -10,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.cert_chain = ['certs/pointlessone.pem']
   if $PROGRAM_NAME.end_with? 'gem'
-    spec.signing_key = File.expand_path('~/.ssh/gem-private_key.pem')
+    spec.signing_key = File.expand_path('~/.gem/gem-private_key.pem')
   end
 
   spec.files = Dir.glob('{examples,lib,spec,manual}/**/**/*') +
@@ -21,7 +23,7 @@ Gem::Specification.new do |spec|
       '.yardopts'
     ]
   spec.require_path = 'lib'
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '~> 2.5'
   spec.required_rubygems_version = '>= 1.3.6'
 
   spec.authors = [
@@ -34,18 +36,19 @@ Gem::Specification.new do |spec|
   ]
   spec.licenses = %w[PRAWN GPL-2.0 GPL-3.0]
 
-  spec.add_dependency('ttfunk', '~> 1.5')
-  spec.add_dependency('pdf-core', '~> 0.7.0')
+  spec.add_dependency('pdf-core', '~> 0.8.1')
+  spec.add_dependency('ttfunk', '~> 1.6')
 
   spec.add_development_dependency('pdf-inspector', '>= 1.2.1', '< 2.0.a')
-  spec.add_development_dependency('yard')
-  spec.add_development_dependency('rspec', '~> 3.0')
+  spec.add_development_dependency('pdf-reader', ['~> 1.4', '>= 1.4.1'])
+  spec.add_development_dependency('prawn-manual_builder', '>= 0.3.0')
   spec.add_development_dependency('rake', '~> 12.0')
+  spec.add_development_dependency('rspec', '~> 3.0')
+  spec.add_development_dependency('rubocop', '~> 0.84.0')
+  spec.add_development_dependency('rubocop-performance', '~> 1.1')
+  spec.add_development_dependency('rubocop-rspec', '~> 1.32')
   spec.add_development_dependency('simplecov')
-  spec.add_development_dependency('prawn-manual_builder', '>= 0.2.0')
-  spec.add_development_dependency('pdf-reader', ['~> 1.4', '>= 1.4.1'])
-  spec.add_development_dependency('rubocop', '~> 0.47.1')
-  spec.add_development_dependency('rubocop-rspec', '~> 1.10')
+  spec.add_development_dependency('yard')
 
   spec.homepage = 'http://prawnpdf.org'
   spec.description = <<END_DESC

data/spec/extensions/encoding_helpers.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module EncodingHelpers
   def win1252_string(str)
-    str.force_encoding(Encoding::Windows_1252)
+    str.dup.force_encoding(Encoding::Windows_1252)
   end
 
   def bin_string(str)
-    str.force_encoding(Encoding::ASCII_8BIT)
+    str.dup.force_encoding(Encoding::ASCII_8BIT)
   end
 end

data/spec/prawn/document/bounding_box_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Prawn::Document::BoundingBox do
@@ -183,8 +185,8 @@ describe Prawn::Document::BoundingBox do
       expect(pdf.y).to be_within(0.001).of(orig_y - pdf.height_of('hello'))
     end
 
-    it 'should not advance y-position of a stretchy bbox if it would stretch ' \
-      'the bbox further' do
+    it 'does not advance y-position of a stretchy bbox if it would stretch '\
+       'the bbox further' do
       bottom = pdf.y = pdf.margin_box.absolute_bottom
       pdf.bounding_box [0, pdf.margin_box.top], width: pdf.bounds.width do
         pdf.y = bottom
@@ -224,12 +226,10 @@ describe Prawn::Document::BoundingBox do
 
     it 'restores the x coordinate and width on error' do
       pdf.bounding_box([100, 100], width: 200) do
-        begin
-          pdf.indent(20) { raise }
-        rescue
-          expect(pdf.bounds.absolute_left).to eq(100)
-          expect(pdf.bounds.width).to eq(200)
-        end
+        pdf.indent(20) { raise }
+      rescue StandardError
+        expect(pdf.bounds.absolute_left).to eq(100)
+        expect(pdf.bounds.width).to eq(200)
       end
     end
 

data/spec/prawn/document/column_box_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Prawn::Document::ColumnBox do

data/spec/prawn/document/security_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'tempfile'
 
@@ -17,7 +19,7 @@ describe Prawn::Document::Security do
       padded = pad_password(pw)
       expect(padded.length).to eq(32)
       expect(padded).to eq(
-        pw + Prawn::Document::Security::PasswordPadding[0, 28]
+        pw + Prawn::Document::Security::PASSWORD_PADDING[0, 28]
       )
     end
 
@@ -25,7 +27,7 @@ describe Prawn::Document::Security do
       pw = ''
       padded = pad_password(pw)
       expect(padded.length).to eq(32)
-      expect(padded).to eq(Prawn::Document::Security::PasswordPadding)
+      expect(padded).to eq(Prawn::Document::Security::PASSWORD_PADDING)
     end
   end
 
@@ -33,10 +35,11 @@ describe Prawn::Document::Security do
     def doc_with_permissions(permissions)
       pdf = Prawn::Document.new
 
-      class << pdf
-        # Make things easier to test
-        public :permissions_value
-      end
+      # Make things easier to test
+      pdf.singleton_class.send :public, :permissions_value
+      # class << pdf
+      #   public :permissions_value
+      # end
 
       pdf.encrypt_document(permissions: permissions)
       pdf
@@ -90,17 +93,17 @@ describe Prawn::Document::Security do
     end
 
     it 'calculates the correct owner hash' do
-      expect(pdf.owner_password_hash.unpack('H*').first)
+      expect(pdf.owner_password_hash.unpack1('H*'))
         .to match(/^61CA855012/i)
     end
 
     it 'calculates the correct user hash' do
-      expect(pdf.user_password_hash.unpack('H*').first)
+      expect(pdf.user_password_hash.unpack1('H*'))
         .to match(/^6BC8C51031/i)
     end
 
     it 'calculates the correct user_encryption_key' do
-      expect(pdf.user_encryption_key.unpack('H*').first.upcase)
+      expect(pdf.user_encryption_key.unpack1('H*').upcase)
         .to eq('B100AB6429')
     end
   end

data/spec/prawn/document_annotations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Prawn::Document do

data/spec/prawn/document_destinations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Prawn::Document do