prawn 0.1.1 → 0.1.2

data/Rakefile

@@ -1,16 +1,18 @@
 require 'rubygems'
 require 'rake'
-require 'spec/rake/spectask'
+require 'rake/testtask'
 require "rake/rdoctask"
 require "rake/gempackagetask"  
 
-PRAWN_VERSION = "0.1.1" 
+PRAWN_VERSION = "0.1.2" 
 
-task :default => [:spec]
-
-desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
+task :default => [:test]
+       
+desc "Run all tests, test-spec and mocha required"
+Rake::TestTask.new do |test|
+  test.libs << "spec"
+  test.test_files = Dir[ "spec/*_spec.rb" ]
+  test.verbose = true
 end
 
 desc "Show library's code statistics"

data/data/images/web-links.dat

@@ -0,0 +1 @@
+x^E�A�1DQ$ !p$DB$D������3�_���,(�d�_ˣ��j�wa����W9$촙w�աɳ�Km��Wg��۹#���M�h��D�#C�_[A���ş�z��r<:�<l�5V�(�L����c�2w?��s3Q���b ��;��O����ݼUD�W�

data/examples/png_types.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+# PNG files come in different flavours - 5 of them. This example embeds
+# one of each type as proof that they all work.
+
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+require "prawn"
+
+images = [
+          ["Type 0", "#{Prawn::BASEDIR}/data/images/web-links.png"],
+          ["Type 2", "#{Prawn::BASEDIR}/data/images/ruport.png"],
+          ["Type 3", "#{Prawn::BASEDIR}/data/images/rails.png"],
+          ["Type 4", "#{Prawn::BASEDIR}/data/images/page_white_text.png"],
+          ["Type 6", "#{Prawn::BASEDIR}/data/images/dice.png"],
+]
+
+Prawn::Document.generate("png_types.pdf", :page_size => "A5") do
+  images.each do |header, file|
+    start_new_page unless header.include?("0")
+    text header
+    image file, :at => [50,450]
+  end
+end

data/lib/prawn.rb

@@ -23,11 +23,12 @@ end
 
 require 'ttf'
 
-module Prawn 
+module Prawn   
   file = __FILE__
   file = File.readlink(file) if File.symlink?(file)
   dir = File.dirname(file)
                           
   # The base source directory for Prawn as installed on the system
-  BASEDIR = File.expand_path(File.join(dir, '..'))    
+  BASEDIR = File.expand_path(File.join(dir, '..'))
+  VERSION = "0.1.2"    
 end

data/lib/prawn/document.rb

@@ -59,6 +59,7 @@ module Prawn
     # <tt>:top_margin</tt>:: Sets the top margin in points [ 0.5 inch]
     # <tt>:bottom_margin</tt>:: Sets the bottom margin in points [0.5 inch]
     # <tt>:skip_page_creation</tt>:: Creates a document without starting the first page [false]
+    # <tt>:compress</tt>:: Compresses content streams before rendering them [false]
     # 
     #                             
     #   # New document, US Letter paper, portrait orientation
@@ -77,9 +78,10 @@ module Prawn
        @pages   = ref(:Type => :Pages, :Count => 0, :Kids => [])  
        @root    = ref(:Type => :Catalog, :Pages => @pages)  
        @page_start_proc = options[:on_page_start]
-       @page_stop_proc  = options[:on_page_end]              
+       @page_stop_proc  = options[:on_page_stop]              
        @page_size   = options[:page_size]   || "LETTER"    
        @page_layout = options[:page_layout] || :portrait
+       @compress = options[:compress] || false
              
        @margins = { :left   => options[:left_margin]   || 36,
                     :right  => options[:right_margin]  || 36,  
@@ -239,6 +241,11 @@ module Prawn
       yield
       fields.each { |f| send("#{f}=", stored[f]) }
     end
+
+    def compression_enabled?
+      @compress
+    end
+
    
     private 
     
@@ -286,6 +293,7 @@ module Prawn
     def finish_page_content     
       @page_stop_proc[self] if @page_stop_proc
       add_content "Q"
+      @page_content.compress_stream if compression_enabled?
       @page_content.data[:Length] = @page_content.stream.size
     end
     

data/lib/prawn/document/text.rb

@@ -37,16 +37,35 @@ module Prawn
       # text will be kerned by default.  You can disable this feature by passing
       # <tt>:kerning => false</tt>.
       #
+      # == Encoding
+      #
       # Note that strings passed to this function should be encoded as UTF-8.
-      # If you get unexpected characters appearing in your rendered 
-      # document, check this.
+      # If you get unexpected characters appearing in your rendered document, 
+      # check this.
+      #
+      # If the current font is a built-in one, although the string must be
+      # encoded as UTF-8, only characters that are available in ISO-8859-1
+      # are allowed.
       #
       # If an empty box is rendered to your PDF instead of the character you 
       # wanted it usually means the current font doesn't include that character.
       #
       def text(text,options={})
+        # ensure a valid font is selected
+        font "Helvetica" unless fonts[@font]
+
+        # we'll be messing with the strings encoding, don't change the users
+        # original string
+        text = text.dup
+
         # check the string is encoded sanely
-        normalize_encoding(text)
+        # - UTF-8 for TTF fonts
+        # - ISO-8859-1 for Built-In fonts
+        if using_builtin_font?
+          normalize_builtin_encoding(text)
+        else
+          normalize_ttf_encoding(text)
+        end
 
         if options.key?(:kerning)
           options[:kerning] = false unless font_metrics.has_kerning_data?
@@ -54,9 +73,6 @@ module Prawn
           options[:kerning] = true if font_metrics.has_kerning_data?
         end
 
-        # ensure a valid font is selected
-        font "Helvetica" unless fonts[@font]
-
         return wrapped_text(text,options) unless options[:at]
         
         x,y = translate(options[:at])
@@ -151,7 +167,8 @@ module Prawn
       alias_method :font_size=, :font_size!
 
       private 
-      
+
+
       # The current font_size being used in the document.
       #
       def current_font_size
@@ -281,11 +298,25 @@ module Prawn
         return basename
       end
 
-      def normalize_encoding(text)
+      # built-in fonts only work with latin encoding, so translate the string
+      def normalize_builtin_encoding(text)
+        if text.respond_to?(:encode!)
+          text.encode!("ISO-8859-1")
+        else
+          require 'iconv'
+          text.replace Iconv.conv('ISO-8859-1', 'utf-8', text)
+        end
+      rescue
+        raise Prawn::Errors::IncompatibleStringEncoding, "When using a " +
+            "builtin font, only characters that exist in " +
+            "WinAnsi/ISO-8859-1 are allowed."
+      end
+
+      def normalize_ttf_encoding(text)
         # TODO: if the current font is a built in one, we can't use the utf-8
         # string provided by the user. We should convert it to WinAnsi or
         # MacRoman or some such.
-        if text.respond_to?(:"encode!")
+        if text.respond_to?(:encode!)
           # if we're running under a M17n aware VM, ensure the string provided is
           # UTF-8 (by converting it if necessary)
           begin
@@ -316,7 +347,7 @@ module Prawn
         fonts[name] ||= ref(:Type => :Font,
                             :Subtype => :Type1,
                             :BaseFont => name.to_sym,
-                            :Encoding => :MacRomanEncoding)
+                            :Encoding => :WinAnsiEncoding)
         return name
       end
 
@@ -341,6 +372,9 @@ module Prawn
         @fonts ||= {}
       end
 
+      def using_builtin_font?
+        fonts[@font].data[:Subtype] == :Type1
+      end
     end
   end
 end

data/lib/prawn/font/metrics.rb

@@ -89,6 +89,8 @@ module Prawn
           Float(bbox[3] - bbox[1]) * font_size / 1000.0
         end        
       
+        # calculates the width of the supplied string.
+        # String *must* be encoded as iso-8859-1
         def string_width(string, font_size, options = {})   
           scale = font_size / 1000.0
           
@@ -101,14 +103,18 @@ module Prawn
               end
             end
           else
-            string.unpack("U*").inject(0) do |s,r|
+            string.unpack("C*").inject(0) do |s,r|
               s + latin_glyphs_table[r]
             end * scale
           end
         end
         
+        # converts a string into an array with spacing offsets
+        # bewteen characters that need to be kerned
+        #
+        # String *must* be encoded as iso-8859-1
         def kern(string) 
-          kerned = string.unpack("U*").inject([]) do |a,r|
+          kerned = string.unpack("C*").inject([]) do |a,r|
             if a.last.is_a? Array
               if kern = latin_kern_pairs_table[[a.last.last, r]]
                 a << kern << [r]
@@ -122,7 +128,8 @@ module Prawn
           end            
           
           kerned.map { |r| 
-            i = r.is_a?(Array) ? r.pack("U*") : r 
+            i = r.is_a?(Array) ? r.pack("C*") : r 
+            i.force_encoding("ISO-8859-1") if i.respond_to?(:force_encoding)
             i.is_a?(Numeric) ? -i : i
           }                        
         end
@@ -178,6 +185,10 @@ module Prawn
           false
         end
 
+        # perform any changes to the string that need to happen
+        # before it is rendered to the canvas
+        #
+        # String *must* be encoded as iso-8859-1
         def convert_text(text, options={})
           options[:kerning] ? kern(text) : text
         end

data/lib/prawn/images.rb

@@ -145,22 +145,12 @@ module Prawn
         raise ArgumentError, 'PNG uses more than 8 bits'
       end
       
-      case png.color_type
-      when 0
-        ncolor = 1
+      case png.pixel_bytes
+      when 1
         color = :DeviceGray
-      when 2
-        ncolor = 3
-        color  = :DeviceRGB
       when 3
-        ncolor = 1
-        color  = :DeviceRGB
-      when 6
-        ncolor = 3
-        color  = :DeviceRGB
-      else
-        raise ArgumentError, "PNG has unsupported color type" 
-      end                                   
+        color = :DeviceRGB
+      end
 
       # build the image dict
       obj = ref(:Type             => :XObject,
@@ -175,7 +165,7 @@ module Prawn
 
       unless png.alpha_channel
         obj.data[:DecodeParms] = {:Predictor => 15,
-                                  :Colors    => ncolor,
+                                  :Colors    => png.pixel_bytes,
                                   :Columns   => png.width}
       end
 

data/lib/prawn/images/png.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# encoding: ASCII-8BIT
 
 # png.rb : Extracts the data from a PNG that is needed for embedding
 #
@@ -84,11 +84,22 @@ module Prawn
         end
 
         # if our img_data contains alpha channel data, split it out
-        unfilter_image_data if @color_type == 6
+        unfilter_image_data if alpha_channel?
+      end
+
+      def pixel_bytes
+        case @color_type
+        when 0, 4    then 1
+        when 1, 2, 6 then 3
+        end
       end
 
       private
 
+      def alpha_channel?
+        @color_type == 4 || @color_type == 6
+      end
+
       def paeth(a, b, c) # left, above, upper left
         p = a + b - c
         pa = (p - a).abs
@@ -104,46 +115,49 @@ module Prawn
         data = Zlib::Inflate.inflate(@img_data).unpack 'C*'
         @img_data = ""
         @alpha_channel = ""
-        scanline_length = 4 * @width + 1 # for filter
+
+        # each pixel has the color bytes, plus a byte of alpha channel
+        pixel_length = pixel_bytes + 1
+        scanline_length = pixel_length * @width + 1 # for filter
         row = 0
         pixels = []
         until data.empty? do
           row_data = data.slice! 0, scanline_length
           filter = row_data.shift
           case filter
-          when 0 then # None
-          when 1 then # Sub
+          when 0 # None
+          when 1 # Sub
             row_data.each_with_index do |byte, index|
-              left = index < 4 ? 0 : row_data[index - 4]
+              left = index < pixel_length ? 0 : row_data[index - pixel_length]
               row_data[index] = (byte + left) % 256
               #p [byte, left, row_data[index]]
             end
-          when 2 then # Up
+          when 2 # Up
             row_data.each_with_index do |byte, index|
-              col = index / 4
-              upper = row == 0 ? 0 : pixels[row-1][col][index % 4]
+              col = index / pixel_length
+              upper = row == 0 ? 0 : pixels[row-1][col][index % pixel_length]
               row_data[index] = (upper + byte) % 256
             end
-          when 3 then # Average
+          when 3  # Average
             row_data.each_with_index do |byte, index|
-              col = index / 4
-              upper = row == 0 ? 0 : pixels[row-1][col][index % 4]
-              left = index < 4 ? 0 : row_data[index - 4]
+              col = index / pixel_length
+              upper = row == 0 ? 0 : pixels[row-1][col][index % pixel_length]
+              left = index < pixel_length ? 0 : row_data[index - pixel_length]
 
               row_data[index] = (byte + ((left + upper)/2).floor) % 256
             end
-          when 4 then # Paeth
+          when 4 # Paeth
             left = upper = upper_left = nil
             row_data.each_with_index do |byte, index|
-              col = index / 4
+              col = index / pixel_length
 
-              left = index < 4 ? 0 : row_data[index - 4]
+              left = index < pixel_length ? 0 : row_data[index - pixel_length]
               if row == 0 then
                 upper = upper_left = 0
               else
-                upper = pixels[row-1][col][index % 4]
+                upper = pixels[row-1][col][index % pixel_length]
                 upper_left = col == 0 ? 0 :
-                  pixels[row-1][col-1][index % 4]
+                  pixels[row-1][col-1][index % pixel_length]
               end
 
               paeth = paeth left, upper, upper_left
@@ -155,7 +169,7 @@ module Prawn
           end
 
           pixels << []
-          row_data.each_slice 4 do |slice|
+          row_data.each_slice pixel_length do |slice|
             pixels.last << slice
           end
           row += 1
@@ -164,8 +178,8 @@ module Prawn
         # convert the pixel data to seperate strings for colours and alpha
         pixels.each do |row|
           row.each do |pixel|
-            @img_data << pixel[0,3].pack("C*")
-            @alpha_channel << pixel[3]
+            @img_data << pixel[0,pixel_bytes].pack("C*")
+            @alpha_channel << pixel.last
           end
         end
 

data/lib/prawn/reference.rb

@@ -6,6 +6,8 @@
 #
 # This is free software. Please see the LICENSE and COPYING files for details.
 
+require 'zlib'
+
 module Prawn  
   
   class Reference #:nodoc:
@@ -17,6 +19,7 @@ module Prawn
       @identifier = id 
       @gen   = 0       
       @data  = data     
+      @compressed = false
     end            
     
     def object 
@@ -29,13 +32,19 @@ module Prawn
     end  
     
     def <<(data)
+      raise 'Cannot add data to a stream that is compressed' if @compressed
       (@stream ||= "") << data  
     end  
     
     def to_s            
       "#{@identifier} #{gen} R"
     end
-      
+
+    def compress_stream
+      @stream = Zlib::Deflate.deflate(@stream)
+      @data[:Filter] = :FlateDecode
+      @compressed = true
+    end
   end         
   
   module_function

data/spec/box_calculation_spec.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

data/spec/document_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,14 +65,38 @@ 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_end => on_end)
+    pdf = Prawn::Document.new(:on_page_stop => on_end)
     pdf.start_new_page
     pdf.start_new_page
     pdf.render
   end
 
+  it "should not compress the page content stream if compression is disabled" do
+
+    pdf = Prawn::Document.new(:compress => false)
+    content_stub = pdf.ref({})
+    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
+    pdf.render
+  end
+
+  it "should compress the page content stream if compression is enabled" do
+
+    pdf = Prawn::Document.new(:compress => true)
+    content_stub = pdf.ref({})
+    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
+    pdf.render
+  end
+
 end                                 
 
 class PageDetails      
@@ -132,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 
@@ -146,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

data/spec/graphics_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

data/spec/images_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
 

data/spec/jpg_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
 

data/spec/metrics_spec.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT          
+# encoding: utf-8
 
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")   
 
@@ -6,23 +6,24 @@ describe "adobe font metrics" do
   
   setup do
     @times = Prawn::Font::Metrics["Times-Roman"]
+    @iconv = Iconv.new('ISO-8859-1', 'utf-8')
   end
   
   it "should calculate string width taking into account accented characters" do
-    @times.string_width("é", 12).should == @times.string_width("e", 12)
+    @times.string_width(@iconv.iconv("é"), 12).should == @times.string_width("e", 12)
   end
   
   it "should calculate string width taking into account kerning pairs" do
-    @times.string_width("To", 12).should == 13.332
-    @times.string_width("To", 12, :kerning => true).should == 12.372
-    @times.string_width("Tö", 12, :kerning => true).should == 12.372
+    @times.string_width(@iconv.iconv("To"), 12).should == 13.332
+    @times.string_width(@iconv.iconv("To"), 12, :kerning => true).should == 12.372
+    @times.string_width(@iconv.iconv("Tö"), 12, :kerning => true).should == 12.372
   end
   
   it "should kern a string" do
-    @times.kern("To").should == ["T", 80, "o"]
-    @times.kern("Télé").should == ["T", 70, "\303\251l\303\251"]
-    @times.kern("Technology").should == ["T", 70, "echnology"]
-    @times.kern("Technology...").should == ["T", 70, "echnology", 65, "..."]
+    @times.kern(@iconv.iconv("To")).should == ["T", 80, "o"]
+    @times.kern(@iconv.iconv("Télé")).should == ["T", 70, @iconv.iconv("élé")]
+    @times.kern(@iconv.iconv("Technology")).should == ["T", 70, "echnology"]
+    @times.kern(@iconv.iconv("Technology...")).should == ["T", 70, "echnology", 65, "..."]
   end
   
 end
@@ -57,4 +58,4 @@ describe "ttf font metrics" do
        "\000\021\000\021\000\021"] 
   end
   
-end
+end

data/spec/pdf_object_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

data/spec/png_spec.rb

@@ -1,35 +1,161 @@
-# encoding: utf-8
+# encoding: ASCII-8BIT
 
 # Spec'ing the PNG class. Not complete yet - still needs to check the
 # contents of palette and transparency to ensure they're correct.
 # Need to find files that have these sections first.
+#
+# see http://www.w3.org/TR/PNG/ for a detailed description of the PNG spec,
+# particuarly Table 11.1 for the different color types
 
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")  
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 
-describe "When reading an RGB PNG file" do
+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"
+    @img_data = File.open(@filename, "rb") { |f| f.read }
+  end
+
+  it "should read the attributes from the header chunk correctly" do
+    png = Prawn::Images::PNG.new(@img_data)
+
+    png.width.should == 21
+    png.height.should == 14
+    png.bits.should == 8
+    png.color_type.should == 0
+    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 == data
+  end
+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"
     @img_data = File.open(@filename, "rb") { |f| f.read }
   end
-   
+
+  it "should read the attributes from the header chunk correctly" do
+    png = Prawn::Images::PNG.new(@img_data)
+
+    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 == data
+  end
+end
+
+# TODO: describe "When reading an indexed color PNG file wiih transparency (color type 3)"
+
+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"
+    @img_data = File.open(@filename, "rb") { |f| f.read }
+  end
+
   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 == 50
+    png.height.should == 64
+    png.bits.should == 8
+    png.color_type.should == 3
+    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)
-  end  
+    png.img_data.should == data
+  end
+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"
+    @img_data = File.open(@filename, "rb") { |f| f.read }
+  end
+
+  it "should read the attributes from the header chunk correctly" do
+    png = Prawn::Images::PNG.new(@img_data)
+
+    png.width.should == 16
+    png.height.should == 16
+    png.bits.should == 8
+    png.color_type.should == 4
+    png.compression_method.should == 0
+    png.filter_method.should == 0
+    png.interlace_method.should == 0
+  end
+
+  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)
+    data = File.open(@data_filename, rb_flag) { |f| f.read }
+    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)
+    data = File.open(@alpha_data_filename, rb_flag) { |f| f.read }
+    png.alpha_channel.should == data
+  end
 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"
+    @img_data = File.open(@filename, "rb") { |f| f.read }       
+  end
+
+  it "should read the attributes from the header chunk correctly" do
+    png = Prawn::Images::PNG.new(@img_data)
+
+    png.width.should == 320
+    png.height.should == 240
+    png.bits.should == 8
+    png.color_type.should == 6
+    png.compression_method.should == 0
+    png.filter_method.should == 0
+    png.interlace_method.should == 0
+  end
+
+  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)
+    data = File.open(@data_filename, rb_flag) { |f| f.read }     
+    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)
+    data = File.open(@alpha_data_filename, rb_flag) { |f| f.read }
+    png.alpha_channel.should == data
+  end
+end

data/spec/reference_spec.rb

@@ -26,4 +26,17 @@ describe "A Reference object" do
                            "\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::Reference(2,{})
+    ref << "Hi There " * 20
+
+    cref = Prawn::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
 end

data/spec/spec_helper.rb

@@ -3,12 +3,19 @@
 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"
 require "pdf/reader"
 
+module Prawn
+  class Document
+    public :ref
+  end
+end
+
 def create_pdf
   @pdf = Prawn::Document.new(:left_margin   => 0,
                              :right_margin  => 0,
@@ -26,4 +33,8 @@ end
 def parse_pdf_object(obj)
   PDF::Reader::Parser.new(
      PDF::Reader::Buffer.new(sio = StringIO.new(obj)), nil).parse_token   
+end    
+
+def rb_flag
+  ruby_18 { "rb" } || ruby_19 { "rb:ASCII-8BIT" }
 end

data/spec/table_spec.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

data/spec/text_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,22 @@ 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
+
+   it "should correctly render a utf-8 string when using a built-in font" do
+     str = "©" # copyright symbol
+     @pdf.text str
+
+     # grab the text from the rendered PDF and ensure it matches
+     text = observer(TextObserver)
+     text.string.should == str
    end
 
    if "spec".respond_to?(:encode!)
@@ -168,22 +177,23 @@ 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)
+       @pdf.font("#{Prawn::BASEDIR}/data/fonts/gkai00mp.ttf")
+       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
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: prawn
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2008-08-08 00:00:00 -04:00
+  version: 0.1.2
+date: 2008-08-11 00:00:00 -04:00
 summary: A fast and nimble PDF generator for Ruby
 require_paths: 
 - lib
@@ -47,6 +47,7 @@ files:
 - examples/multi_page_layout.rb
 - examples/on_page_start.rb
 - examples/page_geometry.rb
+- examples/png_types.rb
 - examples/polygons.rb
 - examples/ruport_formatter.rb
 - examples/ruport_helpers.rb
@@ -144,12 +145,21 @@ files:
 - data/fonts/Times-Roman.afm
 - data/fonts/ZapfDingbats.afm
 - data/images
+- data/images/dice.alpha
+- data/images/dice.dat
 - data/images/dice.png
+- data/images/page_white_text.alpha
+- data/images/page_white_text.dat
+- data/images/page_white_text.png
 - data/images/pigs.jpg
+- data/images/rails.dat
+- data/images/rails.png
 - data/images/ruport.png
 - data/images/ruport_data.dat
 - data/images/ruport_transparent.png
 - data/images/stef.jpg
+- data/images/web-links.dat
+- data/images/web-links.png
 - data/shift_jis_text.txt
 - Rakefile
 - README