rubyvis 0.3.1 → 0.3.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.2 / 2010-11-23
+
+* Updated examples
+* Added Layout::Cluster and dendogram example
+
 === 0.3.1 / 2010-11-19
 
 * Added Layout::Partition

data/Manifest.txt

@@ -15,6 +15,7 @@ examples/cars/cars_data.rb
 examples/crimea/crimea_data.rb
 examples/crimea/crimea_grouped_bar.rb
 examples/crimea/crimea_line.rb
+examples/dendogram.rb
 examples/dot.rb
 examples/first_protovis_api.rb
 examples/first_rbp_api.rb
@@ -45,6 +46,7 @@ lib/rubyvis/histogram.rb
 lib/rubyvis/internals.rb
 lib/rubyvis/javascript_behaviour.rb
 lib/rubyvis/layout.rb
+lib/rubyvis/layout/cluster.rb
 lib/rubyvis/layout/hierarchy.rb
 lib/rubyvis/layout/network.rb
 lib/rubyvis/layout/partition.rb

data/examples/area.rb

@@ -1,7 +1,7 @@
 # = Area Charts
 # This simple area chart is constructed using an area mark, with an added line for emphasis on the top edge. Next, rules and labels are added for reference values.
 # Although this example is basic, it provides a good starting point for adding more complex features. For instance, multiple series of data can be added to produce a stacked area chart. 
-# * Protovis version: http://vis.stanford.edu/protovis/ex/area.html
+# * "Protovis version":http://vis.stanford.edu/protovis/ex/area.html
 # * Syntax: RBP
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'rubyvis'

data/examples/area_interpolation.rb

@@ -1,5 +1,12 @@
 # = Area Interpolation
-# This example show the 5 types of interpolation available for areas.
+# This example show the 5 types of interpolation available for areas:
+# * linear
+# * step-before
+# * step-after
+# * basis
+# * cardinal
+# 
+# See also "Line Interpolation":line_interpolation.html
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'rubyvis'
 

data/examples/dendogram.rb

@@ -0,0 +1,52 @@
+# = Dendogram
+# A dendrogram (or cluster layout) is a node-link diagram that places leaf nodes of the tree at the same depth. In this example, the classes (orange leaf nodes) are aligned on the right edge, with the packages (blue internal nodes) to the left. As with other tree layouts, dendrograms can also be oriented radially. 
+# Uses Protovis API
+$:.unshift(File.dirname(__FILE__)+"/../lib")
+require 'rubyvis'
+
+
+def get_files(path)
+  h={}
+  Dir.glob("#{path}/*").each {|e|
+    next if File.expand_path(e)=~/pkg|web|vendor|doc|~/
+    pa=File.expand_path(e) 
+    if File.stat(pa).directory?
+      h[File.basename(pa)]=get_files(pa)
+    else
+      h[File.basename(pa)]=File.stat(pa).size
+    end
+  }
+  h
+end
+
+files=get_files(File.dirname(__FILE__)+"/../")
+
+
+vis = Rubyvis::Panel.new do
+  width 200
+  height 1500 
+  left 40 
+  right 160 
+  top 10 
+  bottom 10 
+  layout_cluster do
+    nodes pv.dom(files).root("rubyvis").sort(lambda {|a,b| a.node_name<=>b.node_name}).nodes
+    group 1
+    orient "left"
+
+    link.line  do
+      stroke_style "#ccc"
+      line_width 1
+      antialias false
+    end
+
+    node.dot do 
+      fill_style {|n| n.first_child ? "#aec7e8" : "#ff7f0e"}
+    end
+    
+    node_label.label
+  end
+end
+
+vis.render
+puts vis.to_svg

data/examples/line_interpolation.rb

@@ -1,5 +1,14 @@
 # = Line Interpolation
-# This example show the 7 types of interpolation available for lines.
+# This example show the 7 types of interpolation available for lines:
+# * linear
+# * step-before
+# * step-after
+# * polar
+# * polar-reverse
+# * basis
+# * cardinal
+# 
+# See also "Area Interpolation":area_interpolation.html
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'rubyvis'
 

data/examples/stacked_charts.rb

@@ -1,8 +1,10 @@
+# = Stacked Area
+# This example uses the Stack layout to stack areas one over another.
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'rubyvis'
 
 data = pv.range(4).map {|i|
-  pv.range(0, 10, 1).map {|x|
+  pv.range(0, 10, 0.1).map {|x|
     OpenStruct.new({:x=> x, :y=> Math.sin(x) + rand() * 0.5 + 2})
   }
 }

data/examples/sunburst.rb

@@ -1,6 +1,6 @@
 # = Sunbursts
 # A sunburst is an adjacency diagram: a space-filling variant of the node-link diagram. Rather than drawing a link between parent and child in the hierarchy, nodes are drawn as solid areas (either wedges or bars), and their placement relative to adjacent nodes reveals their position in the hierarchy. Because the nodes are now space-filling, we can use an angle encoding for the size of software files. This reveals an additional dimension that would be difficult to show in a node-link diagram.
-# Uses RBP Api
+# This example show files and directory inside rubyvis lib directory and uses RBP API
 
 $:.unshift(File.dirname(__FILE__)+"/../lib")
 require 'rubyvis'
@@ -19,13 +19,15 @@ def get_files(path)
   h
 end
 
-files=get_files(File.dirname(__FILE__)+"/../")
+files=get_files(File.dirname(__FILE__)+"/../lib/rubyvis/")
+
+#load(File.dirname(__FILE__)+"/treemap/treemap_data.rb")
+
 colors=Rubyvis::Colors.category19()
 
 vis = Rubyvis::Panel.new do
   width 900
   height 900
-  bottom -80
   layout_partition_fill do    
     nodes Rubyvis.dom(files).root("rubyvis").nodes
     size {|d| d.node_value}
@@ -39,7 +41,7 @@ vis = Rubyvis::Panel.new do
     end
     
     node_label.label do 
-      visible {|d| d.angle * d.outer_radius >= 6}
+      visible {|d| d.angle * d.outer_radius >= 10}
     end
     
   end

data/lib/rubyvis.rb

@@ -29,7 +29,7 @@ require 'rubyvis/mark/shorcut_methods'
 module Rubyvis
   @document=nil
   # Rubyvis version
-  VERSION = '0.3.1' 
+  VERSION = '0.3.2' 
   # Protovis API on which current Rubyvis is based
   PROTOVIS_API_VERSION='3.3'
   # You actually can do it! http://snipplr.com/view/2137/uses-for-infinity-in-ruby/

data/lib/rubyvis/dom.rb

@@ -78,7 +78,7 @@ module Rubyvis
       
       # The node value. When generated from a map, node value corresponds to 
       # the leaf value for leaf nodes, and is undefined for internal nodes.
-      attr_reader :node_value
+      attr_accessor :node_value
       
       # The array of child nodes. This array is empty for leaf nodes. An easy way to
       # check if child nodes exist is to query <tt>firstChild</tt>.    

data/lib/rubyvis/internals.rb

@@ -1,11 +1,11 @@
 module Rubyvis
   # :section: /pv-internals.js
   @@id=0
-  # Return a unique id each time
+  # Returns a locally-unique positive id.
   def self.id
     @@id+=1
   end
-  # Return a value as a Proc.
+  # Return a proc wrapping specific constant
   def self.functor(f)
     (f.is_a? Proc) ? f : lambda {f}
   end
@@ -30,7 +30,14 @@ module Rubyvis
       array.dup
     end
   end
-  
+  #
+  # Concatenates the specified array with itself <i>n</i> times. For example,
+  # +repeat([1, 2])+ returns [1, 2, 1, 2].
+  #
+  # * @param {array} a an array.
+  # * @param {number} [n] the number of times to repeat; defaults to two.
+  # * @returns {array} an array that repeats the specified array.
+  #
   def self.repeat(array, n=2)
     array*n
   end
@@ -150,14 +157,15 @@ module Rubyvis
     return step ? ((rand() * (stop - start).quo(step)).floor * step + start) : (rand() * (stop - start) + start);
   end
 
-  def self.sum(array,f=nil)
+  def self.sum(array, f=nil)
     if f.nil?
-      array.inject(0) {|ac,v| ac+v}
+      array.inject(0) {|ac, v| ac+v}
     else
       i=0
       array.inject(0) {|ac,v|
-        o=o_index(i);i+=1;
-        ac+f.js_call(o,v);
+        o=o_index(i)
+        i+=1
+        ac+f.js_call(o, v)
       }
     end
   end

data/lib/rubyvis/layout.rb

@@ -36,4 +36,6 @@ require 'rubyvis/layout/network'
 require 'rubyvis/layout/hierarchy'
 require 'rubyvis/layout/treemap'
 require 'rubyvis/layout/partition'
+require 'rubyvis/layout/cluster'
+
 

data/lib/rubyvis/layout/cluster.rb

@@ -0,0 +1,203 @@
+module Rubyvis
+  class Layout
+    # Alias for Rubyvis::Layout::Cluster
+    def self.Cluster
+      Rubyvis::Layout::Cluster
+    end
+
+    # Implements a hierarchical layout using the cluster (or dendrogram)
+    # algorithm. This layout provides both node-link and space-filling
+    # implementations of cluster diagrams. In many ways it is similar to
+    # {@link pv.Layout.Partition}, except that leaf nodes are positioned at maximum
+    # depth, and the depth of internal nodes is based on their distance from their
+    # deepest descendant, rather than their distance from the root.
+    #
+    # <p>The cluster layout supports a "group" property, which if true causes
+    # siblings to be positioned closer together than unrelated nodes at the same
+    # depth. Unlike the partition layout, this layout does not support dynamic
+    # sizing for leaf nodes; all leaf nodes are the same size.
+    #
+    # <p>For more details on how to use this layout, see
+    # {@link pv.Layout.Hierarchy}.
+    #
+    # @see pv.Layout.Cluster.Fill
+    # @extends pv.Layout.Hierarchy
+    class Cluster < Hierarchy
+      include NodeLink
+      attr_accessor :interpolate
+       @properties=Hierarchy.properties.dup 
+        # Constructs a new, empty cluster layout. Layouts are not typically
+        # constructed directly; instead, they are added to an existing panel via
+        # {@link pv.Mark#add}.
+        attr_accessor :interpolate
+        
+      def initialize
+        super
+        @interpolate=nil
+        that=self
+        ## @private Cache layout state to optimize properties. #/
+        @link.interpolate {that.interpolate}
+      end
+      ##
+      # :attr: group
+      # The group parameter; defaults to 0, disabling grouping of siblings. If this
+      # parameter is set to a positive number (or true, which is equivalent to 1),
+      # then additional space will be allotted between sibling groups. In other
+      # words, siblings (nodes that share the same parent) will be positioned more
+      # closely than nodes at the same depth that do not share a parent.
+      #
+      # @type number
+      
+      ##
+      # :attr:orient 
+      #
+      # The orientation. The default orientation is "top", which means that the root
+      # node is placed on the top edge, leaf nodes appear on the bottom edge, and
+      # internal nodes are in-between. The following orientations are supported:<ul>
+      #
+      # <li>left - left-to-right.
+      # <li>right - right-to-left.
+      # <li>top - top-to-bottom.
+      # <li>bottom - bottom-to-top.
+      # <li>radial - radially, with the root at the center.</ul>
+      #
+      # @type string
+      
+      ##
+      # :attr: inner_radius
+      #
+      # The inner radius; defaults to 0. This property applies only to radial
+      # orientations, and can be used to compress the layout radially. Note that for
+      # the node-link implementation, the root node is always at the center,
+      # regardless of the value of this property; this property only affects internal
+      # and leaf nodes. For the space-filling implementation, a non-zero value of
+      # this property will result in the root node represented as a ring rather than
+      # a circle.
+      #
+      # @type number
+      
+      ##
+      # :attr: outer_radius
+      # The outer radius; defaults to fill the containing panel, based on the height
+      # and width of the layout. If the layout has no height and width specified, it
+      # will extend to fill the enclosing panel.
+      #
+      # @type number
+      
+      attr_accessor_dsl :group, :orient, :inner_radius, :outer_radius
+
+
+      
+      # Defaults for cluster layouts. The default group parameter is 0 and the
+      # default orientation is "top".
+      #
+      # @type pv.Layout.Cluster
+      def self.defaults
+        Cluster.new.mark_extend(Hierarchy.defaults).
+          group(0).
+          orient("top")
+      end
+      def build_implied(s)
+        cluster_build_implied(s)
+      end
+      def cluster_build_implied(s)
+        @interpolate=case s.orient
+          when /^(top|bottom)$/
+            'step-before'
+          when /^(left|right)$/
+            'step-after'
+          else
+            'linear'
+        end
+        return nil if hierarchy_build_implied(s)
+        root = s.nodes[0]
+        group = s.group
+        breadth =nil
+        depth = nil 
+        leaf_count = 0
+        leaf_index = 0.5 - group / 2.0
+
+        # Count the leaf nodes and compute the depth of descendants. #/
+        par = nil
+        root.visit_after {|n,i|
+          #puts "#{n.node_value} #{i}"
+          if (n.first_child) 
+            n.depth = 1 + Rubyvis.max(n.child_nodes, lambda {|nn| nn.depth })
+          else
+            if (group!=0 and (par != n.parent_node)) 
+              par = n.parent_node
+              leaf_count += group
+            end
+            leaf_count+=1
+            n.depth = 0
+          end
+        }
+        breadth = 1.0 / leaf_count
+        depth = 1.0 / root.depth
+
+        # Compute the unit breadth and depth of each node. #/
+        par = nil
+        root.visit_after  {|n,i|
+          if (n.first_child) 
+              n.breadth = Rubyvis.mean(n.child_nodes, lambda {|nn| nn.breadth })
+           else 
+             if (group!=0 and (par != n.parent_node)) 
+              par = n.parent_node
+              leaf_index += group
+            end
+            n.breadth = breadth * leaf_index
+            leaf_index+=1
+          end
+          n.depth = 1 - n.depth * depth
+        }
+
+        # Compute breadth and depth ranges for space-filling layouts. #/
+        root.visit_after {|n,i|
+          n.min_breadth = n.first_child ? n.first_child.min_breadth : (n.breadth - breadth / 2.0)
+          n.max_breadth = n.first_child ? n.last_child.max_breadth : (n.breadth + breadth / 2.0)
+        }
+        root.visit_before {|n,i|
+          n.min_depth = n.parent_node ? n.parent_node.max_depth : 0
+          n.max_depth = n.parent_node ? (n.depth + root.depth) : (n.min_depth + 2 * root.depth)
+        }
+        root.min_depth = -depth
+        node_link_build_implied(s)
+        false
+      end
+      # Constructs a new, empty space-filling cluster layout. Layouts are not
+      # typically constructed directly; instead, they are added to an existing panel
+      # via {@link pv.Mark#add}.
+      #
+      # @class A variant of cluster layout that is space-filling. The meaning of the
+      # exported mark prototypes changes slightly in the space-filling
+      # implementation:<ul>
+      #
+      # <li><tt>node</tt> - for rendering nodes; typically a {@link pv.Bar} for
+      # non-radial orientations, and a {@link pv.Wedge} for radial orientations.
+      #
+      # <p><li><tt>link</tt> - unsupported; undefined. Links are encoded implicitly
+      # in the arrangement of the space-filling nodes.
+      #
+      # <p><li><tt>label</tt> - for rendering node labels; typically a
+      # {@link pv.Label}.
+      #
+      # </ul>For more details on how to use this layout, see
+      # {@link pv.Layout.Cluster}.
+      #
+      # @extends pv.Layout.Cluster
+      class Fill < Cluster
+        include Hierarchy::Fill
+        @properties=Cluster.properties.dup  
+        def initialize
+          super
+          fill_constructor
+        end
+        def build_implied(s)
+          return nil if cluster_build_implied(s)
+          fill_build_implied(s)
+        end
+      end
+      
+    end
+  end
+end

data/lib/rubyvis/layout/hierarchy.rb

@@ -50,18 +50,13 @@ module Rubyvis
       def links
         l=self.nodes().find_all {|n| n.parent_node}
         l.map {|n|
-          OpenStruct.new({
+          
+          Network::Link.new({
               :source_node=>n,
               :target_node=>n.parent_node,
               :link_value=>1
         })}
       end
-      #def node_link
-      #  NodeLink.new(self)
-      #end
-      #def fill
-      #  Fill.new(self)
-      #end
     end
     
     module NodeLink
@@ -69,11 +64,15 @@ module Rubyvis
       def node_link_build_implied(s)
         nodes = s.nodes
         @_orient= s.orient
-        @_orient=~/^(top|bottom)$/
-        
-        horizontal = !$1.nil?
+        horizontal= case @_orient
+          when /^(top|bottom)$/
+            true
+          else
+            false
+          end
         @_w = s.width
         @_h = s.height
+        
         # /* Compute default inner and outer radius. */
         if (@_orient == "radial") 
           @_ir = s.inner_radius
@@ -123,6 +122,7 @@ module Rubyvis
             @_h / 2.0 + radius(n) * Math.sin(n.mid_angle)
         end # end case
       end # end method
+      private :node_link_y, :node_link_x, :mid_angle, :radius
     end # end class
     
     module Fill
@@ -153,7 +153,7 @@ module Rubyvis
         @_w = s.width
         @_h = s.height
         @_depth = -nodes[0].min_depth
-        if (@_orient == "radial") 
+        if @_orient == "radial"
           @_ir = s.inner_radius
           @_or = s.outer_radius
           @_ir||=0
@@ -163,7 +163,7 @@ module Rubyvis
         nodes.each_with_index {|n,i|
           n.x = fill_x(n)
           n.y = fill_y(n)
-          if (@_orient == "radial") 
+          if @_orient == "radial"
             n.inner_radius = inner_radius(n);
             n.outer_radius = outer_radius(n);
             n.start_angle = start_angle(n);
@@ -179,7 +179,7 @@ module Rubyvis
       end
       
       def fill_scale(d, depth)
-        (d+depth) / (1.0+depth)
+        (d + depth) / (1 + depth).to_f
       end
       def fill_x(n)
         case @_orient
@@ -209,6 +209,7 @@ module Rubyvis
             @_h / 2.0
         end # end case
       end # end method
+      
       def dx(n)
         if @_orient=='left' or @_orient=='right'
           (n.max_depth - n.min_depth) / (1.0 + @_depth) * @_w
@@ -218,6 +219,7 @@ module Rubyvis
           n.parent_node ? (n.inner_radius + n.outer_radius) * Math.cos(n.mid_angle) : 0
         end          
       end
+      
       def dy(n)
         if @_orient=='left' or @_orient=='right'
           (n.max_breadth - n.min_breadth) * @_h
@@ -227,12 +229,15 @@ module Rubyvis
           n.parent_node ? (n.inner_radius + n.outer_radius) * Math.sin(n.mid_angle) : 0
         end        
       end
+      
       def inner_radius(n)
         [0, fill_scale(n.min_depth, @_depth/2.0)].max * (@_or - @_ir) + @_ir
       end
+      
       def outer_radius(n)
         fill_scale(n.max_depth, @_depth / 2.0) * (@_or - @_ir) + @_ir
       end
+      
       def start_angle(n)
         (n.parent_node ? n.min_breadth - 0.25 : 0) * 2 * Math::PI
       end

data/lib/rubyvis/layout/network.rb

@@ -12,23 +12,21 @@ module Rubyvis
     # includes hierarchical structures; a tree is represented using links from
     # child to parent.
     #
-    # <p>Network layouts require the graph data structure to be defined using two
+    # Network layouts require the graph data structure to be defined using two
     # properties:<ul>
     #
-    # <li><tt>nodes</tt> - an array of objects representing nodes. Objects in this
-    # array must conform to the {@link pv.Layout.Network.Node} interface; which is
+    # <li><tt>nodes</tt> - an array of objects representing nodes. Objects in this array must conform to the {@link pv.Layout.Network.Node} interface; which is
     # to say, be careful to avoid naming collisions with automatic attributes such
-    # as <tt>index</tt> and <tt>linkDegree</tt>. If the nodes property is defined
+    # as <tt>index</tt> and <tt>link_degree</tt>.
+    # If the nodes property is defined
     # as an array of primitives, such as numbers or strings, these primitives are
-    # automatically wrapped in an object; the resulting object's <tt>nodeValue</tt>
+    # automatically wrapped in an object; the resulting object's <tt>node_value</tt>
     # attribute points to the original primitive value.
     #
     # <p><li><tt>links</tt> - an array of objects representing links. Objects in
-    # this array must conform to the {@link pv.Layout.Network.Link} interface; at a
-    # minimum, either <tt>source</tt> and <tt>target</tt> indexes or
-    # <tt>sourceNode</tt> and <tt>targetNode</tt> references must be set. Note that
-    # if the links property is defined after the nodes property, the links can be
-    # defined in terms of <tt>this.nodes()</tt>.
+    # this array must conform to the {@link pv.Layout.Network.Link} interface; at a minimum, either <tt>source</tt> and <tt>target</tt> indexes or
+    # <tt>source_node</tt> and <tt>target_node</tt> references must be set. Note that
+    # if the links property is defined after the nodes property, the links can be defined in terms of <tt>this.nodes()</tt>.
     #
     # </ul>
     #
@@ -118,9 +116,9 @@ module Rubyvis
         that=self
         l=Mark.new().
           mark_extend(@node).
-          data(lambda {|_p| [_p.source_node, p.target_node] }).
+          data(lambda {|d| [d.source_node, d.target_node] }).
           fill_style(nil).
-          line_width(lambda {|d,_p| p.link_value * 1.5 }).
+          line_width(lambda {|d,_p| _p.link_value * 1.5 }).
           stroke_style("rgba(0,0,0,.2)")
         l.extend LinkAdd
         l.that=self
@@ -206,6 +204,7 @@ module Rubyvis
         layout_build_implied(s)
         return true if (!s._id.nil? and s._id >= self._id)
         s._id= self._id
+        
         s.nodes.each do |d|
           d.link_degree=0
         end
@@ -224,6 +223,99 @@ module Rubyvis
         end
         false
       end
+      
+      # Represents a node in a network layout. There is no explicit
+      # constructor; this class merely serves to document the attributes that are
+      # used on nodes in network layouts. (Note that hierarchical nodes place
+      # additional requirements on node representation, vis Rubyvis::Dom::Node.)
+      #
+      class Node
+        # The node index, zero-based. This attribute is populated automatically based
+        # on the index in the array returned by the <tt>nodes</tt> property.
+        #
+        # @type number
+        #/
+        attr_accessor :index
+        
+        # The link degree; the sum of link values for all incoming and outgoing links.
+        # This attribute is populated automatically.
+        #
+        # @type number
+        attr_accessor :link_degree
+        
+        # The node name; optional. If present, this attribute will be used to provide
+        # the text for node labels. If not present, the label text will fallback to the
+        # <tt>nodeValue</tt> attribute.
+        #
+        # @type string
+        attr_accessor :node_name
+        
+        # The node value; optional. If present, and no <tt>nodeName</tt> attribute is
+        # present, the node value will be used as the label text. This attribute is
+        # also automatically populated if the nodes are specified as an array of
+        # primitives, such as strings or numbers.
+        #
+        # @type object
+        attr_accessor :node_value
+      end
+    
+      
+      # Represents a link in a network layout. There is no explicit
+      # constructor; this class merely serves to document the attributes that are
+      # used on links in network layouts. For hierarchical layouts, this class is
+      # used to represent the parent-child links.
+      #
+      # @see pv.Layout.Network
+      # @name pv.Layout.Network.Link
+      class Link
+        def initialize(opts)
+          @source_node=opts.delete :source_node
+          @target_node=opts.delete :target_node
+          @link_value=opts.delete :link_value
+        end
+        # The link value, or weight; optional. If not specified (or not a number), the
+        # default value of 1 is used.
+        #
+        # @type number
+        # @name pv.Layout.Network.Link.prototype.linkValue
+        #/
+        attr_accessor :link_value
+      
+        # The link's source node. If not set, this value will be derived from the
+        # <tt>source</tt> attribute index.
+        #
+        # @type pv.Layout.Network.Node
+        # @name pv.Layout.Network.Link.prototype.sourceNode
+        attr_accessor :source_node
+        # The link's target node. If not set, this value will be derived from the
+        # <tt>target</tt> attribute index.
+        #
+        # @type pv.Layout.Network.Node
+        # @name pv.Layout.Network.Link.prototype.targetNode
+        attr_accessor :target_node
+        # Alias for <tt>sourceNode</tt>, as expressed by the index of the source node.
+        # This attribute is not populated automatically, but may be used as a more
+        # convenient identification of the link's source, for example in a static JSON
+        # representation.
+        #
+        # @type number
+        # @name pv.Layout.Network.Link.prototype.source
+        attr_accessor :source
+        # Alias for <tt>targetNode</tt>, as expressed by the index of the target node.
+        # This attribute is not populated automatically, but may be used as a more
+        # convenient identification of the link's target, for example in a static JSON
+        # representation.
+        #
+        # @type number
+        # @name pv.Layout.Network.Link.prototype.target
+        attr_accessor :target
+        # Alias for <tt>linkValue</tt>. This attribute is not populated automatically,
+        # but may be used instead of the <tt>linkValue</tt> attribute when specifying
+        # links.
+        #
+        # @type number
+        attr_accessor :value
+      end
     end
   end
 end

data/lib/rubyvis/layout/partition.rb

@@ -156,7 +156,7 @@ module Rubyvis
         end
         # Compute the unit breadth and depth of each node. #/
         ds = 1 / max_depth.to_f
-        root.min_breadth = 0;
+        root.min_breadth = 0
         root.breadth = 0.5
         root.max_breadth = 1
         root.visit_before {|n,i| 

data/lib/rubyvis/mark/shorcut_methods.rb

@@ -198,5 +198,19 @@ class Rubyvis::Mark
   # See Mark for examples of use    
   mark_method :layout_treemap, Rubyvis::Layout::Treemap
   
+  ##
+  # :method: layout_cluster(opts,&block)  
+  #
+  # Adds a Layout::Cluster to current mark. 
+  # 
+  # If a block is provided, the context will be defined differently if 
+  # parameter is provided
+  # * Without parameter: block executed inside context of new mark
+  # * With paramenter: block executed inside context of current mark. 
+  #   Paramenter references new mark
+  # 
+  # See Mark for examples of use    
+  mark_method :layout_cluster, Rubyvis::Layout::Cluster
+  
   
 end

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, :_id, :nodes, :round, :links, :padding_left, :padding_right, :padding_top, :padding_bottom, :mode
+    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, :group
     
     def []=(v,i)
       if v.is_a? Numeric

data/web/build_site.rb

@@ -6,6 +6,7 @@ require 'coderay'
 require 'haml'
 require 'ostruct'
 require 'rubyvis'
+require 'RedCloth'
 
 # First, create the examples
 
@@ -64,7 +65,7 @@ files.each do |f|
   # Create an html file with svg included inside
   page.source=CodeRay.scan(source_a.join(), :ruby).div
   page.title=title
-  page.text=text
+  page.text=RedCloth.new(text.join("\n")).to_html
   page.svg_file=base+".svg"
   # Read svg size
   width=350

data/web/examples.haml

@@ -6,9 +6,7 @@
   %body
     %h1="Rubyvis - Example: #{title}"
     .example_main
-      .description
-        - text.each do |t|
-          %p= t
+      .description=find_and_preserve(text)
       .navigation
         %ul
           %li 

data/web/index.haml

@@ -69,8 +69,8 @@
         %div
           %h3 Image
           /[if IE]
-            %embed{:src=>"examples/first.svg" ,:width=>"150", :height=>"150"}
-          %object{:data=>"examples/first.svg", :type=>"image/svg+xml", :width=>150,:height=>150}
+            %embed{:src=>"examples/first_protovis_api.svg" ,:width=>"150", :height=>"150"}
+          %object{:data=>"examples/first_protovis_api.svg", :type=>"image/svg+xml", :width=>150,:height=>150}
     .examples_div
       %h2 Examples
       %p 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyvis
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -36,7 +36,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-11-19 00:00:00 -03:00
+date: 2010-11-23 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,6 +157,7 @@ files:
 - examples/crimea/crimea_data.rb
 - examples/crimea/crimea_grouped_bar.rb
 - examples/crimea/crimea_line.rb
+- examples/dendogram.rb
 - examples/dot.rb
 - examples/first_protovis_api.rb
 - examples/first_rbp_api.rb
@@ -187,6 +188,7 @@ files:
 - lib/rubyvis/internals.rb
 - lib/rubyvis/javascript_behaviour.rb
 - lib/rubyvis/layout.rb
+- lib/rubyvis/layout/cluster.rb
 - lib/rubyvis/layout/hierarchy.rb
 - lib/rubyvis/layout/network.rb
 - lib/rubyvis/layout/partition.rb

metadata.gz.sig

@@ -1,3 +1,2 @@
-m�$�+ă�
�e�k3�;��5O���
-W��㲡���ZY�:��C�P�����]�3��@\o ��,u��=�\r�������1|�h�a�pB
-ޱ1�f[���J������P�_��(�&���-��?~Ո���Ӂc�V��
+� x>+�L��^�#{R�baA)	$��gI����+L��[�sӾ���_)���

i�_�OD�w�C�E$P	�L�
+�`ސ��ۿ!��BEl��lH�Bo>��6Q��ƪ��qx��4ʼn�
��Q�W