rubyvis 0.2.0 → 0.2.1

data/lib/rubyvis/mark/area.rb

@@ -25,13 +25,12 @@ module Rubyvis
         if (!fixed)
           binds.fixed=[]
           fixed = binds.fixed
-          
           filter=lambda {|prop|
             if prop.fixed
               fixed.push(prop)
-              return false
+              false
             else
-              return true
+              true
             end
           }
           #      p binds.required

data/lib/rubyvis/mark/image.rb

@@ -60,7 +60,7 @@ module Rubyvis
     # and <tt>a</tt> attributes. A {@link pv.Color} or string can also be returned,
     # though this typically results in slower performance.
     
-    def image(f)
+    def dynamic_image(f)
       f,dummy=arguments
       @_image = lambda {|*args|
         c=f.js_apply(self,args)

data/lib/rubyvis/mark/line.rb

@@ -145,7 +145,7 @@ module Rubyvis
 
     def self.defaults
       a=Rubyvis::Colors.category10()
-      Line.new.extend(Mark.defaults).line_join('miter').line_width(1.5).stroke_style( lambda {return a.scale(self.parent.index)}).interpolate('linear').eccentricity(0).tension(0.7)
+      Line.new.extend(Mark.defaults).line_join('miter').line_width(1.5).stroke_style( lambda { a.scale(parent.index)}).interpolate('linear').eccentricity(0).tension(0.7)
     end
   end
 end

data/lib/rubyvis/mark/shorcut_methods.rb

@@ -20,39 +20,127 @@ class Rubyvis::Mark
     end
   end
   ##
-  # :method: area(opts,&block)
+  # :method: area(opts, &block)
   #
+  # Adds an Area mark 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 :area, Rubyvis::Area
   ##
   # :method: bar(opts,&block)
   #
+  # Adds a Bar mark 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 :bar, Rubyvis::Bar
   ##
   # :method: dot(opts,&block)
   #
+  # Adds a Dot mark 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 :dot, Rubyvis::Dot
   ##
-  # :method: _image(opts,&block)
+  # :method: image(opts,&block)
+  #
+  # Adds an Image mark 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 :_image, Rubyvis::Image
+  mark_method :image, Rubyvis::Image
+  
   ##
   # :method: label(opts,&block)
   #
+  # Adds a Label mark 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 :label, Rubyvis::Label
   ##
   # :method: line(opts,&block)
   #
+  # Adds a Line mark 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 :line, Rubyvis::Line
   ##
   # :method: panel(opts,&block)
   #
+  # Adds a Panel mark 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 :panel, Rubyvis::Panel
-  ##
+  ##  
   # :method: rule(opts,&block)
+  #
+  # Adds a Rule mark 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 :rule, Rubyvis::Rule
   ##
-  # :method: wedge(opts,&block)
+  # :method: wedge(opts,&block)  
+  #
+  # Adds a Wedge mark 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 :wedge, Rubyvis::Rule
 end

data/lib/rubyvis/mark/wedge.rb

@@ -8,7 +8,9 @@ module Rubyvis
       "wedge"
     end
     @properties=Mark.properties.dup
+    
     attr_accessor_dsl :start_angle, :end_angle, :angle, :inner_radius, :outer_radius, :line_width, [:stroke_style, lambda {|d| Rubyvis.color(d)}], [:fill_style, lambda {|d| Rubyvis.color(d)}]
+    
     def self.defaults
       a=Rubyvis.Colors.category20()
       Wedge.new.extend(Mark.defaults).start_angle(lambda  {s=self.sibling; s ? s.end_angle: -Math::PI.quo(2) } ).inner_radius( 0 ).line_width( 1.5 ).stroke_style( nil ).fill_style( lambda {a.scale(self.index)})
@@ -21,7 +23,8 @@ module Rubyvis
     end
     
     def anchor(name)
-      partial=lambda {|s| s.inner_radius!=0 ? true : s.angle<2*Math.PI}
+      that=self
+      partial=lambda {|s| s.inner_radius!=0 ? true : s.angle < 2*Math::PI}
       mid_radius=lambda {|s| (s.inner_radius+s.outer_radius) / 2.0}
       mid_angle=lambda {|s| (s.start_angle+s.end_angle) / 2.0 }
       
@@ -66,9 +69,9 @@ module Rubyvis
         if (partial.call(s))
           case (self.name()) 
           when 'outer'
-            return self.upright(mid_angle.call(s)) ? 'right':'left'
+            return that.upright(mid_angle.call(s)) ? 'right':'left'
           when 'inner'
-            return self.upright(mid_angle.call(s)) ? 'left':'right'
+            return that.upright(mid_angle.call(s)) ? 'left':'right'
             
           end
         end
@@ -78,9 +81,9 @@ module Rubyvis
         if (partial.call(s))
           case (self.name()) 
           when 'start'
-            return self.upright(s.start_angle) ? 'top':'bottom'
+            return that.upright(s.start_angle) ? 'top':'bottom'
           when 'end'
-            return self.upright(s.end_angle) ? 'bottom':'top'
+            return that.upright(s.end_angle) ? 'bottom':'top'
             
           end
         end
@@ -102,24 +105,26 @@ module Rubyvis
             a=s.end_angle
           end
         end
-        self.upright(a) ? a: (a+Math::PI) 
+        that.upright(a) ? a: (a+Math::PI) 
       })
       
     end
     
     
-    def self.upright(angle)
+    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?)
-        s.angle= s.end_angle-s.start_angle 
+      
+      if s.angle.nil?
+        s.angle = s.end_angle - s.start_angle 
       elsif s.end_angle.nil?
-        s.end_angle=s.start_angle+s.angle
+        s.end_angle = s.start_angle + s.angle
       end
+      
       mark_build_implied(s)
     end
   end

data/lib/rubyvis/scale/ordinal.rb

@@ -177,6 +177,25 @@ module Rubyvis
       @r=Rubyvis.range(min+step.quo(2),max,step)
       self
     end
+    
+    # Sets the range from the given continuous interval. The interval
+    # [<i>min</i>, <i>max</i>] is subdivided into <i>n</i> equispaced points,
+    # where <i>n</i> is the number of (unique) values in the domain. The first
+    # and last point are exactly on the edge of the range.
+    #
+    # <p>This method must be called <i>after</i> the domain is set.
+    #
+    # * @param {number} min minimum value of the output range.
+    # * @param {number} max maximum value of the output range.
+    # * @returns {pv.Scale.ordinal} <tt>this</tt>.
+    # * @see Ordinal.split
+    
+    def split_flush(min,max)
+      n = self.domain().size
+      step = (max - min) / (n - 1).to_f
+      @r = (n == 1) ? [(min + max) / 2.0] : Rubyvis.range(min, max + step/2.0, step)
+      self
+    end
     def by(f)
       that=self
       lambda {|*args|

data/lib/rubyvis/scale/quantitative.rb

@@ -92,6 +92,7 @@ module Rubyvis
     end
     # Transform value +x+ according to domain and range
     def scale(x)
+      return nil if x.nil?
       x=x.to_f
       j=Rubyvis.search(@d, x)
       j=-j-2 if (j<0)

data/lib/rubyvis/scene/svg_line.rb

@@ -105,9 +105,9 @@ module Rubyvis
       return e
     end
 
-    #/** @private Returns the path segment for the specified points. */
+    # Returns the path segment for the specified points. */
 
-    def self.path_segment(s1, s2)
+    def self.path_segment(s1, s2) 
       l = 1; # sweep-flag
       l = 0 if s1.interpolate=='polar-reverse'
       

data/lib/rubyvis/scene/svg_scene.rb

@@ -9,7 +9,7 @@ require 'rubyvis/scene/svg_wedge'
 require 'rubyvis/scene/svg_image'
 require 'rubyvis/scene/svg_curve'
 
-class REXML::Element
+class REXML::Element # :nodoc:
   attr_accessor :_scene
 end
 

data/spec/anchor_spec.rb

@@ -11,10 +11,10 @@ describe Rubyvis::Anchor do
       @expected_p2=[]  
       vis = pv.Panel.new().width(w).height(h)      
       cell=vis.add(pv.Panel).
-        data([1,2]).top(lambda {|*args| data_p1.push(args); return 100}).
-        add(pv.Panel). data(['a','b']).top(lambda {|*args| data_p2.push(args); return 100;})
+        data([1,2]).top(lambda {|*args| data_p1.push(args); 100}).
+        add(pv.Panel). data(['a','b']).top(lambda {|*args| data_p2.push(args); 100;})
       
-      cell.anchor('center').add(pv.Bar).top(lambda {|*args| data_l.push args; return 1})
+      cell.anchor('center').add(pv.Bar).top(lambda {|*args| data_l.push args; 1})
 
       [1,2].each {|a| %w{a b}.each {|b| 
         @expected_l.push([b,b,a,nil])
@@ -123,4 +123,4 @@ describe Rubyvis::Anchor do
       datas.should==expected
     end
   end  
-end
+end

data/spec/internal_spec.rb

@@ -141,6 +141,11 @@ describe "Rubyvis module methods" do
     it "method log_ceil" do
       Rubyvis.log_ceil(-5,4).should be_close(-4, 0.001)
     end
+    it "method dict" do
+      Rubyvis.dict(["one", "three", "seventeen"], lambda {|s| s.size}).should=={"one"=> 3, "three"=> 5, "seventeen"=> 9}
+      Rubyvis.dict(["one", "three", nil, "seventeen"], lambda {|s| s.size}).should=={"one"=> 3, "three"=> 5, "seventeen"=> 9}
+      
+    end
   end
   
 end

data/spec/line_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__)+"/spec_helper.rb"
 describe Rubyvis::Line do
   it "should have correct properties" do
-    props=[:antialias, :bottom, :cursor, :data, :eccentricity, :events, :fill_style, :id, :interpolate, :left, :line_join, :line_width, :reverse, :right, :segmented, :stroke_style, :tension, :title, :top, :visible]
-    Rubyvis::Line.properties.keys.sort.should==props
+    props=[:antialias, :bottom, :cursor, :data, :eccentricity, :events, :fill_style, :id, :interpolate, :left, :line_join, :line_width, :reverse, :right, :segmented, :stroke_style, :tension, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
+    Rubyvis::Line.properties.should==props
   end
   context "rendered" do
     before do

data/spec/readme_spec.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe "Rubyvis Readme" do
+  it "should work with RBP API" do
+    vis=nil
+    lambda {
+    vis = Rubyvis::Panel.new do 
+      width 150
+      height 150
+      bar do
+        data [1, 1.2, 1.7, 1.5, 0.7, 0.3]
+        width 20
+        height {|d| d * 80}
+        bottom(0)
+        left {index * 25}
+      end
+    end
+    
+    vis.render}.should_not raise_exception
+    vis.to_svg.size.should>0
+  end
+  it "should work with Protovis API" do
+    vis=nil
+    lambda {
+    vis = Rubyvis::Panel.new.width(150).height(150);
+    
+    vis.add(pv.Bar).
+      data([1, 1.2, 1.7, 1.5, 0.7, 0.3]).
+      width(20).
+      height(lambda {|d| d * 80}).
+      bottom(0).
+      left(lambda {self.index * 25});
+    
+    vis.render
+    }.should_not raise_exception
+    vis.to_svg.size.should>0
+  end
+  
+end

data/spec/spec.opts

@@ -1,3 +1,3 @@
 --color
 -f s
--b  
+-b

data/web/Rakefile

@@ -1,22 +1,23 @@
 # -*- ruby -*-
 require 'rake'
+
+directory "examples"
+
 def get_base(f)
   f.sub(File.dirname(__FILE__)+"/../examples/","").gsub("/","_").gsub(".rb","")
 end
-directory "examples"
 EXAMPLES=Dir.glob(File.dirname(__FILE__)+"/../examples/**/*.rb").map {|v|     [v,get_base(v)]
 }.find_all{|v| !v[0].include?"_data"}
 
 EXAMPLES_BASE=EXAMPLES.map {|v| v[1]}
 
 
-
+desc "Build all html and svg files"
 task :build_site do
   ruby "build_site.rb"
 end
 
-task :default=>["index.html","../lib/rubyvis.rb"]+EXAMPLES_BASE.map {|v| "examples/#{v}.html"}
-
+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"}
 
@@ -26,7 +27,7 @@ EXAMPLES.each do |v|
   file "examples/#{e}.svg"=>[v[0]] do |t|
     system "ruby1.9 #{v[0]} > #{t.name}"
   end
-  file "examples/#{e}.png"=>"examples/#{e}.svg" do |t|
+  file "examples/#{e}.png"=>["examples/#{e}.svg"] do |t|
   system   "rsvg  -w 200 -h 200 -f png examples/#{e}.svg #{t.name}"
   end
 end

data/web/build_site.rb

@@ -21,7 +21,8 @@ pages={}
 prev_page=nil
 next_page=nil
 
-Dir.glob(File.dirname(__FILE__)+"/../examples/**/*.rb") do |f|
+files=Dir.glob(File.dirname(__FILE__)+"/../examples/**/*.rb").sort{|a,b| puts "#{a}, #{b}"; a<=>b}
+files.each do |f|
   
   next if f.include? "_data.rb"
   fn=get_base(f)
@@ -84,7 +85,7 @@ Dir.glob(File.dirname(__FILE__)+"/../examples/**/*.rb") do |f|
 
 end
 
-pages.each do |name,page|
+pages.each do |name, page|
   html_file="examples/#{page.name}.html"
   File.open(html_file,"w") {|fp|
     fp.write(haml_template.render(page, :pages=>pages))