rubyvis 0.6.1 → 0.7.0

data/spec/javascript_behaviour_spec.rb

@@ -2,24 +2,24 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe "Javascript compatibility" do
   it "extends Proc with js_apply and js_call" do
     f=lambda {|a,b| a+b}
-    f.should respond_to(:js_apply)
-    f.should respond_to(:js_call)
+    expect(f).to respond_to(:js_apply)
+    expect(f).to respond_to(:js_call)
   end
   it "lambdas should respond correctly to js_call with same numbers of arguments and parameters" do
     o=OpenStruct.new :x=>15
     f=lambda {|m1,m2| "#{m1}-#{m2}-#{self.x}"}
-    f.js_call(o,"a","b").should=="a-b-15"
+    expect(f.js_call(o,"a","b")).to eq("a-b-15")
   end
   it "lambdas should respond correctly to js_call without arguments" do
     o=OpenStruct.new :x=>15    
     f=lambda { self.x.to_s}
-    f.js_call(o).should=="15"    
+    expect(f.js_call(o)).to eq("15")    
   end
   it "lambdas should respond correctly to js_call with different number or arguments" do
     o=OpenStruct.new :x=>15    
     f=lambda {|a,b,c| [a,b,c]}
-    f.js_call(o,1).should==[1,nil,nil]
-    f.js_call(o,1,2,3,4).should==[1,2,3]
+    expect(f.js_call(o,1)).to eq([1,nil,nil])
+    expect(f.js_call(o,1,2,3,4)).to eq([1,2,3])
   end
   context "js_call using lambda with variable arguments" do
     before do
@@ -27,37 +27,37 @@ describe "Javascript compatibility" do
       @f=lambda {|a,b,*c| {:a=>a, :b=>b, :c=>c}}
     end
     it "should work without 0 parameters" do
-      @f.js_call(@o).should=={:a=>nil, :b=>nil, :c=>[]}
+      expect(@f.js_call(@o)).to eq({:a=>nil, :b=>nil, :c=>[]})
     end
     it "should work with required parameter and 0 optional" do
-      @f.js_call(@o,1,2).should=={:a=>1, :b=>2, :c=>[]}
+      expect(@f.js_call(@o,1,2)).to eq({:a=>1, :b=>2, :c=>[]})
     end
     it "should work with required and optional parameters" do
-      @f.js_call(@o,1,2,3,4).should=={:a=>1, :b=>2, :c=>[3,4]}
+      expect(@f.js_call(@o,1,2,3,4)).to eq({:a=>1, :b=>2, :c=>[3,4]})
     end
   end
   it "lambdas should respond correctly to js_apply" do
     o=OpenStruct.new :x=>15
     f=lambda {|m1,m2| "#{m1}-#{m2}-#{self.x}"}
-    f.js_apply(o, ["a","b"]).should=="a-b-15"
+    expect(f.js_apply(o, ["a","b"])).to eq("a-b-15")
   end
   it "lambdas should respond correctly to js_apply with empty arguments" do
     o=OpenStruct.new :x=>15
     f=lambda { "#{self.x}"}
-    f.js_apply(o, []).should=="15"
-    f.js_apply(o, [1]).should=="15"
+    expect(f.js_apply(o, [])).to eq("15")
+    expect(f.js_apply(o, [1])).to eq("15")
 
   end
   
   it "lambdas should respond correctly to js_call with fewer parameters" do
     o=OpenStruct.new :x=>15    
     f=lambda {|a,b,c| [a,b,c]}
-    f.js_apply(o,[1]).should==[1,nil,nil]
+    expect(f.js_apply(o,[1])).to eq([1,nil,nil])
   end
   it "lambdas should respond correctly to js_call with more parameters" do
     o=OpenStruct.new :x=>15    
     f=lambda {|a,b,c| [a,b,c]}    
-    f.js_apply(o,[1,2,3,4]).should==[1,2,3]    
+    expect(f.js_apply(o,[1,2,3,4])).to eq([1,2,3])    
   end
   
   

data/spec/label_spec.rb

@@ -3,16 +3,16 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
   it "should have correct properties" do
     props=[:antialias, :bottom, :cursor, :data, :events, :font, :font_family, :font_style, :font_variant, :font_weight, :font_size, :id, :left, :reverse, :right, :text, :text_align, :text_angle, :text_baseline, :text_decoration, :text_margin, :text_shadow, :text_style, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
     
-    Rubyvis::Label.properties.should==props
+    expect(Rubyvis::Label.properties).to eq(props)
   end
   it "should return correct defaults" do
     props=Rubyvis::Bar.defaults._properties
-    props.size.should==2
-    props[0].name.should==:line_width
-    props[0].value.should==1.5
-    props[1].name.should==:fill_style
-    props[1].value.should be_instance_of Proc
-    Rubyvis::Bar.defaults.proto.should be_instance_of Rubyvis::Mark
+    expect(props.size).to eq(2)
+    expect(props[0].name).to eq(:line_width)
+    expect(props[0].value).to eq(1.5)
+    expect(props[1].name).to eq(:fill_style)
+    expect(props[1].value).to be_instance_of Proc
+    expect(Rubyvis::Bar.defaults.proto).to be_instance_of Rubyvis::Mark
     
   end
   context "on a Panel" do 
@@ -30,7 +30,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
       s=@vis.to_svg
       doc=Nokogiri::XML(s)
       #p doc.at_xpath("//xmlns:text")
-      doc.at_xpath("//xmlns:text").attributes['style'].value.should=='font-size:20px'
+      expect(doc.at_xpath("//xmlns:text").attributes['style'].value).to eq('font-size:20px')
     end
     
     it "should bould basic stuff properly " do
@@ -44,7 +44,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
       
       attribs=doc.xpath("//xmlns:text").map {|v|
       [v.attributes['y'].value, v.attributes['transform'].value, v.text] }
-      attribs.should==[["-3","translate(0,100)","1"],["-3","translate(25,100)","2"]]
+      expect(attribs).to eq([["-3","translate(0,100)","1"],["-3","translate(25,100)","2"]])
     end
     
   end  

data/spec/layout_arc_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Layout::Arc do
   include Rubyvis::LayoutSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :canvas, :cursor, :data, :directed, :events, :fill_style, :height, :id, :left, :line_width, :links, :nodes, :orient, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :canvas, :cursor, :data, :directed, :events, :fill_style, :height, :id, :left, :line_width, :links, :nodes, :orient, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Arc.properties.should==props 
   end
   it "should be called using Rubyvis.Layout.Arc" do
-    Rubyvis.Layout.Arc.should eql Rubyvis::Layout::Arc
+    expect(Rubyvis.Layout.Arc).to eql Rubyvis::Layout::Arc
   end  
   describe "rendered" do
     before do
@@ -49,18 +49,18 @@ describe Rubyvis::Layout::Arc do
     
     it "should render correct number of clipaths" do
       
-      @rv_svg.xpath("//xmlns:path").size.should eq @pv_svg.xpath("//path").size
+      expect(@rv_svg.xpath("//xmlns:path").size).to eq @pv_svg.xpath("//path").size
     end
     it "should render equal paths (links)" do
       pv_paths=@pv_svg.xpath("//path")
       @rv_svg.xpath("//xmlns:path").each_with_index {|rv_path,i|
-        rv_path.should have_path_data_close_to pv_paths[i]['d']
+        expect(rv_path).to have_path_data_close_to pv_paths[i]['d']
       }
     end
     it "should render equal dots (nodes)" do
       pv_circles=@pv_svg.xpath("//circle")
       @rv_svg.xpath("//xmlns:circle").each_with_index {|rv_circle,i|
-        rv_circle.should have_same_position pv_circles[i]
+        expect(rv_circle).to have_same_position pv_circles[i]
       }
       
     end

data/spec/layout_cluster_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Layout::Cluster do
   include Rubyvis::LayoutSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style,:group,  :height, :id, :inner_radius, :left, :line_width, :links,  :nodes,   :orient, :outer_radius, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style,:group,  :height, :id, :inner_radius, :left, :line_width, :links,  :nodes,   :orient, :outer_radius, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Cluster.properties.should==props 
   end
   it "should be called using Rubyvis.Layout.Cluster" do
-    Rubyvis.Layout.Cluster.should eql Rubyvis::Layout::Cluster
+    expect(Rubyvis.Layout.Cluster).to eql Rubyvis::Layout::Cluster
   end
   describe "html tests" do
     
@@ -41,13 +41,13 @@ describe Rubyvis::Layout::Cluster do
       @vis.render
       @pv_out=fixture_svg_read("layout_cluster.svg")
       File.open("test.svg","w") {|fp| fp.write(@vis.to_svg)}
-      @vis.to_svg.should have_same_svg_elements(@pv_out)
+      expect(@vis.to_svg).to have_same_svg_elements(@pv_out)
     end
     it "should render correctly 'cluster_left_group_2.html' custom test" do
       @cluster.orient("left").group(2)
       @vis.render
       @pv_out=fixture_svg_read("layout_cluster_left_group_2.svg")
-      @vis.to_svg.should have_same_svg_elements(@pv_out)
+      expect(@vis.to_svg).to have_same_svg_elements(@pv_out)
     end
   end
 end

data/spec/layout_grid_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Layout::Grid do
   include Rubyvis::LayoutSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :canvas, :cols, :cursor, :data, :events, :fill_style, :height,  :id, :left, :line_width, :overflow, :reverse, :right, :rows, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :canvas, :cols, :cursor, :data, :events, :fill_style, :height,  :id, :left, :line_width, :overflow, :reverse, :right, :rows, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Grid.properties.should==props
   end
   it "Rubyvis.Layout.Grid be the same as Rubyvis::Layout::Grid" do
-    Rubyvis.Layout.Grid.should eql Rubyvis::Layout::Grid
+    expect(Rubyvis.Layout.Grid).to eql Rubyvis::Layout::Grid
   end
   it "should render equal to protovis 'layout_grid.html' test" do
    
@@ -30,11 +30,11 @@ describe Rubyvis::Layout::Grid do
       textStyle("rgba(255, 255, 255, .4)").
       font("24px sans");
 
-vis.render();
+    vis.render
     
     
     pv_out=fixture_svg_read("layout_grid.svg")
-    vis.to_svg.should have_same_svg_elements(pv_out)
+    expect(vis.to_svg).to have_same_svg_elements(pv_out)
   end  
   
-end
+end

data/spec/layout_horizon_spec.rb

@@ -3,11 +3,11 @@ describe Rubyvis::Layout::Horizon do
   include Rubyvis::LayoutSpec
   
   it "should have correct properties" do
-    props=[:antialias, :background_style, :bands,  :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :mode, :negative_style, :overflow, :positive_style, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :background_style, :bands,  :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :mode, :negative_style, :overflow, :positive_style, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Horizon.properties.should==props 
   end
   it "should be called using Rubyvis.Layout.Horizon" do
-    Rubyvis.Layout.Horizon.should eql Rubyvis::Layout::Horizon
+    expect(Rubyvis.Layout.Horizon).to eql Rubyvis::Layout::Horizon
   end
   describe "rendered" do
     before do
@@ -46,13 +46,13 @@ describe Rubyvis::Layout::Horizon do
     
     it "should render correct number of clipaths" do
       
-      @rv_svg.xpath("//xmlns:clipPath[@id]").size.should eq @pv_svg.xpath("//clippath[@id]").size
+      expect(@rv_svg.xpath("//xmlns:clipPath[@id]").size).to eq @pv_svg.xpath("//clippath[@id]").size
     end
     it "should render equal paths" do
       pv_paths=@pv_svg.xpath("//path")
       @rv_svg.xpath("//xmlns:path").each_with_index {|rv_path,i|
-        rv_path.should have_path_data_close_to pv_paths[i]['d']
-        rv_path['fill'].should eq pv_paths[i]['fill']
+        expect(rv_path).to have_path_data_close_to pv_paths[i]['d']
+        expect(rv_path['fill']).to eq pv_paths[i]['fill']
       }
     end
   end

data/spec/layout_indent_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Layout::Indent do
   include Rubyvis::LayoutSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :breadth, :canvas, :cursor, :data, :depth, :events, :fill_style, :height, :id, :left, :line_width, :links,  :nodes,  :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :breadth, :canvas, :cursor, :data, :depth, :events, :fill_style, :height, :id, :left, :line_width, :links,  :nodes,  :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Indent.properties.should==props 
   end
   it "should be called using Rubyvis.Layout.Indent" do
-    Rubyvis.Layout.Indent.should eql Rubyvis::Layout::Indent
+    expect(Rubyvis.Layout.Indent).to eql Rubyvis::Layout::Indent
   end  
   describe "rendered" do
     before do
@@ -45,7 +45,7 @@ describe Rubyvis::Layout::Indent do
     it "should render equal nodes (circles)" do
       pv_rects=@pv_svg.xpath("//circle")
       @rv_svg.xpath("//xmlns:circle").each_with_index {|rv_rect,i|
-        rv_rect.should have_same_position pv_rects[i]
+        expect(rv_rect).to have_same_position pv_rects[i]
       }
       
     end

data/spec/layout_matrix_spec.rb

@@ -3,7 +3,7 @@ describe Rubyvis::Layout::Matrix do
   include Rubyvis::LayoutSpec
   
   it "should have correct properties" do
-    props=[:antialias, :bottom, :canvas, :cursor, :data, :directed, :events, :fill_style, :height, :id, :left, :line_width, :links, :nodes, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :canvas, :cursor, :data, :directed, :events, :fill_style, :height, :id, :left, :line_width, :links, :nodes, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Matrix.properties.should==props 
   end
   describe "rendered" do
@@ -19,9 +19,9 @@ describe Rubyvis::Layout::Matrix do
         left(50)
       
       mat=@vis.add(Rubyvis::Layout.Matrix).
-directed(true).
-nodes(net_nodes).links(net_links).
-sort(lambda {|a,b| a.group<=>b.group})
+          directed(true).
+          nodes(net_nodes).links(net_links).
+          sort(lambda {|a,b| a.group<=>b.group})
       
       mat.link.add(pv.Bar).
       fill_style(lambda {|l| l.link_value!=0 ? 
@@ -38,12 +38,12 @@ sort(lambda {|a,b| a.group<=>b.group})
     end
     
     it "should render correct number of rects(links)" do
-      @rv_svg.xpath("//xmlns:rect").size.should eq @pv_svg.xpath("//rect").size
+      expect(@rv_svg.xpath("//xmlns:rect").size).to eq @pv_svg.xpath("//rect").size
     end
     it "should render equal intersections (links)" do
       pv_rects=@pv_svg.xpath("//rect")
       @rv_svg.xpath("//xmlns:rect").each_with_index {|rv_rect,i|
-        rv_rect.should have_same_position pv_rects[i]
+        expect(rv_rect).to have_same_position pv_rects[i]
       }
       
     end

data/spec/layout_pack_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Layout::Pack do
   include Rubyvis::LayoutSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :links,  :nodes,  :order, :overflow, :reverse, :right, :spacing, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :links,  :nodes,  :order, :overflow, :reverse, :right, :spacing, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Pack.properties.should==props 
   end
   describe "rendered" do
@@ -41,7 +41,7 @@ describe Rubyvis::Layout::Pack do
     it "should render equal nodes (circles)" do
       pv_rects=@pv_svg.xpath("//circle")
       @rv_svg.xpath("//xmlns:circle").each_with_index {|rv_rect,i|
-        rv_rect.should have_same_position pv_rects[i]
+        expect(rv_rect).to have_same_position pv_rects[i]
       }
       
     end

data/spec/layout_partition_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Layout::Partition do
   include Rubyvis::LayoutSpec
   it "subclass Fill should have correct properties" do
-    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :inner_radius, :left, :line_width, :links,  :nodes,  :order, :orient, :outer_radius, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
-    Rubyvis::Layout::Partition::Fill.properties.should==props 
+    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :inner_radius, :left, :line_width, :links,  :nodes,  :order, :orient, :outer_radius, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :view_box, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    expect(Rubyvis::Layout::Partition::Fill.properties).to eq(props) 
   end
   it "should be called using Rubyvis.Layout.Partition" do
-    Rubyvis.Layout.Partition.should eql Rubyvis::Layout::Partition
+    expect(Rubyvis.Layout.Partition).to eql Rubyvis::Layout::Partition
   end  
   it "should render correctly 'partition_fill' custom test" do
     color=pv.Colors.category19
@@ -39,7 +39,7 @@ left(10)
     
     @vis.render
     @pv_out=fixture_svg_read("layout_partition_fill.svg")
-    @vis.to_svg.should have_same_svg_elements(@pv_out)
+    expect(@vis.to_svg).to have_same_svg_elements(@pv_out)
     end
   
 end

data/spec/layout_stack_spec.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Layout::Stack do
   include Rubyvis::LayoutSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :layers, :left, :line_width, :offset, :order, :orient, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :layers, :left, :line_width, :offset, :order, :orient, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Stack.properties.should==props
   end
   it "Rubyvis.Dot be the same as Rubyvis::Dot" do
-    Rubyvis.Layout.Stack.should eql Rubyvis::Layout::Stack
+    expect(Rubyvis.Layout.Stack).to eql Rubyvis::Layout::Stack
   end
   describe "html examples" do 
     before do
@@ -40,7 +40,7 @@ describe Rubyvis::Layout::Stack do
       offset("expand")
       @vis.render()
       pv_out=fixture_svg_read("stack_expand.svg")
-      @vis.to_svg.should have_same_svg_elements(pv_out)
+      expect(@vis.to_svg).to have_same_svg_elements(pv_out)
     end
     it "should render 'stack-silohouette.html' example correctly" do
       y=@y
@@ -50,7 +50,7 @@ describe Rubyvis::Layout::Stack do
     
       @vis.render()
       pv_out=fixture_svg_read("stack_silohouette.svg")
-      @vis.to_svg.should have_same_svg_elements(pv_out)
+      expect(@vis.to_svg).to have_same_svg_elements(pv_out)
     end
     it "should render 'stack-wiggle.html' example correctly" do
       y=@y
@@ -60,7 +60,7 @@ describe Rubyvis::Layout::Stack do
     
       @vis.render()
       pv_out=fixture_svg_read("stack_wiggle.svg")
-      @vis.to_svg.should have_same_svg_elements(pv_out)
+      expect(@vis.to_svg).to have_same_svg_elements(pv_out)
     end
     
   end
@@ -90,13 +90,13 @@ describe Rubyvis::Layout::Stack do
         # <svg font-size="10px" font-family="sans-serif" fill="none" stroke="none" stroke-width="1.5" width="200" height="200"><g><g><g><path d="M0,180L66.66666666666666,140L133.33333333333331,160L133.33333333333331,200L66.66666666666666,200L0,200Z" fill="rgb(31,119,180)"/></g><g><path d="M0,140L66.66666666666666,120L133.33333333333331,100L133.33333333333331,160L66.66666666666666,140L0,180Z" fill="rgb(174,199,232)"/></g></g></g></svg>        
       end
       it "should return correct number of areas" do
-        @paths.size.should eq 2
+        expect(@paths.size).to eq 2
       end
       it "should return correct path 1" do
-        @paths[0].should have_path_data_close_to "M0 180L66.66666666666666 140L133.33333333333331 160L133.33333333333331 200L66.66666666666666 200L0 200Z"
+        expect(@paths[0]).to have_path_data_close_to "M0 180L66.66666666666666 140L133.33333333333331 160L133.33333333333331 200L66.66666666666666 200L0 200Z"
       end
       it "should return correct path 2" do
-        @paths[1].should have_path_data_close_to "M0 140L66.66666666666666 120L133.33333333333331 100L133.33333333333331 160L66.66666666666666 140L0 180Z"
+        expect(@paths[1]).to have_path_data_close_to "M0 140L66.66666666666666 120L133.33333333333331 100L133.33333333333331 160L66.66666666666666 140L0 180Z"
       end
     end
     describe "using layers() and values()" do
@@ -114,13 +114,13 @@ describe Rubyvis::Layout::Stack do
         # <svg font-size="10px" font-family="sans-serif" fill="none" stroke="none" stroke-width="1.5" width="200" height="200"><g><g><g><path d="M0,180L66.66666666666666,140L133.33333333333331,160L133.33333333333331,200L66.66666666666666,200L0,200Z" fill="rgb(31,119,180)"/></g><g><path d="M0,140L66.66666666666666,120L133.33333333333331,100L133.33333333333331,160L66.66666666666666,140L0,180Z" fill="rgb(174,199,232)"/></g></g></g></svg>       
       end
       it "should return correct number of areas" do
-        @paths.size.should eq 2
+        expect(@paths.size).to eq 2
       end
       it "should return correct path 1" do
-        @paths[0].should have_path_data_close_to "M0 180L66.66666666666666 140L133.33333333333331 160L133.33333333333331 200L66.66666666666666 200L0 200Z"
+        expect(@paths[0]).to have_path_data_close_to "M0 180L66.66666666666666 140L133.33333333333331 160L133.33333333333331 200L66.66666666666666 200L0 200Z"
       end
       it "should return correct path 2" do
-        @paths[1].should have_path_data_close_to "M0 140L66.66666666666666 120L133.33333333333331 100L133.33333333333331 160L66.66666666666666 140L0 180Z"
+        expect(@paths[1]).to have_path_data_close_to "M0 140L66.66666666666666 120L133.33333333333331 100L133.33333333333331 160L66.66666666666666 140L0 180Z"
       end
       
     end

data/spec/layout_tree_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Layout::Treemap do
   include Rubyvis::LayoutSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :links, :mode, :nodes, :order, :overflow, :padding_bottom, :padding_left, :padding_right, :padding_top, :reverse, :right, :round, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :links, :mode, :nodes, :order, :overflow, :padding_bottom, :padding_left, :padding_right, :padding_top, :reverse, :right, :round, :stroke_style, :title, :top, :transform, :visible, :view_box, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Layout::Treemap.properties.should==props 
   end
   describe "rendered" do
@@ -36,21 +36,21 @@ describe Rubyvis::Layout::Treemap do
       @tree.orient("top")
       @vis.render
       pv_out=fixture_svg_read("layout_tree_orient_top.svg")
-      @vis.to_svg.should have_same_svg_elements(pv_out)
+      expect(@vis.to_svg).to have_same_svg_elements(pv_out)
     end
     
     it  "should render correctly orient('left')" do
       @tree.orient("left")
       @vis.render
       pv_out=fixture_svg_read("layout_tree_orient_left.svg")
-      @vis.to_svg.should have_same_svg_elements(pv_out)
+      expect(@vis.to_svg).to have_same_svg_elements(pv_out)
     end
     
     it "should render equal to pv with orient('radial') and breadth(20)" do
         @tree.nodes(hier_nodes_big).orient("radial").breadth(20)
         @vis.render
         pv_out=fixture_svg_read("layout_tree_orient_radial_breadth_20.svg")
-        @vis.to_svg.should have_same_svg_elements(pv_out)
+        expect(@vis.to_svg).to have_same_svg_elements(pv_out)
     end
   end
 end