prawn 2.0.1 → 2.0.2

data/spec/extensions/mocha.rb

@@ -31,7 +31,6 @@ class Mocha::Expectation
   end
 end
 
-
 # Equivalent to expects(method_name).at_least(0). More useful when combined
 # with parameter matchers to ignore certain calls for the sake of parameter
 # matching.

data/spec/font_metric_cache_spec.rb

@@ -6,30 +6,30 @@ require 'pathname'
 describe "Font metrics caching" do
   let(:document) { Prawn::Document.new }
 
-  subject { Prawn::FontMetricCache.new( document ) }
+  subject { Prawn::FontMetricCache.new(document) }
 
   it "should start with an empty cache" do
-    subject.instance_variable_get( :@cache ).should be_empty
+    expect(subject.instance_variable_get(:@cache)).to be_empty
   end
 
   it "should cache the width of the provided string" do
     subject.width_of('M', {})
 
-    subject.instance_variable_get( :@cache ).should have(1).entry
+    expect(subject.instance_variable_get(:@cache).size).to eq(1)
   end
 
   it "should only cache a single copy of the same string" do
     subject.width_of('M', {})
     subject.width_of('M', {})
 
-    subject.instance_variable_get( :@cache ).should have(1).entry
+    expect(subject.instance_variable_get(:@cache).size).to eq(1)
   end
 
   it "should cache different copies for different strings" do
     subject.width_of('M', {})
     subject.width_of('W', {})
 
-    subject.instance_variable_get( :@cache ).should have(2).entries
+    expect(subject.instance_variable_get(:@cache).entries.size).to eq(2)
   end
 
   it "should cache different copies of the same string with different font sizes" do
@@ -38,7 +38,7 @@ describe "Font metrics caching" do
     document.font_size 24
     subject.width_of('M', {})
 
-    subject.instance_variable_get( :@cache ).should have(2).entries
+    expect(subject.instance_variable_get(:@cache).entries.size).to eq(2)
   end
 
   it "should cache different copies of the same string with different fonts" do
@@ -47,6 +47,6 @@ describe "Font metrics caching" do
     document.font 'Courier'
     subject.width_of('M', {})
 
-    subject.instance_variable_get( :@cache ).should have(2).entries
+    expect(subject.instance_variable_get(:@cache).entries.size).to eq(2)
   end
 end

data/spec/font_spec.rb

@@ -4,38 +4,34 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 require 'pathname'
 
 describe "Font behavior" do
-
   it "should default to Helvetica if no font is specified" do
     @pdf = Prawn::Document.new
-    @pdf.font.name.should == "Helvetica"
+    expect(@pdf.font.name).to eq("Helvetica")
   end
-
 end
 
 describe "Font objects" do
-
   it "should be equal" do
     font1 = Prawn::Document.new.font
     font2 = Prawn::Document.new.font
 
-    font1.should eql( font2 )
+    expect(font1).to eql(font2)
   end
 
   it "should always be the same key" do
     font1 = Prawn::Document.new.font
     font2 = Prawn::Document.new.font
 
-    hash = Hash.new
+    hash = {}
 
     hash[ font1 ] = "Original"
     hash[ font2 ] = "Overwritten"
 
-    hash.size.should == 1
+    expect(hash.size).to eq(1)
 
-    hash[ font1 ].should == "Overwritten"
-    hash[ font2 ].should == "Overwritten"
+    expect(hash[ font1 ]).to eq("Overwritten")
+    expect(hash[ font2 ]).to eq("Overwritten")
   end
-
 end
 
 describe "#width_of" do
@@ -43,7 +39,7 @@ describe "#width_of" do
     create_pdf
     original_width = @pdf.width_of("hello world")
     @pdf.character_spacing(7) do
-      @pdf.width_of("hello world").should == original_width + 11 * 7
+      expect(@pdf.width_of("hello world")).to eq(original_width + 11 * 7)
     end
   end
 
@@ -52,8 +48,9 @@ describe "#width_of" do
     # Use a TTF font that has a non-zero width for \n
     @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
 
-    @pdf.width_of("\nhello world\n").should ==
+    expect(@pdf.width_of("\nhello world\n")).to eq(
       @pdf.width_of("hello world")
+    )
   end
 
   it "should take formatting into account" do
@@ -65,8 +62,8 @@ describe "#width_of" do
       @bold_hello = @pdf.width_of("hello")
     }
 
-    inline_bold_hello.should be > normal_hello
-    inline_bold_hello.should == @bold_hello
+    expect(inline_bold_hello).to be > normal_hello
+    expect(inline_bold_hello).to eq(@bold_hello)
   end
 
   it "should accept :style as an argument" do
@@ -77,7 +74,7 @@ describe "#width_of" do
       @bold_hello = @pdf.width_of("hello")
     }
 
-    styled_bold_hello.should == @bold_hello
+    expect(styled_bold_hello).to eq(@bold_hello)
   end
 
   it "should calculate styled widths correctly using TTFs" do
@@ -86,7 +83,7 @@ describe "#width_of" do
     @pdf.font_families.update(
       'DejaVu Sans' => {
         :normal => "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf",
-        :bold => "#{Prawn::DATADIR}/fonts/DejaVuSans-Bold.ttf",
+        :bold => "#{Prawn::DATADIR}/fonts/DejaVuSans-Bold.ttf"
       }
     )
     @pdf.font("DejaVu Sans") {
@@ -100,15 +97,15 @@ describe "#width_of" do
       @plain_hello = @pdf.width_of("hello")
     }
 
-    @plain_hello.should_not == @bold_hello
+    expect(@plain_hello).not_to eq(@bold_hello)
 
-    @styled_bold_hello.should == @bold_hello
+    expect(@styled_bold_hello).to eq(@bold_hello)
   end
 
   it "should not treat minus as if it were a hyphen", :issue => 578 do
     create_pdf
 
-    @pdf.width_of("-0.75").should be < @pdf.width_of("25.00")
+    expect(@pdf.width_of("-0.75")).to be < @pdf.width_of("25.00")
   end
 end
 
@@ -116,7 +113,7 @@ describe "#font_size" do
   it "should allow setting font size in DSL style" do
     create_pdf
     @pdf.font_size 20
-    @pdf.font_size.should == 20
+    expect(@pdf.font_size).to eq(20)
   end
 end
 
@@ -126,8 +123,8 @@ describe "font style support" do
   it "should complain if there is no @current_page" do
     pdf_without_page = Prawn::Document.new(:skip_page_creation => true)
 
-    lambda{ pdf_without_page.font "Helvetica" }.
-      should raise_error(Prawn::Errors::NotOnPage)
+    expect{ pdf_without_page.font "Helvetica" }.
+      to raise_error(Prawn::Errors::NotOnPage)
   end
 
   it "should allow specifying font style by style name and font family" do
@@ -147,9 +144,12 @@ describe "font style support" do
     @pdf.text "In Normal Helvetica"
 
     text = PDF::Inspector::Text.analyze(@pdf.render)
-    text.font_settings.map { |e| e[:name] }.should ==
-     [:"Courier-Bold", :"Courier-BoldOblique", :"Courier-Oblique",
-      :Courier, :Helvetica]
+    expect(text.font_settings.map { |e| e[:name] }).to eq(
+      [
+        :"Courier-Bold", :"Courier-BoldOblique", :"Courier-Oblique",
+        :Courier, :Helvetica
+      ]
+    )
   end
 
   it "should allow font familes to be defined in a single dfont" do
@@ -167,11 +167,11 @@ describe "font style support" do
     text = PDF::Inspector::Text.analyze(@pdf.render)
     name = text.font_settings.map { |e| e[:name] }.first.to_s
     name = name.sub(/\w+\+/, "subset+")
-    name.should == "subset+PanicSans-Italic"
+    expect(name).to eq("subset+PanicSans-Italic")
   end
 
   it "should accept Pathname objects for font files" do
-    file = Pathname.new( "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf" )
+    file = Pathname.new("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     @pdf.font_families["DejaVu Sans"] = {
       :normal => file
     }
@@ -182,7 +182,7 @@ describe "font style support" do
     text = PDF::Inspector::Text.analyze(@pdf.render)
     name = text.font_settings.map { |e| e[:name] }.first.to_s
     name = name.sub(/\w+\+/, "subset+")
-    name.should == "subset+DejaVuSans"
+    expect(name).to eq("subset+DejaVuSans")
   end
 
   it "should accept IO objects for font files" do
@@ -197,7 +197,7 @@ describe "font style support" do
     text = PDF::Inspector::Text.analyze(@pdf.render)
     name = text.font_settings.map { |e| e[:name] }.first.to_s
     name = name.sub(/\w+\+/, "subset+")
-    name.should == "subset+DejaVuSans"
+    expect(name).to eq("subset+DejaVuSans")
   end
 end
 
@@ -206,47 +206,55 @@ describe "Transactional font handling" do
 
   it "should allow setting of size directly when font is created" do
     @pdf.font "Courier", :size => 16
-    @pdf.font_size.should == 16
+    expect(@pdf.font_size).to eq(16)
   end
 
   it "should allow temporary setting of a new font using a transaction" do
     @pdf.font "Helvetica", :size => 12
 
     @pdf.font "Courier", :size => 16 do
-      @pdf.font.name.should == "Courier"
-      @pdf.font_size.should == 16
+      expect(@pdf.font.name).to eq("Courier")
+      expect(@pdf.font_size).to eq(16)
     end
 
-    @pdf.font.name.should == "Helvetica"
-    @pdf.font_size.should == 12
+    expect(@pdf.font.name).to eq("Helvetica")
+    expect(@pdf.font_size).to eq(12)
   end
 
   it "should mask font size when using a transacation" do
     @pdf.font "Courier", :size => 16 do
-      @pdf.font_size.should == 16
+      expect(@pdf.font_size).to eq(16)
     end
 
     @pdf.font "Times-Roman"
     @pdf.font "Courier"
 
-    @pdf.font_size.should == 12
+    expect(@pdf.font_size).to eq(12)
   end
-
 end
 
 describe "Document#page_fonts" do
   before(:each) { create_pdf }
 
   it "should register fonts properly by page" do
-    @pdf.font "Courier"; @pdf.text("hello")
-    @pdf.font "Helvetica"; @pdf.text("hello")
-    @pdf.font "Times-Roman"; @pdf.text("hello")
-    ["Courier","Helvetica","Times-Roman"].each { |f|
+    @pdf.font "Courier"
+    @pdf.text("hello")
+
+    @pdf.font "Helvetica"
+    @pdf.text("hello")
+
+    @pdf.font "Times-Roman"
+    @pdf.text("hello")
+
+    ["Courier", "Helvetica", "Times-Roman"].each { |f|
       page_should_include_font(f)
     }
 
     @pdf.start_new_page
-    @pdf.font "Helvetica"; @pdf.text("hello")
+
+    @pdf.font "Helvetica"
+    @pdf.text("hello")
+
     page_should_include_font("Helvetica")
     page_should_not_include_font("Courier")
     page_should_not_include_font("Times-Roman")
@@ -257,74 +265,69 @@ describe "Document#page_fonts" do
   end
 
   def page_should_include_font(font)
-    page_includes_font?(font).should be_true
+    expect(page_includes_font?(font)).to be_true
   end
 
   def page_should_not_include_font(font)
-    page_includes_font?(font).should be_false
+    expect(page_includes_font?(font)).to be_false
   end
-
 end
 
 describe "AFM fonts" do
-
   before do
     create_pdf
     @times = @pdf.find_font "Times-Roman"
   end
 
   it "should calculate string width taking into account accented characters" do
-    input = win1252_string("\xE9")# é in win-1252
-    @times.compute_width_of(input, :size => 12).should == @times.compute_width_of("e", :size => 12)
+    input = win1252_string("\xE9") # é in win-1252
+    expect(@times.compute_width_of(input, :size => 12)).to eq(@times.compute_width_of("e", :size => 12))
   end
 
   it "should calculate string width taking into account kerning pairs" do
-    @times.compute_width_of(win1252_string("To"), :size => 12).should == 13.332
-    @times.compute_width_of(win1252_string("To"), :size => 12, :kerning => true).should == 12.372
+    expect(@times.compute_width_of(win1252_string("To"), :size => 12)).to eq(13.332)
+    expect(@times.compute_width_of(win1252_string("To"), :size => 12, :kerning => true)).to eq(12.372)
 
     input = win1252_string("T\xF6") # Tö in win-1252
-    @times.compute_width_of(input, :size => 12, :kerning => true).should == 12.372
+    expect(@times.compute_width_of(input, :size => 12, :kerning => true)).to eq(12.372)
   end
 
   it "should encode text without kerning by default" do
-    @times.encode_text(win1252_string("To")).should == [[0, "To"]]
+    expect(@times.encode_text(win1252_string("To"))).to eq([[0, "To"]])
     input = win1252_string("T\xE9l\xE9") # Télé in win-1252
-    @times.encode_text(input).should == [[0, input]]
-    @times.encode_text(win1252_string("Technology")).should == [[0, "Technology"]]
-    @times.encode_text(win1252_string("Technology...")).should == [[0, "Technology..."]]
+    expect(@times.encode_text(input)).to eq([[0, input]])
+    expect(@times.encode_text(win1252_string("Technology"))).to eq([[0, "Technology"]])
+    expect(@times.encode_text(win1252_string("Technology..."))).to eq([[0, "Technology..."]])
   end
 
   it "should encode text with kerning if requested" do
-    @times.encode_text(win1252_string("To"), :kerning => true).should == [[0, ["T", 80, "o"]]]
+    expect(@times.encode_text(win1252_string("To"), :kerning => true)).to eq([[0, ["T", 80, "o"]]])
     input  = win1252_string("T\xE9l\xE9") # Télé in win-1252
     output = win1252_string("\xE9l\xE9")  # élé  in win-1252
-    @times.encode_text(input, :kerning => true).should == [[0, ["T", 70, output]]]
-    @times.encode_text(win1252_string("Technology"), :kerning => true).should == [[0, ["T", 70, "echnology"]]]
-    @times.encode_text(win1252_string("Technology..."), :kerning => true).should == [[0, ["T", 70, "echnology", 65, "..."]]]
+    expect(@times.encode_text(input, :kerning => true)).to eq([[0, ["T", 70, output]]])
+    expect(@times.encode_text(win1252_string("Technology"), :kerning => true)).to eq([[0, ["T", 70, "echnology"]]])
+    expect(@times.encode_text(win1252_string("Technology..."), :kerning => true)).to eq([[0, ["T", 70, "echnology", 65, "..."]]])
   end
 
   describe "when normalizing encoding" do
-
     it "should not modify the original string when normalize_encoding() is used" do
       original = "Foo"
       normalized = @times.normalize_encoding(original)
-      original.equal?(normalized).should be_false
+      expect(original.equal?(normalized)).to be_false
     end
 
     it "should modify the original string when normalize_encoding!() is used" do
       original = "Foo"
       normalized = @times.normalize_encoding!(original)
-      original.equal?(normalized).should be_true
+      expect(original.equal?(normalized)).to be_true
     end
-
   end
 
   it "should omit /Encoding for symbolic fonts" do
     zapf = @pdf.find_font "ZapfDingbats"
     font_dict = zapf.send(:register, nil)
-    font_dict.data[:Encoding].should == nil
+    expect(font_dict.data[:Encoding]).to be_nil
   end
-
 end
 
 describe "#glyph_present" do
@@ -332,63 +335,62 @@ describe "#glyph_present" do
 
   it "should return true when present in an AFM font" do
     font = @pdf.find_font("Helvetica")
-    font.glyph_present?("H").should be_true
+    expect(font.glyph_present?("H")).to be_true
   end
 
   it "should return false when absent in an AFM font" do
     font = @pdf.find_font("Helvetica")
-    font.glyph_present?("再").should be_false
+    expect(font.glyph_present?("再")).to be_false
   end
 
   it "should return true when present in a TTF font" do
     font = @pdf.find_font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-    font.glyph_present?("H").should be_true
+    expect(font.glyph_present?("H")).to be_true
   end
 
   it "should return false when absent in a TTF font" do
     font = @pdf.find_font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
-    font.glyph_present?("再").should be_false
+    expect(font.glyph_present?("再")).to be_false
 
     font = @pdf.find_font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
-    font.glyph_present?("€").should be_false
+    expect(font.glyph_present?("€")).to be_false
   end
 end
 
 describe "TTF fonts" do
-
   before do
     create_pdf
     @font = @pdf.find_font "#{Prawn::DATADIR}/fonts/DejaVuSans.ttf"
   end
 
   it "should calculate string width taking into account accented characters" do
-    @font.compute_width_of("é", :size => 12).should == @font.compute_width_of("e", :size => 12)
+    expect(@font.compute_width_of("é", :size => 12)).to eq(@font.compute_width_of("e", :size => 12))
   end
 
   it "should calculate string width taking into account kerning pairs" do
-    @font.compute_width_of("To", :size => 12).should be_within(0.01).of(14.65)
-    @font.compute_width_of("To", :size => 12, :kerning => true).should be_within(0.01).of(12.61)
+    expect(@font.compute_width_of("To", :size => 12)).to be_within(0.01).of(14.65)
+    expect(@font.compute_width_of("To", :size => 12, :kerning => true)).to be_within(0.01).of(12.61)
   end
 
   it "should encode text without kerning by default" do
-    @font.encode_text("To").should == [[0, "To"]]
+    expect(@font.encode_text("To")).to eq([[0, "To"]])
 
     tele = "T\216l\216"
     result = @font.encode_text("Télé")
-    result.length.should == 1
-    result[0][0].should == 0
-    result[0][1].bytes.to_a.should == tele.bytes.to_a
+    expect(result.length).to eq(1)
+    expect(result[0][0]).to eq(0)
+    expect(result[0][1].bytes.to_a).to eq(tele.bytes.to_a)
 
-    @font.encode_text("Technology").should == [[0, "Technology"]]
-    @font.encode_text("Technology...").should == [[0, "Technology..."]]
-    @font.encode_text("Teχnology...").should == [[0, "Te"], [1, "!"], [0, "nology..."]]
+    expect(@font.encode_text("Technology")).to eq([[0, "Technology"]])
+    expect(@font.encode_text("Technology...")).to eq([[0, "Technology..."]])
+    expect(@font.encode_text("Teχnology...")).to eq([[0, "Te"], [1, "!"], [0, "nology..."]])
   end
 
   it "should encode text with kerning if requested" do
-    @font.encode_text("To", :kerning => true).should == [[0, ["T", 169.921875, "o"]]]
-    @font.encode_text("Technology", :kerning => true).should == [[0, ["T", 169.921875, "echnology"]]]
-    @font.encode_text("Technology...", :kerning => true).should == [[0, ["T", 169.921875, "echnology", 142.578125, "..."]]]
-    @font.encode_text("Teχnology...", :kerning => true).should == [[0, ["T", 169.921875, "e"]], [1, "!"], [0, ["nology", 142.578125, "..."]]]
+    expect(@font.encode_text("To", :kerning => true)).to eq([[0, ["T", 169.921875, "o"]]])
+    expect(@font.encode_text("Technology", :kerning => true)).to eq([[0, ["T", 169.921875, "echnology"]]])
+    expect(@font.encode_text("Technology...", :kerning => true)).to eq([[0, ["T", 169.921875, "echnology", 142.578125, "..."]]])
+    expect(@font.encode_text("Teχnology...", :kerning => true)).to eq([[0, ["T", 169.921875, "e"]], [1, "!"], [0, ["nology", 142.578125, "..."]]])
   end
 
   it "should use the ascender, descender, and cap height from the TTF verbatim" do
@@ -399,24 +401,23 @@ describe "TTF fonts" do
 
     # Pull out the embedded font descriptor
     descriptor = ref.data[:FontDescriptor].data
-    descriptor[:Ascent].should == 759
-    descriptor[:Descent].should == -240
-    descriptor[:CapHeight].should == 759
+    expect(descriptor[:Ascent]).to eq(759)
+    expect(descriptor[:Descent]).to eq(-240)
+    expect(descriptor[:CapHeight]).to eq(759)
   end
 
   describe "when normalizing encoding" do
     it "should not modify the original string when normalize_encoding() is used" do
       original = "Foo"
       normalized = @font.normalize_encoding(original)
-      original.equal?(normalized).should be_false
+      expect(original.equal?(normalized)).to be_false
     end
 
     it "should modify the original string when normalize_encoding!() is used" do
       original = "Foo"
       normalized = @font.normalize_encoding!(original)
-      original.equal?(normalized).should be_true
+      expect(original.equal?(normalized)).to be_true
     end
-
   end
 end
 
@@ -428,34 +429,34 @@ describe "DFont fonts" do
 
   it "should list all named fonts" do
     list = Prawn::Font::DFont.named_fonts(@file)
-    list.sort.should == %w(PanicSans PanicSans-Italic PanicSans-Bold PanicSans-BoldItalic).sort
+    expect(list.sort).to eq(%w(PanicSans PanicSans-Italic PanicSans-Bold PanicSans-BoldItalic).sort)
   end
 
   it "should count the number of fonts in the file" do
-    Prawn::Font::DFont.font_count(@file).should == 4
+    expect(Prawn::Font::DFont.font_count(@file)).to eq(4)
   end
 
   it "should default selected font to the first one if not specified" do
     font = @pdf.find_font(@file)
-    font.basename.should == "PanicSans"
+    expect(font.basename).to eq("PanicSans")
   end
 
   it "should allow font to be selected by index" do
     font = @pdf.find_font(@file, :font => 2)
-    font.basename.should == "PanicSans-Italic"
+    expect(font.basename).to eq("PanicSans-Italic")
   end
 
   it "should allow font to be selected by name" do
     font = @pdf.find_font(@file, :font => "PanicSans-BoldItalic")
-    font.basename.should == "PanicSans-BoldItalic"
+    expect(font.basename).to eq("PanicSans-BoldItalic")
   end
 
   it "should cache font object based on selected font" do
     f1 = @pdf.find_font(@file, :font => "PanicSans")
     f2 = @pdf.find_font(@file, :font => "PanicSans-Bold")
-    f2.object_id.should_not == f1.object_id
-    @pdf.find_font(@file, :font => "PanicSans").object_id.should == f1.object_id
-    @pdf.find_font(@file, :font => "PanicSans-Bold").object_id.should == f2.object_id
+    expect(f2.object_id).not_to eq(f1.object_id)
+    expect(@pdf.find_font(@file, :font => "PanicSans").object_id).to eq(f1.object_id)
+    expect(@pdf.find_font(@file, :font => "PanicSans-Bold").object_id).to eq(f2.object_id)
   end
 end
 
@@ -463,12 +464,12 @@ describe "#character_count(text)" do
   it "should work on TTF fonts" do
     create_pdf
     @pdf.font("#{Prawn::DATADIR}/fonts/gkai00mp.ttf")
-    @pdf.font.character_count("こんにちは世界").should == 7
-    @pdf.font.character_count("Hello, world!").should == 13
+    expect(@pdf.font.character_count("こんにちは世界")).to eq(7)
+    expect(@pdf.font.character_count("Hello, world!")).to eq(13)
   end
 
   it "should work on AFM fonts" do
     create_pdf
-    @pdf.font.character_count("Hello, world!").should == 13
+    expect(@pdf.font.character_count("Hello, world!")).to eq(13)
   end
 end