prawn 1.0.0.rc1 → 1.0.0.rc2

data/spec/formatted_text_fragment_spec.rb

@@ -224,13 +224,13 @@ describe "Text::Formatted::Fragment that is a subscript" do
     @fragment.ascender = 17
   end
   describe "#subscript?" do
-    it "should be true" do
-      @fragment.should.be.subscript
+    it "should be_true" do
+      @fragment.should be_subscript
     end
   end
   describe "#y_offset" do
     it "should return a negative value" do
-      @fragment.y_offset.should.be < 0
+      @fragment.y_offset.should be < 0
     end
   end
 end
@@ -252,13 +252,13 @@ describe "Text::Formatted::Fragment that is a superscript" do
     @fragment.ascender = 17
   end
   describe "#superscript?" do
-    it "should be true" do
-      @fragment.should.be.superscript
+    it "should be_true" do
+      @fragment.should be_superscript
     end
   end
   describe "#y_offset" do
     it "should return a positive value" do
-      @fragment.y_offset.should.be > 0
+      @fragment.y_offset.should be > 0
     end
   end
 end

data/spec/graphics_spec.rb

@@ -68,7 +68,7 @@ describe "When drawing a line" do
     end
     it "should require a y coordinate" do
       lambda { @pdf.vertical_line(400,500) }.
-        should.raise(ArgumentError)
+        should raise_error(ArgumentError)
     end
   end
 
@@ -162,6 +162,29 @@ describe "When drawing an ellipse" do
     @pdf.ellipse [100,100], 25, 50
     @curve = PDF::Inspector::Graphics::Curve.analyze(@pdf.render)
   end
+  
+  it "should use a Bézier approximation" do
+    @curve.coords.should == 
+      [125.0, 100.0,
+
+       125.0, 127.614,
+       113.807, 150,
+       100.0, 150.0,
+       
+       86.193, 150.0,
+       75.0, 127.614,
+       75.0, 100.0,
+       
+       75.0, 72.386,
+       86.193, 50.0,
+       100.0, 50.0,
+       
+       113.807, 50.0,
+       125.0, 72.386,
+       125.0, 100.0,
+       
+       100.0, 100.0]
+  end
 
   it "should move the pointer to the center of the ellipse after drawing" do
     @curve.coords[-2..-1].should == [100,100]
@@ -257,37 +280,79 @@ describe "When setting colors" do
   end
 end
 
-describe "Gradients" do
+describe "Patterns" do
   before(:each) { create_pdf }
 
-  it "should create a /Pattern resource" do
-    @pdf.fill_gradient [0, @pdf.bounds.height],
-      @pdf.bounds.width, @pdf.bounds.height, 'FF0000', '0000FF'
+  describe 'linear gradients' do
+    it "should create a /Pattern resource" do
+      @pdf.fill_gradient [0, @pdf.bounds.height],
+        [@pdf.bounds.width, @pdf.bounds.height], 'FF0000', '0000FF'
+
+      grad = PDF::Inspector::Graphics::Pattern.analyze(@pdf.render)
+      pattern = grad.patterns.values.first
+
+      pattern.should_not be_nil
+      pattern[:Shading][:ShadingType].should == 2
+      pattern[:Shading][:Coords].should == [0, 0, @pdf.bounds.width, 0]
+      pattern[:Shading][:Function][:C0].zip([1, 0, 0]).all?{ |x1, x2|
+        (x1-x2).abs < 0.01
+      }.should be_true
+      pattern[:Shading][:Function][:C1].zip([0, 0, 1]).all?{ |x1, x2|
+        (x1-x2).abs < 0.01
+      }.should be_true
+    end
 
-    grad = PDF::Inspector::Graphics::Pattern.analyze(@pdf.render)
-    pattern = grad.patterns[:SP1]
+    it "fill_gradient should set fill color to the pattern" do
+      @pdf.fill_gradient [0, @pdf.bounds.height],
+        [@pdf.bounds.width, @pdf.bounds.height], 'FF0000', '0000FF'
 
-    pattern.should.not.be.nil
-    assert pattern[:Shading][:Function][:C0].zip([1, 0, 0]).
-      all?{ |x1, x2| (x1-x2).abs < 0.01 }
-    assert pattern[:Shading][:Function][:C1].zip([0, 0, 1]).
-      all?{ |x1, x2| (x1-x2).abs < 0.01 }
-  end
+      str = @pdf.render
+      str.should =~ %r{/Pattern\s+cs\s*/SP-?\d+\s+scn}
+    end
 
-  it "fill_gradient should set fill color to the pattern" do
-    @pdf.fill_gradient [0, @pdf.bounds.height],
-      @pdf.bounds.width, @pdf.bounds.height, 'FF0000', '0000FF'
+    it "stroke_gradient should set stroke color to the pattern" do
+      @pdf.stroke_gradient [0, @pdf.bounds.height],
+        [@pdf.bounds.width, @pdf.bounds.height], 'FF0000', '0000FF'
 
-    str = @pdf.render
-    str.should =~ %r{/Pattern\s+cs\s*/SP1\s+scn}
+      str = @pdf.render
+      str.should =~ %r{/Pattern\s+CS\s*/SP-?\d+\s+SCN}
+    end
   end
 
-  it "stroke_gradient should set stroke color to the pattern" do
-    @pdf.stroke_gradient [0, @pdf.bounds.height],
-      @pdf.bounds.width, @pdf.bounds.height, 'FF0000', '0000FF'
+  describe 'radial gradients' do
+    it "should create a /Pattern resource" do
+      @pdf.fill_gradient [0, @pdf.bounds.height], 10,
+        [@pdf.bounds.width, @pdf.bounds.height], 20, 'FF0000', '0000FF'
 
-    str = @pdf.render
-    str.should =~ %r{/Pattern\s+CS\s*/SP1\s+SCN}
+      grad = PDF::Inspector::Graphics::Pattern.analyze(@pdf.render)
+      pattern = grad.patterns.values.first
+
+      pattern.should_not be_nil
+      pattern[:Shading][:ShadingType].should == 3
+      pattern[:Shading][:Coords].should == [0, 0, 10, @pdf.bounds.width, 0, 20]
+      pattern[:Shading][:Function][:C0].zip([1, 0, 0]).all?{ |x1, x2|
+        (x1-x2).abs < 0.01
+      }.should be_true
+      pattern[:Shading][:Function][:C1].zip([0, 0, 1]).all?{ |x1, x2|
+        (x1-x2).abs < 0.01
+      }.should be_true
+    end
+
+    it "fill_gradient should set fill color to the pattern" do
+      @pdf.fill_gradient [0, @pdf.bounds.height], 10,
+        [@pdf.bounds.width, @pdf.bounds.height], 20, 'FF0000', '0000FF'
+
+      str = @pdf.render
+      str.should =~ %r{/Pattern\s+cs\s*/SP-?\d+\s+scn}
+    end
+
+    it "stroke_gradient should set stroke color to the pattern" do
+      @pdf.stroke_gradient [0, @pdf.bounds.height], 10,
+        [@pdf.bounds.width, @pdf.bounds.height], 20, 'FF0000', '0000FF'
+
+      str = @pdf.render
+      str.should =~ %r{/Pattern\s+CS\s*/SP-?\d+\s+SCN}
+    end
   end
 end
 
@@ -310,7 +375,7 @@ describe "When using painting shortcuts" do
 
   it "should not break method_missing" do
     lambda { @pdf.i_have_a_pretty_girlfriend_named_jia }.
-      should.raise(NoMethodError)
+      should raise_error(NoMethodError)
   end
 end
 
@@ -407,11 +472,11 @@ describe "When using graphics states" do
   end
     
   
-  it "should raise error if closing an empty graphic stack" do
-    assert_raise Prawn::Errors::EmptyGraphicStateStack do
+  it "should raise_error error if closing an empty graphic stack" do
+    lambda {
       @pdf.render
       @pdf.restore_graphics_state
-    end
+    }.should raise_error(Prawn::Errors::EmptyGraphicStateStack)
   end
 end
 
@@ -509,10 +574,10 @@ describe "When using transformations shortcuts" do
                                       reduce_precision(@cos), 0, 0]
     end
 
-    it "should raise BlockRequired if no block is given" do
+    it "should raise_error BlockRequired if no block is given" do
       lambda {
         @pdf.rotate(@angle, :origin => [@x, @y])
-      }.should.raise(Prawn::Errors::BlockRequired)
+      }.should raise_error(Prawn::Errors::BlockRequired)
     end
 
     def reduce_precision(float)
@@ -565,10 +630,10 @@ describe "When using transformations shortcuts" do
       matrices.matrices[1].should == [@factor, 0, 0, @factor, 0, 0]
     end
 
-    it "should raise BlockRequired if no block is given" do
+    it "should raise_error BlockRequired if no block is given" do
       lambda {
         @pdf.scale(@factor, :origin => [@x, @y])
-      }.should.raise(Prawn::Errors::BlockRequired)
+      }.should raise_error(Prawn::Errors::BlockRequired)
     end
 
     def reduce_precision(float)

data/spec/grid_spec.rb

@@ -62,8 +62,8 @@ describe "A document's grid" do
       @pdf.grid.show_all('cccccc')
 
       colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
-      colors.fill_color.should.not   == [0.8,0.8,0.8]
-      colors.stroke_color.should.not == [0.8,0.8,0.8]
+      colors.fill_color.should_not   == [0.8,0.8,0.8]
+      colors.stroke_color.should_not == [0.8,0.8,0.8]
       
       # Hardcoded default color as I haven't been able to come up with a stable converter
       # between fill_color without lots code.

data/spec/images_spec.rb

@@ -7,7 +7,7 @@ require 'pathname'
 describe "the image() function" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/pigs.jpg" 
+    @filename = "#{Prawn::DATADIR}/images/pigs.jpg" 
     create_pdf
   end
 
@@ -26,7 +26,7 @@ describe "the image() function" do
   it "should return the image info object" do
     info =  @pdf.image(@filename)
     
-    info.should.be.kind_of(Prawn::Images::JPG)
+    info.should be_a_kind_of(Prawn::Images::JPG)
     
     info.height.should == 453
   end
@@ -38,23 +38,31 @@ describe "the image() function" do
     info.height.should == 453
   end
 
+  it "rewinds IO objects to be able to embed them multiply" do
+    file = File.open(@filename, "rb")
+
+    @pdf.image(file)
+    info = @pdf.image(file)
+    info.height.should == 453
+  end
+
   it "should accept Pathname objects" do
     info = @pdf.image(Pathname.new(@filename))
     info.height.should == 453
   end
 
-  it "should raise an UnsupportedImageType if passed a BMP" do
-    filename = "#{Prawn::BASEDIR}/data/images/tru256.bmp"
-    lambda { @pdf.image filename, :at => [100,100] }.should.raise(Prawn::Errors::UnsupportedImageType)
+  it "should raise_error an UnsupportedImageType if passed a BMP" do
+    filename = "#{Prawn::DATADIR}/images/tru256.bmp"
+    lambda { @pdf.image filename, :at => [100,100] }.should raise_error(Prawn::Errors::UnsupportedImageType)
   end
 
-  it "should raise an UnsupportedImageType if passed an interlaced PNG" do
-    filename = "#{Prawn::BASEDIR}/data/images/dice_interlaced.png"
-    lambda { @pdf.image filename, :at => [100,100] }.should.raise(Prawn::Errors::UnsupportedImageType)
+  it "should raise_error an UnsupportedImageType if passed an interlaced PNG" do
+    filename = "#{Prawn::DATADIR}/images/dice_interlaced.png"
+    lambda { @pdf.image filename, :at => [100,100] }.should raise_error(Prawn::Errors::UnsupportedImageType)
   end
 
   it "should bump PDF version to 1.5 or greater on embedding 16-bit PNGs" do
-    @pdf.image "#{Prawn::BASEDIR}/data/images/16bit.png"
+    @pdf.image "#{Prawn::DATADIR}/images/16bit.png"
     @pdf.state.version.should >= 1.5
   end
 
@@ -63,7 +71,7 @@ describe "the image() function" do
   # or anything. OS X Preview handles those files just fine.
   #
   it "should embed 8-bit alpha channels for 16-bit PNGs" do
-    @pdf.image "#{Prawn::BASEDIR}/data/images/16bit.png"
+    @pdf.image "#{Prawn::DATADIR}/images/16bit.png"
 
     output = @pdf.render
     output.should =~ /\/BitsPerComponent 16/

data/spec/jpg_spec.rb

@@ -9,7 +9,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
 describe "When reading a JPEG file" do
 
   before(:each) do
-    @filename = "#{Prawn::BASEDIR}/data/images/pigs.jpg"
+    @filename = "#{Prawn::DATADIR}/images/pigs.jpg"
     @img_data = File.open(@filename, "rb") { |f| f.read }
   end
    

data/spec/line_wrap_spec.rb

@@ -30,7 +30,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                  :document => @pdf)
     string.should == "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
   end
-  it "should raise CannotFit if a too-small width is given" do
+  it "should raise_error CannotFit if a too-small width is given" do
     array = [{ :text => " hello world, " },
              { :text => "goodbye  ", :style => [:bold] }]
     @arranger.format_array = array
@@ -38,7 +38,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
       @line_wrap.wrap_line(:arranger => @arranger,
                            :width => 1,
                            :document => @pdf)
-    end.should.raise(Prawn::Errors::CannotFit)
+    end.should raise_error(Prawn::Errors::CannotFit)
   end
 
   it "should break on space" do
@@ -51,7 +51,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
   end
 
   it "should break on zero-width space" do
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     array = [{ :text => "hello#{Prawn::Text::ZWSP}world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -61,7 +61,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
   end
 
   it "should not display zero-width space" do
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     array = [{ :text => "hello#{Prawn::Text::ZWSP}world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -116,7 +116,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
     expected.force_encoding("utf-8") if "".respond_to?(:force_encoding)
     string.should == expected
 
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}world"
@@ -137,7 +137,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                   :document => @pdf)
     string.should == "helloworld"
 
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}world"
@@ -166,7 +166,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
                                   :document => @pdf)
     string.should == "hello"
 
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
     enough_width_for_hello_world = 68
 
@@ -205,7 +205,7 @@ describe "Core::Text::Formatted::LineWrap#wrap_line" do
     expected.force_encoding("utf-8") if "".respond_to?(:force_encoding)
     string.should == expected
 
-    @pdf.font("#{Prawn::BASEDIR}/data/fonts/DejaVuSans.ttf")
+    @pdf.font("#{Prawn::DATADIR}/fonts/DejaVuSans.ttf")
     @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
 
     string = "hello#{Prawn::Text::SHY}-"
@@ -273,12 +273,12 @@ describe "Core::Text::Formatted::LineWrap" do
       line = @line_wrap.wrap_line(:arranger => @arranger,
                                  :width => 200,
                                  :document => @pdf)
-      line.should.not.be.empty
+      line.should_not be_empty
     end
     line = @line_wrap.wrap_line(:arranger => @arranger,
                                :width => 200,
                                :document => @pdf)
-    line.should.be.empty
+    line.should be_empty
   end
 end
 
@@ -289,7 +289,7 @@ describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
     @line_wrap = Prawn::Core::Text::Formatted::LineWrap.new
     @one_word_width = 50
   end
-  it "should be false when the last printed line is not the end of the paragraph" do
+  it "should be_false when the last printed line is not the end of the paragraph" do
     array = [{ :text => "hello world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -298,7 +298,7 @@ describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
 
     @line_wrap.paragraph_finished?.should == false
   end
-  it "should be true when the last printed line is the last fragment to print" do
+  it "should be_true when the last printed line is the last fragment to print" do
     array = [{ :text => "hello world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -310,7 +310,7 @@ describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
 
     @line_wrap.paragraph_finished?.should == true
   end
-  it "should be true when a newline exists on the current line" do
+  it "should be_true when a newline exists on the current line" do
     array = [{ :text => "hello\n world" }]
     @arranger.format_array = array
     string = @line_wrap.wrap_line(:arranger => @arranger,
@@ -319,7 +319,7 @@ describe "Core::Text::Formatted::LineWrap#paragraph_finished?" do
 
     @line_wrap.paragraph_finished?.should == true
   end
-  it "should be true when a newline exists in the next fragment" do
+  it "should be_true when a newline exists in the next fragment" do
     array = [{ :text => "hello " },
              { :text => " \n" },
              { :text => "world" }]

data/spec/measurement_units_spec.rb

@@ -4,7 +4,7 @@ require "prawn/measurement_extensions"
 describe "Measurement units" do
   
   it "should convert units to PostScriptPoints" do
-    1.mm.should.be.close(2.834645669, 0.000000001)
+    1.mm.should be_within(0.000000001).of(2.834645669)
     1.mm.should == (72 / 25.4)
     2.mm.should == (2 * 72 / 25.4)
     3.mm.should == 3 * 72 / 25.4
@@ -20,4 +20,4 @@ describe "Measurement units" do
   end
   
 end
-  
+  

data/spec/name_tree_spec.rb

@@ -48,7 +48,7 @@ describe "Name Tree" do
     ref_count = @pdf.object_store.length
     node = Prawn::Core::NameTree::Node.new(@pdf, 3)
     tree_add(node, ["one", 1], ["two", 2], ["three", 3], ["four", 4])
-    @pdf.object_store.length.should.equal ref_count+2
+    @pdf.object_store.length.should == ref_count+2
   end
   
   it "should create a one new reference when subtree is split" do
@@ -58,7 +58,7 @@ describe "Name Tree" do
     ref_count = @pdf.object_store.length # save when root is split
     tree_add(node, ["five", 5], ["six", 6], ["seven", 7])
     tree_dump(node).should == "[[five=5,four=4,one=1],[seven=7,six=6],[three=3,two=2]]"
-    @pdf.object_store.length.should.equal ref_count+1
+    @pdf.object_store.length.should == ref_count+1
   end
 
   it "should keep tree balanced when subtree split cascades to root" do
@@ -78,7 +78,7 @@ describe "Name Tree" do
   it "should emit only :Names key with to_hash if root is only node" do
     node = Prawn::Core::NameTree::Node.new(@pdf, 3)
     tree_add(node, ["one", 1], ["two", 2], ["three", 3])
-    node.to_hash.should.equal(
+    node.to_hash.should ==(
       { :Names => [tree_value("one", 1), tree_value("three", 3), tree_value("two", 2)] }
     )
   end
@@ -86,13 +86,13 @@ describe "Name Tree" do
   it "should emit only :Kids key with to_hash if root has children" do
     node = Prawn::Core::NameTree::Node.new(@pdf, 3)
     tree_add(node, ["one", 1], ["two", 2], ["three", 3], ["four", 4])
-    node.to_hash.should.equal({ :Kids => node.children.map { |child| child.ref } })
+    node.to_hash.should ==({ :Kids => node.children.map { |child| child.ref } })
   end
 
   it "should emit :Limits and :Names keys with to_hash for leaf node" do
     node = Prawn::Core::NameTree::Node.new(@pdf, 3)
     tree_add(node, ["one", 1], ["two", 2], ["three", 3], ["four", 4])
-    node.children.first.to_hash.should.equal(
+    node.children.first.to_hash.should ==(
       { :Limits => %w(four one),
         :Names => [tree_value("four", 4), tree_value("one", 1)] }
     )
@@ -104,7 +104,7 @@ describe "Name Tree" do
     tree_add(node, ["five", 5], ["six", 6], ["seven", 7], ["eight", 8])
     tree_add(node, ["nine", 9], ["ten", 10], ["eleven", 11], ["twelve", 12])
     tree_add(node, ["thirteen", 13], ["fourteen", 14], ["fifteen", 15], ["sixteen", 16])
-    node.children.first.to_hash.should.equal(
+    node.children.first.to_hash.should ==(
       { :Limits => %w(eight one),
         :Kids => node.children.first.children.map { |child| child.ref } }
     )