@@ -101,8 +101,8 @@ module Prawn end end else - string.unpack("U*").inject(0) do |s,r| - s + latin_glyphs_table[r] + string.unpack("U*").inject(0) do |s,r| + s + latin_glyphs_table[r].to_i end * scale end end lib/prawn/font/metrics.rb @@ -11,7 +11,7 @@ describe "A bounding box" do @pdf.text "The rain in Spain falls mainly on the plains." end - @pdf.y.should be_close(458.384, 0.001) + @pdf.y.should.be.close 458.384, 0.001 end end spec/box_calculation_spec.rb @@ -49,7 +49,7 @@ describe "When beginning each new page" do it "should execute the lambda specified by on_page_start" do on_start = mock("page_start_proc") - on_start.should_receive(:[]).exactly(3).times + on_start.expects(:[]).times(3) pdf = Prawn::Document.new(:on_page_start => on_start) pdf.start_new_page @@ -65,7 +65,7 @@ describe "When ending each page" do on_end = mock("page_end_proc") - on_end.should_receive(:[]).exactly(3).times + on_end.expects(:[]).times(3) pdf = Prawn::Document.new(:on_page_stop => on_end) pdf.start_new_page @@ -77,8 +77,8 @@ describe "When ending each page" do pdf = Prawn::Document.new(:compress => false) content_stub = pdf.ref({}) - content_stub.stub!(:compress_stream).and_return(true) - content_stub.should_not_receive(:compress_stream) + content_stub.stubs(:compress_stream).returns(true) + content_stub.expects(:compress_stream).never pdf.instance_variable_set("@page_content", content_stub) pdf.text "Hi There" * 20 @@ -89,8 +89,8 @@ describe "When ending each page" do pdf = Prawn::Document.new(:compress => true) content_stub = pdf.ref({}) - content_stub.stub!(:compress_stream).and_return(true) - content_stub.should_receive(:compress_stream).exactly(1).times + content_stub.stubs(:compress_stream).returns(true) + content_stub.expects(:compress_stream).once pdf.instance_variable_set("@page_content", content_stub) pdf.text "Hi There" * 20 @@ -156,8 +156,8 @@ describe "The mask() feature" do @pdf.mask(:y, :line_width) do @pdf.y = y + 1 @pdf.line_width = line_width + 1 - @pdf.y.should_not == y - @pdf.line_width.should_not == line_width + @pdf.y.should.not == y + @pdf.line_width.should.not == line_width end @pdf.y.should == y @pdf.line_width.should == line_width @@ -170,7 +170,7 @@ describe "The render() feature" do @pdf = Prawn::Document.new(:page_size => "A4", :page_layout => :landscape) @pdf.line [100,100], [200,200] str = @pdf.render - str.encoding.to_s.should eql("ASCII-8BIT") + str.encoding.to_s.should == "ASCII-8BIT" end end end spec/document_spec.rb @@ -230,21 +230,21 @@ describe "When using painting shortcuts" do before(:each) { create_pdf } it "should convert stroke_some_method(args) into some_method(args); stroke" do - @pdf.should_receive(:line_to).with([100,100]) - @pdf.should_receive(:stroke) + @pdf.expects(:line_to).with([100,100]) + @pdf.expects(:stroke) @pdf.stroke_line_to [100,100] end it "should convert fill_some_method(args) into some_method(args); fill" do - @pdf.should_receive(:line_to).with([100,100]) - @pdf.should_receive(:fill) + @pdf.expects(:line_to).with([100,100]) + @pdf.expects(:fill) @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) + should.raise(NoMethodError) end end spec/graphics_spec.rb @@ -33,10 +33,10 @@ describe "the image() function" do images = observer(ImageObserver) # there should be 2 images in the page resources - images.page_xobjects.first.size.should eql(2) + images.page_xobjects.first.size.should == 2 # but only 1 image xobject - @output.scan(/\/Type \/XObject/).size.should eql(1) + @output.scan(/\/Type \/XObject/).size.should == 1 end end spec/images_spec.rb @@ -16,10 +16,10 @@ describe "When reading a JPEG file" do it "should read the basic attributes correctly" do jpg = Prawn::Images::JPG.new(@img_data) - jpg.width.should eql(604) - jpg.height.should eql(453) - jpg.bits.should eql(8) - jpg.channels.should eql(3) + jpg.width.should == 604 + jpg.height.should == 453 + jpg.bits.should == 8 + jpg.channels.should == 3 end end spec/jpg_spec.rb @@ -48,7 +48,7 @@ describe "PDF Object Serialization" do it "should not convert a whitespace containing Ruby symbol to a PDF name" do lambda { Prawn::PdfObject(:"My Symbol With Spaces") }. - should raise_error(Prawn::Errors::FailedObjectConversion) + should.raise(Prawn::Errors::FailedObjectConversion) end it "should convert a Ruby array to PDF Array when inside a content stream" do @@ -91,7 +91,7 @@ describe "PDF Object Serialization" do it "should not allow keys other than strings or symbols for PDF dicts" do lambda { Prawn::PdfObject(:foo => :bar, :baz => :bang, 1 => 4) }. - should raise_error(Prawn::Errors::FailedObjectConversion) + should.raise(Prawn::Errors::FailedObjectConversion) end it "should convert a Prawn::Reference to a PDF indirect object reference" do spec/pdf_object_spec.rb @@ -17,19 +17,19 @@ describe "When reading an RGB PNG file" do it "should read the attributes from the header chunk correctly" do png = Prawn::Images::PNG.new(@img_data) - png.width.should eql(258) - png.height.should eql(105) - png.bits.should eql(8) - png.color_type.should eql(2) - png.compression_method.should eql(0) - png.filter_method.should eql(0) - png.interlace_method.should eql(0) + png.width.should == 258 + png.height.should == 105 + png.bits.should == 8 + png.color_type.should == 2 + png.compression_method.should == 0 + png.filter_method.should == 0 + png.interlace_method.should == 0 end it "should read the image data chunk correctly" do png = Prawn::Images::PNG.new(@img_data) data = File.open(@data_filename, "rb") { |f| f.read } - png.img_data.should eql(data) + png.img_data.should == data end end spec/png_spec.rb @@ -35,7 +35,8 @@ describe "A Reference object" do cref << "Hi There " * 20 cref.compress_stream - (cref.stream.size < ref.stream.size).should be_true - cref.data[:Filter].should eql(:FlateDecode) + assert cref.stream.size < ref.stream.size, + "compressed stream expected to be smaller than source but wasn't" + cref.data[:Filter].should == :FlateDecode end end spec/reference_spec.rb @@ -3,7 +3,8 @@ puts "Prawn specs: Running on Ruby Version: #{RUBY_VERSION}" require "rubygems" -require "spec" +require "test/spec" +require "mocha" $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib') require "prawn" gem 'pdf-reader', ">=0.7.3" spec/spec_helper.rb @@ -72,7 +72,7 @@ describe "A table's width" do font_height = pdf.font_metrics.font_height(12) - table_height.should be_close(num_rows*font_height + 2*vpad*num_rows + vpad, 0.001) + table_height.should.be.close(num_rows*font_height + 2*vpad*num_rows + vpad, 0.001) end end @@ -139,7 +139,7 @@ describe "A table's content" do data = [["foo","bar"],["baz",""]] @pdf = Prawn::Document.new @pdf.table(data) - }.should_not raise_error + }.should.not.raise end end spec/table_spec.rb @@ -71,12 +71,12 @@ describe "when drawing text" do position = @pdf.y @pdf.text "Foo" - @pdf.y.should be_close(position - @pdf.font_metrics.font_height(12), + @pdf.y.should.be.close(position - @pdf.font_metrics.font_height(12), 0.0001) position = @pdf.y @pdf.text "Foo\nBar\nBaz" - @pdf.y.should be_close(position - 3*@pdf.font_metrics.font_height(12), + @pdf.y.should.be.close(position - 3*@pdf.font_metrics.font_height(12), 0.0001) end @@ -154,13 +154,13 @@ describe "when drawing text" do @pdf.text "Blaz", :at => [150,150] text = observer(FontObserver) - text.page_fonts.size.should eql(2) - text.page_fonts[0][0].should eql(:Helvetica) - text.page_fonts[1][0].should eql(:Helvetica) + text.page_fonts.size.should == 2 + text.page_fonts[0][0].should == :Helvetica + text.page_fonts[1][0].should == :Helvetica end it "should raise an exception when an unknown font is used" do - lambda { @pdf.font "Pao bu" }.should raise_error(Prawn::Errors::UnknownFont) + lambda { @pdf.font "Pao bu" }.should.raise(Prawn::Errors::UnknownFont) end if "spec".respond_to?(:encode!) @@ -168,22 +168,22 @@ describe "when drawing text" do it "should raise an exception when a utf-8 incompatible string is rendered" do str = "Blah \xDD" str.force_encoding("ASCII-8BIT") - lambda { @pdf.text str }.should raise_error(Prawn::Errors::IncompatibleStringEncoding) + lambda { @pdf.text str }.should.raise(Prawn::Errors::IncompatibleStringEncoding) end it "should not raise an exception when a shift-jis string is rendered" do datafile = "#{Prawn::BASEDIR}/data/shift_jis_text.txt" - sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets } - lambda { @pdf.text sjis_str }.should_not raise_error(Prawn::Errors::IncompatibleStringEncoding) + sjis_str = File.open(datafile, "r:shift_jis") { |f| f.gets } + lambda { @pdf.text sjis_str }.should.not.raise(Prawn::Errors::IncompatibleStringEncoding) end else # Handle non utf-8 string encodings in a sane way on non-M17N aware VMs it "should raise an exception when a corrupt utf-8 string is rendered" do str = "Blah \xDD" - lambda { @pdf.text str }.should raise_error(Prawn::Errors::IncompatibleStringEncoding) + lambda { @pdf.text str }.should.raise(Prawn::Errors::IncompatibleStringEncoding) end it "should raise an exception when a shift-jis string is rendered" do sjis_str = File.read("#{Prawn::BASEDIR}/data/shift_jis_text.txt") - lambda { @pdf.text sjis_str }.should raise_error(Prawn::Errors::IncompatibleStringEncoding) + lambda { @pdf.text sjis_str }.should.raise(Prawn::Errors::IncompatibleStringEncoding) end end spec/text_spec.rb 66fd2f19be6455199939d1b5db65fbcc7ea0c661 Gregory Brown gregory.t.brown@gmail.com http://github.com/sandal/prawn/commit/e1dde4995687392bcf3c43c23e07a05abbc85644 e1dde4995687392bcf3c43c23e07a05abbc85644 2008-08-07T10:19:29-07:00 2008-08-07T10:13:05-07:00 Surprise! Kids, you're going to need to learn test-spec and mocha. If you hate this idea, we can head back to Test::Unit entirely, but I'm not going to be jimmied around by Ruby 1.9 incompatibilities in RSpec. Alternative testing frameworks FTW 0cb8ba51e5e17c050b5ef43560b9574f077e4556 Gregory Brown gregory.t.brown@gmail.com