rubyvis 0.4.0 → 0.4.1

data.tar.gz.sig

@@ -1,2 +1,3 @@
-du��*��xd�I�]�h1�m��%���k(��|)v!�Q�
-J(���7��8���im&�u��R��z�X;�z�,�8�m
+���œ(����l��W�3�w����r.�$�m�P_� ��>/�t[R�X�P1q�]�����QF'bVp�<:
f�����>��q4�ĊD��v��H$��To�i4�G@������DCl
"MzH�+9���94������`�ꩂCW#bBq
+�{Ώt��,��t�y96
+����g�^]q�S�U=*^!^-/9�q�	��F���
+��r���G�%�V2�}g�����Ѿ���Ül

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.4.1 / 2011-01-26
+* All tests run on ruby 1.8.7. Not all pass, because on ruby<1.9 hash order are not preserved
+* Removed warnings for Ruby 1.9+
+* Changed SvgScene.implicit and Color.names with constants
+* Bug gix: Examples crashes on Ruby 1.9.3 because names of files are freezed and REXML try to change it
+
 === 0.4.0 / 2011-01-03
 
 Massive bug fix. Please, update ASAP

data/Rakefile

@@ -16,7 +16,7 @@ h=Hoe.spec 'rubyvis' do
   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"]
+  self.extra_dev_deps << ["coderay",">=0"] << ["haml",">=0"] << ["nokogiri", ">=0"] << ["rspec",">=2.0"] << ["RedCloth",">=0"]
 end
 desc "Publicar docs en rubyforge"
 task :publicar_docs => [:clean, :docs] do

data/examples/5_pv_hierarchies/bubble_charts.rb

@@ -18,7 +18,7 @@ def get_files(path)
   h
 end
 
-files=get_files(File.dirname(__FILE__)+"/../../lib")
+files=get_files(File.expand_path(File.dirname(__FILE__)+"/../../lib/"))
 
 classes = Rubyvis.nodes(Rubyvis.flatten(files).leaf(lambda {|v| v.is_a? Numeric}).array)
 

data/examples/5_pv_hierarchies/bubble_charts_matrix.rb

@@ -49,7 +49,7 @@ vis = pv.Panel.new()
     visible( lambda {|n| n.parent_node}).
     fill_style(lambda {|n|
       colors20.scale(n.parent_node).
-        lighter((n.node_value) / 5.0)
+        brighter((n.node_value) / 5.0)
     }).
     stroke_style(c20)
   

data/examples/5_pv_hierarchies/circle_packing.rb

@@ -22,7 +22,7 @@ def get_files(path)
   h
 end
 
-files=get_files(File.dirname(__FILE__)+"/../../lib/")
+files=get_files(File.expand_path(File.dirname(__FILE__)+"/../../lib/"))
 
 format = Rubyvis::Format.number();
 

data/examples/5_pv_hierarchies/dendogram.rb

@@ -19,7 +19,7 @@ def get_files(path)
   h
 end
 
-files=get_files(File.dirname(__FILE__)+"/../../lib/")
+files=get_files(File.expand_path(File.dirname(__FILE__)+"/../../lib/"))
 
 
 vis = Rubyvis::Panel.new do

data/examples/5_pv_hierarchies/icicle.rb

@@ -18,7 +18,7 @@ def get_files(path)
   h
 end
 
-files=get_files(File.dirname(__FILE__)+"/../../")
+files=get_files(File.expand_path(File.dirname(__FILE__)+"/../../lib/"))
 
 colors=Rubyvis::Colors.category19
 vis = Rubyvis::Panel.new.

data/examples/5_pv_hierarchies/indent.rb

@@ -21,7 +21,7 @@ def get_files(path)
   h
 end
 
-files=get_files(File.dirname(__FILE__)+"/../../")
+files=get_files(File.expand_path(File.dirname(__FILE__)+"/../../lib/"))
 
 
 root = Rubyvis.dom(files)

data/examples/5_pv_hierarchies/node_link_tree.rb

@@ -20,7 +20,7 @@ end
 
 
 
-files=get_files(File.dirname(__FILE__)+"/../../")
+files=get_files(File.expand_path(File.dirname(__FILE__)+"/../../"))
 #files={:b=>{:c=>1,:d=>2}}
 
 

data/examples/5_pv_hierarchies/sunburst.rb

@@ -19,7 +19,7 @@ def get_files(path)
   h
 end
 
-files=get_files(File.dirname(__FILE__)+"/../../lib/rubyvis/")
+files=get_files(File.expand_path(File.dirname(__FILE__)+"/../../lib/rubyvis/"))
 
 #load(File.dirname(__FILE__)+"/treemap/treemap_data.rb")
 

data/examples/5_pv_hierarchies/treemap.rb

@@ -19,7 +19,7 @@ def get_files(path)
   h
 end
 
-files=get_files(File.dirname(__FILE__)+"/../../")
+files=get_files(File.expand_path(File.dirname(__FILE__)+"/../../lib/"))
 
 format=Rubyvis::Format.number
 color = pv.Colors.category20

data/lib/rubyvis.rb

@@ -32,7 +32,7 @@ require 'rubyvis/mark/shorcut_methods'
 module Rubyvis
   @document=nil
   # Rubyvis version
-  VERSION = '0.4.0' 
+  VERSION = '0.4.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/color/color.rb

@@ -53,7 +53,7 @@ module Rubyvis
       end
     end
     
-    named = Rubyvis::Color.names[format.to_sym]
+    named = Rubyvis::Color::NAMES[format.to_sym]
 
 
     return Rubyvis.color(named) if (named)
@@ -88,41 +88,9 @@ module Rubyvis
   # space is dependent on the implementing class; all colors support the
   # Color.rgb() method to convert to RGB color space for interpolation.
   class Color
-    # An opaque color format string, such as "#f00".
-    attr_reader :color
-    # The opacity, a float in [0, 1].
-    attr_reader :opacity
-    
-    # Constructs a color with the specified color format string and opacity. This
-    # constructor should not be invoked directly; use Rubyvis.color instead.
-    def initialize(color,opacity)
-      @color=color
-      @opacity=opacity
-    end
-    # Returns a new color that is a brighter version of this color. The behavior of
-    # this method may vary slightly depending on the underlying color space.
-    # 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.
-    # * @param [k] {number} an optional scale factor; defaults to 1.
-    def brighter(k)
-      self.rgb.brighter(k)
-    end
-    
-    # Returns a new color that is a brighter version of this color. The behavior of
-    # this method may vary slightly depending on the underlying color space.
-    # 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.
-    #
-    # * @param [k] {number} an optional scale factor; defaults to 1.
-    def darker(k)
-      self.rgb.darker(k)
-    end
     
     # Association between names and colors
-    def self.names # :nodoc:
-      {
+    NAMES={
         :aliceblue=>"#f0f8ff",
         :antiquewhite=>"#faebd7",
         :aqua=>"#00ffff",
@@ -271,7 +239,40 @@ module Rubyvis
         :yellow=>"#ffff00",
         :yellowgreen=>"#9acd32",
       }
+    
+    
+    # An opaque color format string, such as "#f00".
+    attr_reader :color
+    # The opacity, a float in [0, 1].
+    attr_reader :opacity
+    
+    # Constructs a color with the specified color format string and opacity. This
+    # constructor should not be invoked directly; use Rubyvis.color instead.
+    def initialize(color,opacity)
+      @color=color
+      @opacity=opacity
+    end
+    # Returns a new color that is a brighter version of this color. The behavior of
+    # this method may vary slightly depending on the underlying color space.
+    # 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.
+    # * @param [k] {number} an optional scale factor; defaults to 1.
+    def brighter(k)
+      self.rgb.brighter(k)
+    end
+    
+    # Returns a new color that is a brighter version of this color. The behavior of
+    # this method may vary slightly depending on the underlying color space.
+    # 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.
+    #
+    # * @param [k] {number} an optional scale factor; defaults to 1.
+    def darker(k)
+      self.rgb.darker(k)
     end
+    
     def self.transparent
       Rubyvis.rgb(0,0,0,0)
     end

data/lib/rubyvis/color/colors.rb

@@ -9,7 +9,7 @@ module Rubyvis
   #
   # <pre>    pv.Scale.linear().domain(0, 1).range(...)</pre>  
   def self.ramp(*arguments)
-    start, _end, dummy = arguments
+    #start, _end, dummy = arguments
     scale = Rubyvis.Scale.linear
     scale.range(*arguments)
     scale

data/lib/rubyvis/internals.rb

@@ -70,7 +70,7 @@ module Rubyvis
     norm.map {|x| x.quo(sum)}
   end
   def self.o_index(i)
-    o=OpenStruct.new :index=>i
+    OpenStruct.new :index=>i
   end
   def self.permute(array,indexes, f=nil)
     f=Rubyvis.identity if f.nil?
@@ -127,7 +127,7 @@ module Rubyvis
       start = 0
     end
     step||= 1
-    raise "range must be finite" if ((stop - start) / step.to_f).infinite?
+    raise "range must be finite" if ((stop.to_f - start.to_f) / step.to_f).infinite?
     array = []
     i = 0
     stop = stop- (stop - start) * 1e-10 #// floating point precision!

data/lib/rubyvis/layout.rb

@@ -22,7 +22,10 @@ module Rubyvis
           func=nil
         end
         @properties[name]=true
-        self.property_method(name,false, func, self)        
+        self.property_method(name,false, func, self)
+
+        remove_method(name.to_s+"=") if public_method_defined? name.to_s+"="
+        
         define_method(name.to_s + "=") {|v|
           self.send(name,v)
         }

data/lib/rubyvis/layout/matrix.rb

@@ -1,6 +1,6 @@
 module Rubyvis
   class Layout
-    # Alias for Rubyvis::Layout::Matrix 
+    # Alias for Rubyvis::Layout::Matrix
     def self.Matrix
       Rubyvis::Layout::Matrix
     end
@@ -53,16 +53,16 @@ module Rubyvis
       end
       # Deletes special add from network
       def _link # :nodoc:
-        that=self
+        #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)")
+        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
@@ -72,117 +72,117 @@ module Rubyvis
         @_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.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
-       
+        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
+      # 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
-        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|
+        #/* 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})
+              :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
+        }
+        #/* 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