rubyvis 0.2.2 → 0.3.0

data/lib/rubyvis/mark/dot.rb

@@ -79,7 +79,7 @@ module Rubyvis
     # style is a categorical color. The default shape is "circle" with radius 4.5.
     def self.defaults()
       a=Rubyvis::Colors.category10
-      Dot.new().extend(Mark.defaults).shape("circle"). line_width(1.5). stroke_style(lambda {a.scale(self.parent.index)})
+      Dot.new().mark_extend(Mark.defaults).shape("circle"). line_width(1.5). stroke_style(lambda {a.scale(self.parent.index)})
     end
     # Constructs a new dot anchor with default properties. Dots support five
     # different anchors:<ul>

data/lib/rubyvis/mark/image.rb

@@ -36,7 +36,7 @@ module Rubyvis
     
     # Default properties for images. By default, there is no stroke or fill style.
     def self.defaults
-      Image.new.extend(Bar.defaults).fill_style(nil)
+      Image.new.mark_extend(Bar.defaults).fill_style(nil)
     end
     
     # @TODO: NOT IMPLEMENTED YET

data/lib/rubyvis/mark/label.rb

@@ -101,7 +101,7 @@ module Rubyvis
     end
     # Default properties for labels. See the individual properties for the default values.
     def self.defaults
-      Label.new.extend(Mark.defaults).events('none').text(Rubyvis.identity).font("10px sans-serif" ).text_angle( 0 ).text_style( 'black' ).text_align( 'left' ).text_baseline( 'bottom' ).text_margin(3)
+      Label.new.mark_extend(Mark.defaults).events('none').text(Rubyvis.identity).font("10px sans-serif" ).text_angle( 0 ).text_style( 'black' ).text_align( 'left' ).text_baseline( 'bottom' ).text_margin(3)
     end
   end
 end

data/lib/rubyvis/mark/line.rb

@@ -145,7 +145,7 @@ module Rubyvis
 
     def self.defaults
       a=Rubyvis::Colors.category10()
-      Line.new.extend(Mark.defaults).line_join('miter').line_width(1.5).stroke_style( lambda { a.scale(parent.index)}).interpolate('linear').eccentricity(0).tension(0.7)
+      Line.new.mark_extend(Mark.defaults).line_join('miter').line_width(1.5).stroke_style( lambda { a.scale(parent.index)}).interpolate('linear').eccentricity(0).tension(0.7)
     end
   end
 end

data/lib/rubyvis/mark/panel.rb

@@ -30,7 +30,7 @@ module Rubyvis
     end
 
     def self.defaults
-      Panel.new.extend(Bar.defaults).fill_style(nil).overflow('visible')
+      Panel.new.mark_extend(Bar.defaults).fill_style(nil).overflow('visible')
     end
     def add(type)
       child=type.new

data/lib/rubyvis/mark/rule.rb

@@ -8,7 +8,7 @@ module Rubyvis
     @properties=Mark.properties.dup
     attr_accessor_dsl :width, :height, :line_width, [:stroke_style, lambda {|d| Rubyvis.color(d)}]
     def self.defaults
-      Rule.new.extend(Mark.defaults).line_width(1).stroke_style('black').antialias(false)
+      Rule.new.mark_extend(Mark.defaults).line_width(1).stroke_style('black').antialias(false)
     end
     def type
       'rule'

data/lib/rubyvis/mark/wedge.rb

@@ -13,7 +13,7 @@ module Rubyvis
     
     def self.defaults
       a=Rubyvis.Colors.category20()
-      Wedge.new.extend(Mark.defaults).start_angle(lambda  {s=self.sibling; s ? s.end_angle: -Math::PI.quo(2) } ).inner_radius( 0 ).line_width( 1.5 ).stroke_style( nil ).fill_style( lambda {a.scale(self.index)})
+      Wedge.new.mark_extend(Mark.defaults).start_angle(lambda  {s=self.sibling; s ? s.end_angle: -Math::PI.quo(2) } ).inner_radius( 0 ).line_width( 1.5 ).stroke_style( nil ).fill_style( lambda {a.scale(self.index)})
     end
     def mid_radius
       (inner_radius+outer_radius) / 2.0

data/lib/rubyvis/scene/svg_curve.rb

@@ -258,7 +258,6 @@ module Rubyvis::SvgScene
     d = []
     m = []
     dx = []
-    k = 0
     
     #/* Compute the slopes of the secant lines between successive points. */
     (points.size-1).times {|k|

data/lib/rubyvis/sceneelement.rb

@@ -8,7 +8,7 @@ module Rubyvis
     end
     include Enumerable
     attr_accessor :visible
-    attr_accessor :mark, :type, :child_index, :parent, :parent_index, :target, :defs, :data,  :antialias, :line_width, :fill_style, :overflow, :width, :height, :top, :bottom, :left, :right, :title, :reverse, :stroke_style, :transform, :canvas, :_g, :events, :cursor, :children, :id, :segmented, :interpolate, :tension, :name, :text_baseline, :text_align, :text, :font, :text_angle, :text_style, :text_margin, :text_decoration, :text_shadow, :line_join, :eccentricity, :shape_size, :shape, :shape_angle, :shape_radius, :start_angle, :end_angle, :angle, :inner_radius, :outer_radius, :layers, :orient, :offset, :order,:url, :image_width, :image_height, :image
+    attr_accessor :mark, :type, :child_index, :parent, :parent_index, :target, :defs, :data,  :antialias, :line_width, :fill_style, :overflow, :width, :height, :top, :bottom, :left, :right, :title, :reverse, :stroke_style, :transform, :canvas, :_g, :events, :cursor, :children, :id, :segmented, :interpolate, :tension, :name, :text_baseline, :text_align, :text, :font, :text_angle, :text_style, :text_margin, :text_decoration, :text_shadow, :line_join, :eccentricity, :shape_size, :shape, :shape_angle, :shape_radius, :start_angle, :end_angle, :angle, :inner_radius, :outer_radius, :layers, :orient, :offset, :order,:url, :image_width, :image_height, :image, :_id, :nodes, :round, :links, :padding_left, :padding_right, :padding_top, :padding_bottom, :mode
     
     def []=(v,i)
       if v.is_a? Numeric

data/spec/dom_spec.rb

@@ -0,0 +1,218 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+describe Rubyvis::Dom do
+  it "should map correctly" do
+    map={
+      :a=>{:aa=>1,
+           :ab=>{:aba=>2}
+          },
+      :b=>4,
+      :c=>{:ca=>5}
+    }
+    dom_map=Rubyvis::Dom.new(map)       
+    
+    root=dom_map.root.sort {|a,b| a.node_name.to_s<=>b.node_name.to_s}
+    root.nodes.should be_instance_of Array
+    root.nodes.size.should eq 8
+    ar=root.nodes.map do |n|
+      [n.node_name, n.node_value]
+    end
+    ar.should eq [[nil, nil], [:a, nil], [:aa, 1], [:ab, nil], [:aba, 2], [:b, 4], [:c, nil], [:ca, 5]]
+  end
+  it "should treemap example works right" do
+    flare={:a=>{:aa=>1,:ab=>1,:ac=>1},:b=>{:ba=>1,:bb=>1},:c=>3}
+    dom_map=Rubyvis::Dom.new(flare)
+    nodes = dom_map.root("flare").nodes
+    root = nodes[0]
+    root.visit_after {|nn,i|
+      if nn.first_child
+        nn.size=Rubyvis.sum(nn.child_nodes, lambda {|v| v.size})
+       else
+         nn.size=nn.node_value.to_f
+       end
+    }
+    root.sort(lambda {|a,b| 
+        if a.size!=b.size
+          a.size<=>b.size 
+        else
+          a.node_name.to_s<=>b.node_name.to_s
+        end
+          
+    })
+    ar=[]
+    root.visit_before {|n,i|
+      ar.push [n.node_name, n.size]
+    }
+    ar.should eq [["flare", 8.0], [:b, 2.0], [:ba, 1.0], [:bb, 1.0], [:a, 3.0], [:aa, 1.0], [:ab, 1.0], [:ac, 1.0], [:c, 3.0]]
+  end
+  describe Rubyvis::Dom::Node do
+    before do
+      @n =Rubyvis::Dom::Node.new(:a)
+      @n2=Rubyvis::Dom::Node.new(:b)
+      @n3=Rubyvis::Dom::Node.new(:c)
+      @n4=Rubyvis::Dom::Node.new(:d)
+      @n5=Rubyvis::Dom::Node.new(:e)
+      
+    end
+    subject {@n}
+    it "should have node_value" do 
+      @n.node_value.should eq :a
+    end
+    it  {should respond_to :parent_node}
+    it  {should respond_to :first_child}
+    it  {should respond_to :last_child}
+    it  {should respond_to :previous_sibling}
+    it  {should respond_to :next_sibling}
+    it  {should respond_to :node_name}
+    it  {should respond_to :child_nodes}
+    it "should child_nodes be empty" do
+      @n.child_nodes.size==0
+    end
+    it "method append_child" do
+      @n.append_child(@n2).should eq @n2
+      @n.child_nodes.should eq [@n2]
+      @n2.parent_node.should eq @n
+      @n.first_child.should eq @n2
+      @n.last_child.should eq @n2
+      
+      @n.append_child(@n3)
+      @n.child_nodes.should eq [@n2,@n3]
+      @n3.parent_node.should eq @n
+      @n.first_child.should eq @n2
+      @n.last_child.should eq @n3
+      @n2.previous_sibling.should be_nil
+      @n2.next_sibling.should eq @n3
+      @n3.previous_sibling.should eq @n2
+      @n3.next_sibling.should be_nil
+      
+      @n.append_child(@n4)
+      @n.last_child.should eq @n4
+      @n2.next_sibling.should eq @n3
+      @n3.next_sibling.should eq @n4
+      @n4.next_sibling.should be_nil
+
+      @n4.previous_sibling.should eq @n3
+      @n3.previous_sibling.should eq @n2
+      @n2.previous_sibling.should be_nil
+      
+    end
+    it "method remove_child" do
+      @n.append_child(@n2)
+      @n.append_child(@n3)
+      @n.append_child(@n4)
+      
+      @n.remove_child(@n3).should eq @n3
+      
+      @n3.next_sibling.should be_nil
+      @n3.previous_sibling.should be_nil
+      @n3.parent_node.should be_nil
+      
+      @n2.next_sibling.should eq @n4
+      @n4.previous_sibling.should eq @n2
+      
+      @n.remove_child(@n4)
+      @n2.next_sibling.should be_nil
+      @n.first_child.should eq @n2
+      @n.last_child.should eq @n2
+    end
+    
+    it "method insert_before" do
+      @n.append_child(@n2)
+      @n.append_child(@n4)
+      @n.insert_before(@n3,@n4)
+      @n.child_nodes.size.should eq 3
+      
+      @n.first_child.should eq @n2
+      @n.last_child.should eq @n4
+      @n2.next_sibling.should eq @n3
+      @n3.next_sibling.should eq @n4
+      @n4.next_sibling.should be_nil
+     
+      @n2.previous_sibling.should be_nil
+      @n3.previous_sibling.should eq @n2
+      @n4.previous_sibling.should eq @n3
+      
+      
+      
+      @n.child_nodes[0].should eq @n2
+      @n.child_nodes[1].should eq @n3
+      @n.child_nodes[2].should eq @n4
+      
+    end
+    it "method replace_child" do
+      @n.append_child(@n2)
+      @n.append_child(@n3)
+      @n.replace_child(@n4,@n3)
+      
+      @n.child_nodes.size.should eq 2
+      
+      @n.child_nodes[0].should eq @n2
+      @n.child_nodes[1].should eq @n4
+
+      @n2.next_sibling.should eq @n4
+      @n4.next_sibling.should eq nil
+     
+      @n2.previous_sibling.should be_nil
+      @n4.previous_sibling.should eq @n2
+
+      
+      @n.first_child.should eq @n2
+      @n.last_child.should eq @n4
+    end
+    describe "visit methods" do
+      before do
+        @n.append_child(@n2)
+        @n2.append_child(@n5)
+        
+        @n.append_child(@n3)
+        @n3.append_child(@n4)
+        @a=[]
+      end
+      
+      it "method visit_before" do
+      @n.visit_before {|n,d|
+        @a.push([n.node_value,d])
+      }
+      @a.should eq [[:a, 0], [:b, 1], [:e, 2], [:c, 1], [:d, 2]]
+      end
+      
+      it "method visit_after" do
+      @n.visit_after {|n,d|
+        @a.push([n.node_value,d])
+      }
+      @a.should eq [[:e, 2], [:b, 1], [:d, 2], [:c, 1], [:a, 0]]
+      end
+    end
+    it "should sort correctly" do
+      @n.append_child(@n5)
+      @n.append_child(@n4)
+      @n.append_child(@n3)
+      @n.append_child(@n2)
+      
+      @n.sort {|a,b| a.node_value.to_s<=>b.node_value.to_s}
+      
+      @n.child_nodes.should eq [@n2,@n3,@n4,@n5]
+      
+      @n.first_child.should eq @n2
+      @n.last_child.should eq @n5
+      
+      @n2.next_sibling.should eq @n3
+      @n3.next_sibling.should eq @n4
+      @n4.next_sibling.should eq @n5
+      @n5.next_sibling.should be_nil
+
+      @n2.previous_sibling.should be_nil
+      @n3.previous_sibling.should eq @n2
+      @n4.previous_sibling.should eq @n3
+      @n5.previous_sibling.should eq @n4
+    end
+    it "should reverse correctly" do
+      @n.append_child(@n3)
+      @n.append_child(@n5)
+      @n.append_child(@n2)
+      @n.append_child(@n4)
+      @n.reverse
+      @n.child_nodes.should eq [@n4,@n2,@n5,@n3]
+    end
+    
+  end
+end

data/web/Rakefile

@@ -25,7 +25,7 @@ EXAMPLES.each do |v|
   e=v[1]
   file "examples/#{e}.html"=>["examples.haml", "examples/#{e}.svg", :build_site, v[0]]
   file "examples/#{e}.svg"=>[v[0]] do |t|
-    system "ruby1.9 #{v[0]} > #{t.name}"
+    system "ruby #{v[0]} > #{t.name}"
   end
   file "examples/#{e}.png"=>["examples/#{e}.svg"] do |t|
   system   "rsvg  -w 200 -h 200 -f png examples/#{e}.svg #{t.name}"

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -36,7 +36,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-11-13 00:00:00 -03:00
+date: 2010-11-17 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,9 +123,9 @@ dependencies:
         hash: 19
         segments: 
         - 2
-        - 6
-        - 2
-        version: 2.6.2
+        - 7
+        - 0
+        version: 2.7.0
   type: :development
   version_requirements: *id006
 description: Ruby port of Protovis[http://vis.stanford.edu/protovis/], a great visualization toolkit
@@ -172,16 +172,22 @@ files:
 - examples/second.rb
 - examples/stacked_charts.rb
 - examples/third.rb
+- examples/treemap/treemap.rb
+- examples/treemap/treemap_data.rb
 - lib/rubyvis.rb
 - lib/rubyvis/color/color.rb
 - lib/rubyvis/color/colors.rb
+- lib/rubyvis/dom.rb
 - lib/rubyvis/format.rb
 - lib/rubyvis/format/date.rb
 - lib/rubyvis/format/number.rb
 - lib/rubyvis/internals.rb
 - lib/rubyvis/javascript_behaviour.rb
 - lib/rubyvis/layout.rb
+- lib/rubyvis/layout/hierarchy.rb
+- lib/rubyvis/layout/network.rb
 - lib/rubyvis/layout/stack.rb
+- lib/rubyvis/layout/treemap.rb
 - lib/rubyvis/mark.rb
 - lib/rubyvis/mark/anchor.rb
 - lib/rubyvis/mark/area.rb
@@ -217,6 +223,7 @@ files:
 - spec/anchor_spec.rb
 - spec/area_spec.rb
 - spec/bar_spec.rb
+- spec/dom_spec.rb
 - spec/internal_spec.rb
 - spec/javascript_behaviour_spec.rb
 - spec/label_spec.rb
@@ -367,21 +374,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby port of Protovis[http://vis.stanford.edu/protovis/], a great visualization toolkit
-test_files: 
-- spec/bar_spec.rb
-- spec/nest_spec.rb
-- spec/scale_ordinal_spec.rb
-- spec/internal_spec.rb
-- spec/panel_spec.rb
-- spec/scale_log_spec.rb
-- spec/scale_linear_datetime_spec.rb
-- spec/anchor_spec.rb
-- spec/readme_spec.rb
-- spec/scale_spec.rb
-- spec/scale_linear_spec.rb
-- spec/ruby_api_spec.rb
-- spec/label_spec.rb
-- spec/mark_spec.rb
-- spec/area_spec.rb
-- spec/javascript_behaviour_spec.rb
-- spec/line_spec.rb
+test_files: []
+