rubyvis 0.3.6 → 0.4.0

data/History.txt

@@ -1,3 +1,19 @@
+=== 0.4.0 / 2011-01-03
+
+Massive bug fix. Please, update ASAP
+
+* Implemented Vector, used on segmented lines
+* Bug fix: Segmented areas with basis, cardinal and monotone interpolation was parsed using linear interpolation
+* Bug fix: Incorrect color when using hsl with decimal h 
+* Bug fix: Segmented areas doesn't change color
+* Bug fix: Wedge without inner radius return incorrect path
+* Bug fix: Stack layout with 'inside-out' order crash.
+* Bug fix: Incorrect marks properties evaluation order
+* Bug fix: Segmented lines raises an Exception
+* New specs: Flatten, Grid, Dot, Vector, Rule, Cluster, Partition, Wedge, Indent, Tree, Treemap
+* Improved specs: Area, Line, Panel
+* Deleted dependence of Rubyvis.document. Each panel without parent have an independent REXML::Document
+
 === 0.3.6 / 2010-12-28
 
 * Matrix layout implemented. Example and spec available.

data/Manifest.txt

@@ -105,25 +105,84 @@ lib/rubyvis/scene/svg_scene.rb
 lib/rubyvis/scene/svg_wedge.rb
 lib/rubyvis/sceneelement.rb
 lib/rubyvis/transform.rb
+lib/rubyvis/vector.rb
 spec/anchor_spec.rb
 spec/area_spec.rb
 spec/bar_spec.rb
 spec/color_spec.rb
 spec/dom_spec.rb
+spec/dot_spec.rb
+spec/fixtures/anchor.html
+spec/fixtures/anchor.svg
+spec/fixtures/area-segmented.html
+spec/fixtures/area_interpolation.html
+spec/fixtures/area_interpolation.svg
+spec/fixtures/area_segmented.svg
+spec/fixtures/dot-anchor.html
+spec/fixtures/dot_anchor.svg
+spec/fixtures/layers.js
+spec/fixtures/layout_arc.svg
+spec/fixtures/layout_cluster.html
+spec/fixtures/layout_cluster.svg
+spec/fixtures/layout_cluster_left_group_2.html
+spec/fixtures/layout_cluster_left_group_2.svg
+spec/fixtures/layout_grid.html
+spec/fixtures/layout_grid.svg
+spec/fixtures/layout_horizon.svg
+spec/fixtures/layout_indent.html
+spec/fixtures/layout_indent.svg
+spec/fixtures/layout_matrix.svg
+spec/fixtures/layout_pack.html
+spec/fixtures/layout_pack.svg
+spec/fixtures/layout_partition_fill.html
+spec/fixtures/layout_partition_fill.svg
+spec/fixtures/layout_tree_orient_left.html
+spec/fixtures/layout_tree_orient_left.svg
+spec/fixtures/layout_tree_orient_radial_breadth_20.html
+spec/fixtures/layout_tree_orient_radial_breadth_20.svg
+spec/fixtures/layout_tree_orient_top.svg
+spec/fixtures/layout_treemap.svg
+spec/fixtures/line_interpolation.html
+spec/fixtures/line_interpolation.svg
+spec/fixtures/line_interpolation_segmented.html
+spec/fixtures/line_interpolation_segmented.svg
+spec/fixtures/protovis-r3.3.js
+spec/fixtures/rule-anchor.html
+spec/fixtures/rule_anchor.svg
+spec/fixtures/stack-expand.html
+spec/fixtures/stack-silohouette.html
+spec/fixtures/stack-wiggle.html
+spec/fixtures/stack_expand.svg
+spec/fixtures/stack_silohouette.svg
+spec/fixtures/stack_wiggle.svg
+spec/fixtures/svgscene.html
+spec/fixtures/wedge-anchor.html
+spec/fixtures/wedge-donut.html
+spec/fixtures/wedge_anchor.svg
+spec/fixtures/wedge_donut.svg
+spec/flatten_spec.rb
 spec/histogram_spec.rb
 spec/internal_spec.rb
 spec/javascript_behaviour_spec.rb
 spec/label_spec.rb
 spec/layout_arc_spec.rb
+spec/layout_cluster_spec.rb
+spec/layout_grid_spec.rb
 spec/layout_horizon_spec.rb
+spec/layout_indent_spec.rb
 spec/layout_matrix_spec.rb
+spec/layout_pack_spec.rb
+spec/layout_partition_spec.rb
 spec/layout_stack_spec.rb
+spec/layout_tree_spec.rb
+spec/layout_treemap_spec.rb
 spec/line_spec.rb
 spec/mark_spec.rb
 spec/nest_spec.rb
 spec/panel_spec.rb
 spec/readme_spec.rb
 spec/ruby_api_spec.rb
+spec/rule_spec.rb
 spec/scale_linear_datetime_spec.rb
 spec/scale_linear_spec.rb
 spec/scale_log_spec.rb
@@ -131,6 +190,8 @@ spec/scale_ordinal_spec.rb
 spec/scale_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+spec/vector_spec.rb
+spec/wedge_spec.rb
 vendor/protovis/protovis-r3.3.js
 vendor/protovis/src/behavior/Behavior.js
 vendor/protovis/src/behavior/Drag.js

data/README.txt

@@ -4,16 +4,16 @@
 
 == DESCRIPTION:
 
-Ruby port of Protovis[http://vis.stanford.edu/protovis/], a great visualization toolkit
+Ruby port of Protovis[http://vis.stanford.edu/protovis/], a Javascript visualization toolkit.
 
 == FEATURES/PROBLEMS:
 
-This library implements almost completely the core API of protovis, including all static marks, SVG builder class and data classes.
+This library implements almost completely core API of protovis, including all static marks, SVG builder class and data classes. Spec coverage is near 90%
 
 Implemented: 
 
 * Marks: All, except transient and transitions.
-* Layout: Cluster, Grid, Horizon, Indent, Pack, Partition, Stack, Tree and Treemap. To implement: Bullet, Arc, Force, Matrix, Rollup.
+* Layout: Arc, Cluster, Grid, Horizon, Indent, Matrix, Pack, Partition, Stack, Tree and Treemap. To implement: Bullet, Force, and Rollup.
 
 Using protovis examples[http://vis.stanford.edu/protovis/ex/] as reference
 
@@ -35,8 +35,8 @@ Using protovis examples[http://vis.stanford.edu/protovis/ex/] as reference
  * Treemap
 * Networks:
  * Arc
-
-
+ * Matrix
+ 
 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. 
 
 User could use +pv+ freely, cause is defined as a global method which call Rubyvis.
@@ -48,6 +48,7 @@ User could use +pv+ freely, cause is defined as a global method which call Rubyv
 * color/Color.js
 * color/Colors.js
 * data/Arrays.js
+* data/Flatten.js
 * data/Histogram.js
 * data/Numbers.js
 * data/LinearScale.js
@@ -57,12 +58,13 @@ User could use +pv+ freely, cause is defined as a global method which call Rubyv
 * data/OrdinalScale.js
 * data/Scale.js
 * layout/Arc.js
-* layout/Layout.js
 * layout/Cluster.js
 * layout/Grid.js
 * layout/Hierarchy.js
 * layout/Horizon.js
 * layout/Indent.js
+* layout/Layout.js
+* layout/Matrix.js
 * layout/Network.js
 * layout/Pack.js
 * layout/Partition.js
@@ -144,7 +146,7 @@ Tested on Ruby 1.8.7, 1.9.1, 1.9.2-p0 and ruby-head (future 1.9.3)
 
 == INSTALL:
 
-$ sudo gem install rubyvis
+$ gem install rubyvis
 
 == LICENSE:
 

data/Rakefile

@@ -18,7 +18,7 @@ h=Hoe.spec 'rubyvis' do
   self.version=Rubyvis::VERSION
   self.extra_dev_deps << ["coderay",">=0"] << ["haml",">=0"] << ["nokogiri", ">=0"] << ["rspec",">=2.0"]
 end
-
+desc "Publicar docs en rubyforge"
 task :publicar_docs => [:clean, :docs] do
   #ruby %{agregar_adsense_a_doc.rb}
   path = File.expand_path("~/.rubyforge/user-config.yml")

data/lib/rubyvis.rb

@@ -5,6 +5,8 @@ require 'rexml/formatters/default'
 
 require 'pp'
 require 'rubyvis/internals'
+require 'rubyvis/vector'
+
 require 'rubyvis/sceneelement'
 require 'rubyvis/property'
 require 'rubyvis/nest'
@@ -30,7 +32,7 @@ require 'rubyvis/mark/shorcut_methods'
 module Rubyvis
   @document=nil
   # Rubyvis version
-  VERSION = '0.3.6' 
+  VERSION = '0.4.0' 
   # 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/
@@ -71,22 +73,6 @@ module Rubyvis
   def self.parent
     lambda {|*args| self.parent.index}
   end
-  def self.clear_document
-    @document=REXML::Document.new
-    @document.add_element("document")
-  end
-  def self.document
-    if @document.nil?
-      @document=REXML::Document.new
-      @document.add_element("document")
-    end
-    @document.root
-  end
-  def self.to_svg
-    s=""
-    @document.write(s)
-    s
-  end
 end
 
 # Alias for Rubyvis module

data/lib/rubyvis/color/color.rb

@@ -36,9 +36,9 @@ module Rubyvis
       end
 
       if ['hsla','hsl'].include? color_type
-        h=m2[0].to_i
-        s=m2[1].to_f / 100
-        l=m2[2].to_f / 100
+        h=m2[0].to_f
+        s=m2[1].to_f / 100.0
+        l=m2[2].to_f / 100.0
         return Color::Hsl.new(h,s,l,a).rgb
       end
      
@@ -106,7 +106,7 @@ module Rubyvis
     # errors.
     # * @param [k] {number} an optional scale factor; defaults to 1.
     def brighter(k)
-      self.rgb.lighter(k)
+      self.rgb.brighter(k)
     end
     
     # Returns a new color that is a brighter version of this color. The behavior of
@@ -328,7 +328,7 @@ module Rubyvis
       # color to create a brighter version of this color. Although brighter and
       # darker are inverse operations, the results of a series of invocations of
       # these two methods might be inconsistent because of rounding errors.
-      def lighter(k=1)
+      def brighter(k=1)
         k = 0.7**k
         i = 30
         r=self.r
@@ -390,7 +390,6 @@ module Rubyvis
         h = self.h
         s = self.s
         l = self.l
-        
         # Some simple corrections for h, s and l. */
         h = h % 360
         h += 360 if (h < 0)
@@ -402,22 +401,21 @@ module Rubyvis
         m1 = 2 * l - m2
         v=lambda {|h1|
           if (h1 > 360)
-            h1 -= 360;
+            h1 -= 360
           elsif (h1 < 0)
              h1 += 360
           end
           
           
-          return m1 + (m2 - m1) * h1 / 60 if (h1 < 60)
-          return m2 if (h1 < 180) 
-          return m1 + (m2 - m1) * (240 - h1) / 60 if (h1 < 240)
+          return m1 + (m2 - m1) * h1 / 60.0 if (h1 < 60.0)
+          return m2 if (h1 < 180.0) 
+          return m1 + (m2 - m1) * (240.0 - h1) / 60.0 if (h1 < 240.0)
           return m1
         }
-        vv=lambda {|h1|
-          (v.call(h1) * 255).round
-        }
         
+        vv=lambda {|h1| (v.call(h1) * 255).round}
         Rubyvis.rgb(vv.call(h + 120), vv.call(h), vv.call(h - 120), a)
+       
       end
     end
 

data/lib/rubyvis/flatten.rb

@@ -62,16 +62,14 @@ module Rubyvis
     # @returns {pv.Nest} this.
     
     def key(k, f=nil)
-      @keys.push(OpenStruct.new({:name=>key,:value=>f}))
+      @keys.push(OpenStruct.new({:name=>k, :value=>f}))
       @leaf=nil
       self
     end
 
     # Flattens using the specified leaf function. This is an alternative to
-    # specifying an explicit set of keys; the tiers of the underlying tree will be
-    # determined dynamically by recursing on the values, and the resulting keys
-    # will be stored in the entries <tt>keys</tt> attribute. The leaf function must
-    # return true for leaves, and false for internal nodes.
+    # specifying an explicit set of keys; the tiers of the underlying tree 
+    # will be determined dynamically by recursing on the values, and the resulting keys will be stored in the entries +:keys+ attribute. The leaf function must return true for leaves, and false for internal nodes.
     #
     # @param {function} f a leaf function.
     # @returns {pv.Nest} this.
@@ -99,7 +97,7 @@ module Rubyvis
           @stack.pop
         }
       else 
-        @entries.push(@stack+value)
+        @entries.push(@stack+[value])
       end
     end
     # Returns the flattened array. Each entry in the array is an object; each
@@ -117,7 +115,7 @@ module Rubyvis
       @entries.map {|stack|
         m={}
         @keys.each_with_index {|k,i|
-          v=@stack[i]
+          v=stack[i]
           m[k.name]=k.value ? k.value.js_call(self,v) : v
         }
         m

data/lib/rubyvis/layout/stack.rb

@@ -107,7 +107,7 @@ module Rubyvis
       end
       def values(f=nil)
         if f.nil?
-          @values
+          return @values
         else
           @_values=Rubyvis.functor(f)
           return self
@@ -171,17 +171,20 @@ module Rubyvis
         
         # order
         _index=nil
-        case (s.order) 
-        when "inside-out" 
-          max  = dy.map {|v| Rubyvis.max.index(v) }
-          map  = pv.range(n).sort {|a,b| return max[a] - max[b]}
+        case s.order
+        when "inside-out"
+          
+          max  = dy.map {|v| Rubyvis.max_index(v) }          
+          _map  = Rubyvis.range(n).sort {|a,b| max[a] <=> max[b]}
+          
           sums = dy.map {|v| Rubyvis.sum(v)}
           top = 0
           bottom = 0
           tops = []
           bottoms = []
+          
           n.times {|i|
-            j = map[i]
+            j = _map[i]
             if (top < bottom) 
               top += sums[j];
               tops.push(j);
@@ -190,8 +193,9 @@ module Rubyvis
               bottoms.push(j);
             end
           }
-          _index = bottoms.reverse+tops
           
+          _index = bottoms.reverse+tops
+
         when "reverse"
           _index = Rubyvis.range(n - 1, -1, -1)
         else
@@ -237,13 +241,13 @@ module Rubyvis
             y[_index[0]][j] = 0
             
             k = 0
-            n.times {|i|k += dy[i][j]}
+            n.times {|i| k += dy[i][j]}
             if (k!=0) 
               k = h / k.to_f
               n.times {|i| dy[i][j] *= k}
             else 
               k = h / n.to_f
-              n.times { dy[i][j] = k}
+              n.times {|i| dy[i][j] = k}
             end
           }
         else
@@ -267,6 +271,7 @@ module Rubyvis
         px = i < 0 ? (horizontal ? "l" : "b") : orient[i + 1,1]
         py = orient[0,1]
         
+        
         @values=values
         @prop.each {|k,v|
           @prop[k]=@none
@@ -279,7 +284,7 @@ module Rubyvis
       
       def layer
         that=self
-        value = Rubyvis::Mark.new().data(lambda { that.values[self.parent.index] }).top(proxy("t")).left(proxy("l")).right(proxy("r")).
+        value = Rubyvis::Mark.new().data(lambda {  that.values[self.parent.index] }).top(proxy("t")).left(proxy("l")).right(proxy("r")).
           bottom(proxy("b")).
         width(proxy("w")).
         height(proxy("h"))

data/lib/rubyvis/mark.rb

@@ -618,6 +618,7 @@ module Rubyvis
           p a if $DEBUG
           a 
         }).visible(lambda {
+          
           self.scene.target[index].visible
         }).id(lambda {
             self.scene.target[index].id
@@ -660,6 +661,7 @@ module Rubyvis
           'left'
         end
       }).text_baseline(lambda {
+
         if ['right','left','center'].include? self.name
           'middle'
         elsif self.name=='top'
@@ -833,7 +835,10 @@ module Rubyvis
     end
     def bind_bind(mark)
       begin
-        mark._properties.each {|v|
+        #puts "Binding:#{mark.type}->#{mark._properties.map {|v| v.name}}"
+        
+        mark._properties.reverse.each {|v|
+          
           #p v.name
           k=v.name
           if !@seen.has_key?(k)
@@ -864,10 +869,14 @@ module Rubyvis
       @types={1=>[],2=>[],3=>[]}
       @_data=nil
       @_required=[]
+      #puts "Binding!"
       bind_bind(self)
       bind_bind((self.class).defaults)
       @types[1].reverse!
       @types[3].reverse!
+      #puts "***"
+      #pp @types[3]
+      #puts "***"
       mark=self
       begin
         properties.each {|name,v|
@@ -1056,7 +1065,6 @@ module Rubyvis
       #p "#{type}:"+props.map {|prop| prop.name}.join(",")
       props.each do |prop|
         v=prop.value
-
         # p "#{prop.name}=#{v}"
         if prop._type==3
           v=v.js_apply(self, Mark.stack)