rubyvis 0.3.5 → 0.3.6

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.6 / 2010-12-28
+
+* Matrix layout implemented. Example and spec available.
+* Added spec for Layout::Arc
+
 === 0.3.5 / 2010-12-20
 
 * Horizon and Arc layouts implemented

data/Manifest.txt

@@ -46,6 +46,7 @@ examples/5_pv_hierarchies/node_link_tree.rb
 examples/5_pv_hierarchies/sunburst.rb
 examples/5_pv_hierarchies/treemap.rb
 examples/6_pv_networks/arc.rb
+examples/6_pv_networks/matrix.rb
 examples/6_pv_networks/miserables_data.rb
 lib/rubyvis.rb
 lib/rubyvis/color/color.rb
@@ -65,6 +66,7 @@ lib/rubyvis/layout/grid.rb
 lib/rubyvis/layout/hierarchy.rb
 lib/rubyvis/layout/horizon.rb
 lib/rubyvis/layout/indent.rb
+lib/rubyvis/layout/matrix.rb
 lib/rubyvis/layout/network.rb
 lib/rubyvis/layout/pack.rb
 lib/rubyvis/layout/partition.rb
@@ -112,7 +114,9 @@ spec/histogram_spec.rb
 spec/internal_spec.rb
 spec/javascript_behaviour_spec.rb
 spec/label_spec.rb
+spec/layout_arc_spec.rb
 spec/layout_horizon_spec.rb
+spec/layout_matrix_spec.rb
 spec/layout_stack_spec.rb
 spec/line_spec.rb
 spec/mark_spec.rb

data/README.txt

@@ -33,6 +33,8 @@ Using protovis examples[http://vis.stanford.edu/protovis/ex/] as reference
  * Node-Link Tree
  * Sunburst
  * Treemap
+* Networks:
+ * Arc
 
 
 I try to maintain, when posible, complete compatibility with Javascript API, including camel case naming of functions. Johnson [http://github.com/jbarnette/johnson] - the lovely Javascript wrapper inside Ruby embrace - is our friend to test implementation of basic object. 
@@ -54,6 +56,7 @@ User could use +pv+ freely, cause is defined as a global method which call Rubyv
 * data/QuantitativeScale.js
 * data/OrdinalScale.js
 * data/Scale.js
+* layout/Arc.js
 * layout/Layout.js
 * layout/Cluster.js
 * layout/Grid.js

data/Rakefile

@@ -11,13 +11,28 @@ require 'rspec/core/rake_task'
 
 Hoe.plugin :git
 
-Hoe.spec 'rubyvis' do
+h=Hoe.spec 'rubyvis' do
   self.testlib=:rspec
-  #self.test_globs="spec/*_spec.rb"
   self.rspec_options << "-c" << "-b"
   self.developer('Claudio Bustos', 'clbustos_at_gmail.com')
   self.version=Rubyvis::VERSION
   self.extra_dev_deps << ["coderay",">=0"] << ["haml",">=0"] << ["nokogiri", ">=0"] << ["rspec",">=2.0"]
 end
 
+task :publicar_docs => [:clean, :docs] do
+  #ruby %{agregar_adsense_a_doc.rb}
+  path = File.expand_path("~/.rubyforge/user-config.yml")
+  config = YAML.load(File.read(path))
+  host = "#{config["username"]}@rubyforge.org"
+  
+  remote_dir = "/var/www/gforge-projects/#{h.rubyforge_name}/#{h.remote_rdoc_dir
+  }"
+  local_dir = h.local_rdoc_dir
+  Dir.glob(local_dir+"/**/*") {|file|
+    sh %{chmod 755 #{file}}
+  }
+  sh %{rsync #{h.rsync_args} #{local_dir}/ #{host}:#{remote_dir}}
+end
+
+
 # vim: syntax=ruby

data/examples/6_pv_networks/matrix.rb

@@ -0,0 +1,34 @@
+# = Matrix Diagrams
+# A graph can be represented by an adjacency matrix, where each value in row i and column j corresponds to the link from node i to node j. Given this representation, an obvious visualization then is: show the matrix! Using color or saturation instead of text allows patterns to be perceived rapidly. The seriation problem applies just as much to the matrix view as to the arc diagram, so the order of rows and columns is important: here we use a community-detection algorithm to order and color the display.
+# While path following is harder in a matrix view than in a node-link diagram, matrices have a number of compensating advantages. As networks get large and highly connected, node-link diagrams often devolve into giant hairballs of line crossings. In matrix views, however, line crossings are impossible, and with an effective sorting one quickly can spot clusters and bridges. Allowing interactive grouping and reordering of the matrix facilitates deeper exploration of network structure.
+# This network represents character co-occurrence in the chapters of Victor Hugo's classic novel, Les Misérables. Node colors depict cluster memberships computed by a community-detection algorithm. Source: Knuth, D. E. 1993. The Stanford GraphBase: A Platform for Combinatorial Computing, Addison-Wesley. 
+
+$:.unshift(File.dirname(__FILE__)+"/../../lib")
+require 'rubyvis'
+load(File.dirname(__FILE__)+"/miserables_data.rb")
+color=Rubyvis::Colors.category19
+
+
+vis = Rubyvis::Panel.new() do 
+  width 693
+  height 693
+  top 90
+  left 90
+  layout_matrix do
+    nodes $miserables.nodes
+    links $miserables.links
+    sort {|a,b| b.group<=>a.group }
+    directed (false)
+    link.bar do
+      fill_style {|l| l.link_value!=0 ?
+       ((l.target_node.group == l.source_node.group) ? color[l.source_node.group] : "#555") : "#eee"}
+      antialias(false)
+      line_width(1)
+    end
+    node_label.label do 
+      text_style {|l| color[l.group]}
+    end
+  end
+end
+vis.render()
+puts vis.to_svg

data/lib/rubyvis/layout/arc.rb

@@ -5,7 +5,7 @@ module Rubyvis
       Rubyvis::Layout::Arc
     end
     
-    # @class Implements a layout for arc diagrams. An arc diagram is a network
+    # Implements a layout for arc diagrams. An arc diagram is a network
     # visualization with a one-dimensional layout of nodes, using circular arcs to
     # render links between nodes. For undirected networks, arcs are rendering on a
     # single side; this makes arc diagrams useful as annotations to other
@@ -16,28 +16,27 @@ module Rubyvis
     # <p>Arc layouts are particularly sensitive to node ordering; for best results,
     # order the nodes such that related nodes are close to each other. A poor
     # (e.g., random) order may result in large arcs with crossovers that impede
-    # visual processing. A future improvement to this layout may include automatic
-    # reordering using, e.g., spectral graph layout or simulated annealing.
+    # visual processing. A future improvement to this layout may include automatic reordering using, e.g., spectral graph layout or simulated annealing.
     #
-    # <p>This visualization technique is related to that developed by
-    # M. Wattenberg, <a
-    # href="http://www.research.ibm.com/visual/papers/arc-diagrams.pdf">"Arc
-    # Diagrams: Visualizing Structure in Strings"</a> in <i>IEEE InfoVis</i>, 2002.
+    # This visualization technique is related to that developed by  M. Wattenberg, {Arc Diagrams: Visualizing Structure in Strings}[http://www.research.ibm.com/visual/papers/arc-diagrams.pdf] in IEEE InfoVis, 2002.
     # However, this implementation is limited to simple node-link networks, as
     # opposed to structures with hierarchical self-similarity (such as strings).
+    # As with other network layouts, three mark prototypes are provided:<ul>
     #
-    # <p>As with other network layouts, three mark prototypes are provided:<ul>
+    # <li><tt>node</tt> - for rendering nodes; typically a Rubyvis::Dot
+    # <li><tt>link</tt> - for rendering links; typically a Rubyvis::Line
+    # <li><tt>node_label</tt> - for rendering node labels; typically a Rubyvis::Label
     #
-    # <li><tt>node</tt> - for rendering nodes; typically a {@link pv.Dot}.
-    # <li><tt>link</tt> - for rendering links; typically a {@link pv.Line}.
-    # <li><tt>label</tt> - for rendering node labels; typically a {@link pv.Label}.
-    #
-    # </ul>For more details on how this layout is structured and can be customized,
-    # see {@link pv.Layout.Network}.
+    # </ul>
+    # For more details on how this layout is structured and can be customized,
+    # see Rubyvis::Layout::Network
     
     class Arc < Network
-      @properties=Network.properties.dup      
-      attr_accessor :_interpolate, :_directed, :_reverse
+      @properties=Network.properties.dup
+      
+      attr_accessor :_interpolate # :nodoc:
+      attr_accessor :_directed    # :nodoc:
+      attr_accessor :_reverse     # :nodoc:
       def initialize
         super
         @_interpolate=nil # cached interpolate
@@ -51,7 +50,7 @@ module Rubyvis
         }).interpolate(lambda{ that._interpolate})
       end
       
-      def build_implied(s)
+      def build_implied(s) # :nodoc:
         return true if network_build_implied(s)
         # Cached
         
@@ -87,17 +86,17 @@ module Rubyvis
         
         # /** @private Returns the x-position, given the breadth. */
         x= lambda do |b|
-        case orient 
-          when "top"
-            b * w
-          when "bottom"
-           b * w
-          when "left"
-          0;
-          when "right"
-          w;
-          when "radial"
-            w / 2.0 + r * Math.cos(mid_angle.call(b))
+          case orient 
+            when "top"
+              b * w
+            when "bottom"
+             b * w
+            when "left"
+            0;
+            when "right"
+            w;
+            when "radial"
+              w / 2.0 + r * Math.cos(mid_angle.call(b))
           end
         end
         
@@ -135,8 +134,7 @@ module Rubyvis
       
       ##
       # :attr: orient
-      # The orientation. The default orientation is "left", which means that nodes
-      # will be positioned from left-to-right in the order they are specified in the
+      # The orientation. The default orientation is "bottom", which means that nodes  will be positioned from bottom-to-top in the order they are specified in the
       # <tt>nodes</tt> property. The following orientations are supported:<ul>
       #
       # <li>left - left-to-right.
@@ -155,26 +153,23 @@ module Rubyvis
       # respectively), while reverse links are drawn on the opposite side.
       
       attr_accessor_dsl :orient, :directed
-      
+      # Default properties for arc layouts. By default, the orientation is "bottom".
       def self.defaults
         Arc.new.mark_extend(Network.defaults).
           orient("bottom")
       end
       
       # Specifies an optional sort function. The sort function follows the same
-      # comparator contract required by {@link pv.Dom.Node#sort}. Specifying a sort
+      # comparator contract required by Rubyvis::Dom::Node.sort(). Specifying a sort
       # function provides an alternative to sort the nodes as they are specified by
       # the <tt>nodes</tt> property; the main advantage of doing this is that the
       # comparator function can access implicit fields populated by the network
-      # layout, such as the <tt>linkDegree</tt>.
+      # layout, such as the <tt>link_degree</tt>.
       #
       # <p>Note that arc diagrams are particularly sensitive to order. This is
       # referred to as the seriation problem, and many different techniques exist to
       # find good node orders that emphasize clusters, such as spectral layout and
       # simulated annealing.
-      #
-      # @param {function} f comparator function for nodes.
-      # @returns {pv.Layout.Arc} this.
       def sort(f=nil,&block)
         f||=block
         @_sort=f

data/lib/rubyvis/layout/cluster.rb

@@ -18,7 +18,7 @@ module Rubyvis
     # 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}.
+    # Rubyvis::Layout::Hierarchy.
     #
     # @see pv.Layout.Cluster.Fill
     # @extends pv.Layout.Hierarchy
@@ -141,9 +141,9 @@ module Rubyvis
           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
+            if (group!=0 and (par != n.parent_node)) 
+            par = n.parent_node
+            leaf_index += group
             end
             n.breadth = breadth * leaf_index
             leaf_index+=1
@@ -179,7 +179,7 @@ module Rubyvis
       # in the arrangement of the space-filling nodes.
       #
       # <p><li><tt>label</tt> - for rendering node labels; typically a
-      # {@link pv.Label}.
+      # Rubyvis::Label.
       #
       # </ul>For more details on how to use this layout, see
       # {@link pv.Layout.Cluster}.

data/lib/rubyvis/layout/horizon.rb

@@ -9,9 +9,9 @@ module Rubyvis
     # area chart where the area is folded into multiple bands. Color is used to
     # encode band, allowing the size of the chart to be reduced significantly
     # without impeding readability. This layout algorithm is based on the work of
-    # J. Heer, N. Kong and M. Agrawala in <a  href="http://hci.stanford.edu/publications/2009/heer-horizon-chi09.pdf">"Sizing
+    # J. Heer, N. Kong and M. Agrawala in {Sizing
     # the Horizon: The Effects of Chart Size and Layering on the Graphical
-    # Perception of Time Series Visualizations"</a>, CHI 2009.
+    # Perception of Time Series Visualizations}[http://hci.stanford.edu/publications/2009/heer-horizon-chi09.pdf], CHI 2009.
     #
     # <p>This layout exports a single <tt>band</tt> mark prototype, which is
     # intended to be used with an area mark. The band mark is contained in a panel

data/lib/rubyvis/layout/matrix.rb

@@ -0,0 +1,188 @@
+module Rubyvis
+  class Layout
+    # Alias for Rubyvis::Layout::Matrix 
+    def self.Matrix
+      Rubyvis::Layout::Matrix
+    end
+
+    # Implements a network visualization using a matrix view. This is, in
+    # effect, a visualization of the graph's <i>adjacency matrix</i>: the cell at
+    # row <i>i</i>, column <i>j</i>, corresponds to the link from node <i>i</i> to
+    # node <i>j</i>. The fill color of each cell is binary by default, and
+    # corresponds to whether a link exists between the two nodes. If the underlying
+    # graph has links with variable values, the <tt>fillStyle</tt> property can be
+    # substited to use an appropriate color function, such as {@link pv.ramp}.
+    #
+    # <p>For undirected networks, the matrix is symmetric around the diagonal. For
+    # directed networks, links in opposite directions can be rendered on opposite
+    # sides of the diagonal using <tt>directed(true)</tt>. The graph is assumed to
+    # be undirected by default.
+    #
+    # <p>The mark prototypes for this network layout are slightly different than
+    # other implementations:<ul>
+    #
+    # <li><tt>node</tt> - unsupported; undefined. No mark is needed to visualize
+    # nodes directly, as the nodes are implicit in the location (rows and columns)
+    # of the links.
+    #
+    # <p><li><tt>link</tt> - for rendering links; typically a {@link pv.Bar}. The
+    # link mark is added directly to the layout, with the data property defined as
+    # all possible pairs of nodes. Each pair is represented as a
+    # {@link pv.Network.Layout.Link}, though the <tt>linkValue</tt> attribute may
+    # be 0 if no link exists in the graph.
+    #
+    # <p><li><tt>label</tt> - for rendering node labels; typically a
+    # {@link pv.Label}. The label mark is added directly to the layout, with the
+    # data property defined via the layout's <tt>nodes</tt> property; note,
+    # however, that the nodes are duplicated so as to provide a label across the
+    # top and down the side. Properties such as <tt>strokeStyle</tt> and
+    # <tt>fillStyle</tt> can be overridden to compute properties from node data
+    # dynamically.
+    #
+    # </ul>For more details on how to use this layout, see
+    # {@link pv.Layout.Network}.
+    class Matrix < Network
+      @properties=Network.properties.dup
+      attr_accessor :_n, :_dx, :_dy, :_labels, :_pairs
+      def build_implied_post(s)
+        @_n = s.nodes.size
+        @_dx = s.width.to_f / @_n
+        @_dy = s.height.to_f / @_n
+        @_labels = s._matrix.labels
+        @_pairs = s._matrix.pairs
+      end
+      # Deletes special add from network
+      def _link # :nodoc:
+        that=self
+        l=Mark.new().
+          mark_extend(@node).
+          data(lambda {|d| [d.source_node, d.target_node] }).
+          fill_style(nil).
+          line_width(lambda {|d,_p| _p.link_value * 1.5 }).
+          stroke_style("rgba(0,0,0,.2)")
+        l
+      end
+      
+      def initialize
+        super
+        @_n=nil, # cached matrix size
+        @_dx=nil, # cached cell width
+        @_dy=nil, # cached cell height
+        @_labels=nil, # cached labels (array of strings)
+        @_pairs=nil, # cached pairs (array of links)
+        that=self
+        #/* Links are all pairs of nodes. */
+        @link.data(lambda  {that._pairs})
+        .left(lambda { that._dx * (self.index % that._n) })
+        .top(lambda  { that._dy * (self.index / that._n.to_f).floor })
+        .width(lambda  { that._dx })
+        .height(lambda  { that._dy })
+        .line_width(1.5)
+        .stroke_style("#fff")
+        .fill_style(lambda {|l| l.link_value!=0 ? "#555" : "#eee" })
+        
+        @link.parent = self
+        #/* No special add for links! */
+        
+        # delete this.link.add;
+
+        #/* Labels are duplicated for top & left. */
+        @node_label.
+          data(lambda  { that._labels }).
+          left(lambda  { (self.index & 1)!=0 ? that._dx * ((self.index >> 1) + 0.5) : 0 }).
+          top(lambda  { (self.index & 1)!=0 ? 0 : that._dy * ((self.index >> 1) + 0.5) }).
+          text_margin(4).text_align(lambda  { (self.index & 1)!=0 ? "left" : "right"; }).
+          text_angle(lambda  { (self.index & 1)!=0 ? -Math::PI / 2.0 : 0; });
+          @node=nil
+       end
+       def self.defaults
+         Matrix.new.mark_extend(Network.defaults).
+           directed(true)
+       end
+        ##
+        # :attr: directed
+        #
+        # Whether this matrix visualization is directed (bidirectional). By default,
+        # the graph is assumed to be undirected, such that the visualization is
+        # symmetric across the matrix diagonal. If the network is directed, then
+        # forward links are drawn above the diagonal, while reverse links are drawn
+        # below.
+        #
+        # @type boolean
+        # @name pv.Layout.Matrix.prototype.directed
+        #/
+       
+       attr_accessor_dsl :directed
+       
+
+        # Specifies an optional sort function. The sort function follows the same
+        # comparator contract required by {@link pv.Dom.Node#sort}. Specifying a sort
+        # function provides an alternative to sort the nodes as they are specified by
+        # the <tt>nodes</tt> property; the main advantage of doing this is that the
+        # comparator function can access implicit fields populated by the network
+        # layout, such as the <tt>linkDegree</tt>.
+        #
+        # <p>Note that matrix visualizations are particularly sensitive to order. This
+        # is referred to as the seriation problem, and many different techniques exist
+        # to find good node orders that emphasize clusters, such as spectral layout and
+        # simulated annealing.
+        #
+        # @param {function} f comparator function for nodes.
+        # @returns {pv.Layout.Matrix} this.
+        #/
+        def sort(f=nil,&block)
+          f||=block
+          @sort=f
+          self
+        end
+        def build_implied(s) # :nodoc:
+          return nil if network_build_implied(s)          
+          nodes = s.nodes
+          links = s.links
+          sort = @sort
+          
+          n = nodes.size
+          index = Rubyvis.range(n)
+          labels = []
+          pairs = []
+          map = {}
+          
+          s._matrix = OpenStruct.new({:labels=> labels, :pairs=> pairs})
+          
+          #/* Sort the nodes. */
+          if sort
+            index.sort! {|a,b| sort.call(nodes[a],nodes[b])}
+          end
+          #/* Create pairs. */
+          n.times {|i|
+            n.times {|j|
+            a = index[i]
+            b = index[j]
+            _p = OpenStruct.new({
+                  :row=> i,
+                  :col=> j,
+                  :source_node=> nodes[a],
+                  :target_node=> nodes[b],
+                  :link_value=> 0})
+            map["#{a}.#{b}"] = _p
+            pairs.push(map["#{a}.#{b}"])
+            }
+          }
+          #/* Create labels. */
+          n.times {|i|
+            a = index[i]
+            labels.push(nodes[a], nodes[a])
+          }
+          #/* Accumulate link values. */
+          links.each_with_index {|l,i|
+            source = l.source_node.index
+            target = l.target_node.index
+            value = l.link_value
+            map["#{source}.#{target}"].link_value += value
+            map["#{target}.#{source}"].link_value += value if (!s.directed) 
+          }
+          build_implied_post(s)
+        end
+      end
+    end
+  end

data/lib/rubyvis/layout/network.rb

@@ -15,7 +15,7 @@ module Rubyvis
     # 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 Rubyvis::Layout::Network::Node interface; which is
     # to say, be careful to avoid naming collisions with automatic attributes such
     # as <tt>index</tt> and <tt>link_degree</tt>.
     # If the nodes property is defined
@@ -24,7 +24,7 @@ module Rubyvis
     # 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
+    # this array must conform to the Rubyvis::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>.
     #
@@ -32,22 +32,18 @@ module Rubyvis
     #
     # <p>Three standard mark prototypes are provided:<ul>
     #
-    # <li><tt>node</tt> - for rendering nodes; typically a {@link pv.Dot}. The node
-    # mark is added directly to the layout, with the data property defined via the
-    # layout's <tt>nodes</tt> property. Properties such as <tt>strokeStyle</tt> and
-    # <tt>fillStyle</tt> can be overridden to compute properties from node data
-    # dynamically.
+    # <li><tt>node</tt> - for rendering nodes; typically a Rubyvis::Dot. The node mark is added directly to the layout, with the data property defined via the layout's <tt>nodes</tt> property. Properties such as <tt>stroke_style</tt> and <tt>fillStyle</tt> can be overridden to compute properties from node data dynamically.
     #
-    # <p><li><tt>link</tt> - for rendering links; typically a {@link pv.Line}. The
+    # <p><li><tt>link</tt> - for rendering links; typically a Rubyvis::Line. The
     # link mark is added to a child panel, whose data property is defined as
     # layout's <tt>links</tt> property. The link's data property is then a
     # two-element array of the source node and target node. Thus, poperties such as
-    # <tt>strokeStyle</tt> and <tt>fillStyle</tt> can be overridden to compute
+    # <tt>stroke_style</tt> and <tt>fill_style</tt> can be overridden to compute
     # properties from either the node data (the first argument) or the link data
     # (the second argument; the parent panel data) dynamically.
     #
-    # <p><li><tt>label</tt> - for rendering node labels; typically a
-    # {@link pv.Label}. The label mark is added directly to the layout, with the
+    # <p><li><tt>node_label</tt> - for rendering node labels; typically a
+    # Rubyvis::Label. The label mark is added directly to the layout, with the
     # data property defined via the layout's <tt>nodes</tt> property. Properties
     # such as <tt>strokeStyle</tt> and <tt>fillStyle</tt> can be overridden to
     # compute properties from node data dynamically.
@@ -223,6 +219,7 @@ module Rubyvis
       def build_implied(s) # :nodoc:
         network_build_implied(s)
       end
+      
       def network_build_implied(s) # :nodoc:
         layout_build_implied(s)
         return true if (!s._id.nil? and s._id >= self._id)

data/lib/rubyvis/layout/pack.rb

@@ -9,13 +9,13 @@ module Rubyvis
     # the exported mark prototypes changes slightly in the space-filling
     # implementation:<ul>
     #
-    # <li><tt>node</tt> - for rendering nodes; typically a {@link pv.Dot}.
+    # <li><tt>node</tt> - for rendering nodes; typically a Rubyvis::Dot.
     #
     # <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}.
+    # Rubyvis::Label.
     #
     # </ul>The pack layout support dynamic sizing for leaf nodes, if a
     # {@link #size} psuedo-property is specified. The default size function returns
@@ -29,7 +29,7 @@ module Rubyvis
     # operator.
     #
     # <p>For more details on how to use this layout, see
-    # {@link pv.Layout.Hierarchy}.
+    # Rubyvis::Layout::Hierarchy.
     #
     # @extends pv.Layout.Hierarchy
     # @see <a href="http://portal.acm.org/citation.cfm?id=1124772.1124851"

data/lib/rubyvis/layout/partition.rb

@@ -22,7 +22,7 @@ module Rubyvis
     # operator.
     #
     # <p>For more details on how to use this layout, see
-    # {@link pv.Layout.Hierarchy}.
+    # Rubyvis::Layout::Hierarchy.
     #
     # @see pv.Layout.Partition.Fill
     # @extends pv.Layout.Hierarchy
@@ -193,7 +193,7 @@ module Rubyvis
       # in the arrangement of the space-filling nodes.
       #
       # <p><li><tt>label</tt> - for rendering node labels; typically a
-      # {@link pv.Label}.
+      # Rubyvis::Label.
       #
       # </ul>For more details on how to use this layout, see
       # {@link pv.Layout.Partition}.

data/lib/rubyvis/layout/tree.rb

@@ -18,7 +18,7 @@ module Rubyvis
     # dimensions, similar to the indent layout.
     #
     # <p>For more details on how to use this layout, see
-    # {@link pv.Layout.Hierarchy}
+    # Rubyvis::Layout::Hierarchy
     class Tree < Hierarchy
       @properties=Hierarchy.properties.dup
       def initialize

data/lib/rubyvis/layout/treemap.rb

@@ -1,5 +1,6 @@
 module Rubyvis
   class Layout
+    # Alias for Rubyvis::Layout::Treemap
     def self.Treemap
       Rubyvis::Layout::Treemap
     end
@@ -21,16 +22,16 @@ module Rubyvis
     # the standard <tt>x</tt> and <tt>y</tt> position attributes.
     #
     # <p><li><tt>leaf</tt> - for rendering leaf nodes only, with no fill or stroke
-    # style by default; typically a {@link pv.Panel} or another layout!
+    # style by default; typically a Rubyvis::Panel or another layout!
     #
     # <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}.
+    # Rubyvis::Label.
     #
     # </ul>For more details on how to use this layout, see
-    # {@link pv.Layout.Hierarchy}.
+    # Rubyvis::Layout::Hierarchy.
     #
     class Treemap < Hierarchy
       @properties=Hierarchy.properties.dup
@@ -265,14 +266,14 @@ module Rubyvis
             
             if (n.size > 0) 
               #/* Scale the sizes to fill the current subregion. */
-              n.visit_before {|n,i| n.size *= k }
+              n.visit_before {|n1,i1| n1.size *= k }
               
               #/** @private Position the specified nodes along one dimension. */
-              position=lambda {|row| 
+              position=lambda {|row1| 
                 horizontal = w == l
-                sum = Rubyvis.sum(row, size)
+                sum = Rubyvis.sum(row1, size)
                 r = l>0 ? round.call(sum / l.to_f) : 0
-                slice.call(row, sum, horizontal, x, y, horizontal ? w : r, horizontal ? r : h)
+                slice.call(row1, sum, horizontal, x, y, horizontal ? w : r, horizontal ? r : h)
                 if horizontal 
                   y += r
                   h -= r

data/lib/rubyvis/layout.rb

@@ -43,4 +43,5 @@ require 'rubyvis/layout/cluster'
 require 'rubyvis/layout/indent'
 require 'rubyvis/layout/pack'
 require 'rubyvis/layout/arc'
+require 'rubyvis/layout/matrix'
 

data/lib/rubyvis/mark/shorcut_methods.rb

@@ -295,5 +295,19 @@ class Rubyvis::Mark
   # 
   # See Mark for examples of use    
   mark_method :layout_arc, Rubyvis::Layout::Arc    
+
+  ##
+  # :method: layout_matrix(opts,&block)
+  #
+  # Adds a Layout::Matrix 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_matrix, Rubyvis::Layout::Matrix    
   
 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, :group, :depth, :breadth, :spacing, :rows, :cols, :_grid,:bands, :background_style, :positive_style, :negative_style,:directed
+    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, :depth, :breadth, :spacing, :rows, :cols, :_grid,:bands, :background_style, :positive_style, :negative_style,:directed, :_matrix
     
     def []=(v,i)
       if v.is_a? Numeric

data/lib/rubyvis.rb

@@ -30,7 +30,7 @@ require 'rubyvis/mark/shorcut_methods'
 module Rubyvis
   @document=nil
   # Rubyvis version
-  VERSION = '0.3.5' 
+  VERSION = '0.3.6' 
   # 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/spec/layout_arc_spec.rb

@@ -0,0 +1,87 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+describe Rubyvis::Layout::Arc do
+  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}
+    Rubyvis::Layout::Arc.properties.should==props 
+  end
+  describe "rendered" do
+    before do
+      
+      
+      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})
+      
+      ]
+      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}),
+      ]
+      
+      
+      w = 300
+      h = 100
+      
+      color=Rubyvis::Colors.category19
+      
+      @vis = Rubyvis::Panel.new()
+      .width(w)
+      .height(h)
+      .bottom(50)
+      .left(0)
+      
+      mat=@vis.add(Rubyvis::Layout::Arc)
+      .nodes(nodes).links(links)
+      .sort(lambda {|a,b| a.group<=>b.group})
+      
+      mat.link.add(Rubyvis::Line).
+      antialias(false).
+      line_width(1)
+      
+      mat.node.add(Rubyvis::Dot).
+      shape_size(10).
+      fill_style(lambda {|l| color[l.group]})
+      
+      mat.node_label.add(Rubyvis::Label).
+      text_style(lambda {|l| color[l.group]})
+      
+      @vis.render
+
+      html_out=<<EOF
+<svg font-size="10px" font-family="sans-serif" fill="none" stroke="none" stroke-width="1.5" width="300" height="150"><g><g><g><path shape-rendering="crispEdges" d="M25,100A25,25 0 0,1 75,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M75,100A25,25 0 0,1 125,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M125,100A25,25 0 0,1 175,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M175,100A25,25 0 0,1 225,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M225,100A25,25 0 0,1 275,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M25,100A25,25 0 0,1 75,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M75,100A25,25 0 0,1 125,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M125,100A25,25 0 0,1 175,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M175,100A25,25 0 0,1 225,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g><g><path shape-rendering="crispEdges" d="M225,100A25,25 0 0,1 275,100" stroke="rgb(0,0,0)" stroke-opacity="0.2" stroke-width="1"/></g></g><g><circle fill="rgb(156,158,222)" stroke="rgb(31,119,180)" cx="25" cy="100" r="3.1622776601683795"/><circle fill="rgb(156,158,222)" stroke="rgb(31,119,180)" cx="75" cy="100" r="3.1622776601683795"/><circle fill="rgb(115,117,181)" stroke="rgb(31,119,180)" cx="125" cy="100" r="3.1622776601683795"/><circle fill="rgb(115,117,181)" stroke="rgb(31,119,180)" cx="175" cy="100" r="3.1622776601683795"/><circle fill="rgb(74,85,132)" stroke="rgb(31,119,180)" cx="225" cy="100" r="3.1622776601683795"/><circle fill="rgb(74,85,132)" stroke="rgb(31,119,180)" cx="275" cy="100" r="3.1622776601683795"/></g><g><text pointer-events="none" x="-7" dy="0.35em" transform="translate(25, 100) rotate(270)" fill="rgb(156,158,222)" text-anchor="end">A</text><text pointer-events="none" x="-7" dy="0.35em" transform="translate(75, 100) rotate(270)" fill="rgb(156,158,222)" text-anchor="end">B</text><text pointer-events="none" x="-7" dy="0.35em" transform="translate(125, 100) rotate(270)" fill="rgb(115,117,181)" text-anchor="end">C</text><text pointer-events="none" x="-7" dy="0.35em" transform="translate(175, 100) rotate(270)" fill="rgb(115,117,181)" text-anchor="end">D</text><text pointer-events="none" x="-7" dy="0.35em" transform="translate(225, 100) rotate(270)" fill="rgb(74,85,132)" text-anchor="end">E</text><text pointer-events="none" x="-7" dy="0.35em" transform="translate(275, 100) rotate(270)" fill="rgb(74,85,132)" text-anchor="end">F</text></g></g></svg>
+EOF
+      @rv_svg=Nokogiri::XML(@vis.to_svg)
+      @pv_svg=Nokogiri::XML(html_out)
+    end
+    
+    it "should render correct number of clipaths" do
+      
+      @rv_svg.xpath("//xmlns:path").size.should 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']
+      }
+    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]
+      }
+      
+    end
+  end
+end

data/spec/layout_matrix_spec.rb

@@ -0,0 +1,80 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+describe Rubyvis::Layout::Matrix do
+  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}
+    Rubyvis::Layout::Matrix.properties.should==props 
+  end
+  describe "rendered" do
+    before do
+            
+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})
+
+]
+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}),
+]
+    
+
+w = 700
+h = 700
+
+color=Rubyvis::Colors.category19()
+@vis = Rubyvis::Panel.new()
+  .width(w)
+  .height(h)
+  .top(50)
+  .left(50)
+
+mat=@vis.add(Rubyvis::Layout.Matrix)
+.directed(true)
+.nodes(nodes).links(links)
+.sort(lambda {|a,b| a.group<=>b.group})
+
+mat.link.add(pv.Bar).
+fill_style(lambda {|l| l.link_value!=0 ? 
+((l.target_node.group==l.source_node.group) ? color[l.sourceNode] : "#555") : "#eee"}).
+antialias(false).
+line_width(1)
+mat.node_label.add(Rubyvis::Label).
+text_style(color)
+
+
+      
+      @vis.render
+      
+      html_out=<<EOF
+<svg font-size="10px" font-family="sans-serif" fill="none" stroke="none" stroke-width="1.5" width="750" height="750"><g transform="translate(50, 50)"><g><rect shape-rendering="crispEdges" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="116.66666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(156,158,222)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="233.33333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="350" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="466.6666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="583.3333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" y="116.66666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(156,158,222)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="116.66666666666667" y="116.66666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="233.33333333333334" y="116.66666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(85,85,85)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="350" y="116.66666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="466.6666666666667" y="116.66666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="583.3333333333334" y="116.66666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" y="233.33333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="116.66666666666667" y="233.33333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(85,85,85)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="233.33333333333334" y="233.33333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="350" y="233.33333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(156,158,222)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="466.6666666666667" y="233.33333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="583.3333333333334" y="233.33333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" y="350" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="116.66666666666667" y="350" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="233.33333333333334" y="350" width="116.66666666666667" height="116.66666666666667" fill="rgb(156,158,222)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="350" y="350" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="466.6666666666667" y="350" width="116.66666666666667" height="116.66666666666667" fill="rgb(85,85,85)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="583.3333333333334" y="350" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" y="466.6666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="116.66666666666667" y="466.6666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="233.33333333333334" y="466.6666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="350" y="466.6666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(85,85,85)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="466.6666666666667" y="466.6666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="583.3333333333334" y="466.6666666666667" width="116.66666666666667" height="116.66666666666667" fill="rgb(156,158,222)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" y="583.3333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="116.66666666666667" y="583.3333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="233.33333333333334" y="583.3333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="350" y="583.3333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="466.6666666666667" y="583.3333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(156,158,222)" stroke="rgb(255,255,255)" stroke-width="1"/><rect shape-rendering="crispEdges" x="583.3333333333334" y="583.3333333333334" width="116.66666666666667" height="116.66666666666667" fill="rgb(238,238,238)" stroke="rgb(255,255,255)" stroke-width="1"/></g><g><text pointer-events="none" x="-4" dy="0.35em" transform="translate(0, 58.3333)" fill="rgb(156,158,222)" text-anchor="end">A</text><text pointer-events="none" x="4" dy="0.35em" transform="translate(58.3333) rotate(-90)" fill="rgb(156,158,222)">A</text><text pointer-events="none" x="-4" dy="0.35em" transform="translate(0, 175)" fill="rgb(156,158,222)" text-anchor="end">B</text><text pointer-events="none" x="4" dy="0.35em" transform="translate(175) rotate(-90)" fill="rgb(156,158,222)">B</text><text pointer-events="none" x="-4" dy="0.35em" transform="translate(0, 291.667)" fill="rgb(156,158,222)" text-anchor="end">C</text><text pointer-events="none" x="4" dy="0.35em" transform="translate(291.667) rotate(-90)" fill="rgb(156,158,222)">C</text><text pointer-events="none" x="-4" dy="0.35em" transform="translate(0, 408.333)" fill="rgb(156,158,222)" text-anchor="end">D</text><text pointer-events="none" x="4" dy="0.35em" transform="translate(408.333) rotate(-90)" fill="rgb(156,158,222)">D</text><text pointer-events="none" x="-4" dy="0.35em" transform="translate(0, 525)" fill="rgb(156,158,222)" text-anchor="end">E</text><text pointer-events="none" x="4" dy="0.35em" transform="translate(525) rotate(-90)" fill="rgb(156,158,222)">E</text><text pointer-events="none" x="-4" dy="0.35em" transform="translate(0, 641.667)" fill="rgb(156,158,222)" text-anchor="end">F</text><text pointer-events="none" x="4" dy="0.35em" transform="translate(641.667) rotate(-90)" fill="rgb(156,158,222)">F</text></g></g></svg>
+EOF
+      @rv_svg=Nokogiri::XML(@vis.to_svg)
+      @pv_svg=Nokogiri::XML(html_out)
+    end
+    
+    it "should render correct number of rects(links)" do
+      @rv_svg.xpath("//xmlns:rect").size.should 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]
+      }
+      
+    end
+    
+    
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,19 @@
 $:.unshift(File.dirname(__FILE__)+"/../lib")
+begin
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/spec/"
+    add_group "Libraries", "lib"
+  end
+rescue LoadError
+end
 require 'rspec'
 #require 'spec/autorun'
 require 'rubyvis'
 require 'pp'
 require 'nokogiri'
+
+
 $PROTOVIS_DIR=File.dirname(__FILE__)+"/../vendor/protovis/src"
 module Rubyvis
   class JohnsonLoader
@@ -34,6 +44,22 @@ RSpec::Matchers.define :have_svg_attributes do |exp|
     }
   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"]
+    }
+    attrs[exp.name].each do |attr|
+      if (obs[attr].to_f -  exp[attr].to_f)>0.0001
+        correct=false
+        break
+      end
+    end
+    correct
+  end
+end
 RSpec::Matchers.define :have_path_data_close_to do |exp|
   def path_scan(path)
       path.scan(/([MmCcZzLlHhVvSsQqTtAa, ])(\d+(?:\.\d+)?)/).map {|v|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyvis
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -36,7 +36,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-12-20 00:00:00 -03:00
+date: 2010-12-28 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,6 +172,7 @@ files:
 - examples/5_pv_hierarchies/sunburst.rb
 - examples/5_pv_hierarchies/treemap.rb
 - examples/6_pv_networks/arc.rb
+- examples/6_pv_networks/matrix.rb
 - examples/6_pv_networks/miserables_data.rb
 - lib/rubyvis.rb
 - lib/rubyvis/color/color.rb
@@ -191,6 +192,7 @@ files:
 - lib/rubyvis/layout/hierarchy.rb
 - lib/rubyvis/layout/horizon.rb
 - lib/rubyvis/layout/indent.rb
+- lib/rubyvis/layout/matrix.rb
 - lib/rubyvis/layout/network.rb
 - lib/rubyvis/layout/pack.rb
 - lib/rubyvis/layout/partition.rb
@@ -238,7 +240,9 @@ files:
 - spec/internal_spec.rb
 - spec/javascript_behaviour_spec.rb
 - spec/label_spec.rb
+- spec/layout_arc_spec.rb
 - spec/layout_horizon_spec.rb
+- spec/layout_matrix_spec.rb
 - spec/layout_stack_spec.rb
 - spec/line_spec.rb
 - spec/mark_spec.rb