prawn 2.3.0 → 2.4.0

data/manual/text/alignment.rb

@@ -17,7 +17,7 @@ require_relative '../example_helper'
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   text 'This text should be left aligned'
-  text 'This text should be centered',      align: :center
+  text 'This text should be centered', align: :center
   text 'This text should be right aligned', align: :right
 
   bounding_box([0, 220], width: 250, height: 220) do
@@ -36,7 +36,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
 
   bounding_box([300, 220], width: 250, height: 220) do
     text 'This text should be vertically top aligned'
-    text 'This text should be vertically centered',       valign: :center
+    text 'This text should be vertically centered', valign: :center
     text 'This text should be vertically bottom aligned', valign: :bottom
     transparent(0.5) { stroke_bounds }
   end

data/manual/text/column_box.rb

@@ -9,12 +9,12 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  text 'The Prince',          align: :center, size: 18
+  text 'The Prince', align: :center, size: 18
   text 'Niccolò Machiavelli', align: :center, size: 14
   move_down 12
 
   column_box([0, cursor], columns: 2, width: bounds.width) do
-    text((<<-TEXT.gsub(/\s+/, ' ') + "\n\n") * 3)
+    text("#{<<~TEXT.gsub(/\s+/, ' ')}\n\n" * 3)
       All the States and Governments by which men are or ever have been ruled,
       have been and are either Republics or Princedoms. Princedoms are either
       hereditary, in which the sovereignty is derived through an ancient line

data/manual/text/font_style.rb

@@ -11,10 +11,13 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  %w[Courier Helvetica Times-Roman].each do |example_font|
+  fonts = %w[Courier Helvetica Times-Roman]
+  styles = %i[bold bold_italic italic normal]
+
+  fonts.each do |example_font|
     move_down 20
 
-    %i[bold bold_italic italic normal].each do |style|
+    styles.each do |style|
       font example_font, style: style
       text "I'm writing in #{example_font} (#{style})"
     end

data/manual/text/formatted_callbacks.rb

@@ -41,25 +41,30 @@ Prawn::ManualBuilder::Example.generate(filename) do
 
     def render_in_front(fragment)
       @document.stroke_polygon(
-        fragment.top_left, fragment.top_right,
-        fragment.bottom_right, fragment.bottom_left
+        fragment.top_left,
+        fragment.top_right,
+        fragment.bottom_right,
+        fragment.bottom_left
       )
 
-      @document.fill_circle(fragment.top_left,     @radius)
-      @document.fill_circle(fragment.top_right,    @radius)
+      @document.fill_circle(fragment.top_left, @radius)
+      @document.fill_circle(fragment.top_right, @radius)
       @document.fill_circle(fragment.bottom_right, @radius)
-      @document.fill_circle(fragment.bottom_left,  @radius)
+      @document.fill_circle(fragment.bottom_left, @radius)
     end
   end
 
   highlight = HighlightCallback.new(color: 'ffff00', document: self)
   border = ConnectedBorderCallback.new(radius: 2.5, document: self)
 
-  formatted_text [
-    { text: 'hello', callback: highlight },
-    { text: '     ' },
-    { text: 'world', callback: border },
-    { text: '     ' },
-    { text: 'hello world', callback: [highlight, border] }
-  ], size: 20
+  formatted_text(
+    [
+      { text: 'hello', callback: highlight },
+      { text: '     ' },
+      { text: 'world', callback: border },
+      { text: '     ' },
+      { text: 'hello world', callback: [highlight, border] }
+    ],
+    size: 20
+  )
 end

data/manual/text/formatted_text.rb

@@ -24,7 +24,7 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  formatted_text [
+  formatted_text([
     { text: 'Some bold. ', styles: [:bold] },
     { text: 'Some italic. ', styles: [:italic] },
     { text: 'Bold italic. ', styles: %i[bold italic] },
@@ -42,7 +42,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
       color: '0000FF',
       local: './local_file.txt'
     }
-  ]
+  ])
 
   formatted_text_box(
     [
@@ -50,9 +50,12 @@ Prawn::ManualBuilder::Example.generate(filename) do
       { text: ' text_box ', font: 'Courier' },
       {
         text: 'with some additional formatting options added to the mix.',
-        color: [50, 100, 0, 0], styles: [:italic]
+        color: [50, 100, 0, 0],
+        styles: [:italic]
       }
     ],
-    at: [100, 100], width: 200, height: 100
+    at: [100, 100],
+    width: 200,
+    height: 100
   )
 end

data/manual/text/free_flowing_text.rb

@@ -27,7 +27,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
   end
 
   bounding_box([300, y_position], width: 200, height: 150) do
-    transparent(0.5) { stroke_bounds }  # This will stroke on one page
+    transparent(0.5) { stroke_bounds } # This will stroke on one page
 
     text 'Now look what happens when the free flowing text reaches the end ' \
       'of a bounding box that is narrower than the margin box.' +
@@ -36,7 +36,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
       'was cloned. If we want it to have the same border as the one on ' \
       'the previous page we will need to stroke the boundaries again.'
 
-    transparent(0.5) { stroke_bounds }  # And this will stroke on the next
+    transparent(0.5) { stroke_bounds } # And this will stroke on the next
   end
 
   move_cursor_to 200
@@ -44,7 +44,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
     text 'Span is a different kind of bounding box as it lets the text ' \
       "flow gracefully onto the next page. It doesn't matter if the text " \
       'started on the middle of the previous page, when it flows to the ' \
-      'next page it will start at the beginning.' + ' _ ' * 500 +
+      "next page it will start at the beginning.#{' _ ' * 500}" \
       'I told you it would start on the beginning of this page.'
   end
 end

data/manual/text/kerning_and_character_spacing.rb

@@ -14,16 +14,16 @@ require_relative '../example_helper'
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
   font_size(30) do
-    text_box 'With kerning:',    kerning: true,  at: [0, y - 40]
+    text_box 'With kerning:', kerning: true, at: [0, y - 40]
     text_box 'Without kerning:', kerning: false, at: [0, y - 80]
 
-    text_box 'Tomato', kerning: true,  at: [250, y - 40]
+    text_box 'Tomato', kerning: true, at: [250, y - 40]
     text_box 'Tomato', kerning: false, at: [250, y - 80]
 
-    text_box 'WAR', kerning: true,  at: [400, y - 40]
+    text_box 'WAR', kerning: true, at: [400, y - 40]
     text_box 'WAR', kerning: false, at: [400, y - 80]
 
-    text_box 'F.', kerning: true,  at: [500, y - 40]
+    text_box 'F.', kerning: true, at: [500, y - 40]
     text_box 'F.', kerning: false, at: [500, y - 80]
   end
 

data/manual/text/paragraph_indentation.rb

@@ -19,14 +19,13 @@ Prawn::ManualBuilder::Example.generate(filename) do
     "\n#{Prawn::Text::NBSP * 10}" + 'This one will with NBSP. ' * 10
 
   move_down 20
-  text 'This paragraph will be indented. ' * 10 +
-    "\n" + 'This one will too. ' * 10,
+  text "#{'This paragraph will be indented. ' * 10}\n#{'This one will too. ' * 10}",
     indent_paragraphs: 60
 
   move_down 20
 
   text 'FROM RIGHT TO LEFT:'
-  text 'This paragraph will be indented. ' * 10 +
-    "\n" + 'This one will too. ' * 10,
-    indent_paragraphs: 60, direction: :rtl
+  text "#{'This paragraph will be indented. ' * 10}\n#{'This one will too. ' * 10}",
+    indent_paragraphs: 60,
+    direction: :rtl
 end

data/manual/text/rendering_and_color.rb

@@ -16,7 +16,7 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  fill_color   '00ff00'
+  fill_color '00ff00'
   stroke_color '0000ff'
 
   font_size(40) do

data/manual/text/right_to_left_text.rb

@@ -31,7 +31,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
     text 'You can override the document direction.', direction: :ltr
     move_down 20
 
-    formatted_text [
+    formatted_text([
       { text: '更可怕的是，同质化竞争对手可以按照' },
       { text: 'URL', direction: :ltr },
       { text: '中后面这个' },
@@ -40,15 +40,15 @@ Prawn::ManualBuilder::Example.generate(filename) do
       { text: 'DB', direction: :ltr },
       { text: '中的内容，写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么'\
         '难事，这样的话，你就非常被动了。' }
-    ]
+    ])
     move_down 20
 
-    formatted_text [
+    formatted_text([
       { text: '更可怕的是，同质化竞争对手可以按照' },
-      { text: 'this',  direction: :ltr },
+      { text: 'this', direction: :ltr },
       { text: "won't", direction: :ltr, size: 24 },
-      { text: 'work',  direction: :ltr },
+      { text: 'work', direction: :ltr },
       { text: '中的内容，写个小爬虫把你的页面上的关键信息顺次爬下来也不是什么难事' }
-    ]
+    ])
   end
 end

data/manual/text/rotation.rb

@@ -21,14 +21,19 @@ Prawn::ManualBuilder::Example.generate(filename) do
   stroke_rectangle [0, y], width, height
   text_box(
     'This text was not rotated',
-    at: [0, y], width: width, height: height
+    at: [0, y],
+    width: width,
+    height: height
   )
 
   stroke_rectangle [0, y - 100], width, height
   text_box(
     'This text was rotated around the center',
-    at: [0, y - 100], width: width, height: height,
-    rotate: angle, rotate_around: :center
+    at: [0, y - 100],
+    width: width,
+    height: height,
+    rotate: angle,
+    rotate_around: :center
   )
 
   %i[lower_left upper_left lower_right upper_right]

data/manual/text/text_box_extensions.rb

@@ -36,7 +36,7 @@ Prawn::ManualBuilder::Example.generate(filename) do
   Prawn::Text::Formatted::Box.extensions << TriangleBox
   stroke_rectangle([200, y_position], width, height)
   formatted_text_box(
-    [text: 'A' * 100, color: '009900'],
+    [{ text: 'A' * 100, color: '009900' }],
     at: [200, y_position],
     width: width,
     height: height

data/manual/text/text_box_overflow.rb

@@ -27,10 +27,11 @@ Prawn::ManualBuilder::Example.generate(filename) do
 
   y_position = cursor - 20
   %i[truncate expand shrink_to_fit].each_with_index do |mode, i|
-    text_box string, at: [i * 150, y_position],
-                     width: 100,
-                     height: 50,
-                     overflow: mode
+    text_box string,
+      at: [i * 150, y_position],
+      width: 100,
+      height: 50,
+      overflow: mode
   end
 
   string = 'If the box is too small for the text, :shrink_to_fit ' \
@@ -40,10 +41,11 @@ Prawn::ManualBuilder::Example.generate(filename) do
   text string
   y_position = cursor - 20
   [nil, 8, 10, 12].each_with_index do |value, index|
-    text_box string, at: [index * 150, y_position],
-                     width: 50,
-                     height: 50,
-                     overflow: :shrink_to_fit,
-                     min_font_size: value
+    text_box string,
+      at: [index * 150, y_position],
+      width: 50,
+      height: 50,
+      overflow: :shrink_to_fit,
+      min_font_size: value
   end
 end

data/manual/text/win_ansi_charset.rb

@@ -8,7 +8,7 @@ require_relative '../example_helper'
 
 filename = File.basename(__FILE__).gsub('.rb', '.pdf')
 Prawn::ManualBuilder::Example.generate(filename) do
-  FONT_SIZE = 9.5
+  font_size = 9.5
 
   x = 0
   y = bounds.top
@@ -18,35 +18,35 @@ Prawn::ManualBuilder::Example.generate(filename) do
     [0, :left]
   ]
 
-  font 'Helvetica', size: FONT_SIZE
+  font 'Helvetica', size: font_size
 
   start_new_page
 
   Prawn::Encoding::WinAnsi::CHARACTERS.each_with_index do |name, index|
     next if name == '.notdef'
 
-    y -= FONT_SIZE
+    y -= font_size
 
-    if y < FONT_SIZE
-      y = bounds.top - FONT_SIZE
+    if y < font_size
+      y = bounds.top - font_size
       x += 170
     end
 
     code = format('%<index>d.', index: index)
     char = index.chr.force_encoding(::Encoding::Windows_1252)
 
-    width = 1000 * width_of(char, size: FONT_SIZE) / FONT_SIZE
+    width = 1000 * width_of(char, size: font_size) / font_size
     size = format('%<width>d', width: width)
 
     data = [code, nil, char, size, nil, name]
     dx = x
     fields.zip(data).each do |(total_width, align), field|
       if field
-        width = width_of(field, size: FONT_SIZE)
+        width = width_of(field, size: font_size)
 
         case align
-        when :left   then offset = 0
-        when :right  then offset = total_width - width
+        when :left then offset = 0
+        when :right then offset = total_width - width
         when :center then offset = (total_width - width) / 2
         end
 

data/prawn.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
       '.yardopts'
     ]
   spec.require_path = 'lib'
-  spec.required_ruby_version = '~> 2.5'
+  spec.required_ruby_version = '>= 2.5'
   spec.required_rubygems_version = '>= 1.3.6'
 
   spec.authors = [
@@ -36,19 +36,13 @@ Gem::Specification.new do |spec|
   ]
   spec.licenses = %w[PRAWN GPL-2.0 GPL-3.0]
 
-  spec.add_dependency('pdf-core', '~> 0.8.1')
-  spec.add_dependency('ttfunk', '~> 1.6')
+  spec.add_dependency('pdf-core', '~> 0.9.0')
+  spec.add_dependency('ttfunk', '~> 1.7')
 
   spec.add_development_dependency('pdf-inspector', '>= 1.2.1', '< 2.0.a')
   spec.add_development_dependency('pdf-reader', ['~> 1.4', '>= 1.4.1'])
+  spec.add_development_dependency('prawn-dev', '~> 0.1.0')
   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('yard')
 
   spec.homepage = 'http://prawnpdf.org'
   spec.description = <<END_DESC

data/spec/prawn/document/bounding_box_spec.rb

@@ -4,99 +4,100 @@ require 'spec_helper'
 
 describe Prawn::Document::BoundingBox do
   let(:pdf) { create_pdf }
-  let(:x) { 100 }
-  let(:y) { 125 }
-  let(:width) { 50 }
-  let(:height) { 75 }
-  let(:box) do
-    described_class.new(
-      nil,
-      nil,
-      [x, y],
-      width: width,
-      height: height
-    )
-  end
 
-  it 'has an anchor at (x, y - height)' do
-    expect(box.anchor).to eq([x, y - height])
-  end
+  describe 'attributes' do
+    let(:box) do
+      described_class.new(
+        nil,
+        nil,
+        [100, 125],
+        width: 50,
+        height: 75
+      )
+    end
 
-  it 'has a left boundary of 0' do
-    expect(box.left).to eq(0)
-  end
+    it 'has an anchor at (x, y - height)' do
+      expect(box.anchor).to eq([100, 50])
+    end
 
-  it 'has a right boundary equal to the width' do
-    expect(box.right).to eq(width)
-  end
+    it 'has a left boundary of 0' do
+      expect(box.left).to eq(0)
+    end
 
-  it 'has a top boundary of height' do
-    expect(box.top).to eq(height)
-  end
+    it 'has a right boundary equal to the width' do
+      expect(box.right).to eq(50)
+    end
 
-  it 'has a bottom boundary of 0' do
-    expect(box.bottom).to eq(0)
-  end
+    it 'has a top boundary of height' do
+      expect(box.top).to eq(75)
+    end
 
-  it 'has a top-left of [0,height]' do
-    expect(box.top_left).to eq([0, height])
-  end
+    it 'has a bottom boundary of 0' do
+      expect(box.bottom).to eq(0)
+    end
 
-  it 'has a top-right of [width,height]' do
-    expect(box.top_right).to eq([width, height])
-  end
+    it 'has a top-left of [0, height]' do
+      expect(box.top_left).to eq([0, 75])
+    end
 
-  it 'has a bottom-left of [0,0]' do
-    expect(box.bottom_left).to eq([0, 0])
-  end
+    it 'has a top-right of [width, height]' do
+      expect(box.top_right).to eq([50, 75])
+    end
 
-  it 'has a bottom-right of [width,0]' do
-    expect(box.bottom_right).to eq([width, 0])
-  end
+    it 'has a bottom-left of [0, 0]' do
+      expect(box.bottom_left).to eq([0, 0])
+    end
 
-  it 'has an absolute left boundary of x' do
-    expect(box.absolute_left).to eq(x)
-  end
+    it 'has a bottom-right of [width ,0]' do
+      expect(box.bottom_right).to eq([50, 0])
+    end
 
-  it 'has an absolute right boundary of x + width' do
-    expect(box.absolute_right).to eq(x + width)
-  end
+    it 'has an absolute left boundary of x' do
+      expect(box.absolute_left).to eq(100)
+    end
 
-  it 'has an absolute top boundary of y' do
-    expect(box.absolute_top).to eq(y)
-  end
+    it 'has an absolute right boundary of x + width' do
+      expect(box.absolute_right).to eq(150)
+    end
 
-  it 'has an absolute bottom boundary of y - height' do
-    expect(box.absolute_bottom).to eq(y - height)
-  end
+    it 'has an absolute top boundary of y' do
+      expect(box.absolute_top).to eq(125)
+    end
 
-  it 'has an absolute bottom-left of [x,y-height]' do
-    expect(box.absolute_bottom_left).to eq([x, y - height])
-  end
+    it 'has an absolute bottom boundary of y - height' do
+      expect(box.absolute_bottom).to eq(50)
+    end
 
-  it 'has an absolute bottom-right of [x+width,y-height]' do
-    expect(box.absolute_bottom_right).to eq([x + width, y - height])
-  end
+    it 'has an absolute bottom-left of [x, y - height]' do
+      expect(box.absolute_bottom_left).to eq([100, 50])
+    end
 
-  it 'has an absolute top-left of [x,y]' do
-    expect(box.absolute_top_left).to eq([x, y])
-  end
+    it 'has an absolute bottom-right of [x + width, y - height]' do
+      expect(box.absolute_bottom_right).to eq([150, 50])
+    end
 
-  it 'has an absolute top-right of [x+width,y]' do
-    expect(box.absolute_top_right).to eq([x + width, y])
-  end
+    it 'has an absolute top-left of [x, y]' do
+      expect(box.absolute_top_left).to eq([100, 125])
+    end
 
-  it 'requires width to be set' do
-    expect do
-      described_class.new(nil, nil, [100, 100])
-    end.to raise_error(ArgumentError)
+    it 'has an absolute top-right of [x + width, y]' do
+      expect(box.absolute_top_right).to eq([150, 125])
+    end
   end
 
-  it 'raise_errors an ArgumentError if a block is not passed' do
-    pdf = Prawn::Document.new
-    expect do
-      pdf.bounding_box([0, 0], width: 200)
-    end.to raise_error(ArgumentError)
+  describe 'validations' do
+    it 'requires width to be set' do
+      expect do
+        described_class.new(nil, nil, [100, 100])
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'raise_errors an ArgumentError if a block is not passed' do
+      pdf = Prawn::Document.new
+      expect do
+        pdf.bounding_box([0, 0], width: 200)
+      end.to raise_error(ArgumentError)
+    end
   end
 
   describe 'drawing' do
@@ -156,10 +157,11 @@ describe Prawn::Document::BoundingBox do
     end
 
     it 'keeps track of the max height the box was stretched to' do
-      box = pdf.bounding_box(pdf.bounds.top_left, width: 100) do
-        pdf.move_down 100
-        pdf.move_up 15
-      end
+      box =
+        pdf.bounding_box(pdf.bounds.top_left, width: 100) do
+          pdf.move_down 100
+          pdf.move_up 15
+        end
 
       expect(box.height).to eq(100)
     end
@@ -431,7 +433,9 @@ describe Prawn::Document::BoundingBox do
 
       original_ypos = doc.y
 
-      doc.canvas {}
+      doc.canvas do
+        # draw
+      end
 
       expect(doc.y).to eq(original_ypos)
     end