rubyvis 0.1.7 → 0.2.0

data/lib/rubyvis/scene/svg_line.rb

@@ -17,14 +17,14 @@ module Rubyvis
 
       d = "M" + s.left.to_s + "," + s.top.to_s
 
-      if (scenes.size > 2 and (s.interpolate == "basis" or s.interpolate == "cardinal" or s.interpolate == "monotone"))
+      if (scenes.size > 2 and (['basis', 'cardinal', 'monotone'].include? s.interpolate))
         case (s.interpolate)
-        when "basis"
-          d = d+ curve_basis(scenes)
-        when "cardinal"
-          d = d+curve_cardinal(scenes, s.tension)
-        when "monotone"
-          d = d+curve_monotone(scenes)
+          when "basis"
+            d = d+ curve_basis(scenes)
+          when "cardinal"
+            d = d+curve_cardinal(scenes, s.tension)
+          when "monotone"
+            d = d+curve_monotone(scenes)
         end
 
       else
@@ -68,7 +68,7 @@ module Rubyvis
         s1 = scenes[i]
         s2 = scenes[i + 1];
 
-        #/* visible */
+        # visible 
         next if (!s1.visible and !s2.visible)
 
         stroke = s1.stroke_style
@@ -76,14 +76,14 @@ module Rubyvis
 
         next if stroke.opacity==0.0
 
-        #/* interpolate */
+        # interpolate
         d=nil
         if ((s1.interpolate == "linear") and (s1.lineJoin == "miter"))
           fill = stroke;
           stroke = Rubyvis.Color.transparent;
           d = path_join(scenes[i - 1], s1, s2, scenes[i + 2]);
         elsif(paths)
-          d = paths[i];
+          d = paths[i]
         else
           d = "M" + s1.left + "," + s1.top + path_segment(s1, s2);
         end
@@ -109,22 +109,24 @@ module Rubyvis
 
     def self.path_segment(s1, s2)
       l = 1; # sweep-flag
-      case (s1.interpolate)
-      when "polar-reverse"
-        l = 0;
-      when "polar"
-        dx = s2.left - s1.left,
+      l = 0 if s1.interpolate=='polar-reverse'
+      
+      if s1.interpolate=='polar' or s1.interpolate=='polar-reverse'
+        dx = s2.left - s1.left
         dy = s2.top - s1.top
         e = 1 - s1.eccentricity
         r = Math.sqrt(dx * dx + dy * dy) / (2 * e)
-        if !((e<=0) and (e>1))
+        if !((e<=0) or (e>1))
           return "A#{r},#{r} 0 0,#{l} #{s2.left},#{s2.top}"
         end
-      when "step-before"
+      end
+      
+      if s1.interpolate=="step-before"
         return "V#{s2.top}H#{s2.left}"
-      when "step-after"
+      elsif s1.interpolate=="step-after"
         return "H#{s2.left}V#{s2.top}"
       end
+      
       return "L#{s2.left},#{s2.top}"
     end
 

data/lib/rubyvis/scene/svg_scene.rb

@@ -7,17 +7,18 @@ require 'rubyvis/scene/svg_dot'
 require 'rubyvis/scene/svg_area'
 require 'rubyvis/scene/svg_wedge'
 require 'rubyvis/scene/svg_image'
+require 'rubyvis/scene/svg_curve'
 
 class REXML::Element
   attr_accessor :_scene
 end
 
 module Rubyvis
-  def self.Scene
+  def self.Scene # :nodoc:
     Rubyvis::SvgScene
   end
-  module SvgScene
-    include REXML
+  module SvgScene # :nodoc:
+    #include REXML
     def self.svg
       "http://www.w3.org/2000/svg"
     end;
@@ -74,7 +75,7 @@ module Rubyvis
       end
     end
     def self.create(type)
-      el=Element.new "#{type}"
+      el=REXML::Element.new "#{type}"
       if type=='svg'
         el.add_namespace(self.svg)
         #el.add_namespace("xmlns:xmlns", self.xmlns)

data/lib/rubyvis/sceneelement.rb

@@ -1,5 +1,8 @@
 module Rubyvis
-  class SceneElement
+  # Scene element
+  # Store information about each scene.
+  # On javascript, is an Array with custom properties.
+  class SceneElement # :nodoc:
     def initialize
       @scenes=Array.new
     end

data/spec/area_spec.rb

@@ -0,0 +1,48 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe Rubyvis::Area do
+  it "should have correct properties" do
+    props=[:antialias, :bottom, :cursor, :data, :events, :fill_style, :height, :id, :interpolate, :left, :line_width, :reverse, :right, :segmented, :stroke_style, :tension, :title, :top, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    Rubyvis::Area.properties.should==props
+  end
+  context "rendered" do
+    before do
+      @h=200
+      @w=200
+      @vis = Rubyvis.Panel.new.width(@w).height(@h)
+      @area=@vis.add(pv.Area).
+        data([1,2,1,4,1,5]).
+        height(lambda {|d| d*20}).
+        left(lambda {index*20}).
+        bottom(0)
+    end
+    it "should return correct default (linear) path" do
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to  "M0 180L20 160L40 180L60 120L80 180L100 100L100 200L80 200L60 200L40 200L20 200L0 200Z"
+    end
+    it "should return correct path for interpolate=step-before" do
+      @area.interpolate('step-before')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180V160L20 160V180L40 180V120L60 120V180L80 180V100L100 100L100 200H80L80 200H60L60 200H40L40 200H20L20 200H0L0 200Z"
+    end
+    it "should return correct path for interpolate=step-after" do
+      @area.interpolate('step-after')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180H20L20 160H40L40 180H60L60 120H80L80 180H100L100 100L100 200V200L80 200V200L60 200V200L40 200V200L20 200V200L0 200Z"
+    end
+    it "should return correct path for interpolate=basis" do
+      @area.interpolate('basis')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180C0 180 0 180 3.333333333333333 176.66666666666666C6.666666666666666 173.33333333333331 13.333333333333332 166.66666666666666 20 166.66666666666666C26.666666666666664 166.66666666666666 33.33333333333333 173.33333333333331 40 166.66666666666666C46.666666666666664 160 53.33333333333333 140 60 140C66.66666666666666 140 73.33333333333333 160 80 156.66666666666666C86.66666666666666 153.33333333333331 93.33333333333331 126.66666666666666 96.66666666666666 113.33333333333331C99.99999999999999 99.99999999999999 99.99999999999999 99.99999999999999 99.99999999999997 99.99999999999997L100 200C99.99999999999999 199.99999999999997 99.99999999999999 199.99999999999997 96.66666666666664 199.99999999999994C93.33333333333331 199.99999999999997 86.66666666666666 199.99999999999997 80 199.99999999999994C73.33333333333333 199.99999999999997 66.66666666666666 199.99999999999997 59.99999999999999 199.99999999999994C53.33333333333333 199.99999999999997 46.666666666666664 199.99999999999997 40 199.99999999999994C33.33333333333333 199.99999999999997 26.666666666666664 199.99999999999997 20 199.99999999999994C13.333333333333332 199.99999999999997 6.666666666666666 199.99999999999997 3.333333333333333 199.99999999999994C0 199.99999999999997 0 199.99999999999997 0 199.99999999999994Z"
+    end   
+    it "should return correct path for interpolate=cardinal" do 
+      @area.interpolate('cardinal')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180Q16 160 20 160C26 160 34 186 40 180S54 120 60 120S74 183 80 180Q84 178 100 100L100 200Q84 200 80 200C74 200 66 200 60 200S46 200 40 200S26 200 20 200Q16 200 0 200Z"
+    end
+  end
+end

data/spec/bar_spec.rb

@@ -65,7 +65,7 @@ require File.dirname(__FILE__)+"/spec_helper.rb"
       x=v.attributes['x'] ? v.attributes['x'].value : nil
         [x, v.attributes['y'].value, v.attributes['height'].value]
       }
-      attribs.should==[[nil,"90","10"],["25","80","20"],[nil,"70","30"],["25","40","60"]]
+      attribs.should==[[nil,"90","10"], ["25","80","20"], [nil,"70","30"], ["25","40","60"]]
     end
     
   end  

data/spec/line_spec.rb

@@ -0,0 +1,63 @@
+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
+  end
+  context "rendered" do
+    before do
+      @h=200
+      @w=200
+      @vis = Rubyvis.Panel.new.width(@w).height(@h)
+      @area=@vis.add(pv.Line).
+        data([1,2,1,4,1,5]).
+        bottom(lambda {|d| d*20}).
+        left(lambda {index*20})
+    end
+    it "should return correct default (linear) path" do
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to  "M0 180L20 160L40 180L60 120L80 180L100 100L100 200L80 200L60 200L40 200L20 200L0 200Z"
+    end
+    it "should return correct path for interpolate=step-before" do
+      @area.interpolate('step-before')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0,180V160H20V180H40V120H60V180H80V100H100"
+    end
+    it "should return correct path for interpolate=step-after" do
+      @area.interpolate('step-after')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0,180H20V160H40V180H60V120H80V180H100V100"
+    end
+    
+    it "should return correct path for interpolate=polar" do
+      @area.interpolate('polar')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0,180A14.142135623730951,14.142135623730951 0 0,1 20,160A14.142135623730951,14.142135623730951 0 0,1 40,180A31.622776601683793,31.622776601683793 0 0,1 60,120A31.622776601683793,31.622776601683793 0 0,1 80,180A41.23105625617661,41.23105625617661 0 0,1 100,100"
+    end
+    
+    
+    it "should return correct path for interpolate=polar-reverse" do
+     
+      @area.interpolate('polar-reverse')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0,180A14.142135623730951,14.142135623730951 0 0,0 20,160A14.142135623730951,14.142135623730951 0 0,0 40,180A31.622776601683793,31.622776601683793 0 0,0 60,120A31.622776601683793,31.622776601683793 0 0,0 80,180A41.23105625617661,41.23105625617661 0 0,0 100,100"
+    end
+    it "should return correct path for interpolate=basis" do
+      @area.interpolate('basis')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180C0 180 0 180 3.333333333333333 176.66666666666666C6.666666666666666 173.33333333333331 13.333333333333332 166.66666666666666 20 166.66666666666666C26.666666666666664 166.66666666666666 33.33333333333333 173.33333333333331 40 166.66666666666666C46.666666666666664 160 53.33333333333333 140 60 140C66.66666666666666 140 73.33333333333333 160 80 156.66666666666666C86.66666666666666 153.33333333333331 93.33333333333331 126.66666666666666 96.66666666666666 113.33333333333331C99.99999999999999 99.99999999999999 99.99999999999999 99.99999999999999 99.99999999999997 99.99999999999997"
+    end   
+    it "should return correct path for interpolate=cardinal" do 
+      @area.interpolate('cardinal')
+      @vis.render
+      doc=Nokogiri::XML(@vis.to_svg)
+      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180Q16 160 20 160C26 160 34 186 40 180S54 120 60 120S74 183 80 180Q84 178 100 100"
+    end
+  end
+end

data/spec/panel_spec.rb

@@ -18,9 +18,7 @@ describe Rubyvis::Panel do
   it "should return valid svg" do   
     @vis.render
     doc=Nokogiri::XML(@vis.to_svg)
-    values={"font-size"=>"10px", "font-family"=>"sans-serif", "fill"=>"none", "stroke"=>"none", "stroke-width"=>"1.5", "width"=>"200.0", "height"=>"200.0"}
-    values.each {|k,v|
-      doc.at_xpath("//xmlns:svg").attributes[k].value.should==v
-    }
+    doc.at_xpath("//xmlns:svg").should have_svg_attributes({"font-size"=>"10px", "font-family"=>"sans-serif", "fill"=>"none", "stroke"=>"none", "stroke-width"=>"1.5", "width"=>"200.0", "height"=>"200.0"})
   end
+  
 end

data/spec/ruby_api_spec.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe "Ruby API for Rubyvis" do
+  before do
+    @h=200
+    @w=200
+  end
+  it "should create a Panel with a block" do
+    lambda {@vis = Rubyvis.Panel.new {
+      width @w
+      height @h
+    }
+    }.should_not raise_exception
+    @vis._properties.size.should==2
+  end
+  it "should create a Bar with new method" do
+    vis1=Rubyvis.Panel.new.width(@w).height(@h)
+    vis1.add(Rubyvis::Bar).
+      data([1,2,3]).
+      width(10).
+      height(10).
+      left(lambda {|x| x*10}).anchor('top').
+        add(Rubyvis::Label).
+          text(lambda {|x| x})
+    vis1.render
+    svg1=vis1.to_svg
+  
+    ww=@w
+    hh=@h
+    vis2=Rubyvis.Panel.new {|pan|
+      pan.width ww
+      pan.height hh
+      pan.bar {
+        data([1,2,3])
+        width 10
+        height 10
+        left {|x| x*10}
+        label(:anchor=>'top') {
+          text {|x| x}
+        }
+      }
+    }
+    vis2.render
+    svg2=vis2.to_svg
+    svg1.should==svg2
+    
+  end
+end

data/spec/scale_linear_spec.rb

@@ -107,5 +107,18 @@ describe Rubyvis::Scale::Linear do
     @y.domain().should==[0.2,1]
   end
   
-  it "should returns correct tick_format"
+  it "should returns correct tick_format" do
+    @y.tick_format.should be_instance_of Proc
+    @y.tick_format.call( 2).should=='2'
+    @y.tick_format.call(2.0).should=='2'
+    @y.tick_format.call(2.1).should=='2.1'
+    @y.tick_format.call("a").should==''
+  end
+  it "should return correct tick_format for small numbers" do
+    @y.domain(0.00001,0.0001)
+    @y.range(0.000001,0.0001)
+    @y.ticks.should==[1.quo(100000), 1.quo(50000), 3.quo(100000), 1.quo(25000), 1.quo(20000), 3.quo(50000), 7.quo(100000), 1.quo(12500), 9.quo(100000), 1.quo(10000)]
+    @y.tick_format.call(0.2).should=='0.20000'
+    
+  end
 end

data/spec/spec_helper.rb

@@ -25,4 +25,39 @@ module Rubyvis
       @runtime = Johnson.load(*files)
     end
   end
+end
+# Spec matcher 
+Spec::Matchers.define :have_svg_attributes do |exp|
+  match do |obs|
+    exp.each {|k,v|
+      obs.attributes[k].value.should==v
+    }
+  end
+end
+Spec::Matchers.define :have_path_data_close_to do |exp|
+  def path_scan(path)
+      path.scan(/([MmCcZzLlHhVvSsQqTtAa, ])(\d+(?:\.\d+)?)/).map {|v|
+      v[0]="," if v[0]==" "
+      v[1]=v[1].to_f
+      v
+      }
+    end
+  match do |obs|
+    correct=true
+    obs_array=path_scan(obs.attributes["d"].value)
+    
+    exp_array=path_scan(exp)
+    obs_array.each_with_index {|v,i|
+      if (v[0]!=exp_array[i][0]) or (v[1]-exp_array[i][1]).abs>0.001
+        correct=false
+        break
+      end
+    }
+    correct
+  end
+  failure_message_for_should do |obs|
+    obs_array=path_scan(obs.attributes["d"].value)
+    exp_array=path_scan(exp)
+    "#{obs_array} path should be equal to #{exp_array}"
+  end
 end

data/web/Rakefile

@@ -22,7 +22,7 @@ file "index.html"=>["index.haml", :build_site]+EXAMPLES_BASE.map {|v| "examples/
 
 EXAMPLES.each do |v|
   e=v[1]
-  file "examples/#{e}.html"=>["examples.haml", :build_site, v[0]]
+  file "examples/#{e}.html"=>["examples.haml", "examples/#{e}.svg", :build_site, v[0]]
   file "examples/#{e}.svg"=>[v[0]] do |t|
     system "ruby1.9 #{v[0]} > #{t.name}"
   end

data/web/build_site.rb

@@ -65,7 +65,23 @@ Dir.glob(File.dirname(__FILE__)+"/../examples/**/*.rb") do |f|
   page.title=title
   page.text=text
   page.svg_file=base+".svg"
-   
+  # Read svg size
+  width=350
+  height=200
+  if File.exists? "examples/#{page.svg_file}"
+    File.open("examples/#{page.svg_file}","r") {|fp|
+      header=fp.gets(">")
+      if header=~/\sheight='([^']+)'/ 
+        height=$1
+      end
+      if header=~/\swidth='([^']+)'/
+        width=$1
+      end
+    }
+  end
+  page.svg_width=width.to_f.ceil
+  page.svg_height=height.to_f.ceil
+
 end
 
 pages.each do |name,page|

data/web/examples.haml

@@ -21,8 +21,8 @@
               %a{:href=>"#{next_ex}.html"} Next: #{pages[next_ex].title}          
       .image
         /[if IE]
-          %embed.svg{:src=>svg_file,:width=>"500", :height=>"300"}
-        %object.svg{:data=>svg_file, :type=>"image/svg+xml"}
+          %embed.svg{:src=>svg_file,:width=>svg_width, :height=>svg_height}
+        %object.svg{:data=>svg_file, :type=>"image/svg+xml", :width=>svg_width, :height=>svg_height}
       .source=find_and_preserve(source)
     :javascript
       var _gaq = _gaq || [];

data/web/index.haml

@@ -19,7 +19,7 @@
           %strong=Rubyvis::VERSION
         %p 
           Protovis API Version:
-          %strong=Rubyvis::API_VERSION
+          %strong=Rubyvis::PROTOVIS_API_VERSION
     %h2 Installation
     %pre gem install rubyvis
     %h2 Synopsis
@@ -28,13 +28,19 @@
         %h3 Ruby
         %pre 
           :preserve
+            require 'rubygems'
             require 'rubyvis'
-            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 = 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()
             puts vis.to_svg # Output final SVG
       #svg_code