prawn 0.15.0 → 1.0.0.rc1

data/spec/formatted_text_fragment_spec.rb

@@ -75,7 +75,7 @@ describe "Text::Formatted::Fragment#word_spacing=" do
     @fragment.ascender = 17
     @fragment.word_spacing = 10
   end
-
+  
   it "should account for word_spacing in #width" do
     @fragment.width.should == 110
   end
@@ -122,7 +122,7 @@ describe "Text::Formatted::Fragment" do
     @fragment.descender = 7
     @fragment.ascender = 17
   end
-
+  
   describe "#width" do
     it "should return the width" do
       @fragment.width.should == 100
@@ -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_error(ArgumentError)
+        should.raise(ArgumentError)
     end
   end
 
@@ -121,7 +121,7 @@ describe "When drawing a curve" do
     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
-
+  
 
 end
 
@@ -141,19 +141,19 @@ describe "When drawing a rounded rectangle" do
     line_points.zip(curves).flatten.each_slice(2) {|p| @all_coords << p }
     @all_coords.unshift @original_point
   end
-
+  
   it "should draw a rectangle by connecting lines with rounded bezier curves" do
-    @all_coords.should == [[60.0, 550.0],[90.0, 550.0], [95.523, 550.0], [100.0, 545.523], [100.0, 540.0],
-                           [100.0, 460.0], [100.0, 454.477], [95.523, 450.0], [90.0, 450.0],
-                           [60.0, 450.0], [54.477, 450.0], [50.0, 454.477], [50.0, 460.0],
+    @all_coords.should == [[60.0, 550.0],[90.0, 550.0], [95.523, 550.0], [100.0, 545.523], [100.0, 540.0], 
+                           [100.0, 460.0], [100.0, 454.477], [95.523, 450.0], [90.0, 450.0], 
+                           [60.0, 450.0], [54.477, 450.0], [50.0, 454.477], [50.0, 460.0], 
                            [50.0, 540.0], [50.0, 545.523], [54.477, 550.0], [60.0, 550.0]]
   end
-
+  
   it "should start and end with the same point" do
     @original_point.should == @all_coords.last
   end
-
-
+     
+  
 end
 
 describe "When drawing an ellipse" do
@@ -163,29 +163,6 @@ describe "When drawing an ellipse" do
     @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]
   end
@@ -268,7 +245,7 @@ describe "When setting colors" do
     colors.fill_color.should   == [0.8,1.0,0.0]
     colors.stroke_color.should == [1.0,0.0,0.8]
   end
-
+  
   it "should set the color space when setting colors on new pages to please fussy readers" do
     @pdf.stroke_color "000000"
     @pdf.stroke { @pdf.rectangle([10, 10], 10, 10) }
@@ -280,79 +257,37 @@ describe "When setting colors" do
   end
 end
 
-describe "Patterns" do
+describe "Gradients" do
   before(:each) { create_pdf }
 
-  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
+  it "should create a /Pattern resource" do
+    @pdf.fill_gradient [0, @pdf.bounds.height],
+      @pdf.bounds.width, @pdf.bounds.height, 'FF0000', '0000FF'
 
-    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'
+    grad = PDF::Inspector::Graphics::Pattern.analyze(@pdf.render)
+    pattern = grad.patterns[:SP1]
 
-      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],
-        [@pdf.bounds.width, @pdf.bounds.height], 'FF0000', '0000FF'
-
-      str = @pdf.render
-      str.should =~ %r{/Pattern\s+CS\s*/SP-?\d+\s+SCN}
-    end
+    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
 
-  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'
-
-      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'
+  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'
 
-      str = @pdf.render
-      str.should =~ %r{/Pattern\s+cs\s*/SP-?\d+\s+scn}
-    end
+    str = @pdf.render
+    str.should =~ %r{/Pattern\s+cs\s*/SP1\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'
+  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*/SP-?\d+\s+SCN}
-    end
+    str = @pdf.render
+    str.should =~ %r{/Pattern\s+CS\s*/SP1\s+SCN}
   end
 end
 
@@ -375,86 +310,86 @@ describe "When using painting shortcuts" do
 
   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
 
 describe "When using graphics states" do
   before(:each) { create_pdf }
-
+  
   it "should add the right content on save_graphics_state" do
     @pdf.expects(:add_content).with('q')
-
+    
     @pdf.save_graphics_state
   end
-
+  
   it "should add the right content on restore_graphics_state" do
     @pdf.expects(:add_content).with('Q')
-
+    
     @pdf.restore_graphics_state
   end
-
+  
   it "should save and restore when save_graphics_state is used with a block" do
     state = sequence "state"
     @pdf.expects(:add_content).with('q').in_sequence(state)
     @pdf.expects(:foo).in_sequence(state)
     @pdf.expects(:add_content).with('Q').in_sequence(state)
-
+    
     @pdf.save_graphics_state do
       @pdf.foo
     end
   end
-
+  
   it "should add the previous color space when restoring to a graphic state with different color space" do
     @pdf.stroke_color '000000'
     @pdf.save_graphics_state
     @pdf.stroke_color 0, 0, 0, 0
-    @pdf.restore_graphics_state
+    @pdf.restore_graphics_state 
     @pdf.stroke_color 0, 0, 100, 0
     @pdf.graphic_state.color_space.should == {:stroke=>:DeviceCMYK}
     colors = PDF::Inspector::Graphics::Color.analyze(@pdf.render)
     colors.color_space.should == :DeviceCMYK
     colors.stroke_color_space_count[:DeviceCMYK].should == 2
   end
-
+  
   it "should use the correct dash setting after restoring and starting new page" do
     @pdf.dash 5
     @pdf.save_graphics_state
     @pdf.dash 10
     @pdf.graphic_state.dash[:dash].should == 10
-    @pdf.restore_graphics_state
+    @pdf.restore_graphics_state 
     @pdf.start_new_page
     @pdf.graphic_state.dash[:dash].should == 5
   end
-
+  
   it "the current graphic state should keep track of previous unchanged settings" do
     @pdf.stroke_color '000000'
     @pdf.save_graphics_state
     @pdf.dash 5
     @pdf.save_graphics_state
     @pdf.cap_style :round
-    @pdf.save_graphics_state
+    @pdf.save_graphics_state 
     @pdf.fill_color 0, 0, 100, 0
     @pdf.save_graphics_state
-
-    @pdf.graphic_state.stroke_color.should == "000000"
+    
+    @pdf.graphic_state.stroke_color.should == "000000" 
     @pdf.graphic_state.join_style.should == :miter
-    @pdf.graphic_state.fill_color.should == [0, 0, 100, 0]
-    @pdf.graphic_state.cap_style.should == :round
-    @pdf.graphic_state.color_space.should == {:fill=>:DeviceCMYK, :stroke=>:DeviceRGB}
+    @pdf.graphic_state.fill_color.should == [0, 0, 100, 0] 
+    @pdf.graphic_state.cap_style.should == :round 
+    @pdf.graphic_state.color_space.should == {:fill=>:DeviceCMYK, :stroke=>:DeviceRGB} 
     @pdf.graphic_state.dash.should == {:space=>5, :phase=>0, :dash=>5}
     @pdf.graphic_state.line_width.should == 1
   end
-
-
-
+    
+    
+  
   it "should not add extra graphic space closings when rendering multiple times" do
     @pdf.render
     state = PDF::Inspector::Graphics::State.analyze(@pdf.render)
     state.save_graphics_state_count.should == 1
     state.restore_graphics_state_count.should == 1
   end
-
+  
   it "should add extra graphic state enclosings when content is added on multiple renderings" do
     @pdf.render
     @pdf.text "Adding a bit more content"
@@ -462,7 +397,7 @@ describe "When using graphics states" do
     state.save_graphics_state_count.should == 2
     state.restore_graphics_state_count.should == 2
   end
-
+  
   it "adds extra graphic state enclosings when new settings are applied on multiple renderings" do
     @pdf.render
     @pdf.stroke_color 0, 0, 0, 0
@@ -470,30 +405,12 @@ describe "When using graphics states" do
     state.save_graphics_state_count.should == 2
     state.restore_graphics_state_count.should == 2
   end
-
-
-  it "should raise_error error if closing an empty graphic stack" do
-    lambda {
+    
+  
+  it "should raise error if closing an empty graphic stack" do
+    assert_raise Prawn::Errors::EmptyGraphicStateStack do
       @pdf.render
       @pdf.restore_graphics_state
-    }.should raise_error(PDF::Core::Errors::EmptyGraphicStateStack)
-  end
-
-  it "should copy mutable attributes when passing a previous_state to the initializer" do
-    new_state = PDF::Core::GraphicState.new(@pdf.graphic_state)
-
-    [:color_space, :dash, :fill_color, :stroke_color].each do |attr|
-      new_state.send(attr).should == @pdf.graphic_state.send(attr)
-      new_state.send(attr).should_not equal(@pdf.graphic_state.send(attr))
-    end
-  end
-
-  it "should copy mutable attributes when duping" do
-    new_state = @pdf.graphic_state.dup
-
-    [:color_space, :dash, :fill_color, :stroke_color].each do |attr|
-      new_state.send(attr).should == @pdf.graphic_state.send(attr)
-      new_state.send(attr).should_not equal(@pdf.graphic_state.send(attr))
     end
   end
 end
@@ -503,19 +420,19 @@ describe "When using transformation matrix" do
 
   # Note: The (approximate) number of significant decimal digits of precision in fractional
   # part is 5 (PDF Reference, Third Edition, p. 706)
-
+  
   it "should send the right content on transformation_matrix" do
     @pdf.expects(:add_content).with('1.00000 0.00000 0.12346 -1.00000 5.50000 20.00000 cm')
     @pdf.transformation_matrix 1, 0, 0.123456789, -1.0, 5.5, 20
   end
-
+    
   it "should use fixed digits with very small number" do
     values = Array.new(6, 0.000000000001)
     string = Array.new(6, "0.00000").join " "
     @pdf.expects(:add_content).with("#{string} cm")
     @pdf.transformation_matrix *values
   end
-
+    
   it "should be received by the inspector" do
     @pdf.transformation_matrix 1, 0, 0, -1, 5.5, 20
     matrices = PDF::Inspector::Graphics::Matrix.analyze(@pdf.render)
@@ -526,7 +443,7 @@ describe "When using transformation matrix" do
     values = Array.new(6, 0.000000000001)
     string = Array.new(6, "0.00000").join " "
     process = sequence "process"
-
+    
     @pdf.expects(:save_graphics_state).with().in_sequence(process)
     @pdf.expects(:add_content).with("#{string} cm").in_sequence(process)
     @pdf.expects(:do_something).with().in_sequence(process)
@@ -535,7 +452,7 @@ describe "When using transformation matrix" do
       @pdf.do_something
     end
   end
-
+    
 end
 
 describe "When using transformations shortcuts" do
@@ -592,10 +509,10 @@ describe "When using transformations shortcuts" do
                                       reduce_precision(@cos), 0, 0]
     end
 
-    it "should raise_error BlockRequired if no block is given" do
+    it "should raise BlockRequired if no block is given" do
       lambda {
         @pdf.rotate(@angle, :origin => [@x, @y])
-      }.should raise_error(Prawn::Errors::BlockRequired)
+      }.should.raise(Prawn::Errors::BlockRequired)
     end
 
     def reduce_precision(float)
@@ -648,10 +565,10 @@ describe "When using transformations shortcuts" do
       matrices.matrices[1].should == [@factor, 0, 0, @factor, 0, 0]
     end
 
-    it "should raise_error BlockRequired if no block is given" do
+    it "should raise BlockRequired if no block is given" do
       lambda {
         @pdf.scale(@factor, :origin => [@x, @y])
-      }.should raise_error(Prawn::Errors::BlockRequired)
+      }.should.raise(Prawn::Errors::BlockRequired)
     end
 
     def reduce_precision(float)

data/spec/grid_spec.rb

@@ -1,57 +1,46 @@
 # encoding: utf-8
-require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper")
+require File.join(File.expand_path(File.dirname(__FILE__)), "spec_helper") 
 
 describe "A document's grid" do
   before do
     @pdf = Prawn::Document.new
   end
-
+  
   it "should allow definition of a grid" do
     @pdf.define_grid(:columns => 5, :rows => 8, :gutter => 0.1)
     @pdf.grid.columns.should == 5
     @pdf.grid.rows.should == 8
     @pdf.grid.gutter.should == 0.1
   end
-
-  it "should allow re-definition of a grid" do
-    @pdf.define_grid(:columns => 5, :rows => 8, :gutter => 0.1)
-    @pdf.grid.columns.should == 5
-    @pdf.grid.rows.should == 8
-    @pdf.grid.gutter.should == 0.1
-    @pdf.define_grid(:columns => 3, :rows => 6, :gutter => 0.1)
-    @pdf.grid.columns.should == 3
-    @pdf.grid.rows.should == 6
-    @pdf.grid.gutter.should == 0.1
-  end
-
+  
   describe "when a grid is defined" do
     before do
       @num_columns = 5
       @num_rows = 8
       @gutter = 10.0
       @pdf.define_grid(
-        :columns => @num_columns,
-        :rows => @num_rows,
+        :columns => @num_columns, 
+        :rows => @num_rows, 
         :gutter => @gutter
       )
     end
-
+    
     it "should compute the column width" do
-      (@pdf.grid.column_width * @num_columns.to_f +
+      (@pdf.grid.column_width * @num_columns.to_f + 
         @gutter * (@num_columns - 1).to_f).should == @pdf.bounds.width
     end
-
+    
     it "should compute the row height" do
-      (@pdf.grid.row_height * @num_rows.to_f +
+      (@pdf.grid.row_height * @num_rows.to_f + 
         @gutter * (@num_rows - 1).to_f).should == @pdf.bounds.height
     end
 
     it "should give the edges of a grid box" do
-      grid_width = (@pdf.bounds.width.to_f -
+      grid_width = (@pdf.bounds.width.to_f - 
         (@gutter * (@num_columns - 1).to_f )) / @num_columns.to_f
-      grid_height = (@pdf.bounds.height.to_f -
+      grid_height = (@pdf.bounds.height.to_f - 
         (@gutter * (@num_rows - 1).to_f ))/ @num_rows.to_f
-
+      
       exp_tl_x = (grid_width + @gutter.to_f) * 4.0
       exp_tl_y = @pdf.bounds.height.to_f - (grid_height + @gutter.to_f)
 
@@ -73,9 +62,9 @@ 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.
       #colors.fill_color.should   == [0.0,0.0,0.0]