rubyvis 0.4.0 → 0.4.1

data/lib/rubyvis/layout/network.rb

@@ -121,7 +121,7 @@ module Rubyvis
     
       
       def _link # :nodoc:
-        that=self
+        #that=self
         l=Mark.new().
           mark_extend(@node).
           data(lambda {|d| [d.source_node, d.target_node] }).
@@ -135,7 +135,7 @@ module Rubyvis
 
      
       def _node_label #:nodoc:
-        that=self
+        #that=self
         nl=Mark.new().
           mark_extend(@node).
           text_margin(7).
@@ -185,7 +185,7 @@ module Rubyvis
 
 
       attr_accessor_dsl [:links, lambda {|v|
-        out=[]
+       # out=[]
         v.map {|d|
           if !d.link_value.is_a? Numeric
             d.link_value = !d.value.is_a?(Numeric) ? 1 : d.value

data/lib/rubyvis/mark.rb

@@ -184,7 +184,8 @@ module Rubyvis
     def self.property_method(name, _def, func=nil, klass=nil)
       return if klass.method_defined? name
       klass.send(:define_method, name) do |*arguments,&block|
-        v,dummy = arguments
+        v=arguments[0]
+        #v,dummy = arguments
         if block
           v=block
         end
@@ -803,8 +804,8 @@ module Rubyvis
         stack.shift
       else
         mark.build
-        Rubyvis.Scene.scale = scale;
-        Rubyvis.Scene.update_all(mark.scene);
+        Rubyvis::SvgScene.scale = scale;
+        Rubyvis::SvgScene.update_all(mark.scene);
       end
       mark.scale=nil
     end
@@ -947,7 +948,7 @@ module Rubyvis
       end while(mark=mark.parent)
     end
     def context(scene, index, f) # :nodoc:
-      proto=Mark
+      #proto=Mark
       stack=Mark.stack
       oscene=Mark.scene
       oindex=Mark.index

data/lib/rubyvis/mark/area.rb

@@ -88,7 +88,7 @@ module Rubyvis
 
 
     def area_anchor(name)
-      scene=nil
+      #scene=nil
       anchor=mark_anchor(name)
       anchor.interpolate(lambda {
         self.scene.target[self.index].interpolate

data/lib/rubyvis/mark/image.rb

@@ -61,7 +61,7 @@ module Rubyvis
     # though this typically results in slower performance.
     
     def dynamic_image(f)
-      f,dummy=arguments
+      #f,dummy=arguments
       @_image = lambda {|*args|
         c=f.js_apply(self,args)
         c.nil? ? pv.Color.transparent : (c.is_a?(String) ? Rubyvis.color(c) : c )

data/lib/rubyvis/mark/rule.rb

@@ -21,8 +21,8 @@ module Rubyvis
     def build_implied(s)
       l=s.left
       r=s.right
-      t=s.top
-      b=s.bottom
+      #t=s.top
+      #b=s.bottom
       
       if((!s.width.nil?) or ((l.nil?) and (r.nil?)) or ((!r.nil?) and (!l.nil?)))
         s.height=0

data/lib/rubyvis/mark/shorcut_methods.rb

@@ -17,6 +17,7 @@ class Rubyvis::Mark
       if block
         block.arity<1 ? a.instance_eval(&block) : block.call(a)
       end
+      a
     end
   end
   ##

data/lib/rubyvis/mark/wedge.rb

@@ -31,63 +31,72 @@ module Rubyvis
       mark_anchor(name).left(lambda {
         s = self.scene.target[self.index];
         if (partial.call(s))
-          
           case (self.name()) 
           when "outer"
-            return s.left + s.outer_radius * Math.cos(mid_angle.call(s))
+            s.left + s.outer_radius * Math.cos(mid_angle.call(s))
           when "inner"
-            return s.left + s.inner_radius * Math.cos(mid_angle.call(s))
+            s.left + s.inner_radius * Math.cos(mid_angle.call(s))
           when "start"
-            return s.left + mid_radius.call(s) * Math.cos(s.start_angle)
+            s.left + mid_radius.call(s) * Math.cos(s.start_angle)
           when "center"
-            return s.left + mid_radius.call(s) * Math.cos(mid_angle.call(s))
+            s.left + mid_radius.call(s) * Math.cos(mid_angle.call(s))
           when "end"
-            return s.left + mid_radius.call(s) * Math.cos(s.end_angle)
+            s.left + mid_radius.call(s) * Math.cos(s.end_angle)
+          else
+            s.left
           end
-        end
-        return s.left;
+        else
+          s.left
+        end        
       }).top(lambda {
         s = self.scene.target[self.index];
         if (partial.call(s))
           case (self.name()) 
           when "outer"
-            return s.top + s.outer_radius * Math.sin(mid_angle.call(s))
+            s.top + s.outer_radius * Math.sin(mid_angle.call(s))
           when "inner"
-            return s.top + s.inner_radius * Math.sin(mid_angle.call(s))
+            s.top + s.inner_radius * Math.sin(mid_angle.call(s))
           when "start"
-            return s.top + mid_radius.call(s) * Math.sin(s.start_angle)
+            s.top + mid_radius.call(s) * Math.sin(s.start_angle)
           when "center"
-            return s.top + mid_radius.call(s) * Math.sin(mid_angle.call(s))
+            s.top + mid_radius.call(s) * Math.sin(mid_angle.call(s))
           when "end"
-            return s.top + mid_radius.call(s) * Math.sin(s.end_angle)
+            s.top + mid_radius.call(s) * Math.sin(s.end_angle)
+          else
+            s.top
           end
+        else
+          s.top
         end
-        return s.top;
           
       }).text_align(lambda {
       s = self.scene.target[self.index];
         if (partial.call(s))
           case (self.name()) 
           when 'outer'
-            return that.upright(mid_angle.call(s)) ? 'right':'left'
+            that.upright(mid_angle.call(s)) ? 'right':'left'
           when 'inner'
-            return that.upright(mid_angle.call(s)) ? 'left':'right'
-            
+            that.upright(mid_angle.call(s)) ? 'left':'right'
+          else 
+            'center'
           end
+        else
+          'center'
         end
-        return 'center'
       }).text_baseline(lambda {
       s = self.scene.target[self.index];
         if (partial.call(s))
           case (self.name()) 
           when 'start'
-            return that.upright(s.start_angle) ? 'top':'bottom'
+            that.upright(s.start_angle) ? 'top':'bottom'
           when 'end'
-            return that.upright(s.end_angle) ? 'bottom':'top'
-            
+            that.upright(s.end_angle) ? 'bottom':'top'
+          else
+            'middle'
           end
+        else
+          'middle'
         end
-        return 'middle'
       }).text_angle(lambda {
         s = self.scene.target[self.index];
         a=0

data/lib/rubyvis/nest.rb

@@ -18,7 +18,7 @@ module Rubyvis
       @values=opts[:values]
     end
     def ==(var)
-      key==var.key and values=var.values
+      key==var.key and values==var.values
     end
   end
   # :startdoc: 

data/lib/rubyvis/scale/ordinal.rb

@@ -82,7 +82,7 @@ module Rubyvis
       end
       @r[@i[x] % @r.size]
     end
-    alias :[] :scale    
+    alias :[] :scale      
     # Sets or gets the input domain. This method can be invoked several ways:
     #
     # <p>1. <tt>domain(values...)</tt>

data/lib/rubyvis/scale/quantitative.rb

@@ -393,7 +393,8 @@ module Rubyvis
       
       @tick_format= Rubyvis.Format.number.fraction_digits([0, -(Rubyvis.log(step, 10) + 0.01).floor].max).to_proc
       
-      ticks = Rubyvis.range(start, _end + step, step);
+      ticks = Rubyvis.range(start, _end + step, step)
+      
       return reverse ? ticks.reverse() : ticks;
     end
     

data/lib/rubyvis/scene/svg_curve.rb

@@ -258,11 +258,14 @@ module Rubyvis::SvgScene
     d = []
     m = []
     dx = []
-    k=0
+    #k=0
     
     #/* Compute the slopes of the secant lines between successive points. */
     
-    while(k < points.size-1) do 
+    
+    0.upto(points.size-2) do |k| 
+    
+#    while(k < points.size-1) do 
       d[k] = (points[k+1].top - points[k].top) / (points[k+1].left - points[k].left).to_f
       k+=1
     end
@@ -270,31 +273,38 @@ module Rubyvis::SvgScene
     #/* Initialize the tangents at every point as the average of the secants. */
     m[0] = d[0]
     dx[0] = points[1].left - points[0].left
+    
+    
     1.upto(points.size-2) {|k|
       m[k] = (d[k-1]+d[k]) / 2.0
       dx[k] = (points[k+1].left - points[k-1].left) / 2.0
     }
+    
+    k=points.size-1
+    
     m[k] = d[k-1];
     dx[k] = (points[k].left - points[k-1].left);
     
     # /* Step 3. Very important, step 3. Yep. Wouldn't miss it. */
-    (points.size-1).times {|k|
-      if d[k] == 0 
-        m[ k ] = 0;
-        m[k+1] = 0;
+    (points.size-1).times {|kk|
+      if d[kk] == 0 
+        m[ kk ] = 0;
+        m[kk + 1] = 0;
       end
     }
     
     # /* Step 4 + 5. Out of 5 or more steps. */
-    (points.size-1).times {|k|
-      next if ((m[k].abs < 1e-5) or (m[k+1].abs < 1e-5))
-      ak = m[k] / d[k].to_f
-      bk = m[k + 1] / d[k].to_f
-      s = ak * ak + bk * bk; # monotone constant (?)
+    
+    
+    (points.size-1).times {|kk|
+      next if ((m[kk].abs < 1e-5) or (m[kk+1].abs < 1e-5))
+      akk = m[kk] / d[kk].to_f
+      bkk = m[kk + 1] / d[kk].to_f
+      s = akk * akk + bkk * bkk; # monotone constant (?)
       if (s > 9) 
-        tk = 3.0 / Math.sqrt(s)
-        m[k] = tk * ak * d[k]
-        m[k + 1] = tk * bk * d[k]
+        tkk = 3.0 / Math.sqrt(s)
+        m[kk] = tkk * akk * d[kk]
+        m[kk + 1] = tkk * bkk * d[kk]
       end
     }
     len=nil;

data/lib/rubyvis/scene/svg_dot.rb

@@ -39,7 +39,7 @@ module Rubyvis
       "pointer-events"=> s.events,
       "cursor"=> s.cursor,
       "fill"=> fill.color,
-      "fill-opacity"=> (fill.opacity==0) ? nil :fill.opacity,
+      "fill-opacity"=> (fill.opacity==0) ? nil : fill.opacity,
       "stroke"=> stroke.color,
       "stroke-opacity"=> (stroke.opacity==0) ? nil : stroke.opacity,
       "stroke-width"=> (stroke.opacity!=0) ? s.line_width / self.scale : nil

data/lib/rubyvis/scene/svg_label.rb

@@ -40,8 +40,9 @@ module Rubyvis
           "fill-opacity"=> fill.opacity==0 ? nil : fill.opacity,
           "text-anchor"=> anchor
         }, {
-        "font"=> s.font, "text-shadow"=> s.text_shadow, "text-decoration"=> s.text_decoration      })
-        e.text=s.text
+        "font"=> s.font, "text-shadow"=> s.text_shadow, "text-decoration"=> s.text_decoration})
+        
+        e.text=s.text.frozen? ? s.text.dup : s.text
 
 
         e=SvgScene.append(e,scenes,i)

data/lib/rubyvis/scene/svg_scene.rb

@@ -14,9 +14,6 @@ class REXML::Element #:nodoc:
 end
 
 module Rubyvis
-  def self.Scene # :nodoc:
-    Rubyvis::SvgScene
-  end
   module SvgScene # :nodoc:
     #include REXML
     def self.svg
@@ -38,8 +35,7 @@ module Rubyvis
     def self.scale=(v)
       @scale=v
     end
-    def self.implicit
-      svg={
+    IMPLICIT={:svg=>{
         "shape-rendering"=> "auto",
         "pointer-events"=> "painted",
         "x"=> 0,
@@ -53,11 +49,9 @@ module Rubyvis
         "stroke-opacity"=> 1,
         "stroke-width"=> 1.5,
         "stroke-linejoin"=> "miter"
-      }
-      css={"font"=>"10px sans-serif"}
-
-      {:svg=>svg,:css=>css}
-    end
+      },:css=>{"font"=>"10px sans-serif"}
+    }
+    
     def self.update_all(scenes)
       puts "update_all: #{scenes.inspect}" if $DEBUG
       if (scenes.size>0 and scenes[0].reverse and scenes.type!='line' and scenes.type!='area')
@@ -130,7 +124,7 @@ module Rubyvis
         e = self.create(type)
       end
       attributes.each {|name,value|
-        value = nil if (value == self.implicit[:svg][name])
+        value = nil if (value == IMPLICIT[:svg][name])
         if (value.nil?)
           e.delete_attribute(name)
         else
@@ -147,7 +141,7 @@ module Rubyvis
           array_styles[$1]=$2
         }
         style.each {|name,value|
-          value=nil if value==self.implicit[:css][name]
+          value=nil if value==IMPLICIT[:css][name]
           if (value.nil?)
             array_styles.delete(name)
           else

data/spec/anchor_spec.rb

@@ -107,9 +107,9 @@ describe Rubyvis::Anchor do
     end
   end
   it "should render equal to protovis 'anchor.html' example" do
-      @vis = Rubyvis::Panel.new()
-      .width(200)
-      .height(200)
+      @vis = Rubyvis::Panel.new().
+        width(200).
+        height(200)
       
       @vis.add(Rubyvis::Bar).
         fill_style("#ccc").

data/spec/area_spec.rb

@@ -10,21 +10,21 @@ describe Rubyvis::Area do
   end
   it "should render equal to protovis 'area-segmented.html' test" do
     data=Rubyvis.range(0, 6, 0.1).map {|x| Math.sin(x)}
-    vis = Rubyvis.Panel.new()
-    .width(500)
-    .height(200)
-    .top(50)
-    .bottom(50)
-    .left(10)
-    .right(10)
+    vis = Rubyvis.Panel.new().
+width(500).
+height(200).
+top(50).
+bottom(50).
+left(10).
+right(10)
 
-    vis.add(Rubyvis::Area)
-    .segmented(true)
-    .data(data)
-    .bottom(0)
-    .left(lambda {self.index / 59.0 * 500})
-    .height(lambda {|d| (d + 1) / 2.0 * 200 + 50})
-    .fill_style(lambda {|d| "hsl(#{(d + 1) * 180.0},50,50)"})
+    vis.add(Rubyvis::Area).
+segmented(true).
+data(data).
+bottom(0).
+left(lambda {self.index / 59.0 * 500}).
+height(lambda {|d| (d + 1) / 2.0 * 200 + 50}).
+fill_style(lambda {|d| "hsl(#{(d + 1) * 180.0},50,50)"})
      vis.render()
      pv_out=fixture_svg_read("area_segmented.svg")
      vis.to_svg.should have_same_svg_elements(pv_out)
@@ -53,13 +53,13 @@ describe Rubyvis::Area do
       interpolations=["linear","step-before","step-after", "basis", "cardinal", "monotone"]
       
       #/* The root panel. */
-      vis = pv.Panel.new()
-      .width(w)
-      .height(h)
-      .bottom(20)
-      .left(20)
-      .right(10)
-      .top(5)
+      vis = pv.Panel.new().
+width(w).
+height(h).
+bottom(20).
+left(20).
+right(10).
+top(5)
       
       interpolations.each_with_index do |inter,i|
       n=i%2
@@ -74,7 +74,7 @@ describe Rubyvis::Area do
       panel.add(Rubyvis::Area).data(data).
       bottom(0).
       segmented(true).
-      fill_style(lambda {return color[self.index]}).
+      fill_style(lambda {color[self.index]}).
       left(lambda {|d| x.scale(d.x)}).
       height(lambda {|d| y.scale(d.y)}).
       interpolate(inter)