rubyvis 0.3.6 → 0.4.0

data/spec/spec_helper.rb

@@ -16,6 +16,60 @@ require 'nokogiri'
 
 $PROTOVIS_DIR=File.dirname(__FILE__)+"/../vendor/protovis/src"
 module Rubyvis
+  module GeneralSpec
+    def fixture_svg_read(filename)
+      File.read(File.dirname(__FILE__)+"/fixtures/#{filename}")
+    end
+  end
+  module LayoutSpec
+    include GeneralSpec
+    def waves(n, m) 
+    Rubyvis.range(n).map {|i| 
+      Rubyvis.range(m).map {|j| 
+        x = 20 * j / m.to_f - i / 3.0
+        x > 0 ? 2 * x * Math.exp(-0.5 * x) : 0
+      }
+    }
+    end
+
+    
+    
+    
+    def net_nodes
+      [
+      OpenStruct.new({:node_value=>'A', :group=>1}),
+      OpenStruct.new({:node_value=>'B', :group=>1}),
+      OpenStruct.new({:node_value=>'C', :group=>2}),
+      OpenStruct.new({:node_value=>'D',:group=>2}),
+      OpenStruct.new({:node_value=>'E',:group=>3}),
+      OpenStruct.new({:node_value=>'F',:group=>3})
+      
+      ]
+    end
+    def net_links
+      [
+      OpenStruct.new({:source=>0,:target=>1, :value=>1}),
+      OpenStruct.new({:source=>1,:target=>2, :value=>1}),
+      OpenStruct.new({:source=>2,:target=>3, :value=>1}),
+      OpenStruct.new({:source=>3,:target=>4, :value=>1}),
+      OpenStruct.new({:source=>4,:target=>5, :value=>1}),
+      OpenStruct.new({:source=>1,:target=>0, :value=>1}),
+      OpenStruct.new({:source=>2,:target=>1, :value=>1}),
+      OpenStruct.new({:source=>3,:target=>2, :value=>1}),
+      OpenStruct.new({:source=>4,:target=>3, :value=>1}),
+      OpenStruct.new({:source=>5,:target=>4, :value=>1}),
+      ]
+    end
+    def hier_nodes
+      Rubyvis.dom({:a=>1,:b=>{:ba=>2,:bb=>{:bba=>3}, :bc=>4}, :c=>5}).root("test").nodes
+    end
+    def hier_nodes_big
+      subtree={:a=>1,:b=>2,:c=>3,:d=>4}
+
+      Rubyvis.dom({:a=>subtree,:b=>subtree, :c=>subtree, :d=>subtree,:e=>subtree,:f=>subtree}).root("test").nodes()
+
+    end
+  end
   class JohnsonLoader
     begin
       require 'johnson'
@@ -43,16 +97,115 @@ RSpec::Matchers.define :have_svg_attributes do |exp|
       obs.attributes[k].value.should==v
     }
   end
+  failure_message_for_should do |obs|
+    "\n#{exp} attributes expected, but xml doesn't contains them \n#{obs.to_s}"
+  end
+end
+
+# Include
+# * rect
+# * circle
+# * text
+# Using attributes and content
+Rspec::Matchers.define :have_same_svg_elements do |exp|
+  def equal_float(a,b)
+    a||=0
+    b||=0
+    (a.to_f-b.to_f).abs<0.0001
+  end
+  def equal_string_nil(a,b)
+    a||="none"
+    b||="none"
+    a.to_s==b.to_s
+  end
+  def equal_string(a,b)
+    a.to_s==b.to_s
+  end
+  def path_scan(path)
+    path.scan(/([MmCcZzLlHhVvSsQqTtAa, ])(\d+(?:\.\d+)?)/).map {|v|
+      v[0]="," if v[0]==" "
+      v[1]=v[1].to_f
+      v
+    }
+  end
+  
+  def equal_path(a,b)
+    path_a=path_scan(a)
+    path_b=path_scan(b)
+    correct=true
+    path_a.each_with_index do |v,i|
+      if (v[0]!=path_b[i][0]) or (v[1]-path_b[i][1]).abs>0.001
+        correct=false
+        break
+      end
+      
+    end
+    correct
+  end
+  match do |obs|
+    obs_xml=Nokogiri::XML(obs)
+    exp_xml=Nokogiri::XML(exp)
+    correct=true
+    attrs={
+      "circle"=>{'fill'=>:string_nil, 'fill-opacity'=>:float, 'cx'=>:float,'stroke'=>:string_nil, 'stroke-opacity'=>:string, 'cy'=>:float,'r'=>:float},
+      "rect"=>{"x"=>:float,"y"=>:float,"width"=>:float,"height"=>:float, 'fill'=>:string_nil, 'fill-opacity'=>:float, 'stroke'=>:string_nil, 'stroke-opacity'=>:float},
+      "text"=>{"x"=>:float,"dx"=>:float,"y"=>:float,"dy"=>:float},
+      'path'=>{'d'=>:path, 'fill'=>:string_nil, 'fill-opacity'=>:float, 'stroke'=>:string_nil, 'stroke-opacity'=>:float, 'stroke-width'=>:float}
+    }
+    
+    @error={:type=>"Undefined error"}
+    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
+        @error={:type=>"Different number of #{key} elements",:exp=>exp_elements.size, :obs=>obs_elements.size}
+        correct=false
+        break
+      end
+      exp_elements.each_with_index {|exp_data,i|
+        obs_data=obs_elements[i]
+        
+        if obs_data.nil?
+          @error={:type=>"Missing obs", :exp=>exp_data, :i=>i}
+          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
+          end
+        end
+        if !correct
+          break
+        end
+      }
+    end
+    correct
+  end
+  failure_message_for_should do |obs|
+    "#{@error[:type]}: #{@error[:exp].to_s} expected, but #{@error[:obs]} retrieved, on attr #{@error[:attr]} -> #{@error[:i]} : #{@error[:exp_attr]} <> #{@error[:obs_attr]}"
+  end
+  
 end
 Rspec::Matchers.define :have_same_position do |exp|
   match do |obs|
     correct=true
     attrs={
       "circle"=>['cx','cy','r'],
-      "rect"=>["x","y","width","height"]
+      "rect"=>["x","y","width","height"],
+      "text"=>["x","dx","y","dy","transform"]
     }
     attrs[exp.name].each do |attr|
-      if (obs[attr].to_f -  exp[attr].to_f)>0.0001
+      if (obs[attr].to_f -  exp[attr].to_f).abs>0.0001
         correct=false
         break
       end
@@ -60,6 +213,8 @@ Rspec::Matchers.define :have_same_position do |exp|
     correct
   end
 end
+
+
 RSpec::Matchers.define :have_path_data_close_to do |exp|
   def path_scan(path)
       path.scan(/([MmCcZzLlHhVvSsQqTtAa, ])(\d+(?:\.\d+)?)/).map {|v|
@@ -67,7 +222,7 @@ RSpec::Matchers.define :have_path_data_close_to do |exp|
       v[1]=v[1].to_f
       v
       }
-    end
+  end
   match do |obs|
     correct=true
     obs_array=path_scan(obs.attributes["d"].value)

data/spec/vector_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+describe Rubyvis::Vector do
+  before do
+    @x1,@x2,@y1,@y2=rand(10)+1,rand(10)+1,rand(10)+1,rand(10)+1
+    @v1=Rubyvis::Vector.new(@x1,@y1)
+    @v2=Rubyvis::Vector.new(@x2,@y2)
+  end
+  it "should return the same as Rubyvis.vector" do
+    Rubyvis.vector(@x1,@y1).should== @v1
+  end
+  it "method perp" do
+    @v1.perp.should==Rubyvis::Vector.new(-@y1,@x1)
+  end
+  it "method times" do
+    times=rand(10)+1
+    @v1.times(times).should==Rubyvis::Vector.new(@x1*times,@y1*times)
+  end
+  it "method length" do
+    l=Math.sqrt(@x1*@x1+@y1*@y1)
+    @v1.length.should eq l
+  end
+  it "method norm" do
+    l=@v1.length
+    @v1.norm.should==@v1.times(1/l.to_f)
+  end
+  it "method plus" do
+    @v1.plus(@v2).should==Rubyvis::Vector.new(@x1+@x2,@y1+@y2)
+  end
+  it "method minus" do
+    @v1.minus(@v2).should==Rubyvis::Vector.new(@x1-@x2,@y1-@y2)
+  end
+  it "method dot" do
+    @v1.dot(@v2).should==@x1*@x2+@y1*@y2
+  end
+end
+

data/spec/wedge_spec.rb

@@ -0,0 +1,66 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+describe Rubyvis::Wedge do
+  include Rubyvis::GeneralSpec
+  it "should have correct properties" do
+    props=[:angle, :antialias, :bottom, :cursor, :data, :end_angle, :events, :fill_style,  :id, :inner_radius, :left, :line_width, :outer_radius, :reverse, :right, :start_angle, :stroke_style, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
+    Rubyvis::Wedge.properties.should==props
+  end
+  it "Rubyvis.Wedge be the same as Rubyvis::Wedge" do
+    Rubyvis.Wedge.should eql Rubyvis::Wedge
+  end
+  it "should render equal to protovis 'wedge-anchor.html' test" do
+    
+    data = Rubyvis.range(5).map {|x| x}
+    w = 400
+    h = 400
+    r = w / 2.0
+    t = 30
+    a = Rubyvis::Scale.linear(0, Rubyvis.sum(data)).range(0, 2 * Math::PI);
+
+    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.render();
+    pv_out=fixture_svg_read("wedge_anchor.svg")
+    vis.to_svg.should have_same_svg_elements(pv_out)
+    
+  end
+  it "should render equal to protovis 'wedge-donut.html' test" do
+    data = Rubyvis.range(10).map {|x| (Math.sin(x)).abs}
+    w = 400
+    h = 400
+    r = w / 2.0
+    t = 30
+    a = Rubyvis.Scale.linear(0, Rubyvis.sum(data)).range(0, 2 * Math::PI)
+    
+    @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.render();
+
+    @pv_out=fixture_svg_read("wedge_donut.svg")
+    @vis.to_svg.should have_same_svg_elements(@pv_out)
+  end  
+  
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubyvis
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 6
-  version: 0.3.6
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -36,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-12-28 00:00:00 -03:00
+date: 2011-01-03 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +46,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,7 +59,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -75,7 +72,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -89,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
@@ -104,7 +99,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
         segments: 
         - 2
         - 8
@@ -112,7 +106,7 @@ dependencies:
         version: 2.8.0
   type: :development
   version_requirements: *id005
-description: Ruby port of Protovis[http://vis.stanford.edu/protovis/], a great visualization toolkit
+description: Ruby port of Protovis[http://vis.stanford.edu/protovis/], a Javascript visualization toolkit.
 email: 
 - clbustos_at_gmail.com
 executables: []
@@ -231,25 +225,84 @@ files:
 - lib/rubyvis/scene/svg_wedge.rb
 - lib/rubyvis/sceneelement.rb
 - lib/rubyvis/transform.rb
+- lib/rubyvis/vector.rb
 - spec/anchor_spec.rb
 - spec/area_spec.rb
 - spec/bar_spec.rb
 - spec/color_spec.rb
 - spec/dom_spec.rb
+- spec/dot_spec.rb
+- spec/fixtures/anchor.html
+- spec/fixtures/anchor.svg
+- spec/fixtures/area-segmented.html
+- spec/fixtures/area_interpolation.html
+- spec/fixtures/area_interpolation.svg
+- spec/fixtures/area_segmented.svg
+- spec/fixtures/dot-anchor.html
+- spec/fixtures/dot_anchor.svg
+- spec/fixtures/layers.js
+- spec/fixtures/layout_arc.svg
+- spec/fixtures/layout_cluster.html
+- spec/fixtures/layout_cluster.svg
+- spec/fixtures/layout_cluster_left_group_2.html
+- spec/fixtures/layout_cluster_left_group_2.svg
+- spec/fixtures/layout_grid.html
+- spec/fixtures/layout_grid.svg
+- spec/fixtures/layout_horizon.svg
+- spec/fixtures/layout_indent.html
+- spec/fixtures/layout_indent.svg
+- spec/fixtures/layout_matrix.svg
+- spec/fixtures/layout_pack.html
+- spec/fixtures/layout_pack.svg
+- spec/fixtures/layout_partition_fill.html
+- spec/fixtures/layout_partition_fill.svg
+- spec/fixtures/layout_tree_orient_left.html
+- spec/fixtures/layout_tree_orient_left.svg
+- spec/fixtures/layout_tree_orient_radial_breadth_20.html
+- spec/fixtures/layout_tree_orient_radial_breadth_20.svg
+- spec/fixtures/layout_tree_orient_top.svg
+- spec/fixtures/layout_treemap.svg
+- spec/fixtures/line_interpolation.html
+- spec/fixtures/line_interpolation.svg
+- spec/fixtures/line_interpolation_segmented.html
+- spec/fixtures/line_interpolation_segmented.svg
+- spec/fixtures/protovis-r3.3.js
+- spec/fixtures/rule-anchor.html
+- spec/fixtures/rule_anchor.svg
+- spec/fixtures/stack-expand.html
+- spec/fixtures/stack-silohouette.html
+- spec/fixtures/stack-wiggle.html
+- spec/fixtures/stack_expand.svg
+- spec/fixtures/stack_silohouette.svg
+- spec/fixtures/stack_wiggle.svg
+- spec/fixtures/svgscene.html
+- spec/fixtures/wedge-anchor.html
+- spec/fixtures/wedge-donut.html
+- spec/fixtures/wedge_anchor.svg
+- spec/fixtures/wedge_donut.svg
+- spec/flatten_spec.rb
 - spec/histogram_spec.rb
 - spec/internal_spec.rb
 - spec/javascript_behaviour_spec.rb
 - spec/label_spec.rb
 - spec/layout_arc_spec.rb
+- spec/layout_cluster_spec.rb
+- spec/layout_grid_spec.rb
 - spec/layout_horizon_spec.rb
+- spec/layout_indent_spec.rb
 - spec/layout_matrix_spec.rb
+- spec/layout_pack_spec.rb
+- spec/layout_partition_spec.rb
 - spec/layout_stack_spec.rb
+- spec/layout_tree_spec.rb
+- spec/layout_treemap_spec.rb
 - spec/line_spec.rb
 - spec/mark_spec.rb
 - spec/nest_spec.rb
 - spec/panel_spec.rb
 - spec/readme_spec.rb
 - spec/ruby_api_spec.rb
+- spec/rule_spec.rb
 - spec/scale_linear_datetime_spec.rb
 - spec/scale_linear_spec.rb
 - spec/scale_log_spec.rb
@@ -257,6 +310,8 @@ files:
 - spec/scale_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/vector_spec.rb
+- spec/wedge_spec.rb
 - vendor/protovis/protovis-r3.3.js
 - vendor/protovis/src/behavior/Behavior.js
 - vendor/protovis/src/behavior/Drag.js
@@ -371,7 +426,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -380,7 +434,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -390,6 +443,6 @@ rubyforge_project: rubyvis
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Ruby port of Protovis[http://vis.stanford.edu/protovis/], a great visualization toolkit
+summary: Ruby port of Protovis[http://vis.stanford.edu/protovis/], a Javascript visualization toolkit.
 test_files: []