prawn 1.0.0.rc1 → 1.0.0.rc2

data/spec/object_store_spec.rb

@@ -35,27 +35,27 @@ describe "Prawn::ObjectStore" do
   end
 
   it "should import all objects from a PDF that has an indirect reference in a stream dict" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/indirect_reference.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/indirect_reference.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.size.should == 8
   end
 
-  it "should raise ArgumentError when given a file that doesn exist as a template" do
+  it "should raise_error ArgumentError when given a file that doesn exist as a template" do
     filename = "not_really_there.pdf"
 
-    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should.raise(ArgumentError)
+    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should raise_error(ArgumentError)
   end
 
-  it "should raise Prawn::Errors::TemplateError when given a non PDF as a template" do
-    filename = "#{Prawn::BASEDIR}/data/images/dice.png"
+  it "should raise_error Prawn::Errors::TemplateError when given a non PDF as a template" do
+    filename = "#{Prawn::DATADIR}/images/dice.png"
 
-    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should.raise(Prawn::Errors::TemplateError)
+    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should raise_error(Prawn::Errors::TemplateError)
   end
 
-  it "should raise Prawn::Errors::TemplateError when given an encrypted PDF as a template" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/encrypted.pdf"
+  it "should raise_error Prawn::Errors::TemplateError when given an encrypted PDF as a template" do
+    filename = "#{Prawn::DATADIR}/pdfs/encrypted.pdf"
 
-    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should.raise(Prawn::Errors::TemplateError)
+    lambda { Prawn::Core::ObjectStore.new(:template => filename) }.should raise_error(Prawn::Errors::TemplateError)
   end
 
   it "should add to its objects when ref() is called" do
@@ -100,7 +100,7 @@ describe "Prawn::ObjectStore#compact" do
     old_size = store.size
     store.compact
     
-    store.size.should.be < old_size
+    store.size.should be < old_size
     store.map{ |o| o.identifier }.should == (1..store.size).to_a
   end
 
@@ -111,44 +111,44 @@ describe "Prawn::ObjectStore#compact" do
     old_size = store.size
     store.compact
     
-    store.size.should.be < old_size
+    store.size.should be < old_size
     store.map{ |o| o.identifier }.should == (1..store.size).to_a
   end
 end
 
 describe "Prawn::ObjectStorie#object_id_for_page" do
   it "should return the object ID of an imported template page" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.object_id_for_page(0).should == 4
   end
 
   it "should return the object ID of the first imported template page" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/two_hexagons.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/two_hexagons.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.object_id_for_page(1).should == 4
   end
 
   it "should return the object ID of the last imported template page" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/two_hexagons.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/two_hexagons.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.object_id_for_page(-1).should == 6
   end
 
   it "should return the object ID of the first page of a template that uses nested Pages" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/nested_pages.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/nested_pages.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.object_id_for_page(1).should == 5
   end
 
   it "should return the object ID of the last page of a template that uses nested Pages" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/nested_pages.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/nested_pages.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.object_id_for_page(-1).should == 8
   end
 
   it "should return nil if given an invalid page number" do
-    filename = "#{Prawn::BASEDIR}/data/pdfs/hexagon.pdf"
+    filename = "#{Prawn::DATADIR}/pdfs/hexagon.pdf"
     store = Prawn::Core::ObjectStore.new(:template => filename)
     store.object_id_for_page(10).should == nil
   end

data/spec/outline_spec.rb

@@ -36,7 +36,7 @@ describe "Outline" do
     end
 
     it "should create a root outline dictionary item" do
-      assert_not_nil @outline_root
+      @outline_root.should_not be_nil
     end
 
     it "should set the first and last top items of the root outline dictionary item" do
@@ -46,7 +46,7 @@ describe "Outline" do
 
     describe "#create_outline_item" do
       it "should create outline items for each section and page" do
-        [@section_1, @page_1, @page_2].each {|item| assert_not_nil item}
+        [@section_1, @page_1, @page_2].each {|item| item.should_not be_nil}
       end
     end
 
@@ -70,7 +70,7 @@ describe "Outline" do
 
       it "should add the count of all descendant items" do
         @outline_root[:Count].should == 3
-        @section_1[:Count].should.abs == 2
+        @section_1[:Count].abs.should == 2
         @page_1[:Count].should == 0
         @page_2[:Count].should == 0
       end
@@ -100,7 +100,7 @@ describe "Outline" do
     end
 
     it "should add new outline items to document" do
-      [@section_2, @page_3].each { |item| assert_not_nil item}
+      [@section_2, @page_3].each { |item| item.should_not be_nil}
     end
 
     it "should reset the last items for root outline dictionary" do
@@ -139,7 +139,7 @@ describe "Outline" do
       end
     
       it "should add new outline items to document" do
-        [@subsection, @added_page_3].each { |item| assert_not_nil item}
+        [@subsection, @added_page_3].each { |item| item.should_not be_nil}
       end
     
       it "should reset the last item for parent item dictionary" do
@@ -186,7 +186,7 @@ describe "Outline" do
       end
 
       it "should add new outline items to document" do
-        [@subsection, @added_page_3].each { |item| assert_not_nil item}
+        [@subsection, @added_page_3].each { |item| item.should_not be_nil}
       end
 
       it "should reset the first item for parent item dictionary" do
@@ -217,7 +217,7 @@ describe "Outline" do
     end
     
     it "should require an existing title" do
-      assert_raise Prawn::Errors::UnknownOutlineTitle do
+      lambda do
         @pdf.go_to_page 1
         @pdf.start_new_page
         @pdf.text "Inserted Page"
@@ -227,7 +227,7 @@ describe "Outline" do
           end
         end
         render_and_find_objects
-      end
+      end.should raise_error(Prawn::Errors::UnknownOutlineTitle)
     end
   end     
 
@@ -246,13 +246,13 @@ describe "Outline" do
 
       it "should insert new outline items to document" do
         render_and_find_objects
-        assert_not_nil @inserted_page
+        @inserted_page.should_not be_nil
       end
       
       it "should adjust the count of all ancestors" do
         render_and_find_objects
         @outline_root[:Count].should == 4
-        @section_1[:Count].should.abs == 3
+        @section_1[:Count].abs.should == 3
       end
        
       describe "#adjust_relations" do
@@ -317,7 +317,7 @@ describe "Outline" do
         end
 
         it "should set the sibling relation of added item to adjoining items" do
-          assert_nil referenced_object(@inserted_page[:Next])
+          referenced_object(@inserted_page[:Next]).should be_nil
           referenced_object(@inserted_page[:Prev]).should == @page_2
         end
 
@@ -329,7 +329,7 @@ describe "Outline" do
     end
 
     it "should require an existing title" do
-      assert_raise Prawn::Errors::UnknownOutlineTitle do
+      lambda do
         @pdf.go_to_page 1
         @pdf.start_new_page
         @pdf.text "Inserted Page"
@@ -339,26 +339,26 @@ describe "Outline" do
           end
         end
         render_and_find_objects
-      end
+      end.should raise_error(Prawn::Errors::UnknownOutlineTitle)
     end
 
   end
 
   describe "#page" do
     it "should require a title option to be set" do
-      assert_raise Prawn::Errors::RequiredOption do
+      lambda do
         @pdf = Prawn::Document.new() do
           text "Page 1. This is the first Chapter. "
           outline.define do
             page :destination => 1, :title => nil
           end
         end
-      end
+      end.should raise_error(Prawn::Errors::RequiredOption)
     end
   end
 end
   
-context "foreign character encoding" do
+describe "foreign character encoding" do
   before(:each) do
     pdf = Prawn::Document.new() do
       outline.define do
@@ -370,7 +370,25 @@ context "foreign character encoding" do
 
   it "should handle other encodings for the title" do
     object = find_by_title('La pomme croquée')
-    object.should.not == nil
+    object.should_not == nil
+  end
+end
+
+describe "with optimize_objects option" do
+  before(:each) do
+    @pdf = Prawn::Document.new(:optimize_objects => true) do
+      outline.define do
+        section 'Chapter 1', :destination => 1, :closed => true do
+          page :destination => 1, :title => 'Page 1'
+        end
+      end
+    end
+    render_and_find_objects
+  end
+
+  it "should generate an outline" do
+    @section_1.should_not be_nil
+    @page_1.should_not be_nil
   end
 end
 

data/spec/pdf_object_spec.rb

@@ -17,6 +17,8 @@ describe "PDF Object Serialization" do
   it "should convert a Ruby number to PDF number" do
     Prawn::Core::PdfObject(1).should == "1"
     Prawn::Core::PdfObject(1.214112421).should == "1.214112421" 
+    # scientific notation is not valid in PDF
+    Prawn::Core::PdfObject(0.000005).should == "0.000005"
   end
   
   it "should convert a Ruby time object to a PDF timestamp" do
@@ -151,7 +153,7 @@ describe "PDF Object Serialization" do
   
   it "should not allow keys other than strings or symbols for PDF dicts" do
     lambda { Prawn::Core::PdfObject(:foo => :bar, :baz => :bang, 1 => 4) }.
-      should.raise(Prawn::Errors::FailedObjectConversion) 
+      should raise_error(Prawn::Errors::FailedObjectConversion) 
   end  
   
   it "should convert a Prawn::Reference to a PDF indirect object reference" do

data/spec/png_spec.rb

@@ -12,8 +12,8 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 describe "When reading a greyscale PNG file (color type 0)" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/web-links.png"
-    @data_filename = "#{Prawn::BASEDIR}/data/images/web-links.dat"
+    @filename = "#{Prawn::DATADIR}/images/web-links.png"
+    @data_filename = "#{Prawn::DATADIR}/images/web-links.dat"
     @img_data = File.binread(@filename)
   end
 
@@ -39,7 +39,7 @@ end
 describe "When reading a greyscale PNG file with transparency (color type 0)" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/ruport_type0.png"
+    @filename = "#{Prawn::DATADIR}/images/ruport_type0.png"
     @img_data = File.binread(@filename)
   end
 
@@ -56,8 +56,8 @@ end
 describe "When reading an RGB PNG file (color type 2)" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/ruport.png"
-    @data_filename = "#{Prawn::BASEDIR}/data/images/ruport_data.dat"
+    @filename = "#{Prawn::DATADIR}/images/ruport.png"
+    @data_filename = "#{Prawn::DATADIR}/images/ruport_data.dat"
     @img_data = File.binread(@filename)
   end
 
@@ -83,7 +83,7 @@ end
 describe "When reading an RGB PNG file with transparency (color type 2)" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/arrow2.png"
+    @filename = "#{Prawn::DATADIR}/images/arrow2.png"
     @img_data = File.binread(@filename)
   end
 
@@ -103,8 +103,8 @@ end
 describe "When reading an indexed color PNG file (color type 3)" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/rails.png"
-    @data_filename = "#{Prawn::BASEDIR}/data/images/rails.dat"
+    @filename = "#{Prawn::DATADIR}/images/rails.png"
+    @data_filename = "#{Prawn::DATADIR}/images/rails.dat"
     @img_data = File.binread(@filename)
   end
 
@@ -130,9 +130,9 @@ end
 describe "When reading a greyscale+alpha PNG file (color type 4)" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/page_white_text.png"
-    @data_filename = "#{Prawn::BASEDIR}/data/images/page_white_text.dat"
-    @alpha_data_filename = "#{Prawn::BASEDIR}/data/images/page_white_text.alpha"
+    @filename = "#{Prawn::DATADIR}/images/page_white_text.png"
+    @data_filename = "#{Prawn::DATADIR}/images/page_white_text.dat"
+    @alpha_data_filename = "#{Prawn::DATADIR}/images/page_white_text.alpha"
     @img_data = File.binread(@filename)
   end
 
@@ -166,9 +166,9 @@ end
 describe "When reading an RGB+alpha PNG file (color type 6)" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/dice.png"
-    @data_filename = "#{Prawn::BASEDIR}/data/images/dice.dat"
-    @alpha_data_filename = "#{Prawn::BASEDIR}/data/images/dice.alpha"
+    @filename = "#{Prawn::DATADIR}/images/dice.png"
+    @data_filename = "#{Prawn::DATADIR}/images/dice.dat"
+    @alpha_data_filename = "#{Prawn::DATADIR}/images/dice.alpha"
     @img_data = File.binread(@filename)
   end
 
@@ -188,24 +188,27 @@ describe "When reading an RGB+alpha PNG file (color type 6)" do
     png = Prawn::Images::PNG.new(@img_data)
     png.split_alpha_channel!
     data = File.binread(@data_filename)
-    png.img_data.should == data
+    # compare decompressed rather than compressed image data
+    # because JRuby's implementation of Zlib is different from MRI --
+    #   both generate valid gzipped data, but not bit-identical to each other
+    Zlib::Inflate.inflate(png.img_data).should == Zlib::Inflate.inflate(data)
   end
 
   it "should correctly extract the alpha channel data from the image data chunk" do
     png = Prawn::Images::PNG.new(@img_data)
     png.split_alpha_channel!
     data = File.binread(@alpha_data_filename)
-    png.alpha_channel.should == data
+    Zlib::Inflate.inflate(png.alpha_channel).should == Zlib::Inflate.inflate(data)
   end
 end
 
 describe "When reading a 16bit RGB+alpha PNG file (color type 6)" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/16bit.png"
-    @data_filename = "#{Prawn::BASEDIR}/data/images/16bit.dat"
+    @filename = "#{Prawn::DATADIR}/images/16bit.png"
+    @data_filename = "#{Prawn::DATADIR}/images/16bit.dat"
     # alpha channel truncated to 8-bit
-    @alpha_data_filename = "#{Prawn::BASEDIR}/data/images/16bit.alpha"
+    @alpha_data_filename = "#{Prawn::DATADIR}/images/16bit.alpha"
     @img_data = File.binread(@filename)
   end
 

data/spec/reference_spec.rb

@@ -35,7 +35,7 @@ describe "A Reference object" do
     cref << "Hi There " * 20
     cref.compress_stream
 
-    assert cref.stream.size < ref.stream.size, 
+    cref.stream.size.should be < ref.stream.size,
       "compressed stream expected to be smaller than source but wasn't"
     cref.data[:Filter].should == :FlateDecode
   end
@@ -67,6 +67,22 @@ describe "A Reference object" do
     to.compressed?.should == true
   end
 
+  it "should have Length if stream present" do
+    ref = Prawn::Core::Reference(7, {})
+    ref << "Hello"
+
+    ref.data[:Length].should == 5
+  end
+
+  it "should update Length when stream is updated" do
+    ref = Prawn::Core::Reference(7, {})
+    ref << "Hello"
+    ref.data[:Length].should == 5
+
+    ref << " world"
+    ref.data[:Length].should == 11
+  end
+
   describe "generated via Prawn::Document" do
     it "should return a proper reference on ref!" do
       pdf = Prawn::Document.new
@@ -78,5 +94,12 @@ describe "A Reference object" do
       r = pdf.ref({})
       r.is_a?(Integer).should == true
     end
+
+    it "should have :Length of stream if it has one when compression disabled" do
+      pdf = Prawn::Document.new :compress => false
+      ref = pdf.ref!({})
+      ref << 'Hello'
+      ref.data[:Length].should == 5
+    end
   end
 end

data/spec/repeater_spec.rb

@@ -10,14 +10,14 @@ describe "Repeaters" do
 
     r = repeater(doc, :all) { :do_nothing }
 
-    assert_equal orig_count + 1,  Prawn::Repeater.count
+    Prawn::Repeater.count.should == orig_count + 1
   end
 
   it "must provide an :all filter" do
     doc = sample_document
     r = repeater(doc, :all) { :do_nothing }
 
-    assert (1..doc.page_count).all? { |i| r.match?(i) }
+    (1..doc.page_count).all? { |i| r.match?(i) }.should be_true
   end
 
   it "must provide an :odd filter" do
@@ -26,29 +26,29 @@ describe "Repeaters" do
 
     odd, even = (1..doc.page_count).partition { |e| e % 2 == 1 }
 
-    assert odd.all? { |i| r.match?(i) }
-    assert ! even.any? { |i| r.match?(i) }
+    odd.all? { |i| r.match?(i) }.should be_true
+    even.any? { |i| r.match?(i) }.should be_false
   end
 
   it "must be able to filter by an array of page numbers" do
     doc = sample_document
     r = repeater(doc, [1,2,7]) { :do_nothing }
 
-    assert_equal [1,2,7], (1..10).select { |i| r.match?(i) }
+    (1..10).select { |i| r.match?(i) }.should == [1,2,7]
   end
 
   it "must be able to filter by a range of page numbers" do
     doc = sample_document
     r = repeater(doc, 2..4) { :do_nothing }
 
-    assert_equal [2,3,4], (1..10).select { |i| r.match?(i) }
+    (1..10).select { |i| r.match?(i) }.should == [2,3,4]
   end
 
   it "must be able to filter by an arbitrary proc" do
     doc = sample_document
     r = repeater(doc, lambda { |x| x == 1 or x % 3 == 0 })
 
-    assert_equal [1,3,6,9], (1..10).select { |i| r.match?(i) }
+    (1..10).select { |i| r.match?(i) }.should == [1,3,6,9]
   end
 
   it "must try to run a stamp if the page number matches" do
@@ -95,7 +95,7 @@ describe "Repeaters" do
     end
 
     text = PDF::Inspector::Text.analyze(doc.render)
-    assert_equal (1..10).to_a.map{|p| "Page #{p}"}, text.strings
+    text.strings.should == (1..10).to_a.map{|p| "Page #{p}"}
   end
 
   it "must treat any block as a closure (Document.new instance_eval form)" do
@@ -110,7 +110,7 @@ describe "Repeaters" do
     end
 
     text = PDF::Inspector::Text.analyze(doc.render)
-    assert_equal (1..10).to_a.map{|p| "Page #{p}"}, text.strings
+    text.strings.should == (1..10).to_a.map{|p| "Page #{p}"}
   end
 
   def sample_document