prawn 0.1.2 → 0.2.0

data/spec/graphics_spec.rb

@@ -1,24 +1,7 @@
 # encoding: utf-8
 
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")  
-
-class LineDrawingObserver
-  attr_accessor :points, :strokes
-
-  def initialize
-    @points = [] 
-  end  
-
-  def append_line(*params)
-    @points << params
-  end    
-             
-  def begin_new_subpath(*params)
-    @points << params
-  end
   
-end                    
-           
 describe "When drawing a line" do
    
   before(:each) { create_pdf }
@@ -26,35 +9,48 @@ describe "When drawing a line" do
   it "should draw a line from (100,600) to (100,500)" do
     @pdf.line([100,600],[100,500])
     
-    line_drawing = observer(LineDrawingObserver)
+    line_drawing = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
     
     line_drawing.points.should == [[100,600],[100,500]]       
   end  
   
-  it "should draw two lines (100,600) to (100,500) and stroke each line" +
+  it "should draw two lines at (100,600) to (100,500) " +
      "and (75,100) to (50,125)" do 
     @pdf.line(100,600,100,500) 
     @pdf.line(75,100,50,125)
     
-    line_drawing = observer(LineDrawingObserver)
+    line_drawing = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
     
     line_drawing.points.should == 
       [[100.0, 600.0], [100.0, 500.0], [75.0, 100.0], [50.0, 125.0]]
   end
+
+  it "should properly set line width via line_width=" do
+     @pdf.line_width = 10
+     line = PDF::Inspector::Graphics::Line.analyze(@pdf.render) 
+     line.widths.first.should == 10 
+  end  
+  
+  it "should properly set line width via line_width(width)" do
+     @pdf.line_width(10)
+     line = PDF::Inspector::Graphics::Line.analyze(@pdf.render) 
+     line.widths.first.should == 10 
+  end 
   
-  class LineWidthReader 
-    attr_accessor :width
-    def set_line_width(params)
-      @width = params
+  describe "(Horizontally)" do  
+   
+    before :each do
+      @pdf = Prawn::Document.new
+      @pdf.horizontal_line(100,150)
+      @line = PDF::Inspector::Graphics::Line.analyze(@pdf.render)
     end
+   
+    it "should draw from [x1,pdf.y],[x2,pdf.y]" do
+      @line.points.should == [[100.0 + @pdf.bounds.absolute_left, @pdf.y],
+                              [150.0 + @pdf.bounds.absolute_left, @pdf.y]]
+    end      
+    
   end
-  
-  it "should properly set line width" do
-     create_pdf
-     @pdf.line_width = 10
-     line = observer(LineWidthReader)
-     line.width.should == 10 
-  end   
         
 end                            
 
@@ -65,23 +61,12 @@ describe "When drawing a polygon" do
   it "should draw each line passed to polygon()" do
     @pdf.polygon([100,500],[100,400],[200,400])
 
-    line_drawing = observer(LineDrawingObserver)
+    line_drawing = PDF::Inspector::Graphics::Line.analyze(@pdf.render) 
     line_drawing.points.should == [[100,500],[100,400],[200,400],[100,500]]
   end
 
 end                                
 
-class RectangleDrawingObserver
-  
-  attr_reader :point, :width, :height
-  
-  def append_rectangle(*params) 
-    @point  = params[0..1]    
-    @width  = params[2]
-    @height = params[3]      
-  end
-end
-
 describe "When drawing a rectangle" do
 
   before(:each) { create_pdf }
@@ -89,33 +74,16 @@ describe "When drawing a rectangle" do
   it "should use a point, width, and height for coords" do
     @pdf.rectangle [200,200], 50, 100
 
-    rectangle = observer(RectangleDrawingObserver)
+    rectangles = PDF::Inspector::Graphics::Rectangle.
+      analyze(@pdf.render).rectangles
     # PDF uses bottom left corner
-    rectangle.point.should  == [200,100]
-    rectangle.width.should  == 50
-    rectangle.height.should == 100
+    rectangles[0][:point].should  == [200,100]
+    rectangles[0][:width].should  == 50
+    rectangles[0][:height].should == 100
 
   end
 
-end
-
-class CurveObserver
-     
-  attr_reader :coords
-  
-  def initialize
-    @coords = []          
-  end   
-  
-  def begin_new_subpath(*params)   
-    @coords += params
-  end
-  
-  def append_curved_segment(*params)
-    @coords += params
-  end           
-  
-end   
+end  
 
 describe "When drawing a curve" do  
     
@@ -124,13 +92,13 @@ describe "When drawing a curve" do
   it "should draw a bezier curve from 50,50 to 100,100" do
     @pdf.move_to  [50,50]
     @pdf.curve_to [100,100],:bounds => [[20,90], [90,70]]
-    curve = observer(CurveObserver) 
+    curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)
     curve.coords.should == [50.0, 50.0, 20.0, 90.0, 90.0, 70.0, 100.0, 100.0] 
   end                             
   
   it "should draw a bezier curve from 100,100 to 50,50" do
     @pdf.curve [100,100], [50,50], :bounds => [[20,90], [90,75]] 
-    curve = observer(CurveObserver)
+    curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)  
     curve.coords.should == [100.0, 100.0, 20.0, 90.0, 90.0, 75.0, 50.0, 50.0] 
   end
   
@@ -140,21 +108,21 @@ describe "When drawing an ellipse" do
   before(:each) do 
     create_pdf
     @pdf.ellipse_at [100,100], 25, 50
-    @curve = observer(CurveObserver) 
+    @curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)  
   end       
   
   it "should move the pointer to the center of the ellipse after drawing" do
     @curve.coords[-2..-1].should == [100,100]
   end 
   
-end  
+end    
 
 describe "When drawing a circle" do
   before(:each) do 
     create_pdf
     @pdf.circle_at [100,100], :radius => 25 
     @pdf.ellipse_at [100,100], 25, 25
-    @curve = observer(CurveObserver) 
+    @curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)        
   end       
   
   it "should stroke the same path as the equivalent ellipse" do 
@@ -163,66 +131,45 @@ describe "When drawing a circle" do
   end
 end    
 
-class ColorObserver 
-  attr_reader :stroke_color, :fill_color, :stroke_color_count, 
-              :fill_color_count
-                            
-  def initialize
-    @stroke_color_count = 0
-    @fill_color_count   = 0
-  end
-
-  def set_rgb_color_for_stroking(*params)    
-    @stroke_color_count += 1
-    @stroke_color = params
-  end
-
-  def set_rgb_color_for_nonstroking(*params) 
-    @fill_color_count += 1
-    @fill_color = params
-  end
-end
-
 describe "When setting colors" do
 
   before(:each) { create_pdf }
 
   it "should set stroke colors" do
     @pdf.stroke_color "ffcccc"
-    colors = observer(ColorObserver)
+    colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
     # 100% red, 80% green, 80% blue
     colors.stroke_color.should == [1.0, 0.8, 0.8]
   end
 
   it "should set fill colors" do
     @pdf.fill_color "ccff00"
-    colors = observer(ColorObserver)
+    colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render) 
     # 80% red, 100% green, 0% blue
     colors.fill_color.should == [0.8,1.0,0]
   end   
   
   it "should reset the colors on each new page if they have been defined" do
     @pdf.fill_color "ccff00"
-    colors = observer(ColorObserver)
+    colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render) 
     
     colors.fill_color_count.should == 2   
     colors.stroke_color_count.should == 1
     @pdf.start_new_page                
     @pdf.stroke_color "ff00cc"  
     
-    colors = observer(ColorObserver)
+    colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render) 
     colors.fill_color_count.should == 3  
     colors.stroke_color_count.should == 3
     
     @pdf.start_new_page
-    colors = observer(ColorObserver)
+    colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render) 
     colors.fill_color_count.should == 4
     colors.stroke_color_count.should == 4
     
     colors.fill_color.should   == [0.8,1.0,0.0]
     colors.stroke_color.should == [1.0,0.0,0.8] 
-  end
-    
+  end    
 
 end
 
@@ -247,4 +194,4 @@ describe "When using painting shortcuts" do
     lambda { @pdf.i_have_a_pretty_girlfriend_named_jia }.
       should.raise(NoMethodError) 
   end
-end
+end

data/spec/images_spec.rb

@@ -2,23 +2,6 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")  
 
-class ImageObserver
-
-  attr_accessor :page_xobjects
-
-  def initialize
-    @page_xobjects = []
-  end
-
-  def resource_xobject(*params)
-    @page_xobjects.last << params.first
-  end
-
-  def begin_page(*params)
-    @page_xobjects << [] 
-  end
-end
-
 describe "the image() function" do
 
   before(:each) do
@@ -29,14 +12,14 @@ describe "the image() function" do
   it "should only embed an image once, even if it's added multiple times" do
     @pdf.image @filename, :at => [100,100]
     @pdf.image @filename, :at => [300,300]
-
-    images = observer(ImageObserver)
-
+           
+    output = @pdf.render
+    images = PDF::Inspector::XObject.analyze(output)
     # there should be 2 images in the page resources
     images.page_xobjects.first.size.should == 2
 
     # but only 1 image xobject
-    @output.scan(/\/Type \/XObject/).size.should == 1
+    output.scan(/\/Type \/XObject/).size.should == 1
   end  
 end
 

data/spec/pdf_object_spec.rb

@@ -21,23 +21,23 @@ describe "PDF Object Serialization" do
   
   it "should convert a Ruby string to PDF string when inside a content stream" do       
     s = "I can has a string"
-    parse_pdf_object(Prawn::PdfObject(s, true)).should == s
+    PDF::Inspector.parse(Prawn::PdfObject(s, true)).should == s
   end                      
 
   it "should convert a Ruby string to a UTF-16 PDF string when outside a content stream" do       
     s = "I can has a string"
     s_utf16 = "\xFE\xFF" + s.unpack("U*").pack("n*")
-    parse_pdf_object(Prawn::PdfObject(s, false)).should == s_utf16
+    PDF::Inspector.parse(Prawn::PdfObject(s, false)).should == s_utf16
   end                      
   
   it "should escape parens when converting from Ruby string to PDF" do
     s =  'I )(can has a string'      
-    parse_pdf_object(Prawn::PdfObject(s, true)).should == s
+    PDF::Inspector.parse(Prawn::PdfObject(s, true)).should == s
   end               
   
   it "should handle ruby escaped parens when converting to PDF string" do
     s = 'I can \\)( has string'
-    parse_pdf_object(Prawn::PdfObject(s, true)).should == s  
+    PDF::Inspector.parse(Prawn::PdfObject(s, true)).should == s  
   end      
   
   it "should convert a Ruby symbol to PDF name" do
@@ -53,13 +53,13 @@ describe "PDF Object Serialization" do
   
   it "should convert a Ruby array to PDF Array when inside a content stream" do
     Prawn::PdfObject([1,2,3]).should == "[1 2 3]"
-    parse_pdf_object(Prawn::PdfObject([[1,2],:foo,"Bar"], true)).should ==  
+    PDF::Inspector.parse(Prawn::PdfObject([[1,2],:foo,"Bar"], true)).should ==  
       [[1,2],:foo, "Bar"]
   end  
 
   it "should convert a Ruby array to PDF Array when outside a content stream" do
     Prawn::PdfObject([1,2,3]).should == "[1 2 3]"
-    parse_pdf_object(Prawn::PdfObject([[1,2],:foo,"Bar"], false)).should ==  
+    PDF::Inspector.parse(Prawn::PdfObject([[1,2],:foo,"Bar"], false)).should ==  
       [[1,2],:foo, "\xFE\xFF\x00B\x00a\x00r"]
   end  
  
@@ -68,7 +68,7 @@ describe "PDF Object Serialization" do
                               "baz"  => [1,2,3], 
                               :bang => {:a => "what", :b => [:you, :say] }}, true )     
 
-    res = parse_pdf_object(dict)           
+    res = PDF::Inspector.parse(dict)           
 
     res[:foo].should == :bar
     res[:baz].should == [1,2,3]
@@ -81,7 +81,7 @@ describe "PDF Object Serialization" do
                               "baz"  => [1,2,3], 
                               :bang => {:a => "what", :b => [:you, :say] }}, false )
 
-    res = parse_pdf_object(dict)           
+    res = PDF::Inspector.parse(dict)           
 
     res[:foo].should == :bar
     res[:baz].should == [1,2,3]

data/spec/png_spec.rb

@@ -14,7 +14,7 @@ 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 }
+    @img_data = File.read_binary(@filename) 
   end
 
   it "should read the attributes from the header chunk correctly" do
@@ -31,17 +31,34 @@ 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.open(@data_filename, "rb") { |f| f.read }
+    data = File.read_binary(@data_filename)
     png.img_data.should == data
   end
 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"
+    @img_data = File.read_binary(@filename)
+  end
+
+  # In a greyscale type 0 PNG image, the tRNS chunk should contain a single value
+  # that indicates the color that should be interpreted as transparent.
+  #
+  # http://www.w3.org/TR/PNG/#11tRNS
+  it "should read the tRNS chunk correctly" do
+    png = Prawn::Images::PNG.new(@img_data)
+    png.transparency[:grayscale].should == 255
+  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 }
+    @img_data = File.read_binary(@filename)
   end
 
   it "should read the attributes from the header chunk correctly" do
@@ -58,11 +75,29 @@ 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.open(@data_filename, "rb") { |f| f.read }
+    data = File.read_binary(@data_filename)
     png.img_data.should == data
   end
 end
 
+describe "When reading an RGB PNG file with transparency (color type 2)" do
+
+  before(:each) do
+    @filename = "#{Prawn::BASEDIR}/data/images/arrow2.png"
+    @img_data = File.read_binary(@filename)
+  end
+
+  # In a RGB type 2 PNG image, the tRNS chunk should contain a single RGB value
+  # that indicates the color that should be interpreted as transparent. In this
+  # case it's green.
+  #
+  # http://www.w3.org/TR/PNG/#11tRNS
+  it "should read the tRNS chunk correctly" do
+    png = Prawn::Images::PNG.new(@img_data)
+    png.transparency[:rgb].should == [0, 255, 0]
+  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
@@ -70,7 +105,7 @@ 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 }
+    @img_data = File.read_binary(@filename) 
   end
 
   it "should read the attributes from the header chunk correctly" do
@@ -87,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.open(@data_filename, "rb") { |f| f.read }
+    data = File.read_binary(@data_filename)
     png.img_data.should == data
   end
 end
@@ -98,7 +133,7 @@ describe "When reading a greyscale+alpha PNG file (color type 4)" 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 }
+    @img_data = File.read_binary(@filename)
   end
 
   it "should read the attributes from the header chunk correctly" do
@@ -115,13 +150,13 @@ 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)
-    data = File.open(@data_filename, rb_flag) { |f| f.read }
+    data = File.read_binary(@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)
-    data = File.open(@alpha_data_filename, rb_flag) { |f| f.read }
+    data = File.read_binary(@alpha_data_filename) 
     png.alpha_channel.should == data
   end
 end
@@ -132,7 +167,7 @@ describe "When reading an RGB+alpha PNG file (color type 6)" 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 }       
+    @img_data = File.read_binary(@filename)  
   end
 
   it "should read the attributes from the header chunk correctly" do
@@ -149,13 +184,13 @@ 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)
-    data = File.open(@data_filename, rb_flag) { |f| f.read }     
+    data = File.read_binary(@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)
-    data = File.open(@alpha_data_filename, rb_flag) { |f| f.read }
+    data = File.read_binary(@alpha_data_filename)
     png.alpha_channel.should == data
   end
 end