prawn 2.0.1 → 2.0.2

data/spec/formatted_text_fragment_spec.rb

@@ -5,20 +5,20 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 describe "Text::Formatted::Fragment#space_count" do
   it "should return the number of spaces in the fragment" do
     create_pdf
-    format_state = { }
+    format_state = {}
     fragment = Prawn::Text::Formatted::Fragment.new("hello world ",
-                                                     format_state,
-                                                     @pdf)
-    fragment.space_count.should == 2
+                                                    format_state,
+                                                    @pdf)
+    expect(fragment.space_count).to eq(2)
   end
-  it "should exclude trailing spaces from the count when " +
+  it "should exclude trailing spaces from the count when " \
     ":exclude_trailing_white_space => true" do
     create_pdf
     format_state = { :exclude_trailing_white_space => true }
     fragment = Prawn::Text::Formatted::Fragment.new("hello world ",
-                                                     format_state,
-                                                     @pdf)
-    fragment.space_count.should == 1
+                                                    format_state,
+                                                    @pdf)
+    expect(fragment.space_count).to eq(1)
   end
 end
 
@@ -27,31 +27,31 @@ describe "Text::Formatted::Fragment#include_trailing_white_space!" do
     create_pdf
     format_state = { :exclude_trailing_white_space => true }
     fragment = Prawn::Text::Formatted::Fragment.new("hello world ",
-                                                     format_state,
-                                                     @pdf)
-    fragment.space_count.should == 1
+                                                    format_state,
+                                                    @pdf)
+    expect(fragment.space_count).to eq(1)
     fragment.include_trailing_white_space!
-    fragment.space_count.should == 2
+    expect(fragment.space_count).to eq(2)
   end
 end
 
 describe "Text::Formatted::Fragment#text" do
   it "should return the fragment text" do
     create_pdf
-    format_state = { }
+    format_state = {}
     fragment = Prawn::Text::Formatted::Fragment.new("hello world ",
-                                                     format_state,
-                                                     @pdf)
-    fragment.text.should == "hello world "
+                                                    format_state,
+                                                    @pdf)
+    expect(fragment.text).to eq("hello world ")
   end
-  it "should return the fragment text without trailing spaces when " +
+  it "should return the fragment text without trailing spaces when " \
     ":exclude_trailing_white_space => true" do
     create_pdf
     format_state = { :exclude_trailing_white_space => true }
     fragment = Prawn::Text::Formatted::Fragment.new("hello world ",
-                                                     format_state,
-                                                     @pdf)
-    fragment.text.should == "hello world"
+                                                    format_state,
+                                                    @pdf)
+    expect(fragment.text).to eq("hello world")
   end
 end
 
@@ -77,11 +77,11 @@ describe "Text::Formatted::Fragment#word_spacing=" do
   end
 
   it "should account for word_spacing in #width" do
-    @fragment.width.should == 110
+    expect(@fragment.width).to eq(110)
   end
   it "should account for word_spacing in #bounding_box" do
     target_box = [50, 193, 160, 217]
-    @fragment.bounding_box.should == target_box
+    expect(@fragment.bounding_box).to eq(target_box)
   end
   it "should account for word_spacing in #absolute_bounding_box" do
     target_box = [50, 193, 160, 217]
@@ -89,17 +89,17 @@ describe "Text::Formatted::Fragment#word_spacing=" do
     target_box[1] += @pdf.bounds.absolute_bottom
     target_box[2] += @pdf.bounds.absolute_left
     target_box[3] += @pdf.bounds.absolute_bottom
-    @fragment.absolute_bounding_box.should == target_box
+    expect(@fragment.absolute_bounding_box).to eq(target_box)
   end
   it "should account for word_spacing in #underline_points" do
     y = 198.75
     target_points = [[50, y], [160, y]]
-    @fragment.underline_points.should == target_points
+    expect(@fragment.underline_points).to eq(target_points)
   end
   it "should account for word_spacing in #strikethrough_points" do
     y = 200 + @fragment.ascender * 0.3
     target_points = [[50, y], [160, y]]
-    @fragment.strikethrough_points.should == target_points
+    expect(@fragment.strikethrough_points).to eq(target_points)
   end
 end
 
@@ -125,13 +125,13 @@ describe "Text::Formatted::Fragment" do
 
   describe "#width" do
     it "should return the width" do
-      @fragment.width.should == 100
+      expect(@fragment.width).to eq(100)
     end
   end
 
   describe "#styles" do
     it "should return the styles array" do
-      @fragment.styles.should == [:bold, :italic]
+      expect(@fragment.styles).to eq([:bold, :italic])
     end
     it "should never return nil" do
       format_state = { :styles => nil,
@@ -143,50 +143,51 @@ describe "Text::Formatted::Fragment" do
       fragment = Prawn::Text::Formatted::Fragment.new("hello world",
                                                       format_state,
                                                       @pdf)
-      fragment.styles.should == []
+      expect(fragment.styles).to eq([])
     end
   end
 
   describe "#line_height" do
     it "should return the line_height" do
-      @fragment.line_height.should == 27
+      expect(@fragment.line_height).to eq(27)
     end
   end
 
   describe "#ascender" do
     it "should return the ascender" do
-      @fragment.ascender.should == 17
+      expect(@fragment.ascender).to eq(17)
     end
   end
 
   describe "#descender" do
     it "should return the descender" do
-      @fragment.descender.should == 7
+      expect(@fragment.descender).to eq(7)
     end
   end
 
   describe "#y_offset" do
     it "should be zero" do
-      @fragment.y_offset.should == 0
+      expect(@fragment.y_offset).to eq(0)
     end
   end
 
   describe "#bounding_box" do
     it "should return the bounding box surrounding the fragment" do
       target_box = [50, 193, 150, 217]
-      @fragment.bounding_box.should == target_box
+      expect(@fragment.bounding_box).to eq(target_box)
     end
   end
 
   describe "#absolute_bounding_box" do
-    it "should return the bounding box surrounding the fragment" +
+    it "should return the bounding box surrounding the fragment" \
        " in absolute coordinates" do
       target_box = [50, 193, 150, 217]
-        target_box[0] += @pdf.bounds.absolute_left
-        target_box[1] += @pdf.bounds.absolute_bottom
-        target_box[2] += @pdf.bounds.absolute_left
-        target_box[3] += @pdf.bounds.absolute_bottom
-      @fragment.absolute_bounding_box.should == target_box
+      target_box[0] += @pdf.bounds.absolute_left
+      target_box[1] += @pdf.bounds.absolute_bottom
+      target_box[2] += @pdf.bounds.absolute_left
+      target_box[3] += @pdf.bounds.absolute_bottom
+
+      expect(@fragment.absolute_bounding_box).to eq(target_box)
     end
   end
 
@@ -194,7 +195,7 @@ describe "Text::Formatted::Fragment" do
     it "should define a line under the fragment" do
       y = 198.75
       target_points = [[50, y], [150, y]]
-      @fragment.underline_points.should == target_points
+      expect(@fragment.underline_points).to eq(target_points)
     end
   end
 
@@ -202,7 +203,7 @@ describe "Text::Formatted::Fragment" do
     it "should define a line through the fragment" do
       y = 200 + @fragment.ascender * 0.3
       target_points = [[50, y], [150, y]]
-      @fragment.strikethrough_points.should == target_points
+      expect(@fragment.strikethrough_points).to eq(target_points)
     end
   end
 end
@@ -225,12 +226,12 @@ describe "Text::Formatted::Fragment that is a subscript" do
   end
   describe "#subscript?" do
     it "should be_true" do
-      @fragment.should be_subscript
+      expect(@fragment).to be_subscript
     end
   end
   describe "#y_offset" do
     it "should return a negative value" do
-      @fragment.y_offset.should be < 0
+      expect(@fragment.y_offset).to be < 0
     end
   end
 end
@@ -253,12 +254,12 @@ describe "Text::Formatted::Fragment that is a superscript" do
   end
   describe "#superscript?" do
     it "should be_true" do
-      @fragment.should be_superscript
+      expect(@fragment).to be_superscript
     end
   end
   describe "#y_offset" do
     it "should return a positive value" do
-      @fragment.y_offset.should be > 0
+      expect(@fragment.y_offset).to be > 0
     end
   end
 end
@@ -268,31 +269,31 @@ describe "Text::Formatted::Fragment with :direction => :rtl" do
     create_pdf
     format_state = { :direction => :rtl }
     fragment = Prawn::Text::Formatted::Fragment.new("hello world",
-                                                     format_state,
-                                                     @pdf)
-    fragment.text.should == "dlrow olleh"
+                                                    format_state,
+                                                    @pdf)
+    expect(fragment.text).to eq("dlrow olleh")
   end
 end
 
 describe "Text::Formatted::Fragment default_direction=" do
-  it "should set the direction if there is no fragment level direction " +
+  it "should set the direction if there is no fragment level direction " \
      "specification" do
     create_pdf
-    format_state = { }
+    format_state = {}
     fragment = Prawn::Text::Formatted::Fragment.new("hello world",
-                                                     format_state,
-                                                     @pdf)
+                                                    format_state,
+                                                    @pdf)
     fragment.default_direction = :rtl
-    fragment.direction.should == :rtl
+    expect(fragment.direction).to eq(:rtl)
   end
-  it "should not set the direction if there is a fragment level direction " +
+  it "should not set the direction if there is a fragment level direction " \
      "specification" do
     create_pdf
     format_state = { :direction => :rtl }
     fragment = Prawn::Text::Formatted::Fragment.new("hello world",
-                                                     format_state,
+                                                    format_state,
                                                     @pdf)
     fragment.default_direction = :ltr
-    fragment.direction.should == :rtl
+    expect(fragment.direction).to eq(:rtl)
   end
 end

data/spec/graphics_spec.rb

@@ -3,126 +3,116 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 describe "When drawing a line" do
-
   before(:each) { create_pdf }
 
   it "should draw a line from (100,600) to (100,500)" do
-    @pdf.line([100,600],[100,500])
+    @pdf.line([100, 600], [100, 500])
 
     line_drawing = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
 
-    line_drawing.points.should == [[100,600],[100,500]]
+    expect(line_drawing.points).to eq([[100, 600], [100, 500]])
   end
 
-  it "should draw two lines at (100,600) to (100,500) " +
+  it "should draw two lines at (100,600) to (100,500) " \
      "and (75,100) to (50,125)" do
-    @pdf.line(100,600,100,500)
-    @pdf.line(75,100,50,125)
+    @pdf.line(100, 600, 100, 500)
+    @pdf.line(75, 100, 50, 125)
 
     line_drawing = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
 
-    line_drawing.points.should ==
+    expect(line_drawing.points).to eq(
       [[100.0, 600.0], [100.0, 500.0], [75.0, 100.0], [50.0, 125.0]]
+    )
   end
 
   it "should properly set line width via line_width=" do
-     @pdf.line_width = 10
-     line = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
-     line.widths.first.should == 10
+    @pdf.line_width = 10
+    line = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
+    expect(line.widths.first).to eq(10)
   end
 
   it "should properly set line width via line_width(width)" do
-     @pdf.line_width(10)
-     line = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
-     line.widths.first.should == 10
+    @pdf.line_width(10)
+    line = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
+    expect(line.widths.first).to eq(10)
   end
 
   it "should carry the current line width settings over to new pages" do
     @pdf.line_width(10)
     @pdf.start_new_page
     line = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
-    line.widths.length.should == 2
-    line.widths[1].should == 10
+    expect(line.widths.length).to eq(2)
+    expect(line.widths[1]).to eq(10)
   end
 
   describe "(Horizontally)" do
     it "should draw from [x1,pdf.y],[x2,pdf.y]" do
-      @pdf.horizontal_line(100,150)
+      @pdf.horizontal_line(100, 150)
       @line = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
-      @line.points.should == [[100.0 + @pdf.bounds.absolute_left, @pdf.y],
-                              [150.0 + @pdf.bounds.absolute_left, @pdf.y]]
+      expect(@line.points).to eq([[100.0 + @pdf.bounds.absolute_left, @pdf.y],
+                                  [150.0 + @pdf.bounds.absolute_left, @pdf.y]])
     end
 
     it "should draw a line from (200, 250) to (300, 250)" do
-      @pdf.horizontal_line(200,300,:at => 250)
+      @pdf.horizontal_line(200, 300, :at => 250)
       line_drawing = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
-      line_drawing.points.should == [[200,250],[300,250]]
+      expect(line_drawing.points).to eq([[200, 250], [300, 250]])
     end
   end
 
   describe "(Vertically)" do
     it "should draw a line from (350, 300) to (350, 400)" do
-      @pdf.vertical_line(300,400,:at => 350)
+      @pdf.vertical_line(300, 400, :at => 350)
       line_drawing = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
-      line_drawing.points.should == [[350,300],[350,400]]
+      expect(line_drawing.points).to eq([[350, 300], [350, 400]])
     end
     it "should require a y coordinate" do
-      lambda { @pdf.vertical_line(400,500) }.
-        should raise_error(ArgumentError)
+      expect { @pdf.vertical_line(400, 500) }.
+        to raise_error(ArgumentError)
     end
   end
-
 end
 
 describe "When drawing a polygon" do
-
   before(:each) { create_pdf }
 
   it "should draw each line passed to polygon()" do
-    @pdf.polygon([100,500],[100,400],[200,400])
+    @pdf.polygon([100, 500], [100, 400], [200, 400])
 
     line_drawing = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
-    line_drawing.points.should == [[100,500],[100,400],[200,400],[100,500]]
+    expect(line_drawing.points).to eq([[100, 500], [100, 400], [200, 400], [100, 500]])
   end
-
 end
 
 describe "When drawing a rectangle" do
-
   before(:each) { create_pdf }
 
   it "should use a point, width, and height for coords" do
-    @pdf.rectangle [200,200], 50, 100
+    @pdf.rectangle [200, 200], 50, 100
 
-    rectangles = PDF::Inspector::Graphics::Rectangle.
-      analyze(@pdf.render).rectangles
+    rectangles = PDF::Inspector::Graphics::Rectangle.analyze(@pdf.render).rectangles
     # PDF uses bottom left corner
-    rectangles[0][:point].should  == [200,100]
-    rectangles[0][:width].should  == 50
-    rectangles[0][:height].should == 100
-
+    expect(rectangles[0][:point]).to eq([200, 100])
+    expect(rectangles[0][:width]).to eq(50)
+    expect(rectangles[0][:height]).to eq(100)
   end
-
 end
 
 describe "When drawing a curve" do
-
   before(:each) { create_pdf }
 
   it "should draw a bezier curve from 50,50 to 100,100" do
-    @pdf.move_to  [50,50]
-    @pdf.curve_to [100,100],:bounds => [[20,90], [90,70]]
+    @pdf.move_to [50, 50]
+    @pdf.curve_to [100, 100], :bounds => [[20, 90], [90, 70]]
     curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)
-    curve.coords.should == [50.0, 50.0, 20.0, 90.0, 90.0, 70.0, 100.0, 100.0]
+    expect(curve.coords).to eq([50.0, 50.0, 20.0, 90.0, 90.0, 70.0, 100.0, 100.0])
   end
 
   it "should draw a bezier curve from 100,100 to 50,50" do
-    @pdf.curve [100,100], [50,50], :bounds => [[20,90], [90,75]]
+    @pdf.curve [100, 100], [50, 50], :bounds => [[20, 90], [90, 75]]
     curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)
-    curve.coords.should == [100.0, 100.0, 20.0, 90.0, 90.0, 75.0, 50.0, 50.0]
+    expect(curve.coords).to eq([100.0, 100.0, 20.0, 90.0, 90.0, 75.0, 50.0, 50.0])
   end
-
-
 end
 
 describe "When drawing a rounded rectangle" do
@@ -131,42 +121,40 @@ describe "When drawing a rounded rectangle" do
     @pdf.rounded_rectangle([50, 550], 50, 100, 10)
     curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)
     curve_points = []
-    curve.coords.each_slice(2) {|p| curve_points << p}
+    curve.coords.each_slice(2) { |p| curve_points << p }
     @original_point = curve_points.shift
     curves = []
-    curve_points.each_slice(3) {|c| curves << c}
+    curve_points.each_slice(3) { |c| curves << c }
     line_points = PDF::Inspector::Graphics::Line.analyze(@pdf.render).points
     line_points.shift
     @all_coords = []
-    line_points.zip(curves).flatten.each_slice(2) {|p| @all_coords << p }
+    line_points.zip(curves).flatten.each_slice(2) { |p| @all_coords << p }
     @all_coords.unshift @original_point
   end
 
   it "should draw a rectangle by connecting lines with rounded bezier curves" do
-    @all_coords.should == [[60.0, 550.0],[90.0, 550.0], [95.5228, 550.0],
-                           [100.0, 545.5228], [100.0, 540.0], [100.0, 460.0],
-                           [100.0, 454.4772], [95.5228, 450.0], [90.0, 450.0],
-                           [60.0, 450.0], [54.4772, 450.0], [50.0, 454.4772],
-                           [50.0, 460.0], [50.0, 540.0], [50.0, 545.5228],
-                           [54.4772, 550.0], [60.0, 550.0]]
+    expect(@all_coords).to eq([[60.0, 550.0], [90.0, 550.0], [95.5228, 550.0],
+                               [100.0, 545.5228], [100.0, 540.0], [100.0, 460.0],
+                               [100.0, 454.4772], [95.5228, 450.0], [90.0, 450.0],
+                               [60.0, 450.0], [54.4772, 450.0], [50.0, 454.4772],
+                               [50.0, 460.0], [50.0, 540.0], [50.0, 545.5228],
+                               [54.4772, 550.0], [60.0, 550.0]])
   end
 
   it "should start and end with the same point" do
-    @original_point.should == @all_coords.last
+    expect(@original_point).to eq(@all_coords.last)
   end
-
-
 end
 
 describe "When drawing an ellipse" do
   before(:each) do
     create_pdf
-    @pdf.ellipse [100,100], 25, 50
+    @pdf.ellipse [100, 100], 25, 50
     @curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)
   end
 
   it "should use a Bézier approximation" do
-    @curve.coords.should ==
+    expect(@curve.coords).to eq(
       [125.0, 100.0,
 
        125.0, 127.6142,
@@ -186,25 +174,25 @@ describe "When drawing an ellipse" do
        125.0, 100.0,
 
        100.0, 100.0]
+    )
   end
 
   it "should move the pointer to the center of the ellipse after drawing" do
-    @curve.coords[-2..-1].should == [100,100]
+    expect(@curve.coords[-2..-1]).to eq([100, 100])
   end
-
 end
 
 describe "When drawing a circle" do
   before(:each) do
     create_pdf
-    @pdf.circle [100,100], 25
-    @pdf.ellipse [100,100], 25, 25
+    @pdf.circle [100, 100], 25
+    @pdf.ellipse [100, 100], 25, 25
     @curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)
   end
 
   it "should stroke the same path as the equivalent ellipse" do
     middle = @curve.coords.length / 2
-    @curve.coords[0...middle].should == @curve.coords[middle..-1]
+    expect(@curve.coords[0...middle]).to eq(@curve.coords[middle..-1])
   end
 end
 
@@ -233,42 +221,35 @@ describe "When filling" do
 end
 
 describe "When setting colors" do
-
   before(:each) { create_pdf }
 
   it "should set stroke colors" do
     @pdf.stroke_color "ffcccc"
     colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
     # 100% red, 80% green, 80% blue
-    colors.stroke_color.should == [1.0, 0.8, 0.8]
+    expect(colors.stroke_color).to eq([1.0, 0.8, 0.8])
   end
 
   it "should set fill colors" do
     @pdf.fill_color "ccff00"
     colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
     # 80% red, 100% green, 0% blue
-    colors.fill_color.should == [0.8,1.0,0]
+    expect(colors.fill_color).to eq([0.8, 1.0, 0])
   end
 
   it "should reset the colors on each new page if they have been defined" do
     @pdf.fill_color "ccff00"
-    #colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
 
-    # colors.fill_color_count.should == 2
-    # colors.stroke_color_count.should == 1
     @pdf.start_new_page
     @pdf.stroke_color "ff00cc"
 
-    #colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
-    # colors.fill_color_count.should == 3
-
     @pdf.start_new_page
     colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
-    colors.fill_color_count.should == 3
-    colors.stroke_color_count.should == 2
+    expect(colors.fill_color_count).to eq(3)
+    expect(colors.stroke_color_count).to eq(2)
 
-    colors.fill_color.should   == [0.8,1.0,0.0]
-    colors.stroke_color.should == [1.0,0.0,0.8]
+    expect(colors.fill_color).to eq([0.8, 1.0, 0.0])
+    expect(colors.stroke_color).to eq([1.0, 0.0, 0.8])
   end
 
   it "should set the color space when setting colors on new pages to please fussy readers" do
@@ -278,7 +259,7 @@ describe "When setting colors" do
     @pdf.stroke_color "000000"
     @pdf.stroke { @pdf.rectangle([10, 10], 10, 10) }
     colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
-    colors.stroke_color_space_count[:DeviceRGB].should == 2
+    expect(colors.stroke_color_space_count[:DeviceRGB]).to eq(2)
   end
 end
 
@@ -288,72 +269,78 @@ describe "Patterns" do
   describe 'linear gradients' do
     it "should create a /Pattern resource" do
       @pdf.fill_gradient [0, @pdf.bounds.height],
-        [@pdf.bounds.width, @pdf.bounds.height], 'FF0000', '0000FF'
+                         [@pdf.bounds.width, @pdf.bounds.height],
+                         'FF0000', '0000FF'
 
       grad = PDF::Inspector::Graphics::Pattern.analyze(@pdf.render)
       pattern = grad.patterns.values.first
 
-      pattern.should_not be_nil
-      pattern[:Shading][:ShadingType].should == 2
-      pattern[:Shading][:Coords].should == [0, 0, @pdf.bounds.width, 0]
-      pattern[:Shading][:Function][:C0].zip([1, 0, 0]).all?{ |x1, x2|
-        (x1-x2).abs < 0.01
-      }.should be_true
-      pattern[:Shading][:Function][:C1].zip([0, 0, 1]).all?{ |x1, x2|
-        (x1-x2).abs < 0.01
-      }.should be_true
+      expect(pattern).not_to be_nil
+      expect(pattern[:Shading][:ShadingType]).to eq(2)
+      expect(pattern[:Shading][:Coords]).to eq([0, 0, @pdf.bounds.width, 0])
+      expect(pattern[:Shading][:Function][:C0].zip([1, 0, 0]).all?{ |x1, x2|
+        (x1 - x2).abs < 0.01
+      }).to be_true
+      expect(pattern[:Shading][:Function][:C1].zip([0, 0, 1]).all?{ |x1, x2|
+        (x1 - x2).abs < 0.01
+      }).to be_true
     end
 
     it "fill_gradient should set fill color to the pattern" do
       @pdf.fill_gradient [0, @pdf.bounds.height],
-        [@pdf.bounds.width, @pdf.bounds.height], 'FF0000', '0000FF'
+                         [@pdf.bounds.width, @pdf.bounds.height],
+                         'FF0000', '0000FF'
 
       str = @pdf.render
-      str.should =~ %r{/Pattern\s+cs\s*/SP-?\d+\s+scn}
+      expect(str).to match(%r{/Pattern\s+cs\s*/SP-?\d+\s+scn})
     end
 
     it "stroke_gradient should set stroke color to the pattern" do
       @pdf.stroke_gradient [0, @pdf.bounds.height],
-        [@pdf.bounds.width, @pdf.bounds.height], 'FF0000', '0000FF'
+                           [@pdf.bounds.width, @pdf.bounds.height],
+                           'FF0000', '0000FF'
 
       str = @pdf.render
-      str.should =~ %r{/Pattern\s+CS\s*/SP-?\d+\s+SCN}
+      expect(str).to match(%r{/Pattern\s+CS\s*/SP-?\d+\s+SCN})
     end
   end
 
   describe 'radial gradients' do
     it "should create a /Pattern resource" do
       @pdf.fill_gradient [0, @pdf.bounds.height], 10,
-        [@pdf.bounds.width, @pdf.bounds.height], 20, 'FF0000', '0000FF'
+                         [@pdf.bounds.width, @pdf.bounds.height], 20,
+                         'FF0000', '0000FF'
 
       grad = PDF::Inspector::Graphics::Pattern.analyze(@pdf.render)
       pattern = grad.patterns.values.first
 
-      pattern.should_not be_nil
-      pattern[:Shading][:ShadingType].should == 3
-      pattern[:Shading][:Coords].should == [0, 0, 10, @pdf.bounds.width, 0, 20]
-      pattern[:Shading][:Function][:C0].zip([1, 0, 0]).all?{ |x1, x2|
-        (x1-x2).abs < 0.01
-      }.should be_true
-      pattern[:Shading][:Function][:C1].zip([0, 0, 1]).all?{ |x1, x2|
-        (x1-x2).abs < 0.01
-      }.should be_true
+      expect(pattern).not_to be_nil
+      expect(pattern[:Shading][:ShadingType]).to eq(3)
+      expect(pattern[:Shading][:Coords]).to eq([0, 0, 10, @pdf.bounds.width, 0, 20])
+      expect(pattern[:Shading][:Function][:C0].zip([1, 0, 0]).all?{ |x1, x2|
+        (x1 - x2).abs < 0.01
+      }).to be_true
+      expect(pattern[:Shading][:Function][:C1].zip([0, 0, 1]).all?{ |x1, x2|
+        (x1 - x2).abs < 0.01
+      }).to be_true
     end
 
     it "fill_gradient should set fill color to the pattern" do
       @pdf.fill_gradient [0, @pdf.bounds.height], 10,
-        [@pdf.bounds.width, @pdf.bounds.height], 20, 'FF0000', '0000FF'
+                         [@pdf.bounds.width, @pdf.bounds.height], 20,
+                         'FF0000', '0000FF'
 
       str = @pdf.render
-      str.should =~ %r{/Pattern\s+cs\s*/SP-?\d+\s+scn}
+      expect(str).to match(%r{/Pattern\s+cs\s*/SP-?\d+\s+scn})
     end
 
     it "stroke_gradient should set stroke color to the pattern" do
       @pdf.stroke_gradient [0, @pdf.bounds.height], 10,
-        [@pdf.bounds.width, @pdf.bounds.height], 20, 'FF0000', '0000FF'
+                           [@pdf.bounds.width, @pdf.bounds.height], 20,
+                           'FF0000', '0000FF'
 
       str = @pdf.render
-      str.should =~ %r{/Pattern\s+CS\s*/SP-?\d+\s+SCN}
+      expect(str).to match(%r{/Pattern\s+CS\s*/SP-?\d+\s+SCN})
     end
   end
 end
@@ -362,22 +349,22 @@ describe "When using painting shortcuts" do
   before(:each) { create_pdf }
 
   it "should convert stroke_some_method(args) into some_method(args); stroke" do
-    @pdf.expects(:line_to).with([100,100])
+    @pdf.expects(:line_to).with([100, 100])
     @pdf.expects(:stroke)
 
-    @pdf.stroke_line_to [100,100]
+    @pdf.stroke_line_to [100, 100]
   end
 
   it "should convert fill_some_method(args) into some_method(args); fill" do
-    @pdf.expects(:line_to).with([100,100])
+    @pdf.expects(:line_to).with([100, 100])
     @pdf.expects(:fill)
 
-    @pdf.fill_line_to [100,100]
+    @pdf.fill_line_to [100, 100]
   end
 
   it "should not break method_missing" do
-    lambda { @pdf.i_have_a_pretty_girlfriend_named_jia }.
-      should raise_error(NoMethodError)
+    expect { @pdf.i_have_a_pretty_girlfriend_named_jia }.
+      to raise_error(NoMethodError)
   end
 end
 
@@ -413,32 +400,32 @@ describe "When using graphics states" do
     @pdf.stroke_color 0, 0, 0, 0
     @pdf.restore_graphics_state
     @pdf.stroke_color 0, 0, 100, 0
-    @pdf.graphic_state.color_space.should == {:stroke=>:DeviceCMYK}
+    expect(@pdf.graphic_state.color_space).to eq(:stroke => :DeviceCMYK)
     colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
-    colors.color_space.should == :DeviceCMYK
-    colors.stroke_color_space_count[:DeviceCMYK].should == 2
+    expect(colors.color_space).to eq(:DeviceCMYK)
+    expect(colors.stroke_color_space_count[:DeviceCMYK]).to eq(2)
   end
 
   it "should use the correct dash setting after restoring and starting new page" do
     @pdf.dash 5
     @pdf.save_graphics_state
     @pdf.dash 10
-    @pdf.graphic_state.dash[:dash].should == 10
+    expect(@pdf.graphic_state.dash[:dash]).to eq(10)
     @pdf.restore_graphics_state
     @pdf.start_new_page
-    @pdf.graphic_state.dash[:dash].should == 5
+    expect(@pdf.graphic_state.dash[:dash]).to eq(5)
   end
 
   it "should round dash values to four decimal places" do
     @pdf.dash 5.12345
-    @pdf.graphic_state.dash_setting.should == "[5.1235 5.1235] 0.0 d"
+    expect(@pdf.graphic_state.dash_setting).to eq("[5.1235 5.1235] 0.0 d")
   end
 
   it "should raise an error when dash is called w. a zero length or space" do
     expect { @pdf.dash(0) }.to raise_error(ArgumentError)
     expect { @pdf.dash([0]) }.to raise_error(ArgumentError)
-    expect { @pdf.dash([0,0]) }.to raise_error(ArgumentError)
-    expect { @pdf.dash([0,0,0,1]) }.to raise_error(ArgumentError)
+    expect { @pdf.dash([0, 0]) }.to raise_error(ArgumentError)
+    expect { @pdf.dash([0, 0, 0, 1]) }.to raise_error(ArgumentError)
   end
 
   it "the current graphic state should keep track of previous unchanged settings" do
@@ -451,54 +438,51 @@ describe "When using graphics states" do
     @pdf.fill_color 0, 0, 100, 0
     @pdf.save_graphics_state
 
-    @pdf.graphic_state.stroke_color.should == "000000"
-    @pdf.graphic_state.join_style.should == :miter
-    @pdf.graphic_state.fill_color.should == [0, 0, 100, 0]
-    @pdf.graphic_state.cap_style.should == :round
-    @pdf.graphic_state.color_space.should == {:fill=>:DeviceCMYK, :stroke=>:DeviceRGB}
-    @pdf.graphic_state.dash.should == {:space=>5, :phase=>0, :dash=>5}
-    @pdf.graphic_state.line_width.should == 1
+    expect(@pdf.graphic_state.stroke_color).to eq("000000")
+    expect(@pdf.graphic_state.join_style).to eq(:miter)
+    expect(@pdf.graphic_state.fill_color).to eq([0, 0, 100, 0])
+    expect(@pdf.graphic_state.cap_style).to eq(:round)
+    expect(@pdf.graphic_state.color_space).to eq(:fill => :DeviceCMYK, :stroke => :DeviceRGB)
+    expect(@pdf.graphic_state.dash).to eq(:space => 5, :phase => 0, :dash => 5)
+    expect(@pdf.graphic_state.line_width).to eq(1)
   end
 
-
-
   it "should not add extra graphic space closings when rendering multiple times" do
     @pdf.render
     state = PDF::Inspector::Graphics::State.analyze(@pdf.render)
-    state.save_graphics_state_count.should == 1
-    state.restore_graphics_state_count.should == 1
+    expect(state.save_graphics_state_count).to eq(1)
+    expect(state.restore_graphics_state_count).to eq(1)
   end
 
   it "should add extra graphic state enclosings when content is added on multiple renderings" do
     @pdf.render
     @pdf.text "Adding a bit more content"
     state = PDF::Inspector::Graphics::State.analyze(@pdf.render)
-    state.save_graphics_state_count.should == 2
-    state.restore_graphics_state_count.should == 2
+    expect(state.save_graphics_state_count).to eq(2)
+    expect(state.restore_graphics_state_count).to eq(2)
   end
 
   it "adds extra graphic state enclosings when new settings are applied on multiple renderings" do
     @pdf.render
     @pdf.stroke_color 0, 0, 0, 0
     state = PDF::Inspector::Graphics::State.analyze(@pdf.render)
-    state.save_graphics_state_count.should == 2
-    state.restore_graphics_state_count.should == 2
+    expect(state.save_graphics_state_count).to eq(2)
+    expect(state.restore_graphics_state_count).to eq(2)
   end
 
-
   it "should raise_error error if closing an empty graphic stack" do
-    lambda {
+    expect {
       @pdf.render
       @pdf.restore_graphics_state
-    }.should raise_error(PDF::Core::Errors::EmptyGraphicStateStack)
+    }.to raise_error(PDF::Core::Errors::EmptyGraphicStateStack)
   end
 
   it "should copy mutable attributes when passing a previous_state to the initializer" do
     new_state = PDF::Core::GraphicState.new(@pdf.graphic_state)
 
     [:color_space, :dash, :fill_color, :stroke_color].each do |attr|
-      new_state.send(attr).should == @pdf.graphic_state.send(attr)
-      new_state.send(attr).should_not equal(@pdf.graphic_state.send(attr))
+      expect(new_state.send(attr)).to eq(@pdf.graphic_state.send(attr))
+      expect(new_state.send(attr)).not_to equal(@pdf.graphic_state.send(attr))
     end
   end
 
@@ -506,8 +490,8 @@ describe "When using graphics states" do
     new_state = @pdf.graphic_state.dup
 
     [:color_space, :dash, :fill_color, :stroke_color].each do |attr|
-      new_state.send(attr).should == @pdf.graphic_state.send(attr)
-      new_state.send(attr).should_not equal(@pdf.graphic_state.send(attr))
+      expect(new_state.send(attr)).to eq(@pdf.graphic_state.send(attr))
+      expect(new_state.send(attr)).not_to equal(@pdf.graphic_state.send(attr))
     end
   end
 end
@@ -527,13 +511,13 @@ describe "When using transformation matrix" do
     values = Array.new(6, 0.000000000001)
     string = Array.new(6, "0.00000").join " "
     @pdf.renderer.expects(:add_content).with("#{string} cm")
-    @pdf.transformation_matrix *values
+    @pdf.transformation_matrix(*values)
   end
 
   it "should be received by the inspector" do
     @pdf.transformation_matrix 1, 0, 0, -1, 5.5, 20
     matrices = PDF::Inspector::Graphics::Matrix.analyze(@pdf.render)
-    matrices.matrices.should == [[1, 0, 0, -1, 5.5, 20]]
+    expect(matrices.matrices).to eq([[1, 0, 0, -1, 5.5, 20]])
   end
 
   it "should save the graphics state inside the given block" do
@@ -541,15 +525,14 @@ describe "When using transformation matrix" do
     string = Array.new(6, "0.00000").join " "
     process = sequence "process"
 
-    @pdf.expects(:save_graphics_state).with().in_sequence(process)
+    @pdf.expects(:save_graphics_state).with.in_sequence(process)
     @pdf.renderer.expects(:add_content).with("#{string} cm").in_sequence(process)
-    @pdf.expects(:do_something).with().in_sequence(process)
-    @pdf.expects(:restore_graphics_state).with().in_sequence(process)
+    @pdf.expects(:do_something).with.in_sequence(process)
+    @pdf.expects(:restore_graphics_state).with.in_sequence(process)
     @pdf.transformation_matrix(*values) do
       @pdf.do_something
     end
   end
-
 end
 
 describe "When using transformations shortcuts" do
@@ -577,13 +560,13 @@ describe "When using transformations shortcuts" do
       @pdf.rotate(@angle, :origin => [@x, @y]) { @pdf.text('hello world') }
 
       matrices = PDF::Inspector::Graphics::Matrix.analyze(@pdf.render)
-      matrices.matrices[0].should == [1, 0, 0, 1,
-                                      reduce_precision(@x - x_prime),
-                                      reduce_precision(@y - y_prime)]
-      matrices.matrices[1].should == [reduce_precision(@cos),
-                                      reduce_precision(@sin),
-                                      reduce_precision(-@sin),
-                                      reduce_precision(@cos), 0, 0]
+      expect(matrices.matrices[0]).to eq([1, 0, 0, 1,
+                                          reduce_precision(@x - x_prime),
+                                          reduce_precision(@y - y_prime)])
+      expect(matrices.matrices[1]).to eq([reduce_precision(@cos),
+                                          reduce_precision(@sin),
+                                          reduce_precision(-@sin),
+                                          reduce_precision(@cos), 0, 0])
     end
 
     it "should rotate around the origin in a document with a margin" do
@@ -597,19 +580,19 @@ describe "When using transformations shortcuts" do
       y_prime = x * @sin + y * @cos
 
       matrices = PDF::Inspector::Graphics::Matrix.analyze(@pdf.render)
-      matrices.matrices[0].should == [1, 0, 0, 1,
-                                      reduce_precision(x - x_prime),
-                                      reduce_precision(y - y_prime)]
-      matrices.matrices[1].should == [reduce_precision(@cos),
-                                      reduce_precision(@sin),
-                                      reduce_precision(-@sin),
-                                      reduce_precision(@cos), 0, 0]
+      expect(matrices.matrices[0]).to eq([1, 0, 0, 1,
+                                          reduce_precision(x - x_prime),
+                                          reduce_precision(y - y_prime)])
+      expect(matrices.matrices[1]).to eq([reduce_precision(@cos),
+                                          reduce_precision(@sin),
+                                          reduce_precision(-@sin),
+                                          reduce_precision(@cos), 0, 0])
     end
 
     it "should raise_error BlockRequired if no block is given" do
-      lambda {
+      expect {
         @pdf.rotate(@angle, :origin => [@x, @y])
-      }.should raise_error(Prawn::Errors::BlockRequired)
+      }.to raise_error(Prawn::Errors::BlockRequired)
     end
 
     def reduce_precision(float)
@@ -640,10 +623,10 @@ describe "When using transformations shortcuts" do
       @pdf.scale(@factor, :origin => [@x, @y]) { @pdf.text('hello world') }
 
       matrices = PDF::Inspector::Graphics::Matrix.analyze(@pdf.render)
-      matrices.matrices[0].should == [1, 0, 0, 1,
-                                      reduce_precision(@x - x_prime),
-                                      reduce_precision(@y - y_prime)]
-      matrices.matrices[1].should == [@factor, 0, 0, @factor, 0, 0]
+      expect(matrices.matrices[0]).to eq([1, 0, 0, 1,
+                                          reduce_precision(@x - x_prime),
+                                          reduce_precision(@y - y_prime)])
+      expect(matrices.matrices[1]).to eq([@factor, 0, 0, @factor, 0, 0])
     end
 
     it "should scale from the origin in a document with a margin" do
@@ -656,16 +639,16 @@ describe "When using transformations shortcuts" do
       @pdf.scale(@factor, :origin => [@x, @y]) { @pdf.text('hello world') }
 
       matrices = PDF::Inspector::Graphics::Matrix.analyze(@pdf.render)
-      matrices.matrices[0].should == [1, 0, 0, 1,
-                                      reduce_precision(x - x_prime),
-                                      reduce_precision(y - y_prime)]
-      matrices.matrices[1].should == [@factor, 0, 0, @factor, 0, 0]
+      expect(matrices.matrices[0]).to eq([1, 0, 0, 1,
+                                          reduce_precision(x - x_prime),
+                                          reduce_precision(y - y_prime)])
+      expect(matrices.matrices[1]).to eq([@factor, 0, 0, @factor, 0, 0])
     end
 
     it "should raise_error BlockRequired if no block is given" do
-      lambda {
+      expect {
         @pdf.scale(@factor, :origin => [@x, @y])
-      }.should raise_error(Prawn::Errors::BlockRequired)
+      }.to raise_error(Prawn::Errors::BlockRequired)
     end
 
     def reduce_precision(float)