prawn 0.11.1 → 0.15.0

data/spec/outline_spec.rb

@@ -16,27 +16,27 @@ describe "Outline" do
       end
     end
   end
-  if RUBY_VERSION >= "1.9"
-    describe "outline encoding" do
-      it "should store all outline titles as UTF-16" do
-        render_and_find_objects
-        @hash.values.each do |obj|
-          if obj.is_a?(Hash) && obj[:Title]
-            title = obj[:Title].dup
-            title.force_encoding("UTF-16LE")
-            title.valid_encoding?.should == true
-          end
+
+  describe "outline encoding" do
+    it "should store all outline titles as UTF-16" do
+      render_and_find_objects
+      @hash.values.each do |obj|
+        if obj.is_a?(Hash) && obj[:Title]
+          title = obj[:Title].dup
+          title.force_encoding(Encoding::UTF_16LE)
+          title.valid_encoding?.should == true
         end
       end
     end
   end
+
   describe "#generate_outline" do
     before(:each) do
       render_and_find_objects
     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
@@ -87,6 +87,28 @@ describe "Outline" do
 
   end
 
+  describe "adding a custom destination" do
+    before(:each) do
+      @pdf.start_new_page
+      @pdf.text "Page 3 with a destination"
+      @pdf.add_dest('customdest', @pdf.dest_xyz(200, 200))
+      pdf = @pdf
+      @pdf.outline.update do
+        page :destination => pdf.dest_xyz(200, 200), :title => 'Custom Destination'
+      end
+      render_and_find_objects
+    end
+
+    it "should create an outline item" do
+      @custom_dest.should_not be_nil
+    end
+
+    it "should reference the custom destination" do
+      referenced_object(@custom_dest[:Dest].first).should == referenced_object(@pages.last)
+    end
+
+  end
+
   describe "addding a section later with outline#section" do
     before(:each) do
       @pdf.start_new_page
@@ -100,7 +122,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
@@ -120,11 +142,11 @@ describe "Outline" do
       @outline_root[:Count].should == 5
     end
 
-  end  
-  
-  describe "#outline.add_subsection_to" do  
+  end
+
+  describe "#outline.add_subsection_to" do
     context "positioned last" do
-    
+
       before(:each) do
         @pdf.start_new_page
         @pdf.text "Page 3. An added subsection "
@@ -133,45 +155,45 @@ describe "Outline" do
             section 'Added SubSection', :destination => 3 do
               page :destination => 3, :title => 'Added Page 3'
             end
-          end 
+          end
         end
         render_and_find_objects
       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
         referenced_object(@section_1[:First]).should == @page_1
         referenced_object(@section_1[:Last]).should == @subsection
       end
-    
+
       it "should set the prev relation for the new subsection to its parent's old last item" do
         referenced_object(@subsection[:Prev]).should == @page_2
       end
-    
-    
+
+
       it "the subsection should become the next relation for its parent's old last item" do
          referenced_object(@page_2[:Next]).should == @subsection
        end
-    
+
       it "should set the first relation for the new subsection" do
         referenced_object(@subsection[:First]).should == @added_page_3
       end
-    
+
       it "should set the correct last relation of the added to section" do
         referenced_object(@subsection[:Last]).should == @added_page_3
       end
-    
+
       it "should increase the count of root outline dictionary" do
         @outline_root[:Count].should == 5
       end
-    
-    end  
-    
+
+    end
+
     context "positioned first" do
-    
+
       before(:each) do
         @pdf.start_new_page
         @pdf.text "Page 3. An added subsection "
@@ -186,14 +208,14 @@ 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
         referenced_object(@section_1[:First]).should == @subsection
         referenced_object(@section_1[:Last]).should == @page_2
       end
-    
+
       it "should set the next relation for the new subsection to its parent's old first item" do
         referenced_object(@subsection[:Next]).should == @page_1
       end
@@ -215,9 +237,9 @@ describe "Outline" do
       end
 
     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,9 +249,9 @@ describe "Outline" do
           end
         end
         render_and_find_objects
-      end
+      end.should raise_error(Prawn::Errors::UnknownOutlineTitle)
     end
-  end     
+  end
 
   describe "#outline.insert_section_after" do
     describe "inserting in the middle of another section" do
@@ -246,47 +268,47 @@ 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
-      
+
         it "should reset the sibling relations of adjoining items to inserted item" do
           render_and_find_objects
           referenced_object(@page_1[:Next]).should == @inserted_page
           referenced_object(@page_2[:Prev]).should == @inserted_page
         end
-      
+
         it "should set the sibling relation of added item to adjoining items" do
           render_and_find_objects
           referenced_object(@inserted_page[:Next]).should == @page_2
           referenced_object(@inserted_page[:Prev]).should == @page_1
         end
-      
+
         it "should not affect the first and last relations of parent item" do
           render_and_find_objects
           referenced_object(@section_1[:First]).should == @page_1
           referenced_object(@section_1[:Last]).should == @page_2
         end
-      
-      end 
-      
-      
-      context "when adding another section afterwards" do 
+
+      end
+
+
+      context "when adding another section afterwards" do
         it "should have reset the root position so that a new section is added at the end of root sections" do
           @pdf.start_new_page
           @pdf.text "Another Inserted Page"
           @pdf.outline.update do
             section 'Added Section' do
               page :destination => page_number, :title => "Inserted Page"
-            end 
-          end 
+            end
+          end
           render_and_find_objects
           referenced_object(@outline_root[:Last]).should == @section_2
           referenced_object(@section_1[:Next]).should == @section_2
@@ -305,7 +327,7 @@ describe "Outline" do
          @pdf.outline.update do
            insert_section_after 'Page 2' do
              page :destination => page_number, :title => "Inserted Page"
-           end 
+           end
          end
          render_and_find_objects
       end
@@ -317,7 +339,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 +351,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 +361,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 +392,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
 
@@ -384,9 +424,10 @@ def render_and_find_objects
   @page_2 = find_by_title('Page 2')
   @section_2 = find_by_title('Added Section')
   @page_3 = find_by_title('Page 3')
-  @inserted_page = find_by_title('Inserted Page') 
+  @inserted_page = find_by_title('Inserted Page')
   @subsection = find_by_title('Added SubSection')
   @added_page_3 = find_by_title('Added Page 3')
+  @custom_dest = find_by_title('Custom Destination')
 end
 
 # Outline titles are stored as UTF-16. This method accepts a UTF-8 outline title
@@ -405,4 +446,3 @@ end
 def referenced_object(reference)
   @hash[reference]
 end
-

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
 
@@ -31,7 +31,7 @@ describe "When reading a greyscale PNG file (color type 0)" do
 
   it "should read the image data chunk correctly" do
     png = Prawn::Images::PNG.new(@img_data)
-    data = File.binread(@data_filename)
+    data = Zlib::Inflate.inflate(File.binread(@data_filename))
     png.img_data.should == data
   end
 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
 
@@ -75,7 +75,7 @@ describe "When reading an RGB PNG file (color type 2)" do
 
   it "should read the image data chunk correctly" do
     png = Prawn::Images::PNG.new(@img_data)
-    data = File.binread(@data_filename)
+    data = Zlib::Inflate.inflate(File.binread(@data_filename))
     png.img_data.should == data
   end
 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,16 +103,16 @@ 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/indexed_color.png"
+    @data_filename = "#{Prawn::DATADIR}/images/indexed_color.dat"
     @img_data = File.binread(@filename)
   end
 
   it "should read the attributes from the header chunk correctly" do
     png = Prawn::Images::PNG.new(@img_data)
 
-    png.width.should == 50
-    png.height.should == 64
+    png.width.should == 150
+    png.height.should == 200
     png.bits.should == 8
     png.color_type.should == 3
     png.compression_method.should == 0
@@ -122,7 +122,7 @@ describe "When reading an indexed color PNG file (color type 3)" do
 
   it "should read the image data chunk correctly" do
     png = Prawn::Images::PNG.new(@img_data)
-    data = File.binread(@data_filename)
+    data = Zlib::Inflate.inflate(File.binread(@data_filename))
     png.img_data.should == data
   end
 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"
+    @color_data_filename = "#{Prawn::DATADIR}/images/page_white_text.color"
+    @alpha_data_filename = "#{Prawn::DATADIR}/images/page_white_text.alpha"
     @img_data = File.binread(@filename)
   end
 
@@ -151,7 +151,7 @@ describe "When reading a greyscale+alpha PNG file (color type 4)" do
   it "should correctly return the raw image data (with no alpha channel) from the image data chunk" do
     png = Prawn::Images::PNG.new(@img_data)
     png.split_alpha_channel!
-    data = File.binread(@data_filename)
+    data = File.binread(@color_data_filename)
     png.img_data.should == data
   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"
+    @color_data_filename = "#{Prawn::DATADIR}/images/dice.color"
+    @alpha_data_filename = "#{Prawn::DATADIR}/images/dice.alpha"
     @img_data = File.binread(@filename)
   end
 
@@ -187,7 +187,7 @@ describe "When reading an RGB+alpha PNG file (color type 6)" do
   it "should correctly return the raw image data (with no alpha channel) from the image data chunk" do
     png = Prawn::Images::PNG.new(@img_data)
     png.split_alpha_channel!
-    data = File.binread(@data_filename)
+    data = File.binread(@color_data_filename)
     png.img_data.should == data
   end
 
@@ -202,10 +202,10 @@ 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"
+    @color_data_filename = "#{Prawn::DATADIR}/images/16bit.color"
     # 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
 
@@ -224,7 +224,7 @@ describe "When reading a 16bit RGB+alpha PNG file (color type 6)" do
   it "should correctly return the raw image data (with no alpha channel) from the image data chunk" do
     png = Prawn::Images::PNG.new(@img_data)
     png.split_alpha_channel!
-    data = File.binread(@data_filename)
+    data = File.binread(@color_data_filename)
     png.img_data.should == data
   end
 

data/spec/reference_spec.rb

@@ -3,74 +3,10 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 describe "A Reference object" do
-  it "should produce a PDF reference on #to_s call" do
-    ref = Prawn::Core::Reference(1,true)
-    ref.to_s.should == "1 0 R"
-  end                                        
-  
-  it "should allow changing generation number" do
-    ref = Prawn::Core::Reference(1,true)
-    ref.gen = 1
-    ref.to_s.should == "1 1 R"
-  end
-  
-  it "should generate a valid PDF object for the referenced data" do
-    ref = Prawn::Core::Reference(2,[1,"foo"]) 
-    ref.object.should == "2 0 obj\n#{Prawn::Core::PdfObject([1,"foo"])}\nendobj\n" 
-  end             
-  
-  it "should automatically open a stream when #<< is used" do
-     ref = Prawn::Core::Reference(1, :Length => 41)
-     ref << "BT\n/F1 12 Tf\n72 712 Td\n( A stream ) Tj\nET"   
-     ref.object.should == "1 0 obj\n<< /Length 41\n>>\nstream"+
-                           "\nBT\n/F1 12 Tf\n72 712 Td\n( A stream ) Tj\nET" +
-                           "\nendstream\nendobj\n"
-  end
-
-  it "should compress a stream upon request" do
-    ref = Prawn::Core::Reference(2,{})
-    ref << "Hi There " * 20
-
-    cref = Prawn::Core::Reference(2,{})
-    cref << "Hi There " * 20
-    cref.compress_stream
-
-    assert cref.stream.size < ref.stream.size, 
-      "compressed stream expected to be smaller than source but wasn't"
-    cref.data[:Filter].should == :FlateDecode
-  end
-
-  it "should copy the data and stream from another ref on #replace" do
-    from = Prawn::Core::Reference(3, {:foo => 'bar'})
-    from << "has a stream too"
-
-    to = Prawn::Core::Reference(4, {:foo => 'baz'})
-    to.replace from
-
-    # should preserve identifier but copy data and stream
-    to.identifier.should == 4
-    to.data.should == from.data
-    to.stream.should == from.stream
-  end
-
-  it "should copy a compressed stream from a compressed ref on #replace" do
-    from = Prawn::Core::Reference(5, {:foo => 'bar'})
-    from << "has a stream too " * 20
-    from.compress_stream
-
-    to = Prawn::Core::Reference(6, {:foo => 'baz'})
-    to.replace from
-
-    to.identifier.should == 6
-    to.data.should == from.data
-    to.stream.should == from.stream
-    to.compressed?.should == true
-  end
-
   describe "generated via Prawn::Document" do
     it "should return a proper reference on ref!" do
       pdf = Prawn::Document.new
-      pdf.ref!({}).is_a?(Prawn::Core::Reference).should == true
+      pdf.ref!({}).is_a?(PDF::Core::Reference).should == true
     end
 
     it "should return an identifier on ref" do
@@ -78,5 +14,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.stream.data[:Length].should == 5
+    end
   end
 end