prawn 2.0.2 → 2.1.0

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

@@ -21,6 +21,8 @@ module Prawn
 
         # The number of spaces in the last wrapped line
         attr_reader :space_count
+        attr_reader :soft_hyphen
+        attr_reader :zero_width_space
 
         # Whether this line is the last line in the paragraph
         def paragraph_finished?
@@ -150,9 +152,6 @@ module Prawn
           "-"
         end
 
-        attr_reader :soft_hyphen
-        attr_reader :zero_width_space
-
         def line_empty?
           @line_empty && @accumulated_width == 0
         end

data/lib/prawn/transformation_stack.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+#
+# transformation_stack.rb : Stores the transformations that have been applied to the document
+#
+# Copyright 2015, Roger Nesbitt. All Rights Reserved.
+#
+# This is free software. Please see the LICENSE and COPYING files for details.
+#
+
+require 'matrix'
+
+module Prawn
+  module TransformationStack
+    def add_to_transformation_stack(a, b, c, d, e, f)
+      @transformation_stack ||= [[]]
+      @transformation_stack.last.push([a, b, c, d, e, f].map(&:to_f))
+    end
+
+    def save_transformation_stack
+      @transformation_stack ||= [[]]
+      @transformation_stack.push(@transformation_stack.last.dup)
+    end
+
+    def restore_transformation_stack
+      @transformation_stack.pop if @transformation_stack
+    end
+
+    def current_transformation_matrix_with_translation(x = 0, y = 0)
+      transformations = (@transformation_stack || [[]]).last
+
+      matrix = Matrix.identity(3)
+
+      transformations.each do |a, b, c, d, e, f|
+        matrix *= Matrix[[a, c, e], [b, d, f], [0, 0, 1]]
+      end
+
+      matrix *= Matrix[[1, 0, x], [0, 1, y], [0, 0, 1]]
+
+      matrix.to_a[0..1].transpose.flatten
+    end
+  end
+end

data/lib/prawn/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Prawn
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/manual/graphics/blend_mode.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+#
+# Blend modes can be used to change the way two layers (images, graphics,
+# text, etc.) are blended together. The <code>blend_mode</code> method
+# accepts a single blend mode or an array of blend modes. PDF viewers should
+# blend the layers based on the first recognized blend mode.
+#
+# Valid blend modes in v1.4 of the PDF spec include :Normal, :Multiply, :Screen,
+# :Overlay, :Darken, :Lighten, :ColorDodge, :ColorBurn, :HardLight, :SoftLight,
+# :Difference, :Exclusion, :Hue, :Saturation, :Color, and :Luminosity.
+#
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   %w[.. example_helper]))
+
+filename = File.basename(__FILE__).gsub('.rb', '.pdf')
+Prawn::ManualBuilder::Example.generate(filename) do
+  start_new_page
+
+  # https://commons.wikimedia.org/wiki/File:Blend_modes_2.-bottom-layer.jpg#/media/File:Blend_modes_2.-bottom-layer.jpg
+  bottom_layer = "#{Prawn::DATADIR}/images/blend_modes_bottom_layer.jpg"
+
+  # https://commons.wikimedia.org/wiki/File:Blend_modes_1.-top-layer.jpg#/media/File:Blend_modes_1.-top-layer.jpg
+  top_layer = "#{Prawn::DATADIR}/images/blend_modes_top_layer.jpg"
+
+  blend_modes = [:Normal, :Multiply, :Screen, :Overlay, :Darken, :Lighten, :ColorDodge, :ColorBurn, :HardLight, :SoftLight, :Difference, :Exclusion, :Hue, :Saturation, :Color, :Luminosity]
+  blend_modes.each_with_index do |blend_mode, index|
+    x = index % 4 * 135
+    y = cursor - (index / 4 * 200)
+
+    image bottom_layer, :at => [x, y], :fit => [125, 125]
+    blend_mode(blend_mode) do
+      image top_layer, :at => [x, y], :fit => [125, 125]
+    end
+
+    y -= 130
+
+    fill_color '009ddc'
+    fill_rectangle [x, y], 75, 25
+    blend_mode(blend_mode) do
+      fill_color 'fdb827'
+      fill_rectangle [x + 50, y], 75, 25
+    end
+
+    y -= 30
+
+    fill_color '000000'
+    text_box blend_mode.to_s, :at => [x, y]
+  end
+end

data/manual/graphics/graphics.rb

@@ -29,6 +29,7 @@ Prawn::ManualBuilder::Example.generate("graphics.pdf", :page_size => "FOLIO") do
       s.example "gradients"
       s.example "transparency"
       s.example "soft_masks"
+      s.example "blend_mode"
       s.example "fill_rules"
     end
 

data/manual/graphics/soft_masks.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-# Soft masks are user for more complex alpha channel manipulations. You can use
+# Soft masks are used for more complex alpha channel manipulations. You can use
 # arbitrary drawing functions for creation of soft masks. The resulting alpha
 # channel is made of greyscale version of the drawing (luminosity channel to be
 # precise). So while you can use any combination of colors for soft masks it's

data/prawn.gemspec

@@ -22,15 +22,14 @@ Gem::Specification.new do |spec|
   spec.authors = ["Gregory Brown", "Brad Ediger", "Daniel Nelson", "Jonathan Greenberg", "James Healy"]
   spec.email = ["gregory.t.brown@gmail.com", "brad@bradediger.com", "dnelson@bluejade.com", "greenberg@entryway.net", "jimmy@deefa.com"]
   spec.rubyforge_project = "prawn"
-  spec.licenses = ['RUBY', 'GPL-2', 'GPL-3']
+  spec.licenses = %w(PRAWN GPL-2.0 GPL-3.0)
 
   spec.add_dependency('ttfunk', '~> 1.4.0')
-  spec.add_dependency('pdf-core', "~> 0.6.0")
+  spec.add_dependency('pdf-core', "~> 0.6.1")
 
-  spec.add_development_dependency('pdf-inspector', '~> 1.2.0')
+  spec.add_development_dependency('pdf-inspector', '~> 1.2.1')
   spec.add_development_dependency('yard')
-  spec.add_development_dependency('rspec', '2.14.1')
-  spec.add_development_dependency('mocha')
+  spec.add_development_dependency('rspec', '~> 3.0')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('simplecov')
   spec.add_development_dependency('prawn-manual_builder', ">= 0.2.0")

data/spec/acceptance/png_spec.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require_relative "../../spec/spec_helper"
+
+describe "When making a pdf file with png images" do
+  image_dir = "#{Prawn::BASEDIR}/data/images"
+  images = [
+    ["Type 0", "#{image_dir}/web-links.png"],
+    ["Type 0 with transparency", "#{image_dir}/ruport_type0.png"],
+    ["Type 2", "#{image_dir}/ruport.png"],
+    ["Type 2 with transparency", "#{image_dir}/arrow2.png"],
+    ["Type 3", "#{image_dir}/indexed_color.png"],
+    ["Type 3 with transparency", "#{image_dir}/indexed_transparency.png"],
+    ["Type 4", "#{image_dir}/page_white_text.png"],
+    ["Type 6", "#{image_dir}/dice.png"],
+    ["Type 6 in 16bit", "#{image_dir}/16bit.png"]
+  ]
+
+  images.each do |header, file|
+    describe "and the image is #{header}" do
+      it "does not error" do
+        expect do
+          Prawn::Document.generate("#{header}.pdf", :page_size => "A5") do
+            fill_color "00FF00"
+
+            fill_rectangle bounds.top_left, bounds.width, bounds.height
+            text header
+
+            image file, :at => [50, 450]
+          end
+        end.to_not raise_error
+      end
+    end
+  end
+end

data/spec/blend_mode_spec.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+
+module BlendModeHelper
+  def make_blend_mode(blend_mode)
+    @pdf.blend_mode(blend_mode) do
+      yield if block_given?
+    end
+  end
+end
+
+describe "Document with with blend_mode" do
+  include BlendModeHelper
+
+  it "the PDF version should be at least 1.4" do
+    create_pdf
+    make_blend_mode(:Multiply)
+    str = @pdf.render
+    expect(str[0, 8]).to eq("%PDF-1.4")
+  end
+
+  it "a new extended graphics state should be created for " \
+     "each unique blend mode setting" do
+    create_pdf
+    make_blend_mode(:Multiply) do
+      make_blend_mode(:Screen)
+    end
+    extgstates = PDF::Inspector::ExtGState.analyze(@pdf.render).extgstates
+    expect(extgstates.length).to eq(2)
+  end
+
+  it "a new extended graphics state should not be created for " \
+     "each duplicate blend mode setting" do
+    create_pdf
+    make_blend_mode(:Multiply) do
+      make_blend_mode(:Multiply)
+    end
+    extgstates = PDF::Inspector::ExtGState.analyze(@pdf.render).extgstates
+    expect(extgstates.length).to eq(1)
+  end
+
+  it "setting the blend mode with only one parameter sets a single blend mode value" do
+    create_pdf
+    make_blend_mode(:Multiply)
+    extgstate = PDF::Inspector::ExtGState.analyze(@pdf.render).extgstates.first
+    expect(extgstate[:blend_mode]).to eq(:Multiply)
+  end
+
+  it "setting the blend mode with multiple parameters sets an array of blend modes" do
+    create_pdf
+    make_blend_mode([:Multiply, :Screen, :Overlay])
+    extgstate = PDF::Inspector::ExtGState.analyze(@pdf.render).extgstates.first
+    expect(extgstate[:blend_mode]).to eq([:Multiply, :Screen, :Overlay])
+  end
+
+  describe "with more than one page" do
+    include BlendModeHelper
+
+    it "the extended graphic state resource should be added to both pages" do
+      create_pdf
+      make_blend_mode(:Multiply)
+      @pdf.start_new_page
+      make_blend_mode(:Multiply)
+      extgstates = PDF::Inspector::ExtGState.analyze(@pdf.render).extgstates
+      extgstate = extgstates[0]
+      expect(extgstates.length).to eq(2)
+      expect(extgstate[:blend_mode]).to eq(:Multiply)
+    end
+  end
+end

data/spec/document_spec.rb

@@ -77,14 +77,14 @@ describe "when generating a document from a subclass" do
     Prawn::Document.extensions.delete(mod1)
     Prawn::Document.extensions.delete(mod2)
 
-    expect(Prawn::Document.new.respond_to?(:test_extensions1)).to be_false
-    expect(Prawn::Document.new.respond_to?(:test_extensions2)).to be_false
+    expect(Prawn::Document.new.respond_to?(:test_extensions1)).to eq false
+    expect(Prawn::Document.new.respond_to?(:test_extensions2)).to eq false
 
     # verify these still exist on custom class
     expect(custom_document.extensions).to eq([mod1, mod2])
 
-    expect(custom_document.new.respond_to?(:test_extensions1)).to be_true
-    expect(custom_document.new.respond_to?(:test_extensions2)).to be_true
+    expect(custom_document.new.respond_to?(:test_extensions1)).to eq true
+    expect(custom_document.new.respond_to?(:test_extensions2)).to eq true
   end
 end
 
@@ -176,7 +176,7 @@ describe "on_page_create callback" do
   end
 
   it "should be delegated from Document to renderer" do
-    expect(@pdf.respond_to?(:on_page_create)).to be_true
+    expect(@pdf.respond_to?(:on_page_create)).to eq true
   end
 
   it "should be invoked with document" do
@@ -190,8 +190,8 @@ describe "on_page_create callback" do
   end
 
   it "should be invoked for each new page" do
-    trigger = mock
-    trigger.expects(:fire).times(5)
+    trigger = double("trigger")
+    expect(trigger).to receive(:fire).exactly(5).times
 
     @pdf.renderer.on_page_create { trigger.fire }
 
@@ -199,11 +199,11 @@ describe "on_page_create callback" do
   end
 
   it "should be replaceable" do
-    trigger1 = mock
-    trigger1.expects(:fire).times(1)
+    trigger1 = double("trigger 1")
+    expect(trigger1).to receive(:fire).once
 
-    trigger2 = mock
-    trigger2.expects(:fire).times(1)
+    trigger2 = double("trigger 2")
+    expect(trigger2).to receive(:fire).once
 
     @pdf.renderer.on_page_create { trigger1.fire }
 
@@ -215,8 +215,8 @@ describe "on_page_create callback" do
   end
 
   it "should be clearable by calling on_page_create without a block" do
-    trigger = mock
-    trigger.expects(:fire).times(1)
+    trigger = double("trigger")
+    expect(trigger).to receive(:fire).once
 
     @pdf.renderer.on_page_create { trigger.fire }
 
@@ -231,8 +231,8 @@ end
 describe "Document compression" do
   it "should not compress the page content stream if compression is disabled" do
     pdf = Prawn::Document.new(:compress => false)
-    pdf.page.content.stream.stubs(:compress!).returns(true)
-    pdf.page.content.stream.expects(:compress!).never
+    allow(pdf.page.content.stream).to receive(:compress!).and_return(true)
+    expect(pdf.page.content.stream).to_not receive(:compress!)
 
     pdf.text "Hi There" * 20
     pdf.render
@@ -240,8 +240,8 @@ describe "Document compression" do
 
   it "should compress the page content stream if compression is enabled" do
     pdf = Prawn::Document.new(:compress => true)
-    pdf.page.content.stream.stubs(:compress!).returns(true)
-    pdf.page.content.stream.expects(:compress!).once
+    allow(pdf.page.content.stream).to receive(:compress!).and_return(true)
+    expect(pdf.page.content.stream).to receive(:compress!).once
 
     pdf.text "Hi There" * 20
     pdf.render
@@ -304,30 +304,31 @@ describe "When reopening pages" do
   end
 
   it "should restore the layout of the page" do
-    Prawn::Document.new do
+    doc = Prawn::Document.new do
       start_new_page :layout => :landscape
-      lsize = [bounds.width, bounds.height]
-
-      [bounds.width, bounds.height].should == lsize
-      go_to_page 1
-      [bounds.width, bounds.height].should == lsize.reverse
     end
+
+    lsize = [doc.bounds.width, doc.bounds.height]
+
+    expect([doc.bounds.width, doc.bounds.height]).to eq lsize
+    doc.go_to_page 1
+    expect([doc.bounds.width, doc.bounds.height]).to eq lsize.reverse
   end
 
   it "should restore the margin box of the page" do
-    Prawn::Document.new(:margin => [100, 100]) do
-      page1_bounds = bounds
+    doc = Prawn::Document.new(:margin => [100, 100])
+    page1_bounds = doc.bounds
 
-      start_new_page(:margin => [200, 200])
+    doc.start_new_page(:margin => [200, 200])
 
-      [bounds.width, bounds.height].should == [page1_bounds.width - 200,
-                                               page1_bounds.height - 200]
+    expect([doc.bounds.width, doc.bounds.height]).to eq(
+      [page1_bounds.width - 200, page1_bounds.height - 200]
+    )
 
-      go_to_page(1)
+    doc.go_to_page(1)
 
-      bounds.width.should == page1_bounds.width
-      bounds.height.should == page1_bounds.height
-    end
+    expect(doc.bounds.width).to eq page1_bounds.width
+    expect(doc.bounds.height).to eq page1_bounds.height
   end
 end
 
@@ -469,22 +470,17 @@ describe "The render() feature" do
   it "should trigger before_render callbacks just before rendering" do
     pdf = Prawn::Document.new
 
-    seq = sequence("callback_order")
-
     # Verify the order: finalize -> fire callbacks -> render body
-    pdf.renderer.expects(:finalize_all_page_contents).in_sequence(seq)
-    trigger = mock
-    trigger.expects(:fire).in_sequence(seq)
+    expect(pdf.renderer).to receive(:finalize_all_page_contents).and_call_original.ordered
 
-    # Store away the render_body method to be called below
-    render_body = pdf.renderer.method(:render_body)
-    pdf.renderer.expects(:render_body).in_sequence(seq)
+    trigger = double("trigger")
+    expect(trigger).to receive(:fire).ordered
 
     pdf.renderer.before_render{ trigger.fire }
 
-    # Render the body to set up object offsets
-    render_body.call(StringIO.new)
-    pdf.render
+    expect(pdf.renderer).to receive(:render_body).and_call_original.ordered
+
+    pdf.render(StringIO.new)
   end
 
   it "should be idempotent" do
@@ -574,31 +570,31 @@ describe "The number_pages method" do
 
   it "replaces the '<page>' string with the proper page number" do
     @pdf.start_new_page
-    @pdf.expects(:text_box).with("1, test", :height => 50)
+    expect(@pdf).to receive(:text_box).with("1, test", :height => 50)
     @pdf.number_pages "<page>, test", :page_filter => :all
   end
 
   it "replaces the '<total>' string with the total page count" do
     @pdf.start_new_page
-    @pdf.expects(:text_box).with("test, 1", :height => 50)
+    expect(@pdf).to receive(:text_box).with("test, 1", :height => 50)
     @pdf.number_pages "test, <total>", :page_filter => :all
   end
 
   it "must print each page if given the :all page_filter" do
     10.times { @pdf.start_new_page }
-    @pdf.expects(:text_box).times(10)
+    expect(@pdf).to receive(:text_box).exactly(10).times
     @pdf.number_pages "test", :page_filter => :all
   end
 
   it "must print each page if no :page_filter is specified" do
     10.times { @pdf.start_new_page }
-    @pdf.expects(:text_box).times(10)
+    expect(@pdf).to receive(:text_box).exactly(10).times
     @pdf.number_pages "test"
   end
 
   it "must not print the page number if given a nil filter" do
     10.times { @pdf.start_new_page }
-    @pdf.expects(:text_box).never
+    expect(@pdf).to_not receive(:text_box)
     @pdf.number_pages "test", :page_filter => nil
   end
 
@@ -608,8 +604,8 @@ describe "The number_pages method" do
         it "increments the pages" do
           2.times { @pdf.start_new_page }
           options = { :page_filter => :all, :start_count_at => startat }
-          @pdf.expects(:text_box).with("#{startat} 2", :height => 50)
-          @pdf.expects(:text_box).with("#{startat + 1} 2", :height => 50)
+          expect(@pdf).to receive(:text_box).with("#{startat} 2", :height => 50)
+          expect(@pdf).to receive(:text_box).with("#{startat + 1} 2", :height => 50)
           @pdf.number_pages "<page> <total>", options
         end
       end
@@ -620,9 +616,9 @@ describe "The number_pages method" do
         it "defaults to start at page 1" do
           3.times { @pdf.start_new_page }
           options = { :page_filter => :all, :start_count_at => val }
-          @pdf.expects(:text_box).with("1 3", :height => 50)
-          @pdf.expects(:text_box).with("2 3", :height => 50)
-          @pdf.expects(:text_box).with("3 3", :height => 50)
+          expect(@pdf).to receive(:text_box).with("1 3", :height => 50)
+          expect(@pdf).to receive(:text_box).with("2 3", :height => 50)
+          expect(@pdf).to receive(:text_box).with("3 3", :height => 50)
           @pdf.number_pages "<page> <total>", options
         end
       end
@@ -632,8 +628,8 @@ describe "The number_pages method" do
   context "total_pages option" do
     it "allows the total pages count to be overridden" do
       2.times { @pdf.start_new_page }
-      @pdf.expects(:text_box).with("1 10", :height => 50)
-      @pdf.expects(:text_box).with("2 10", :height => 50)
+      expect(@pdf).to receive(:text_box).with("1 10", :height => 50)
+      expect(@pdf).to receive(:text_box).with("2 10", :height => 50)
       @pdf.number_pages "<page> <total>", :page_filter => :all, :total_pages => 10
     end
   end
@@ -642,16 +638,16 @@ describe "The number_pages method" do
     context "such as :odd" do
       it "increments the pages" do
         3.times { @pdf.start_new_page }
-        @pdf.expects(:text_box).with("1 3", :height => 50)
-        @pdf.expects(:text_box).with("3 3", :height => 50)
-        @pdf.expects(:text_box).with("2 3", :height => 50).never
+        expect(@pdf).to receive(:text_box).with("1 3", :height => 50)
+        expect(@pdf).to receive(:text_box).with("3 3", :height => 50)
+        expect(@pdf).to_not receive(:text_box).with("2 3", :height => 50)
         @pdf.number_pages "<page> <total>", :page_filter => :odd
       end
     end
     context "missing" do
       it "does not print any page numbers" do
         3.times { @pdf.start_new_page }
-        @pdf.expects(:text_box).never
+        expect(@pdf).to_not receive(:text_box)
         @pdf.number_pages "<page> <total>", :page_filter => nil
       end
     end
@@ -661,10 +657,10 @@ describe "The number_pages method" do
     context "such as :odd and 7" do
       it "increments the pages" do
         3.times { @pdf.start_new_page }
-        @pdf.expects(:text_box).with("1 3", :height => 50).never
-        @pdf.expects(:text_box).with("5 3", :height => 50) # page 1
-        @pdf.expects(:text_box).with("6 3", :height => 50).never # page 2
-        @pdf.expects(:text_box).with("7 3", :height => 50) # page 3
+        expect(@pdf).to_not receive(:text_box).with("1 3", :height => 50)
+        expect(@pdf).to receive(:text_box).with("5 3", :height => 50) # page 1
+        expect(@pdf).to_not receive(:text_box).with("6 3", :height => 50) # page 2
+        expect(@pdf).to receive(:text_box).with("7 3", :height => 50) # page 3
         @pdf.number_pages "<page> <total>", :page_filter => :odd, :start_count_at => 5
       end
     end
@@ -672,12 +668,12 @@ describe "The number_pages method" do
       it "increments the pages" do
         6.times { @pdf.start_new_page }
         options = { :page_filter => lambda { |p| p != 2 && p != 5 }, :start_count_at => 4 }
-        @pdf.expects(:text_box).with("4 6", :height => 50) # page 1
-        @pdf.expects(:text_box).with("5 6", :height => 50).never # page 2
-        @pdf.expects(:text_box).with("6 6", :height => 50) # page 3
-        @pdf.expects(:text_box).with("7 6", :height => 50) # page 4
-        @pdf.expects(:text_box).with("8 6", :height => 50).never # page 5
-        @pdf.expects(:text_box).with("9 6", :height => 50) # page 6
+        expect(@pdf).to receive(:text_box).with("4 6", :height => 50) # page 1
+        expect(@pdf).to_not receive(:text_box).with("5 6", :height => 50) # page 2
+        expect(@pdf).to receive(:text_box).with("6 6", :height => 50) # page 3
+        expect(@pdf).to receive(:text_box).with("7 6", :height => 50) # page 4
+        expect(@pdf).to_not receive(:text_box).with("8 6", :height => 50) # page 5
+        expect(@pdf).to receive(:text_box).with("9 6", :height => 50) # page 6
         @pdf.number_pages "<page> <total>", options
       end
     end
@@ -689,17 +685,17 @@ describe "The number_pages method" do
     end
 
     it "with 10 height" do
-      @pdf.expects(:text_box).with("1 1", :height => 10)
+      expect(@pdf).to receive(:text_box).with("1 1", :height => 10)
       @pdf.number_pages "<page> <total>", :height => 10
     end
 
     it "with nil height" do
-      @pdf.expects(:text_box).with("1 1", :height => nil)
+      expect(@pdf).to receive(:text_box).with("1 1", :height => nil)
       @pdf.number_pages "<page> <total>", :height => nil
     end
 
     it "with no height" do
-      @pdf.expects(:text_box).with("1 1", :height => 50)
+      expect(@pdf).to receive(:text_box).with("1 1", height: 50)
       @pdf.number_pages "<page> <total>"
     end
   end
@@ -712,17 +708,17 @@ describe "The page_match? method" do
   end
 
   it "returns nil given no filter" do
-    expect(@pdf.page_match?(:nil, 1)).to be_false
+    expect(@pdf.page_match?(:nil, 1)).to be_falsey
   end
 
   it "must provide an :all filter" do
-    expect((1..@pdf.page_count).all? { |i| @pdf.page_match?(:all, i) }).to be_true
+    expect((1..@pdf.page_count).all? { |i| @pdf.page_match?(:all, i) }).to eq true
   end
 
   it "must provide an :odd filter" do
     odd, even = (1..@pdf.page_count).partition(&:odd?)
-    expect(odd.all? { |i| @pdf.page_match?(:odd, i) }).to be_true
-    expect(even.any? { |i| @pdf.page_match?(:odd, i) }).to be_false
+    expect(odd.all? { |i| @pdf.page_match?(:odd, i) }).to eq true
+    expect(even.any? { |i| @pdf.page_match?(:odd, i) }).to be_falsey
   end
 
   it "must be able to filter by an array of page numbers" do