prawn 2.3.0 → 2.4.0

data/spec/prawn/images_spec.rb

@@ -29,25 +29,30 @@ describe Prawn::Images do
   end
 
   it 'accepts IO objects' do
-    file = File.open(filename, 'rb')
-    info = pdf.image(file)
+    info =
+      File.open(filename, 'rb') do |file|
+        pdf.image(file)
+      end
 
     expect(info.height).to eq(453)
   end
 
   it 'rewinds IO objects to be able to embed them multiply' do
-    file = File.open(filename, 'rb')
+    info =
+      File.open(filename, 'rb') do |file|
+        pdf.image(file)
+        pdf.image(file)
+      end
 
-    pdf.image(file)
-    info = pdf.image(file)
     expect(info.height).to eq(453)
   end
 
   it 'does not close passed-in IO objects' do
-    file = File.open(filename, 'rb')
-    _info = pdf.image(file)
+    File.open(filename, 'rb') do |file|
+      pdf.image(file)
 
-    expect(file).to_not be_closed
+      expect(file).to_not be_closed
+    end
   end
 
   it 'accepts Pathname objects' do

data/spec/prawn/outline_spec.rb

@@ -18,27 +18,15 @@ describe Prawn::Outline do
     end
   end
 
-  let(:output) { StringIO.new(pdf.render, 'r+') }
-  let(:hash) { PDF::Reader::ObjectHash.new(output) }
+  let(:hash) do
+    output = StringIO.new(pdf.render, 'r+')
+    PDF::Reader::ObjectHash.new(output)
+  end
   let(:outline_root) do
     hash.values.find do |obj|
       obj.is_a?(Hash) && obj[:Type] == :Outlines
     end
   end
-  let(:pages) do
-    hash.values.find do |obj|
-      obj.is_a?(Hash) && obj[:Type] == :Pages
-    end[:Kids]
-  end
-  let(:section1) { find_by_title('Chapter 1') }
-  let(:page1) { find_by_title('Page 1') }
-  let(:page2) { find_by_title('Page 2') }
-  let(:section2) { find_by_title('Added Section') }
-  let(:page3) { find_by_title('Page 3') }
-  let(:inserted_page) { find_by_title('Inserted Page') }
-  let(:subsection) { find_by_title('Added SubSection') }
-  let(:added_page3) { find_by_title('Added Page 3') }
-  let(:custom_dest) { find_by_title('Custom Destination') }
 
   describe 'outline encoding' do
     it 'stores all outline titles as UTF-16' do
@@ -59,12 +47,18 @@ describe Prawn::Outline do
 
     it 'sets the first and last top items of the root outline dictionary '\
       'item' do
+      section1 = find_by_title('Chapter 1')
+
       expect(referenced_object(outline_root[:First])).to eq(section1)
       expect(referenced_object(outline_root[:Last])).to eq(section1)
     end
 
     describe '#create_outline_item' do
       it 'creates outline items for each section and page' do
+        section1 = find_by_title('Chapter 1')
+        page1 = find_by_title('Page 1')
+        page2 = find_by_title('Page 2')
+
         expect(section1).to_not be_nil
         expect(page1).to_not be_nil
         expect(page2).to_not be_nil
@@ -73,16 +67,27 @@ describe Prawn::Outline do
 
     describe '#set_relations, #set_variables_for_block, and #reset_parent' do
       it 'links sibling items' do
+        page1 = find_by_title('Page 1')
+        page2 = find_by_title('Page 2')
+
         expect(referenced_object(page1[:Next])).to eq(page2)
         expect(referenced_object(page2[:Prev])).to eq(page1)
       end
 
       it 'links child items to parent item' do
+        section1 = find_by_title('Chapter 1')
+        page1 = find_by_title('Page 1')
+        page2 = find_by_title('Page 2')
+
         expect(referenced_object(page1[:Parent])).to eq(section1)
         expect(referenced_object(page2[:Parent])).to eq(section1)
       end
 
       it 'sets the first and last child items for parent item' do
+        section1 = find_by_title('Chapter 1')
+        page1 = find_by_title('Page 1')
+        page2 = find_by_title('Page 2')
+
         expect(referenced_object(section1[:First])).to eq(page1)
         expect(referenced_object(section1[:Last])).to eq(page2)
       end
@@ -90,6 +95,10 @@ describe Prawn::Outline do
 
     describe '#increase_count' do
       it 'adds the count of all descendant items' do
+        section1 = find_by_title('Chapter 1')
+        page1 = find_by_title('Page 1')
+        page2 = find_by_title('Page 2')
+
         expect(outline_root[:Count]).to eq(3)
         expect(section1[:Count].abs).to eq(2)
         expect(page1[:Count]).to eq(0)
@@ -99,6 +108,8 @@ describe Prawn::Outline do
 
     describe 'closed option' do
       it "sets the item's integer count to negative" do
+        section1 = find_by_title('Chapter 1')
+
         expect(section1[:Count]).to eq(-2)
       end
     end
@@ -116,12 +127,21 @@ describe Prawn::Outline do
     end
 
     it 'creates an outline item' do
+      custom_dest = find_by_title('Custom Destination')
+
       expect(custom_dest).to_not be_nil
     end
 
     it 'references the custom destination' do
+      custom_dest = find_by_title('Custom Destination')
+      last_page =
+        hash.values.find do |obj|
+          obj.is_a?(Hash) && obj[:Type] == :Pages
+        end[:Kids]
+          .last
+
       expect(referenced_object(custom_dest[:Dest].first))
-        .to eq(referenced_object(pages.last))
+        .to eq(referenced_object(last_page))
     end
   end
 
@@ -137,20 +157,32 @@ describe Prawn::Outline do
     end
 
     it 'adds new outline items to document' do
+      section2 = find_by_title('Added Section')
+      page3 = find_by_title('Page 3')
+
       expect(section2).to_not be_nil
       expect(page3).to_not be_nil
     end
 
     it 'resets the last items for root outline dictionary' do
+      section1 = find_by_title('Chapter 1')
+      section2 = find_by_title('Added Section')
+
       expect(referenced_object(outline_root[:First])).to eq(section1)
       expect(referenced_object(outline_root[:Last])).to eq(section2)
     end
 
     it 'resets the next relation for the previous last top level item' do
+      section1 = find_by_title('Chapter 1')
+      section2 = find_by_title('Added Section')
+
       expect(referenced_object(section1[:Next])).to eq(section2)
     end
 
     it 'sets the previous relation of the addded to section' do
+      section1 = find_by_title('Chapter 1')
+      section2 = find_by_title('Added Section')
+
       expect(referenced_object(section2[:Prev])).to eq(section1)
     end
 
@@ -174,31 +206,50 @@ describe Prawn::Outline do
       end
 
       it 'adds new outline items to document' do
+        subsection = find_by_title('Added SubSection')
+        added_page = find_by_title('Added Page 3')
+
         expect(subsection).to_not be_nil
-        expect(added_page3).to_not be_nil
+        expect(added_page).to_not be_nil
       end
 
       it 'resets the last item for parent item dictionary' do
+        section1 = find_by_title('Chapter 1')
+        page1 = find_by_title('Page 1')
+        subsection = find_by_title('Added SubSection')
+
         expect(referenced_object(section1[:First])).to eq(page1)
         expect(referenced_object(section1[:Last])).to eq(subsection)
       end
 
       it "sets the prev relation for the new subsection to its parent's old "\
         'last item' do
+        subsection = find_by_title('Added SubSection')
+        page2 = find_by_title('Page 2')
+
         expect(referenced_object(subsection[:Prev])).to eq(page2)
       end
 
       it "the subsection should become the next relation for its parent's old "\
         'last item' do
+        subsection = find_by_title('Added SubSection')
+        page2 = find_by_title('Page 2')
+
         expect(referenced_object(page2[:Next])).to eq(subsection)
       end
 
       it 'sets the first relation for the new subsection' do
-        expect(referenced_object(subsection[:First])).to eq(added_page3)
+        subsection = find_by_title('Added SubSection')
+        added_page = find_by_title('Added Page 3')
+
+        expect(referenced_object(subsection[:First])).to eq(added_page)
       end
 
       it 'sets the correct last relation of the added to section' do
-        expect(referenced_object(subsection[:Last])).to eq(added_page3)
+        subsection = find_by_title('Added SubSection')
+        added_page = find_by_title('Added Page 3')
+
+        expect(referenced_object(subsection[:Last])).to eq(added_page)
       end
 
       it 'increases the count of root outline dictionary' do
@@ -220,31 +271,50 @@ describe Prawn::Outline do
       end
 
       it 'adds new outline items to document' do
+        subsection = find_by_title('Added SubSection')
+        added_page = find_by_title('Added Page 3')
+
         expect(subsection).to_not be_nil
-        expect(added_page3).to_not be_nil
+        expect(added_page).to_not be_nil
       end
 
       it 'resets the first item for parent item dictionary' do
+        section1 = find_by_title('Chapter 1')
+        subsection = find_by_title('Added SubSection')
+        page2 = find_by_title('Page 2')
+
         expect(referenced_object(section1[:First])).to eq(subsection)
         expect(referenced_object(section1[:Last])).to eq(page2)
       end
 
       it "sets the next relation for the new subsection to its parent's old "\
         'first item' do
+        subsection = find_by_title('Added SubSection')
+        page1 = find_by_title('Page 1')
+
         expect(referenced_object(subsection[:Next])).to eq(page1)
       end
 
       it "the subsection should become the prev relation for its parent's old "\
         'first item' do
+        subsection = find_by_title('Added SubSection')
+        page1 = find_by_title('Page 1')
+
         expect(referenced_object(page1[:Prev])).to eq(subsection)
       end
 
       it 'sets the first relation for the new subsection' do
-        expect(referenced_object(subsection[:First])).to eq(added_page3)
+        subsection = find_by_title('Added SubSection')
+        added_page = find_by_title('Added Page 3')
+
+        expect(referenced_object(subsection[:First])).to eq(added_page)
       end
 
       it 'sets the correct last relation of the added to section' do
-        expect(referenced_object(subsection[:Last])).to eq(added_page3)
+        subsection = find_by_title('Added SubSection')
+        added_page = find_by_title('Added Page 3')
+
+        expect(referenced_object(subsection[:Last])).to eq(added_page)
       end
 
       it 'increases the count of root outline dictionary' do
@@ -281,26 +351,42 @@ describe Prawn::Outline do
       end
 
       it 'inserts new outline items to document' do
+        inserted_page = find_by_title('Inserted Page')
+
         expect(inserted_page).to_not be_nil
       end
 
       it 'adjusts the count of all ancestors' do
+        section1 = find_by_title('Chapter 1')
+
         expect(outline_root[:Count]).to eq(4)
         expect(section1[:Count].abs).to eq(3)
       end
 
       describe '#adjust_relations' do
         it 'resets the sibling relations of adjoining items to inserted item' do
+          inserted_page = find_by_title('Inserted Page')
+          page1 = find_by_title('Page 1')
+          page2 = find_by_title('Page 2')
+
           expect(referenced_object(page1[:Next])).to eq(inserted_page)
           expect(referenced_object(page2[:Prev])).to eq(inserted_page)
         end
 
         it 'sets the sibling relation of added item to adjoining items' do
+          inserted_page = find_by_title('Inserted Page')
+          page1 = find_by_title('Page 1')
+          page2 = find_by_title('Page 2')
+
           expect(referenced_object(inserted_page[:Next])).to eq(page2)
           expect(referenced_object(inserted_page[:Prev])).to eq(page1)
         end
 
         it 'does not affect the first and last relations of parent item' do
+          section1 = find_by_title('Chapter 1')
+          page1 = find_by_title('Page 1')
+          page2 = find_by_title('Page 2')
+
           expect(referenced_object(section1[:First])).to eq(page1)
           expect(referenced_object(section1[:Last])).to eq(page2)
         end
@@ -316,6 +402,10 @@ describe Prawn::Outline do
               page destination: page_number, title: 'Inserted Page'
             end
           end
+
+          section1 = find_by_title('Chapter 1')
+          section2 = find_by_title('Added Section')
+
           expect(referenced_object(outline_root[:Last])).to eq(section2)
           expect(referenced_object(section1[:Next])).to eq(section2)
         end
@@ -336,15 +426,24 @@ describe Prawn::Outline do
 
       describe '#adjust_relations' do
         it 'resets the sibling relations of adjoining item to inserted item' do
+          page2 = find_by_title('Page 2')
+          inserted_page = find_by_title('Inserted Page')
+
           expect(referenced_object(page2[:Next])).to eq(inserted_page)
         end
 
         it 'sets the sibling relation of added item to adjoining items' do
+          page2 = find_by_title('Page 2')
+          inserted_page = find_by_title('Inserted Page')
+
           expect(referenced_object(inserted_page[:Next])).to be_nil
           expect(referenced_object(inserted_page[:Prev])).to eq(page2)
         end
 
         it 'adjusts the last relation of parent item' do
+          section1 = find_by_title('Chapter 1')
+          inserted_page = find_by_title('Inserted Page')
+
           expect(referenced_object(section1[:Last])).to eq(inserted_page)
         end
       end
@@ -379,11 +478,12 @@ describe Prawn::Outline do
 
   describe 'foreign character encoding' do
     let(:hash) do
-      pdf = Prawn::Document.new do
-        outline.define do
-          section 'La pomme croquée', destination: 1, closed: true
+      pdf =
+        Prawn::Document.new do
+          outline.define do
+            section 'La pomme croquée', destination: 1, closed: true
+          end
         end
-      end
       PDF::Reader::ObjectHash.new(StringIO.new(pdf.render, 'r+'))
     end
 

data/spec/prawn/repeater_spec.rb

@@ -110,15 +110,16 @@ describe Prawn::Repeater do
   end
 
   it 'must treat any block as a closure (Document.new instance_eval form)' do
-    doc = Prawn::Document.new(skip_page_creation: true) do
-      10.times { start_new_page }
-
-      page = 'Page'
-      repeat(:all, dynamic: true) do
-        # ensure self is accessible here
-        draw_text "#{page} #{page_number}", at: [500, 0]
+    doc =
+      Prawn::Document.new(skip_page_creation: true) do
+        10.times { start_new_page }
+
+        page = 'Page'
+        repeat(:all, dynamic: true) do
+          # ensure self is accessible here
+          draw_text "#{page} #{page_number}", at: [500, 0]
+        end
       end
-    end
 
     text = PDF::Inspector::Text.analyze(doc.render)
     expect(text.strings).to eq((1..10).to_a.map { |p| "Page #{p}" })

data/spec/prawn/soft_mask_spec.rb

@@ -52,7 +52,7 @@ describe Prawn::SoftMask do
     extgstate = PDF::Inspector::ExtGState.analyze(pdf.render).extgstates.first
     expect(extgstate[:soft_mask][:G].data).to eq(
       "q\n/DeviceRGB cs\n0.0 0.0 0.0 scn\n/DeviceRGB CS\n0.0 0.0 0.0 SCN\n"\
-      "1 w\n0 J\n0 j\n[] 0 d\n/DeviceRGB cs\n0.502 0.502 0.502 scn\n"\
+      "1 w\n0 J\n0 j\n[] 0 d\n/DeviceRGB cs\n0.50196 0.50196 0.50196 scn\n"\
       "100.0 -100.0 200.0 200.0 re\nf\nQ\n"
     )
   end

data/spec/prawn/stamp_spec.rb

@@ -116,9 +116,10 @@ describe Prawn::Stamp do
       output = pdf.render
       objects = output.split('endobj')
       objects.each do |object|
-        if %r{/Type /Page$}.match?(object)
+        case object
+        when %r{/Type /Page$}
           expect(object).to_not match(%r{/ExtGState})
-        elsif %r{/Type /XObject$}.match?(object)
+        when %r{/Type /XObject$}
           expect(object).to match(%r{/ExtGState})
         end
       end

data/spec/prawn/text/box_spec.rb

@@ -183,7 +183,8 @@ describe Prawn::Text::Box do
       draw_block = instance_spy('Draw block')
 
       pdf.text_box 'this text has <b>fancy</b> formatting',
-        inline_format: true, width: 500,
+        inline_format: true,
+        width: 500,
         draw_text_callback: ->(text, _) { draw_block.kick(text) }
 
       expect(draw_block).to have_received(:kick).with('this text has ')
@@ -193,8 +194,9 @@ describe Prawn::Text::Box do
 
     it 'does not call #draw_text!' do
       allow(pdf).to receive(:draw_text!)
-      pdf.text_box 'some text', width: 500,
-                                draw_text_callback: ->(_, _) {}
+      pdf.text_box 'some text',
+        width: 500,
+        draw_text_callback: ->(_, _) {}
       expect(pdf).to_not have_received(:draw_text!)
     end
   end
@@ -310,21 +312,16 @@ describe Prawn::Text::Box do
   end
 
   describe '#render with :rotate option of 30)' do
-    let(:angle) { 30 }
-    let(:x) { 300 }
-    let(:y) { 70 }
-    let(:width) { 100 }
-    let(:height) { 50 }
-    let(:cos) { Math.cos(angle * Math::PI / 180) }
-    let(:sin) { Math.sin(angle * Math::PI / 180) }
+    let(:cos) { Math.cos(30 * Math::PI / 180) }
+    let(:sin) { Math.sin(30 * Math::PI / 180) }
     let(:text) { 'Oh hai text rect. ' * 10 }
     let(:options) do
       {
         document: pdf,
-        rotate: angle,
-        at: [x, y],
-        width: width,
-        height: height
+        rotate: 30,
+        at: [300, 70],
+        width: 100,
+        height: 50
       }
     end
 
@@ -335,14 +332,14 @@ describe Prawn::Text::Box do
         text_box.render
 
         matrices = PDF::Inspector::Graphics::Matrix.analyze(pdf.render)
-        x_ = x + width / 2
-        y_ = y - height / 2
-        x_prime = x_ * cos - y_ * sin
-        y_prime = x_ * sin + y_ * cos
+        x = 350
+        y = 45
+        x_prime = x * cos - y * sin
+        y_prime = x * sin + y * cos
         expect(matrices.matrices[0]).to eq([
           1, 0, 0, 1,
-          reduce_precision(x_ - x_prime),
-          reduce_precision(y_ - y_prime)
+          reduce_precision(x - x_prime),
+          reduce_precision(y - y_prime)
         ])
         expect(matrices.matrices[1]).to eq([
           reduce_precision(cos),
@@ -365,12 +362,12 @@ describe Prawn::Text::Box do
         text_box.render
 
         matrices = PDF::Inspector::Graphics::Matrix.analyze(pdf.render)
-        x_prime = x * cos - y * sin
-        y_prime = x * sin + y * cos
+        x_prime = 300 * cos - 70 * sin
+        y_prime = 300 * sin + 70 * cos
         expect(matrices.matrices[0]).to eq([
           1, 0, 0, 1,
-          reduce_precision(x - x_prime),
-          reduce_precision(y - y_prime)
+          reduce_precision(300 - x_prime),
+          reduce_precision(70 - y_prime)
         ])
         expect(matrices.matrices[1]).to eq([
           reduce_precision(cos),
@@ -392,12 +389,12 @@ describe Prawn::Text::Box do
         text_box.render
 
         matrices = PDF::Inspector::Graphics::Matrix.analyze(pdf.render)
-        x_prime = x * cos - y * sin
-        y_prime = x * sin + y * cos
+        x_prime = 300 * cos - 70 * sin
+        y_prime = 300 * sin + 70 * cos
         expect(matrices.matrices[0]).to eq([
           1, 0, 0, 1,
-          reduce_precision(x - x_prime),
-          reduce_precision(y - y_prime)
+          reduce_precision(300 - x_prime),
+          reduce_precision(70 - y_prime)
         ])
         expect(matrices.matrices[1]).to eq([
           reduce_precision(cos),
@@ -420,14 +417,14 @@ describe Prawn::Text::Box do
         text_box.render
 
         matrices = PDF::Inspector::Graphics::Matrix.analyze(pdf.render)
-        x_ = x + width
-        y_ = y
-        x_prime = x_ * cos - y_ * sin
-        y_prime = x_ * sin + y_ * cos
+        x = 400
+        y = 70
+        x_prime = x * cos - y * sin
+        y_prime = x * sin + y * cos
         expect(matrices.matrices[0]).to eq([
           1, 0, 0, 1,
-          reduce_precision(x_ - x_prime),
-          reduce_precision(y_ - y_prime)
+          reduce_precision(x - x_prime),
+          reduce_precision(y - y_prime)
         ])
         expect(matrices.matrices[1]).to eq([
           reduce_precision(cos),
@@ -450,14 +447,14 @@ describe Prawn::Text::Box do
         text_box.render
 
         matrices = PDF::Inspector::Graphics::Matrix.analyze(pdf.render)
-        x_ = x + width
-        y_ = y - height
-        x_prime = x_ * cos - y_ * sin
-        y_prime = x_ * sin + y_ * cos
+        x = 400
+        y = 20
+        x_prime = x * cos - y * sin
+        y_prime = x * sin + y * cos
         expect(matrices.matrices[0]).to eq([
           1, 0, 0, 1,
-          reduce_precision(x_ - x_prime),
-          reduce_precision(y_ - y_prime)
+          reduce_precision(x - x_prime),
+          reduce_precision(y - y_prime)
         ])
         expect(matrices.matrices[1]).to eq([
           reduce_precision(cos),
@@ -480,14 +477,14 @@ describe Prawn::Text::Box do
         text_box.render
 
         matrices = PDF::Inspector::Graphics::Matrix.analyze(pdf.render)
-        x_ = x
-        y_ = y - height
-        x_prime = x_ * cos - y_ * sin
-        y_prime = x_ * sin + y_ * cos
+        x = 300
+        y = 20
+        x_prime = x * cos - y * sin
+        y_prime = x * sin + y * cos
         expect(matrices.matrices[0]).to eq([
           1, 0, 0, 1,
-          reduce_precision(x_ - x_prime),
-          reduce_precision(y_ - y_prime)
+          reduce_precision(x - x_prime),
+          reduce_precision(y - y_prime)
         ])
         expect(matrices.matrices[1]).to eq([
           reduce_precision(cos),
@@ -578,7 +575,7 @@ describe Prawn::Text::Box do
     it 'printed text should match requested text, except that preceding and ' \
       'trailing white space will be stripped from each line, and newlines ' \
       'may be inserted' do
-      text_box = described_class.new('  ' + text, options)
+      text_box = described_class.new("  #{text}", options)
       text_box.render
       expect(text_box.text.tr("\n", ' ')).to eq(text.strip)
     end
@@ -746,11 +743,9 @@ describe Prawn::Text::Box do
           remaining_text = text_box.render
 
           rotate = 30
-          x = 300
-          y = 70
           options[:document] = pdf
           options[:rotate] = rotate
-          options[:at] = [x, y]
+          options[:at] = [300, 70]
           rotated_text_box = described_class.new(text, options)
           expect(rotated_text_box.render).to eq(remaining_text)
         end
@@ -1023,14 +1018,15 @@ describe Prawn::Text::Box do
 
       pdf.font 'Courier'
       text_box = described_class.new(
-        text, width: 180,
-              overflow: :expand,
-              document: pdf
+        text,
+        width: 180,
+        overflow: :expand,
+        document: pdf
       )
 
       text_box.render
 
-      expected = +'©' * 25 + "\n" + '©' * 5
+      expected = "#{'©' * 25}\n#{'©' * 5}"
       expected = pdf.font.normalize_encoding(expected)
       expected = expected.force_encoding(Encoding::UTF_8)
       expect(text_box.text).to eq(expected)
@@ -1039,16 +1035,18 @@ describe Prawn::Text::Box do
     it 'wraps non-unicode strings using single-byte word-wrapping' do
       text = 'continúa esforzandote ' * 5
       text_box = described_class.new(
-        text, width: 180,
-              document: pdf
+        text,
+        width: 180,
+        document: pdf
       )
       text_box.render
       results_with_accent = text_box.text
 
       text = 'continua esforzandote ' * 5
       text_box = described_class.new(
-        text, width: 180,
-              document: pdf
+        text,
+        width: 180,
+        document: pdf
       )
       text_box.render
       results_without_accent = text_box.text
@@ -1107,6 +1105,6 @@ describe Prawn::Text::Box do
   end
 
   def first_line(str)
-    str.each_line { |line| return line }
+    str.lines.first
   end
 end