prawn 0.12.0 → 0.13.0

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"
+    @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
 
@@ -151,14 +151,14 @@ 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 = Zlib::Inflate.inflate(File.binread(@data_filename))
     png.img_data.should == 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)
+    data = Zlib::Inflate.inflate(File.binread(@alpha_data_filename))
     png.alpha_channel.should == data
   end
 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
 
@@ -187,14 +187,17 @@ 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 = Zlib::Inflate.inflate(File.binread(@data_filename))
+    # 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
     png.img_data.should == 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)
+    data = Zlib::Inflate.inflate(File.binread(@alpha_data_filename))
     png.alpha_channel.should == data
   end
 end
@@ -202,10 +205,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"
+    @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
 
@@ -224,14 +227,14 @@ 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 = Zlib::Inflate.inflate(File.binread(@data_filename))
     png.img_data.should == 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)
+    data = Zlib::Inflate.inflate(File.binread(@alpha_data_filename))
     png.alpha_channel.should == data
   end
 end

data/spec/reference_spec.rb

@@ -4,47 +4,40 @@ 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 = PDF::Core::Reference(1,true)
     ref.to_s.should == "1 0 R"
-  end                                        
-  
+  end
+
   it "should allow changing generation number" do
-    ref = Prawn::Core::Reference(1,true)
+    ref = PDF::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"
+    ref = PDF::Core::Reference(2,[1,"foo"])
+    ref.object.should == "2 0 obj\n#{PDF::Core::PdfObject([1,"foo"])}\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
+  it "should include stream fileds in dictionary when serializing" do
+     ref = PDF::Core::Reference(1, {})
+     ref.stream << 'Hello'
+     ref.object.should == "1 0 obj\n<< /Length 5\n>>\nstream\nHello\nendstream\nendobj\n"
+  end
 
-    assert cref.stream.size < ref.stream.size, 
-      "compressed stream expected to be smaller than source but wasn't"
-    cref.data[:Filter].should == :FlateDecode
+  it "should append data to stream when #<< is used" do
+     ref = PDF::Core::Reference(1, {})
+     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 copy the data and stream from another ref on #replace" do
-    from = Prawn::Core::Reference(3, {:foo => 'bar'})
+    from = PDF::Core::Reference(3, {:foo => 'bar'})
     from << "has a stream too"
 
-    to = Prawn::Core::Reference(4, {:foo => 'baz'})
+    to = PDF::Core::Reference(4, {:foo => 'baz'})
     to.replace from
 
     # should preserve identifier but copy data and stream
@@ -54,23 +47,23 @@ describe "A Reference object" do
   end
 
   it "should copy a compressed stream from a compressed ref on #replace" do
-    from = Prawn::Core::Reference(5, {:foo => 'bar'})
+    from = PDF::Core::Reference(5, {:foo => 'bar'})
     from << "has a stream too " * 20
-    from.compress_stream
+    from.stream.compress!
 
-    to = Prawn::Core::Reference(6, {:foo => 'baz'})
+    to = PDF::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
+    to.stream.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 +71,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

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
@@ -58,7 +58,7 @@ describe "Repeaters" do
     repeater(doc, :odd).run(3)
   end
 
-  it "must not try to run a stamp if the page number matches" do
+  it "must not try to run a stamp unless the page number matches" do
     doc = sample_document
 
     doc.expects(:stamp).never
@@ -72,6 +72,20 @@ describe "Repeaters" do
     (1..10).each { |p| repeater(doc, :all, true){:do_nothing}.run(p) }
   end
 
+  it "must try to run a block if the page number matches" do
+    doc = sample_document
+
+    doc.expects(:draw_text).twice
+    (1..10).each { |p| repeater(doc, [1,2], true){doc.draw_text "foo"}.run(p) }
+  end
+
+  it "must not try to run a block unless the page number matches" do
+    doc = sample_document
+
+    doc.expects(:draw_text).never
+    repeater(doc, :odd, true){doc.draw_text "foo"}.run(2)
+  end
+
   it "must treat any block as a closure" do
     doc = sample_document
 
@@ -81,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
@@ -96,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
@@ -136,7 +150,7 @@ describe "Repeaters" do
         text.strings.include?("cap_style: round").should == false
         text.strings.include?("cap_style: butt").should == true
       end
-      
+
     end
 
   end

data/spec/security_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "tempfile"
 
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper") 
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
 describe "Document encryption" do
 
@@ -31,9 +31,9 @@ describe "Document encryption" do
     end
 
   end
-  
+
   describe "Setting permissions" do
-    
+
     def doc_with_permissions(permissions)
       pdf = Prawn::Document.new
 
@@ -66,10 +66,10 @@ describe "Document encryption" do
         should == 0b1111_1111_1111_1111_1111_1111_1101_1111
     end
 
-    it "should raise ArgumentError if invalid option is provided" do
+    it "should raise_error ArgumentError if invalid option is provided" do
       lambda {
         doc_with_permissions(:modify_document => false)
-      }.should.raise(ArgumentError)
+      }.should raise_error(ArgumentError)
     end
 
   end
@@ -89,7 +89,7 @@ describe "Document encryption" do
     end
 
     it "should calculate the correct owner hash" do
-      @pdf.owner_password_hash.unpack("H*").first.should.match(/^61CA855012/i)
+      @pdf.owner_password_hash.unpack("H*").first.should match(/^61CA855012/i)
     end
 
     it "should calculate the correct user hash" do
@@ -106,21 +106,53 @@ describe "Document encryption" do
   describe "EncryptedPdfObject" do
 
     it "should delegate to PdfObject for simple types" do
-      Prawn::Core::EncryptedPdfObject(true, nil, nil, nil).should == "true"
-      Prawn::Core::EncryptedPdfObject(42, nil, nil, nil).should == "42"
+      PDF::Core::EncryptedPdfObject(true, nil, nil, nil).should == "true"
+      PDF::Core::EncryptedPdfObject(42, nil, nil, nil).should == "42"
     end
 
     it "should encrypt strings properly" do
-      Prawn::Core::EncryptedPdfObject("foo", "12345", 123, 0).should == "<4ad6e3>"
+      PDF::Core::EncryptedPdfObject("foo", "12345", 123, 0).should == "<4ad6e3>"
+    end
+
+    it "should encrypt literal strings properly" do
+       PDF::Core::EncryptedPdfObject(PDF::Core::LiteralString.new("foo"), "12345", 123, 0).should == bin_string("(J\xD6\xE3)")
+       PDF::Core::EncryptedPdfObject(PDF::Core::LiteralString.new("lhfbqg3do5u0satu3fjf"), nil, 123, 0).should == bin_string("(\xF1\x8B\\(\b\xBB\xE18S\x130~4*#\\(%\x87\xE7\x8E\\\n)")
+    end
+
+    it "should encrypt time properly" do
+       PDF::Core::EncryptedPdfObject(Time.utc(2050, 04, 26, 10, 17, 10), "12345", 123, 0).should == bin_string("(h\x83\xBE\xDC\xEC\x99\x0F\xD7\\)%\x13\xD4$\xB8\xF0\x16\xB8\x80\xC5\xE91+\xCF)")
     end
 
     it "should properly handle compound types" do
-      Prawn::Core::EncryptedPdfObject({:Bar => "foo"}, "12345", 123, 0).should ==
+      PDF::Core::EncryptedPdfObject({:Bar => "foo"}, "12345", 123, 0).should ==
         "<< /Bar <4ad6e3>\n>>"
-      Prawn::Core::EncryptedPdfObject(["foo", "bar"], "12345", 123, 0).should ==
+      PDF::Core::EncryptedPdfObject(["foo", "bar"], "12345", 123, 0).should ==
         "[<4ad6e3> <4ed8fe>]"
     end
-    
+
+  end
+
+  describe "Reference#encrypted_object" do
+    it "should encrypt references properly" do
+      ref = PDF::Core::Reference(1,["foo"])
+      ref.encrypted_object(nil).should == "1 0 obj\n[<4fca3f>]\nendobj\n"
+    end
+
+    it "should encrypt references with streams properly" do
+      ref = PDF::Core::Reference(1, {})
+      ref << 'foo'
+      result = bin_string("1 0 obj\n<< /Length 3\n>>\nstream\nO\xCA?\nendstream\nendobj\n")
+      ref.encrypted_object(nil).should == result
+    end
+  end
+
+  describe "String#encrypted_object" do
+    it "should encrypt stream properly" do
+      stream = PDF::Core::Stream.new
+      stream << "foo"
+      result = bin_string("stream\nO\xCA?\nendstream\n")
+      stream.encrypted_object(nil, 1, 0).should == result
+    end
   end
 
 end