rubyvis 0.4.0 → 0.4.1

data/spec/dot_spec.rb

@@ -14,16 +14,16 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
     w = 400
     h = 400
     
-    vis = Rubyvis::Panel.new()
-    .width(w)
-    .height(h)
-    .margin(20)
-    .stroke_style("#ccc");
+    vis = Rubyvis::Panel.new().
+      width(w).
+      height(h).
+      margin(20).
+      stroke_style("#ccc");
     
-    dot = vis.add(Rubyvis::Dot)
-    .top(w / 2.0)
-    .left(w / 2.0)
-    .shape_radius(w >> 2)
+    dot = vis.add(Rubyvis::Dot).
+      top(w / 2.0).
+      left(w / 2.0).
+      shape_radius(w >> 2)
     
     dot.anchor("top").add(Rubyvis::Label).text("top");
     dot.anchor("left").add(Rubyvis::Label).text("left");

data/spec/layout_arc_spec.rb

@@ -19,15 +19,15 @@ describe Rubyvis::Layout::Arc do
       
       color=Rubyvis::Colors.category19
       
-      @vis = Rubyvis::Panel.new()
-      .width(w)
-      .height(h)
-      .bottom(50)
-      .left(0)
+      @vis = Rubyvis::Panel.new().
+        width(w).
+        height(h).
+        bottom(50).
+        left(0)
       
-      mat=@vis.add(Rubyvis::Layout::Arc)
-      .nodes(net_nodes).links(net_links)
-      .sort(lambda {|a,b| a.group<=>b.group})
+      mat=@vis.add(Rubyvis::Layout::Arc).
+        nodes(net_nodes).links(net_links).
+        sort(lambda {|a,b| a.group<=>b.group})
       
       mat.link.add(Rubyvis::Line).
       antialias(false).

data/spec/layout_cluster_spec.rb

@@ -15,12 +15,12 @@ describe Rubyvis::Layout::Cluster do
       w=400
       h=400
       
-      @vis = Rubyvis.Panel.new()
-      .width(w)
-      .height(h)
-      .top(20)
-      .bottom(10)
-      .left(10)
+      @vis = Rubyvis.Panel.new().
+        width(w).
+        height(h).
+        top(20).
+        bottom(10).
+        left(10)
       
       @cluster = @vis.add(Rubyvis::Layout::Cluster).
       nodes(hier_nodes_big).
@@ -40,6 +40,7 @@ describe Rubyvis::Layout::Cluster do
     it "should render correctly 'cluster.html' custom test" 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)
     end
     it "should render correctly 'cluster_left_group_2.html' custom test" do

data/spec/layout_grid_spec.rb

@@ -10,25 +10,25 @@ describe Rubyvis::Layout::Grid do
   end
   it "should render equal to protovis 'layout_grid.html' test" do
    
-    vis = pv.Panel.new()
-    .data(["A"])
-    .width(800)
-    .height(800)
-    .margin(10)
-    .fill_style("#eee")
-    .stroke_style("#ccc");
+    vis = pv.Panel.new().
+      data(["A"]).
+      width(800).
+      height(800).
+      margin(10).
+      fill_style("#eee").
+    stroke_style("#ccc");
 
-    vis.add(Rubyvis::Layout::Grid)
-    .rows(3)
-    .cols(3)
-  .cell.add(Rubyvis::Layout::Grid)
-    .rows(Rubyvis.index)
-    .cols(Rubyvis.index)
-  .cell.add(Rubyvis::Bar)
-    .stroke_style("#fff")
-  .anchor("center").add(Rubyvis::Label)
-    .textStyle("rgba(255, 255, 255, .4)")
-    .font("24px sans");
+    vis.add(Rubyvis::Layout::Grid).
+      rows(3).
+      cols(3).
+      cell.add(Rubyvis::Layout::Grid).
+      rows(Rubyvis.index).
+      cols(Rubyvis.index).
+      cell.add(Rubyvis::Bar).
+      stroke_style("#fff").
+    anchor("center").add(Rubyvis::Label).
+      textStyle("rgba(255, 255, 255, .4)").
+      font("24px sans");
 
 vis.render();
     

data/spec/layout_indent_spec.rb

@@ -14,12 +14,12 @@ describe Rubyvis::Layout::Indent do
     w=200
     h=200
     
-    @vis = pv.Panel.new()
-    .width(w)
-    .height(h)
-    .top(20)
-    .bottom(10)
-    .left(10)
+    @vis = pv.Panel.new().
+      width(w).
+      height(h).
+      top(20).
+      bottom(10).
+      left(10)
     
     indent = @vis.add(pv.Layout.Indent).
     nodes(hier_nodes_big).

data/spec/layout_matrix_spec.rb

@@ -12,16 +12,16 @@ describe Rubyvis::Layout::Matrix do
       h = 700
       
       color=Rubyvis::Colors.category19()
-      @vis = Rubyvis::Panel.new()
-        .width(w)
-        .height(h)
-        .top(50)
-        .left(50)
+      @vis = Rubyvis::Panel.new().
+        width(w).
+        height(h).
+        top(50).
+        left(50)
       
-      mat=@vis.add(Rubyvis::Layout.Matrix)
-      .directed(true)
-      .nodes(net_nodes).links(net_links)
-      .sort(lambda {|a,b| a.group<=>b.group})
+      mat=@vis.add(Rubyvis::Layout.Matrix).
+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 ? 

data/spec/layout_pack_spec.rb

@@ -11,12 +11,12 @@ describe Rubyvis::Layout::Pack do
     w=200
     h=200
     
-    @vis = pv.Panel.new()
-    .width(w)
-    .height(h)
-    .top(20)
-    .bottom(10)
-    .left(10)
+    @vis = pv.Panel.new().
+      width(w).
+      height(h).
+      top(20).
+      bottom(10).
+      left(10)
     
     pack = @vis.add(pv.Layout.Pack).
     nodes(hier_nodes_big)

data/spec/layout_partition_spec.rb

@@ -13,12 +13,12 @@ describe Rubyvis::Layout::Partition do
     w=400
     h=400
     
-    @vis = pv.Panel.new()
-    .width(w)
-    .height(h)
-    .top(20)
-    .bottom(10)
-    .left(10)
+    @vis = pv.Panel.new().
+width(w).
+height(h).
+top(20).
+bottom(10).
+left(10)
     
     pack = @vis.add(Rubyvis::Layout::Partition::Fill).
     nodes(hier_nodes_big).

data/spec/layout_stack_spec.rb

@@ -20,19 +20,19 @@ describe Rubyvis::Layout::Stack do
       
       fill=pv.ramp("#ada", "#656").domain(n, 0)
       
-      @vis = Rubyvis::Panel.new()
-      .width(w)
-      .height(@h)
+      @vis = Rubyvis::Panel.new().
+        width(w).
+        height(@h)
       
       dat=waves(n,m)
-      @stack=@vis.add(Rubyvis::Layout::Stack)
-      .layers(dat)
-      .x(lambda {|d| x[self.index]})
-      .y(lambda {|d| d})
+      @stack=@vis.add(Rubyvis::Layout::Stack).
+        layers(dat).
+        x(lambda {|d| x[self.index]}).
+        y(lambda {|d| d})
       
-      @stack.layer.add(Rubyvis::Area)
-      .fill_style(lambda {fill[self.parent.index]})
-      .stroke_style("#797")
+      @stack.layer.add(Rubyvis::Area).
+        fill_style(lambda {fill[self.parent.index]}).
+        stroke_style("#797")
     end
     
     it "should render 'stack-expand.html' example correctly" do

data/spec/layout_tree_spec.rb

@@ -11,12 +11,12 @@ describe Rubyvis::Layout::Treemap do
       w=200
       h=200
       
-      @vis = pv.Panel.new()
-      .width(w)
-      .height(h)
-      .top(20)
-      .bottom(10)
-      .left(10)
+      @vis = pv.Panel.new().
+        width(w).
+        height(h).
+        top(20).
+        bottom(10).
+        left(10)
       
       @tree= @vis.add(pv.Layout.Tree).
       nodes(hier_nodes).breadth(40)

data/spec/layout_treemap_spec.rb

@@ -11,9 +11,9 @@ describe Rubyvis::Layout::Treemap do
     w=200
     h=200
 
-    @vis = pv.Panel.new()
-    .width(w)
-    .height(h)
+    @vis = pv.Panel.new().
+      width(w).
+      height(h)
     
     treemap = @vis.add(pv.Layout.Treemap).
     nodes(hier_nodes).
@@ -34,7 +34,7 @@ describe Rubyvis::Layout::Treemap do
       @pv_out=fixture_svg_read("layout_treemap.svg")
     end
     
-    it "should render equal to protovis version " do
+    it "should render equal to protovis version " do 
       @vis.to_svg.should have_same_svg_elements(@pv_out)
     end
   end

data/spec/line_spec.rb

@@ -28,13 +28,13 @@ describe Rubyvis::Line do
       interpolations=["linear","step-before","step-after","polar","polar-reverse", "basis", "cardinal"]
       
       #/* The root panel. */
-      vis = pv.Panel.new()
-      .width(w)
-      .height(h)
-      .bottom(20)
-      .left(20)
-      .right(10)
-      .top(5)
+      vis = pv.Panel.new().
+width(w).
+height(h).
+bottom(20).
+left(20).
+right(10).
+top(5)
       
       interpolations.each_with_index do |inter,i|
       n=i%2
@@ -78,13 +78,13 @@ describe Rubyvis::Line do
       
       interpolations=["linear","step-before","step-after","polar","polar-reverse", "basis", "cardinal","monotone"]
       #/* The root panel. */
-      vis = pv.Panel.new()
-      .width(w)
-      .height(h)
-      .bottom(20)
-      .left(20)
-      .right(10)
-      .top(5)
+      vis = pv.Panel.new().
+width(w).
+height(h).
+bottom(20).
+left(20).
+right(10).
+top(5)
       
       interpolations.each_with_index do |inter,i|
       n=i%2

data/spec/nest_spec.rb

@@ -34,9 +34,9 @@ describe Rubyvis::Nest do
     Rubyvis::NestedArray.new(:key=>2011, :values=>
       [
         Rubyvis::NestedArray.new(:key=>'London', :values=>
-          [{:year=>2011, :city=>'London',:value=>3}]),
+          [{:year=>2011, :city=>'London',:value=>5}]),
         Rubyvis::NestedArray.new(:key=>'France', :values=>
-          [{:year=>2011, :city=>'France',:value=>4}])
+          [{:year=>2011, :city=>'France',:value=>6}])
       ])
     ]
     

data/spec/rule_spec.rb

@@ -9,22 +9,21 @@ describe Rubyvis::Rule do
     Rubyvis.Rule.should eql Rubyvis::Rule
   end
   it "should render equal to protovis 'rule-anchor.html' test" do
-    vis = Rubyvis::Panel.new()
-    .width(400)
-    .height(300)
+    vis = Rubyvis::Panel.new().
+      width(400).
+      height(300)
     
     
-    bar=vis.add(pv.Bar)
-    .data(["left", "top", "right", "bottom", "center"])
-    .width(300)
-    .height(30)
-    .left(40)
-    .right(40)
-    .top(lambda {self.index*60}).fill_style('red')
+    bar=vis.add(pv.Bar).
+      data(["left", "top", "right", "bottom", "center"]).
+      width(300).
+      height(30).
+      left(40).
+      right(40).
+      top(lambda {self.index*60}).fill_style('red')
     
     rule = bar.add(pv.Rule)
-    rule.anchor(lambda {|d| d}).add(pv.Label)
-    .text(lambda {|d| d})
+    rule.anchor(lambda {|d| d}).add(pv.Label).text(lambda {|d| d})
     
     vis.render();
     pv_out=fixture_svg_read("rule_anchor.svg")

data/spec/spec_helper.rb

@@ -154,8 +154,7 @@ Rspec::Matchers.define :have_same_svg_elements do |exp|
     }
     
     @error={:type=>"Undefined error"}
-    attrs.each_pair do |key,attrs| 
-      
+    attrs.each_pair do |key,attrs|
       exp_elements=exp_xml.xpath("//#{key}")
       obs_elements=obs_xml.xpath("//xmlns:#{key}")
       if exp_elements.size!=obs_elements.size
@@ -163,22 +162,24 @@ Rspec::Matchers.define :have_same_svg_elements do |exp|
         correct=false
         break
       end
+      
       exp_elements.each_with_index {|exp_data,i|
-        obs_data=obs_elements[i]
-        
+        obs_data=obs_elements[i]  
         if obs_data.nil?
           @error={:type=>"Missing obs", :exp=>exp_data, :i=>i}
           correct=false
           break
         end
+        if exp_data.content!=obs_data.content
+          @error={:type=>"Content", :exp=>exp_data, :i=>i, :obs=>obs_data, :exp_attr=>exp_data.content, :obs_attr=>obs_data.content}
+          correct=false
+          break;
+        end
         
-        exp_data.content.should==obs_data.content
         attrs.each do |attr,method|
-          
           eq=send("equal_#{method}",obs_data[attr],exp_data[attr])
           if !eq
             puts "Uneql attr: #{method}->#{attr}"
-
             @error={:type=>"Incorrect data", :exp=>exp_data, :obs=>obs_data, :attr=>attr, :exp_attr=>exp_data[attr], :obs_attr=>obs_data[attr],:i=>i}
             correct=false
             break

data/spec/wedge_spec.rb

@@ -17,18 +17,18 @@ describe Rubyvis::Wedge do
     t = 30
     a = Rubyvis::Scale.linear(0, Rubyvis.sum(data)).range(0, 2 * Math::PI);
 
-    vis = Rubyvis::Panel.new()
-    .width(w)
-    .height(h)
+    vis = Rubyvis::Panel.new().
+width(w).
+height(h)
 
     anchors=["outer","inner","start","center","end"]
     
-    vis.add(Rubyvis::Wedge)
-    .data(data)
-    .outer_radius(r)
-    .angle(a)
-    .anchor(lambda {anchors[self.index]}).add(pv.Label)
-    .text(lambda {anchors[self.index]})
+    vis.add(Rubyvis::Wedge).
+data(data).
+outer_radius(r).
+angle(a).
+anchor(lambda {anchors[self.index]}).add(pv.Label).
+text(lambda {anchors[self.index]})
 
     vis.render();
     pv_out=fixture_svg_read("wedge_anchor.svg")
@@ -43,20 +43,20 @@ describe Rubyvis::Wedge do
     t = 30
     a = Rubyvis.Scale.linear(0, Rubyvis.sum(data)).range(0, 2 * Math::PI)
     
-    @vis = Rubyvis::Panel.new()
-    .width(w)
-    .height(h)
+    @vis = Rubyvis::Panel.new().
+width(w).
+height(h)
     
-    @vis.add(Rubyvis::Wedge)
-    .data(data)
-    .inner_radius(r - t)
-    .outer_radius(r)
-    .angle(a)
-    .title(lambda {|d| d})
-    .anchor("outer").add(Rubyvis::Label)
-    .visible(lambda {|d| d>0.05})
-    .text_margin(t + 5)
-    .text(lambda {|d| "%0.2f" % d})
+    @vis.add(Rubyvis::Wedge).
+data(data).
+inner_radius(r - t).
+outer_radius(r).
+angle(a).
+title(lambda {|d| d}).
+anchor("outer").add(Rubyvis::Label).
+visible(lambda {|d| d>0.05}).
+text_margin(t + 5).
+text(lambda {|d| "%0.2f" % d})
     @vis.render();
 
     @pv_out=fixture_svg_read("wedge_donut.svg")