rubyvis 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.3.1 / 2010-11-19
+
+* Added Layout::Partition
+* Added Rubyvis::Histogram
+* Added sunburst and icicle example
+* Added shortcuts methods for layouts
+* Bug fix on Hierarchy
+* Updated README and Histogram spec
+
 === 0.3.0 / 2010-11-17
 * Network and Hierarchy classes on module Layout implemented. Require testing
 * Rubyvis::Layout::Treemap fully operational

data/Manifest.txt

@@ -20,6 +20,7 @@ examples/first_protovis_api.rb
 examples/first_rbp_api.rb
 examples/fixtures/tipsy.gif
 examples/grouped_charts.rb
+examples/icicle.rb
 examples/image.rb
 examples/line.rb
 examples/line_and_step.rb
@@ -29,6 +30,7 @@ examples/pie_and_donut.rb
 examples/scatterplot.rb
 examples/second.rb
 examples/stacked_charts.rb
+examples/sunburst.rb
 examples/third.rb
 examples/treemap/treemap.rb
 examples/treemap/treemap_data.rb
@@ -39,11 +41,13 @@ lib/rubyvis/dom.rb
 lib/rubyvis/format.rb
 lib/rubyvis/format/date.rb
 lib/rubyvis/format/number.rb
+lib/rubyvis/histogram.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/partition.rb
 lib/rubyvis/layout/stack.rb
 lib/rubyvis/layout/treemap.rb
 lib/rubyvis/mark.rb
@@ -82,6 +86,7 @@ spec/anchor_spec.rb
 spec/area_spec.rb
 spec/bar_spec.rb
 spec/dom_spec.rb
+spec/histogram_spec.rb
 spec/internal_spec.rb
 spec/javascript_behaviour_spec.rb
 spec/label_spec.rb

data/README.txt

@@ -8,22 +8,20 @@ Ruby port of Protovis[http://vis.stanford.edu/protovis/], a great visualization
 
 == FEATURES/PROBLEMS:
 
-Implemented: All marks, except transient and transitions. 
+Implemented: 
+* Marks: All, except transient and transitions.
+* Layout: Partition, Stack and Treemap.
 
-Basic protovis examples[http://vis.stanford.edu/protovis/ex/] works exactly like ruby ones with minor sintactic modifications:
-* Area Charts: Ok
-* Bar & Column Charts: Ok
-* Scatterplots: Ok
-* Pie & Donut: Interaction with mouse not implemented
-* Line & Step Charts: Ok
-* Stacked Charts: Ok
-* Grouped Charts: Ok.
+Using protovis examples[http://vis.stanford.edu/protovis/ex/] as reference
 
-Complex examples requires more works:
-
-* antibiotics: Ok
-* barley: Ok
-* crimea: line and grouped line ok.
+* Conventional: All working
+* Custom: 
+ * Backer's Barley
+ * Burtin's Antibiotics
+* Hierarchies:
+ * Sunbursts
+ * Icicles
+ * Treemaps
 
 
 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. 
@@ -34,16 +32,23 @@ User could use +pv+ freely, cause is defined as a global method which call Rubyv
 
 * pv.js
 * pv-internals.js
-* color/Color.js (incomplete)
+* color/Color.js
 * color/Colors.js
 * data/Arrays.js
+* data/Histogram.js
 * data/Numbers.js
-* data/Scale.js
 * data/LinearScale.js
 * data/LogScale.js (incomplete)
 * data/Nest.js
 * data/QuantitativeScale.js
 * data/OrdinalScale.js
+* data/Scale.js
+* layout/Hierarchy.js
+* layout/Layout.js
+* layout/Hierarchy.js
+* layout/Network.js
+* layout/Partition.js
+* layout/Stack.js
 * mark/Anchor.js
 * mark/Area.js
 * mark/Bar.js 
@@ -60,6 +65,7 @@ User could use +pv+ freely, cause is defined as a global method which call Rubyv
 * scene/SvgPanel.js
 * scene/SvgRule.js
 * scene/SvgScene.js
+* scene/SvgWedge.js
 * text/Format.js (incomplete)
 * text/NumberFormat.js (incomplete)
 

data/examples/barley/barley.rb

@@ -81,7 +81,7 @@ vis.add(pv.Rule)
 
 # A legend showing the year. */
 vis.add(pv.Dot)
-    .extend(dot)
+    .mark_extend(dot)
     .data([{:year=>1931}, {:year=>1932}])
     .left(lambda {|d| 260 + self.index * 40})
     .top(-8)

data/examples/icicle.rb

@@ -0,0 +1,48 @@
+# = Icicle
+# An icicle is simply a sunburst transformed from polar to cartesian coordinates. Here we show the various files on Rubyvis package; the color of each cell corresponds to the package, while the area encodes the size of the source code in bytes 
+# 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__)+"/../")
+
+colors=Rubyvis::Colors.category19
+vis = Rubyvis::Panel.new.
+  width(600).
+  height(500).
+  bottom(30)
+
+layout = vis.add(Rubyvis::Layout::Partition::Fill).
+  nodes(Rubyvis.dom(files).root("rubyvis").nodes)
+layout.order("descending")
+layout.orient("top")
+layout.size(lambda {|d| d.node_value})
+
+layout.node.add(pv.Bar).
+  fill_style( lambda {|d|
+  colors.scale(d.parent_node ? d.parent_node.node_name : '')}
+  ).
+  stroke_style("rgba(255,255,255,.5)").
+  line_width(1).
+  antialias(false)
+
+layout.node_label.add(pv.Label)
+    .text_angle(-Math::PI / 2.0)
+    .visible(lambda {|d| d.dx >6 })
+vis.render()
+
+puts vis.to_svg

data/examples/sunburst.rb

@@ -0,0 +1,50 @@
+# = 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
+
+$:.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__)+"/../")
+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}
+    order "descending"
+    orient "radial"
+    
+    node.wedge do 
+      fill_style {|d| colors.scale(d.parent_node)}
+      stroke_style("#fff")
+      line_width(0.5)
+    end
+    
+    node_label.label do 
+      visible {|d| d.angle * d.outer_radius >= 6}
+    end
+    
+  end
+end
+vis.render
+
+
+puts vis.to_svg

data/examples/treemap/treemap.rb

@@ -4,7 +4,7 @@
 $:.unshift(File.dirname(__FILE__)+"/../../lib")
 require 'rubyvis'
 load(File.dirname(__FILE__)+"/treemap_data.rb")
-color = pv.Colors.category19()
+color = pv.Colors.category19
 nodes = pv.dom($flare).root("flare").nodes
 
 

data/lib/rubyvis.rb

@@ -13,6 +13,8 @@ require 'rubyvis/javascript_behaviour'
 require 'rubyvis/format'
 require 'rubyvis/mark'
 require 'rubyvis/scale'
+require 'rubyvis/histogram'
+
 require 'rubyvis/color/color'
 require 'rubyvis/color/colors'
 
@@ -21,12 +23,13 @@ require 'rubyvis/dom'
 
 require 'rubyvis/scene/svg_scene'
 require 'rubyvis/transform'
+require 'rubyvis/mark/shorcut_methods'
 
 
 module Rubyvis
   @document=nil
   # Rubyvis version
-  VERSION = '0.3.0' 
+  VERSION = '0.3.1' 
   # 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

@@ -100,7 +100,19 @@ module Rubyvis
       attr_accessor :y
       attr_accessor :size
       
+      attr_accessor :min_breadth
+      attr_accessor :max_breadth
+      attr_accessor :breadth
+      attr_accessor :min_depth
+      attr_accessor :max_depth
       
+      attr_accessor :mid_angle
+      attr_accessor :angle
+      attr_accessor :start_angle
+      attr_accessor :outer_radius
+      attr_accessor :inner_radius      
+      
+
       # Constructs a DOM node for the specified value. Instances of this class are
       # not typically created directly; instead they are generated from a JavaScript 
       # map using the {@link pv.Dom} operator.

data/lib/rubyvis/histogram.rb

@@ -0,0 +1,44 @@
+module Rubyvis
+  def self.histogram(data,f=nil)
+    Rubyvis::Histogram.new(data,f)
+  end
+  class Histogram
+    module Bin
+      attr_accessor :x, :dx, :y
+    end
+    attr_accessor :frequency
+    attr_reader :data
+    attr_reader :f
+    def initialize(data,f=nil)
+      @data=data
+      @f=f
+      @frequency=true
+    end
+    def bins(ticks=nil)
+      x=Rubyvis.map(data,f)
+      bins=[]
+      ticks||=Rubyvis::Scale.linear(x).ticks()
+      # Initialize the bins
+      (ticks.size-1).times {|i|
+        bin=bins[i]=[]
+        bin.extend Bin
+        bin.x=ticks[i]
+        bin.dx=ticks[i+1]-ticks[i]
+        bin.y=0
+      }
+      x.size.times {|i|
+        j=Rubyvis.search_index(ticks, x[i])-1
+        bin=bins[ [0,[bins.size-1,j].min].max]
+        bin.y+=1
+        bin.push(data[i])
+      }
+      if !@frequency
+        bins.each {|b|
+          b.y=b.y/x.size.to_f
+        }
+      end
+      bins
+    end
+    
+  end
+end

data/lib/rubyvis/layout.rb

@@ -4,13 +4,13 @@ module Rubyvis
   end
   class Layout < Rubyvis::Panel
     @properties=Panel.properties.dup
-    def build_properties(s,properties)
+    def build_properties(s,properties)      
       layout_build_properties(s,properties)
     end
     def layout_build_properties(s,properties)
-      mark_build_properties(s,properties)
+      mark_build_properties(s, properties)
     end
-    def layout_build_implied(s)
+    def layout_build_implied(s)      
       panel_build_implied(s)
     end
     def self.attr_accessor_dsl(*attr)
@@ -35,5 +35,5 @@ require 'rubyvis/layout/stack'
 require 'rubyvis/layout/network'
 require 'rubyvis/layout/hierarchy'
 require 'rubyvis/layout/treemap'
-
+require 'rubyvis/layout/partition'
 

data/lib/rubyvis/layout/hierarchy.rb

@@ -56,191 +56,188 @@ module Rubyvis
               :link_value=>1
         })}
       end
-      def node_link
-        NodeLink.new(self)
-      end
-      def fill
-        Fill.new(self)
-      end
+      #def node_link
+      #  NodeLink.new(self)
+      #end
+      #def fill
+      #  Fill.new(self)
+      #end
     end
     
-    class NodeLink
-      attr_accessor :ir, :_or, :orient, :w, :h
-      def initialize(obj)
-        @obj=obj
-      end
-      def build_implied(s)
+    module NodeLink
+      attr_accessor :_ir, :_or, :_orient, :_w, :_h
+      def node_link_build_implied(s)
         nodes = s.nodes
-        orient= s.orient
-        orient=~/^(top|bottom)$/
+        @_orient= s.orient
+        @_orient=~/^(top|bottom)$/
         
-        horizontal = $1
-        w = s.width
-        h = s.height
+        horizontal = !$1.nil?
+        @_w = s.width
+        @_h = s.height
         # /* Compute default inner and outer radius. */
-        if (orient == "radial") 
-          ir = s.inner_radius
-          _or = s.outer_radius
-          ir||=0
-          _or||=[w,h].min / 2.0
+        if (@_orient == "radial") 
+          @_ir = s.inner_radius
+          @_or = s.outer_radius
+          @_ir||=0
+          @_or||=[@_w,@_h].min / 2.0
         end
-        nodes.length.times {|i|
-          n = nodes[i]
-          n.mid_angle = (orient == "radial") ? mid_angle(n) : (horizontal ? Math::PI / 2.0 : 0)
-          n.x = x(n)
-          n.y = y(n)
+        nodes.each_with_index{|n,i|
+          n.mid_angle = (@_orient == "radial") ? mid_angle(n) : (horizontal ? Math::PI / 2.0 : 0)
+          n.x = node_link_x(n)
+          n.y = node_link_y(n)
           n.mid_angle+=Math::PI if (n.first_child)
-        }      
+        }
+        false
       end
       def radius(n)
-        n.parent_node ? (n.depth * (_or-ir)+ir) : 0
+        n.parent_node ? (n.depth * (@_or-@_ir)+@_ir) : 0
       end
-      def min_angle(n)
+      def mid_angle(n)
         n.parent_node ? ((n.breadth - 0.25) * 2 * Math::PI ) : 0
       end
-      def x(n)
-        case orient
+      def node_link_x(n)
+        case @_orient
           when "left"
-            n.depth*w
+            n.depth*@_w
           when "right"
-            w-n.depth*w
+            @_w-n.depth*@_w
           when "top"
-            n.breadth*w
+            n.breadth*@_w
           when "bottom"
-            w-n.breath*w
+            @_w-n.breath*@_w
           when "radial"
-            w/2.0+radius(n)*Math.cos(n.mid_angle)
+            @_w/2.0+radius(n)*Math.cos(n.mid_angle)
         end
       end
-      def y(n)
-        case orient
+      def node_link_y(n)
+        case @_orient
           when "left"
-            n.breadth*h
+            n.breadth*@_h
           when "right"
-            h-n.depth*h
+            @_h-n.depth*@_h
           when "top"
-            n.depth*h            
+            n.depth*@_h            
           when "bottom"
-            h-n.breath*h
+            @_h-n.breath*@_h
           when "radial"
-            h / 2.0 + radius(n) * Math.sin(n.mid_angle)
+            @_h / 2.0 + radius(n) * Math.sin(n.mid_angle)
         end # end case
       end # end method
     end # end class
     
-    class Fill
-      attr_accessor :ir, :_or, :orient, :w, :h
-      def initialize(obj)
-        @obj=obj
-      end
-      def constructor
-        self.node.
-        stroke_style("#fff").
-        fill_style("#ccc").
-        width(lambda {|n| n.dx}).
-        height(lambda {|n| n.dy}).
-        inner_radius(lambda {|n| n.inner_radius}).
-        outer_radius(lambda {|n| n.outer_radius}).
-        start_angle(lambda {|n| n.start_angle}).
-        angle(lambda {return n.angle})
-      self.node_label.
-        text_align("center").
-        left(lambda {|n| n.x+ (n.dx / 2.0) })
-        top(lambda {|n| n.y+(n.dy / 0.2)})
-        # delete this.link
+    module Fill
+      attr_accessor :ir, :_or, :_orient, :_w, :_h
+      def fill_constructor
+        @node.stroke_style("#fff").
+          fill_style("#ccc").
+          width(lambda {|n| n.dx}).
+          height(lambda {|n| n.dy}).
+          inner_radius(lambda {|n| n.inner_radius}).
+          outer_radius(lambda {|n| n.outer_radius}).
+          start_angle(lambda {|n| n.start_angle}).
+          angle(lambda {|n| n.angle})
+        
+          @node_label.
+            text_align("center").
+            left(lambda {|n| n.x+ (n.dx / 2.0) }).
+            top(lambda {|n| n.y+(n.dy / 2.0)})
+          @link=nil
+        
       end
-      def build_implied(s)
+      
+      def fill_build_implied(s)
         nodes = s.nodes
-        orient= s.orient
-        orient=~/^(top|bottom)$/
-        horizontal = $1
-        w = s.width
-        h = s.height
-        depth = -nodes[0].min_depth
-        if (orient == "radial") 
-          ir = s.inner_radius
-          _or = s.outer_radius
-          ir||=0
-          depth = depth * 2 if ir!=0
-          _or||=[w,h].min / 2.0
+        @_orient= s.orient
+        @_orient=~/^(top|bottom)$/
+        horizontal = !$1.nil?
+        @_w = s.width
+        @_h = s.height
+        @_depth = -nodes[0].min_depth
+        if (@_orient == "radial") 
+          @_ir = s.inner_radius
+          @_or = s.outer_radius
+          @_ir||=0
+          @_depth = @_depth * 2 if @_ir!=0
+          @_or||=[@_w,@_h].min / 2.0
         end
         nodes.each_with_index {|n,i|
-          n.x = x(n)
-          n.y = y(n)
-          if (orient == "radial") 
+          n.x = fill_x(n)
+          n.y = fill_y(n)
+          if (@_orient == "radial") 
             n.inner_radius = inner_radius(n);
             n.outer_radius = outer_radius(n);
             n.start_angle = start_angle(n);
             n.angle = angle(n);
-            n.mid_Angle = n.start_angle + n.angle / 2.0;
+            n.mid_angle = n.start_angle + n.angle / 2.0
           else 
-            n.mid_angle = horizontal ? -Math::PI / 2.0 : 0;
+            n.mid_angle = horizontal ? -Math::PI / 2.0 : 0
           end
           n.dx = dx(n)
           n.dy = dy(n)
         }
+        false
       end
       
-      def scale(d, depth)
+      def fill_scale(d, depth)
         (d+depth) / (1.0+depth)
       end
-      def x(n)
-        case orient
+      def fill_x(n)
+        case @_orient
           when "left"
-            scale(n.min_depth,depth)*w
+            fill_scale(n.min_depth,@_depth)*@_w
           when "right"
-            (1-scale(n.max_depth,depth))*w
+            (1-fill_scale(n.max_depth,@_depth))*@_w
           when "top"
-            n.min_breadth*w
+            n.min_breadth*@_w
           when "bottom"
-            (1-n.max_breath)*w
+            (1-n.max_breath)*@_w
           when "radial"
-            w / 2.0
+            @_w / 2.0
         end
       end
-      def y(n)
-        case orient
+      def fill_y(n)
+        case @_orient
           when "left"
-            n.min_breadth*h
+            n.min_breadth*@_h
           when "right"
-            (1-n.max_breadth)*h
+            (1-n.max_breadth)*@_h
           when "top"
-            scale(n.min_depth, depth) * h            
+            fill_scale(n.min_depth, @_depth) * @_h            
           when "bottom"
-            (1-scale(n.max_depth, depth)) * h
+            (1-fill_scale(n.max_depth, @_depth)) * @_h
           when "radial"
-            h / 2.0
+            @_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;
-        elsif orient=='top' or orient=='bottom'
-          (n.max_breadth - n.min_breadth) * w
-        elsif orient=='radial'
+        if @_orient=='left' or @_orient=='right'
+          (n.max_depth - n.min_depth) / (1.0 + @_depth) * @_w
+        elsif @_orient=='top' or @_orient=='bottom'
+          (n.max_breadth - n.min_breadth) * @_w
+        elsif @_orient=='radial'
           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;
-        elsif orient=='top' or orient=='bottom'
-          (n.max_depth - n.min_depth) / (1.0 + depth) * h;
+        if @_orient=='left' or @_orient=='right'
+          (n.max_breadth - n.min_breadth) * @_h
+        elsif @_orient=='top' or @_orient=='bottom'
+          (n.max_depth - n.min_depth) / (1.0 + @_depth) * @_h
         elsif orient=='radial'
           n.parent_node ? (n.inner_radius + n.outer_radius) * Math.sin(n.mid_angle) : 0
         end        
       end
       def inner_radius(n)
-        [0, scale(n.min_depth, depth/2.0)].max * (_or - _ir) + ir
+        [0, fill_scale(n.min_depth, @_depth/2.0)].max * (@_or - @_ir) + @_ir
       end
       def outer_radius(n)
-        scale(n.max_depth, depth / 2.0) * (_or - ir) + ir
+        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
       def angle(n)
-        (n.parent_node ? n.max_breadt - n.min_breadth : 1 ) * 2 * Math::PI
+        (n.parent_node ? n.max_breadth - n.min_breadth : 1 ) * 2 * Math::PI
       end
     end
   end

data/lib/rubyvis/layout/network.rb

@@ -136,7 +136,8 @@ module Rubyvis
       # but it was replaced to not conflict with Mark.label() 
       def _node_label
         that=self
-        nl=Mark.new.mark_extend(@node).
+        nl=Mark.new().
+          mark_extend(@node).
           text_margin(7).
           text_baseline("middle").
           text(lambda {|n| n.node_name ? n.node_name : n.node_value }).
@@ -198,7 +199,7 @@ module Rubyvis
         end
       end
       
-      def build_implied(s)
+      def build_implied(s)        
         network_build_implied(s)
       end
       def network_build_implied(s)

data/lib/rubyvis/layout/partition.rb

@@ -0,0 +1,227 @@
+module Rubyvis
+  class Layout
+    # Alias for Rubyvis::Layout::Partition
+    def self.Partition
+      Rubyvis::Layout::Partition
+    end
+    # Implemeents a hierarchical layout using the partition (or sunburst,
+    # icicle) algorithm. This layout provides both node-link and space-filling
+    # implementations of partition diagrams. In many ways it is similar to
+    # {@link pv.Layout.Cluster}, except that leaf nodes are positioned based on
+    # their distance from the root.
+    #
+    # <p>The partition layout support dynamic sizing for leaf nodes, if a
+    # {@link #size} psuedo-property is specified. The default size function returns
+    # 1, causing all leaf nodes to be sized equally, and all internal nodes to be
+    # sized by the number of leaf nodes they have as descendants.
+    #
+    # <p>The size function can be used in conjunction with the order property,
+    # which allows the nodes to the sorted by the computed size. Note: for sorting
+    # based on other data attributes, simply use the default <tt>null</tt> for the
+    # order property, and sort the nodes beforehand using the {@link pv.Dom}
+    # operator.
+    #
+    # <p>For more details on how to use this layout, see
+    # {@link pv.Layout.Hierarchy}.
+    #
+    # @see pv.Layout.Partition.Fill
+    # @extends pv.Layout.Hierarchy
+    
+    class Partition < Hierarchy
+      include NodeLink
+      @properties=Hierarchy.properties.dup  
+      # Constructs a new, empty partition layout. Layouts are not typically
+      # constructed directly; instead, they are added to an existing panel via
+      # {@link pv.Mark#add}.
+      #      
+      def initialize
+        super
+      end
+      
+      ##
+      # :attr: order
+      # The sibling node order. The default order is <tt>null</tt>, which means to
+      # use the sibling order specified by the nodes property as-is. A value of
+      # "ascending" will sort siblings in ascending order of size, while "descending"
+      # will do the reverse. For sorting based on data attributes other than size,
+      # use the default <tt>null</tt> for the order property, and sort the nodes
+      # beforehand using the {@link pv.Dom} operator.
+      #
+      # @see pv.Dom.Node#sort
+      # @type string
+      
+      ##
+      # :attr: orient
+      # The orientation. The default orientation is "top", which means that the root
+      # node is placed on the top edge, leaf nodes appear at the bottom, 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 :order, :orient , :inner_radius, :outer_radius
+      
+      # Default properties for partition layouts. The default orientation is "top".
+      def self.defaults
+        Rubyvis::Layout::Partition.new.mark_extend(Rubyvis::Layout::Hierarchy.defaults).
+          orient("top")
+      end
+      def _size(f)
+        if @_size.nil?
+          1
+        else
+          @_size.call(f)
+        end
+      end
+      # Specifies the sizing function. By default, a sizing function is disabled and
+      # all nodes are given constant size. The sizing function is invoked for each
+      # leaf node in the tree (passed to the constructor).
+      #
+      # <p>For example, if the tree data structure represents a file system, with
+      # files as leaf nodes, and each file has a <tt>bytes</tt> attribute, you can
+      # specify a size function as:
+      #
+      # <pre>    .size(function(d) d.bytes)</pre>
+      #
+      # As with other properties, a size function may specify additional arguments to
+      # access the data associated with the layout and any enclosing panels.
+      #
+      # @param {function} f the new sizing function.
+      # @returns {pv.Layout.Partition} this.
+      
+      def size(f=nil,&block)
+        f=block if f.nil?
+        raise "You should pass a proc" if f.nil?
+        @_size=f
+        self
+      end
+      def build_implied(s)
+        partition_build_implied(s)
+      end
+      def partition_build_implied(s)
+        
+        return false if hierarchy_build_implied(s)
+        that = self
+        root = s.nodes[0]
+
+        stack = Rubyvis::Mark.stack
+        max_depth = 0
+
+        # Recursively compute the tree depth and node size. #/
+        stack.unshift(nil)
+        root.visit_after {|n,i| 
+          max_depth=i if i>max_depth
+          if n.first_child
+            n.size = Rubyvis.sum(n.child_nodes, lambda {|v| v.size})
+          else
+            stack[0]=n
+            n.size=that._size(stack[0])
+          end
+          }
+          
+        stack.shift
+        # # Order #/
+        case s.order
+          when 'ascending'
+            root.sort(lambda {|a,b| a.size<=>b.size})
+          when 'descending'
+            root.sort(lambda {|a,b| b.size<=>a.size})
+        end
+        # Compute the unit breadth and depth of each node. #/
+        ds = 1 / max_depth.to_f
+        root.min_breadth = 0;
+        root.breadth = 0.5
+        root.max_breadth = 1
+        root.visit_before {|n,i| 
+          b = n.min_breadth
+          ss = n.max_breadth - b
+          c = n.first_child
+          while(c) do
+            c.min_breadth=b
+            b+=(c.size/n.size.to_f)*ss
+            
+            c.max_breadth=b
+            c.breadth=(b+c.min_breadth) / 2.0
+            c=c.next_sibling
+            
+          end
+        }
+        root.visit_after {|n,i|
+          n.min_depth=(i-1)*ds
+          n.max_depth=n.depth=i*ds
+        }
+        
+        node_link_build_implied(s)
+        false
+      end
+      
+      # A variant of partition 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.Partition}.
+      #
+      # @extends pv.Layout.Partition
+
+      
+      class Fill < Partition
+        include Hierarchy::Fill
+        @properties=Partition.properties.dup  
+        
+        # Constructs a new, empty space-filling partition layout. Layouts are not
+        # typically constructed directly; instead, they are added to an existing panel
+        # via {@link pv.Mark#add}.
+        def initialize
+          super
+          fill_constructor
+        end
+        def build_implied(s)
+          return nil if partition_build_implied(s)
+          fill_build_implied(s)
+        end
+        
+        def self.defaults
+          Rubyvis::Layout::Partition::Fill.new.mark_extend(Rubyvis::Layout::Partition.defaults)
+        end
+        
+      end
+    end
+  end
+end

data/lib/rubyvis/layout/treemap.rb

@@ -37,6 +37,7 @@ module Rubyvis
       def initialize
         super
         @size=lambda {|d| d.node_value.to_f}
+        
         @node.stroke_style("#fff").
           fill_style("rgba(31, 119, 180, .25)").
           width(lambda {|n| n.dx}).
@@ -48,7 +49,6 @@ module Rubyvis
           top(lambda {|n| n.y + (n.dy / 2.0) }).
           text_align("center").
           text_angle(lambda {|n| n.dx > n.dy ? 0 : -Math::PI / 2.0 })
-      
       end
       
       def leaf

data/lib/rubyvis/mark.rb

@@ -979,7 +979,6 @@ module Rubyvis
     def build
       scene=self.scene
       stack=Mark.stack
-
       if(!scene)
         self.scene=SceneElement.new
         scene=self.scene
@@ -1046,7 +1045,7 @@ module Rubyvis
     end
     
     def mark_build_properties(ss, props) # :nodoc:
-      #p props
+      #p "#{type}:"+props.map {|prop| prop.name}.join(",")
       props.each do |prop|
         v=prop.value
 
@@ -1057,6 +1056,7 @@ module Rubyvis
         ss.send((prop.name.to_s+"=").to_sym, v)
       end
     end
+    
     # @todo implement
     def event(type,handler) # :nodoc:
       #@_handlers[type]=handler
@@ -1075,5 +1075,4 @@ require 'rubyvis/mark/rule'
 require 'rubyvis/mark/label'
 require 'rubyvis/mark/dot'
 require 'rubyvis/mark/wedge'
-require 'rubyvis/mark/shorcut_methods'
 

data/lib/rubyvis/mark/shorcut_methods.rb

@@ -4,7 +4,7 @@ class Rubyvis::Mark
   ##
   
   # Create 
-  def self.mark_method(name,mark) #:nodoc:
+  def self.mark_method(name, mark) #:nodoc:
     define_method(name) do |*args,&block|
       opts=args[0]
       opts||=Hash.new
@@ -126,7 +126,7 @@ class Rubyvis::Mark
   #   Paramenter references new mark
   # 
   # See Mark for examples of use    
-  #    
+
   mark_method :rule, Rubyvis::Rule
   ##
   # :method: wedge(opts,&block)  
@@ -141,6 +141,62 @@ class Rubyvis::Mark
   # 
   # See Mark for examples of use    
 
-  #    
-  mark_method :wedge, Rubyvis::Rule
+  mark_method :wedge, Rubyvis::Wedge
+  ##
+  # :method: layout_stack(opts,&block)  
+  #
+  # Adds a Layout::Stack 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_stack, Rubyvis::Layout::Stack
+  
+  ##
+  # :method: layout_partition(opts,&block)  
+  #
+  # Adds a Layout::Partition 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_partition, Rubyvis::Layout::Partition
+  
+  ##
+  # :method: layout_partition_fill(opts,&block)  
+  #
+  # Adds a Layout::Partition::Fill 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_partition_fill, Rubyvis::Layout::Partition::Fill
+  
+  ##
+  # :method: layout_treemap(opts,&block)  
+  #
+  # Adds a Layout::Treemap 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_treemap, Rubyvis::Layout::Treemap
+  
+  
 end

data/lib/rubyvis/mark/wedge.rb

@@ -110,13 +110,18 @@ module Rubyvis
       
     end
     
-    
-    def upright(angle)
+    def self.upright(angle)
       angle=angle % (2*Math::PI)
       angle=(angle<0) ? (2*Math::PI+angle) : angle
-      (angle < Math::PI/2.0) or (angle>=3*Math::PI / 2.0)
+      (angle < Math::PI/2.0) or (angle>=3*Math::PI / 2.0)  
       
     end
+    def upright(angle)
+      angle=angle % (2*Math::PI)
+      angle=(angle<0) ? (2*Math::PI+angle) : angle
+      (angle < Math::PI/2.0) or (angle>=3*Math::PI / 2.0)  
+    end
+    
     def build_implied(s)
       
       if s.angle.nil?

data/spec/histogram_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+describe Rubyvis::Histogram do
+  describe "bins" do
+    before do 
+      data = Rubyvis.range(0, 10, 0.1).map {|x| 
+        Math.sin(x)
+      }
+      @hist=Rubyvis::Histogram.new(data)
+      @bins=@hist.bins
+    end
+    it "size should be correct" do
+      @bins.size.should eq 8
+    end
+    it "bin.x should be correct" do
+      @bins.map {|b| b.x}.should eq [-0.8, -0.6, -0.4, -0.2, 0, 0.2,0.4, 0.6]
+    end
+    it "bin.dx should be correct" do
+      @bins.map {|b| b.dx}.should eq [0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]
+    end
+    it "bin.y should be correct" do
+      @bins.map {|b| b.y}.should eq [19,5,6,7,8,8,11,36]
+    end
+    it "bin.y should be correct using frequency=false" do
+      @hist.frequency=false
+      @hist.bins.map {|b| b.y}.should eq [0.19,0.05,0.06,0.07,0.08,0.08,0.11,0.36]
+    end
+  end
+end

data/web/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 require 'rake'
-
+require 'fileutils'
 directory "examples"
 
 def get_base(f)
@@ -17,6 +17,19 @@ task :build_site do
   ruby "build_site.rb"
 end
 
+
+task :clean do
+  Dir.glob(File.dirname(__FILE__)+"/examples/*.svg").each do |t|
+    FileUtils.rm t
+  end
+  Dir.glob(File.dirname(__FILE__)+"/examples/*.html").each do |t|
+    FileUtils.rm t
+  end
+  Dir.glob(File.dirname(__FILE__)+"/examples/*.png").each do |t|
+    FileUtils.rm t
+  end
+  
+end
 task :default=>["examples", "index.html", "../lib/rubyvis.rb"]+EXAMPLES_BASE.map {|v| "examples/#{v}.html"}
 
 file "index.html"=>["index.haml", :build_site]+EXAMPLES_BASE.map {|v| "examples/#{v}.png"}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyvis
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -36,7 +36,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-11-17 00:00:00 -03:00
+date: 2010-11-19 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -162,6 +162,7 @@ files:
 - examples/first_rbp_api.rb
 - examples/fixtures/tipsy.gif
 - examples/grouped_charts.rb
+- examples/icicle.rb
 - examples/image.rb
 - examples/line.rb
 - examples/line_and_step.rb
@@ -171,6 +172,7 @@ files:
 - examples/scatterplot.rb
 - examples/second.rb
 - examples/stacked_charts.rb
+- examples/sunburst.rb
 - examples/third.rb
 - examples/treemap/treemap.rb
 - examples/treemap/treemap_data.rb
@@ -181,11 +183,13 @@ files:
 - lib/rubyvis/format.rb
 - lib/rubyvis/format/date.rb
 - lib/rubyvis/format/number.rb
+- lib/rubyvis/histogram.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/partition.rb
 - lib/rubyvis/layout/stack.rb
 - lib/rubyvis/layout/treemap.rb
 - lib/rubyvis/mark.rb
@@ -224,6 +228,7 @@ files:
 - spec/area_spec.rb
 - spec/bar_spec.rb
 - spec/dom_spec.rb
+- spec/histogram_spec.rb
 - spec/internal_spec.rb
 - spec/javascript_behaviour_spec.rb
 - spec/label_spec.rb