rubyvis 0.1.1 → 0.1.2

data/lib/rubyvis/scene/svg_scene.rb

@@ -2,6 +2,7 @@ require 'rubyvis/scene/svg_panel'
 require 'rubyvis/scene/svg_bar'
 require 'rubyvis/scene/svg_rule'
 require 'rubyvis/scene/svg_label'
+require 'rubyvis/scene/svg_line'
 
 class REXML::Element
   attr_accessor :_scene
@@ -22,7 +23,7 @@ module Rubyvis
     def self.xlink
       "http://www.w3.org/1999/xlink"
     end
-    def self.xhtml 
+    def self.xhtml
       "http://www.w3.org/1999/xhtml"
     end
     @scale=1
@@ -34,25 +35,27 @@ module Rubyvis
     end
     def self.implicit
       svg={
-      "shape-rendering"=> "auto",
-      "pointer-events"=> "painted",
-      "x"=> 0,
-      "y"=> 0,
-      "dy"=> 0,
-      "text-anchor"=> "start",
-      "transform"=> "translate(0,0)",
-      "fill"=> "none",
-      "fill-opacity"=> 1,
-      "stroke"=> "none",
-      "stroke-opacity"=> 1,
-      "stroke-width"=> 1.5,
-      "stroke-linejoin"=> "miter"
-    }
-    css={"font"=>"10px sans-serif"}
-    
-    {:svg=>svg,:css=>css}
+        "shape-rendering"=> "auto",
+        "pointer-events"=> "painted",
+        "x"=> 0,
+        "y"=> 0,
+        "dy"=> 0,
+        "text-anchor"=> "start",
+        "transform"=> "translate(0,0)",
+        "fill"=> "none",
+        "fill-opacity"=> 1,
+        "stroke"=> "none",
+        "stroke-opacity"=> 1,
+        "stroke-width"=> 1.5,
+        "stroke-linejoin"=> "miter"
+      }
+      css={"font"=>"10px sans-serif"}
+
+      {:svg=>svg,:css=>css}
     end
+
     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')
         scenes=scenes.reverse
       end
@@ -71,22 +74,22 @@ module Rubyvis
       el.add_namespace('svg',self.svg) if type=='svg'
       el
     end
-    
+
     def self.append(e,scenes,index)
       e._scene=OpenStruct.new({:scenes=>scenes, :index=>index})
       #e=self.title
-      
+
       if(!e.parent)
         scenes._g.add_element(e)
       end
       return e.next_sibling_node
     end
-    
-    def self.expect(e, type, attributes, style=nil) 
-      
+
+    def self.expect(e, type, attributes, style=nil)
+
       if (e)
-        e = e.elements[1] if (e.name == "a") 
-        if (e.name != type) 
+        e = e.elements[1] if (e.name == "a")
+        if (e.name != type)
           n = self.create(type);
           e.parent.replace_child(e, n);
           e = n
@@ -96,9 +99,9 @@ module Rubyvis
       end
       attributes.each {|name,value|
         value = nil if (value == self.implicit[:svg][name])
-        if (value.nil?) 
-          e.delete_attribute(name) 
-        else 
+        if (value.nil?)
+          e.delete_attribute(name)
+        else
           e.attributes[name]=value
         end
       }
@@ -114,6 +117,6 @@ module Rubyvis
       end
       e
     end
-    
+
   end
-end
+end

data/lib/rubyvis/sceneelement.rb

@@ -5,7 +5,7 @@ module Rubyvis
     end
     include Enumerable
     attr_accessor :visible
-    attr_accessor :mark, :type, :child_index, :parent, :parent_index, :target, :defs, :data,  :antialias, :line_width, :fill_style, :overflow, :width, :height, :top, :bottom, :left, :right, :title, :reverse, :stroke_style, :transform, :canvas, :_g, :events, :cursor, :children, :id, :segmented, :interpolate, :tension, :name, :text_baseline, :text_align, :text, :font, :text_angle, :text_style, :text_margin, :text_decoration, :text_shadow
+    attr_accessor :mark, :type, :child_index, :parent, :parent_index, :target, :defs, :data,  :antialias, :line_width, :fill_style, :overflow, :width, :height, :top, :bottom, :left, :right, :title, :reverse, :stroke_style, :transform, :canvas, :_g, :events, :cursor, :children, :id, :segmented, :interpolate, :tension, :name, :text_baseline, :text_align, :text, :font, :text_angle, :text_style, :text_margin, :text_decoration, :text_shadow, :line_join, :eccentricity
     def []=(v,i)
       if v.is_a? Numeric
         @scenes[v]=i
@@ -33,6 +33,10 @@ module Rubyvis
     def size
       @scenes.size
     end
+    def inspect
+      elements_id=@scenes.map{|e| '<'+ e.object_id.to_s(16)+'>'}.join(", ")
+      "<SE #{object_id.to_s(16)} (#{type}), elements: #{self.size} (#{elements_id}), children: #{children ? children.size : '0'}, data: #{data ? data.to_s: ''}>"
+    end
     def size=(v)
       if self.size==v
         return true

data/lib/rubyvis/transform.rb

@@ -15,11 +15,11 @@ module Rubyvis
       v.x=self.k*x+self.x
       v.y=self.k*y+self.y
       v
-      
+
     end
     def self.identity
       Transform.new
     end
   end
-  
+
 end

data/spec/mark_spec.rb

@@ -5,12 +5,12 @@ describe Rubyvis::Mark do
     Rubyvis::Mark.properties.should==props
   end
   it "should return correct defaults" do
-    props=Rubyvis::Mark.defaults._properties
-    props[0].name.should==:data
-    props[0].value.should be_instance_of Proc
-    props[1].name.should==:visible
-    props[2].name.should==:antialias
-    props[3].name.should==:events
+    props=Rubyvis::Mark.defaults._properties.sort {|a,b| a.name.to_s<=>b.name.to_s}
+    props[1].name.should==:data
+    props[1].value.should be_instance_of Proc
+    props[3].name.should==:visible
+    props[0].name.should==:antialias
+    props[2].name.should==:events
   end
   
 end

data/spec/scale_linear_datetime_spec.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe "Rubyvis::Scale::Linear with dates" do
+  it "should be created as Javascript" do
+    h=280
+    y = Rubyvis.Scale.linear(Time.utc(2010,1,1), Time.utc(2010,2,1))
+  end
+  
+  before do
+    @bd=Time.utc(2010,1,1)
+    @ed=Time.utc(2010,2,1)
+    @h=280
+    @y = Rubyvis.Scale.linear(@bd, @ed).range(0,@h)
+  end
+  it "y should be a Scale" do
+    @y.should be_a(Rubyvis::Scale::Linear)
+  end
+  it "should respond to domain" do
+    @y.domain.should==[@bd, @ed]
+    @y.domain(@bd)
+    @y.domain.should==[@bd,@bd]
+    @y.domain(@bd,@ed,@ed+1)
+    @y.domain.should==[@bd,@ed,@ed+1]
+  end
+  it "should respond to range" do
+    @y.range.should==[0, @h]
+    @y.range(1)
+    @y.range.should==[1,1]
+    @y.range(1,100,300)
+    @y.range.should==[1,100,300]
+  end
+  it "should returns correct scale" do
+    @y.scale(@bd).should==0
+    @y.scale(@ed).should==@h
+    @y[@ed].should==@h
+    val= (@ed.to_f+@bd.to_f) / 2.0
+    @y.scale(val).should be_close(@h / 2.0, 0.001)
+  end
+  it "should returns correct invert" do
+    @y.invert(0).should==@bd
+    @y.invert(@h).should==@ed
+  end
+  it "should returns correct ticks" do
+    @y.ticks.size.should==5
+    @y.ticks(5).size.should==5
+    @y.ticks(5)[0].should be_instance_of Time
+    
+    #p @y.ticks
+  end
+  it "should returns correct tick_format"
+
+  it "should nice nicely"
+end

data/spec/scale_linear_spec.rb

@@ -71,16 +71,6 @@ describe Rubyvis::Scale::Linear do
   it "y should be a Scale" do
     @y.should be_a(Rubyvis::Scale::Linear)
   end
-  it "should set domain with dates" do
-    pending("Should accept dates as domain values")
-    data= [
-    { :date=> Date.today, :wounds=> 0, :other=> 110, :disease=> 110 },
-    { :date=> Date.new, :wounds=> 2, :other=> 130, :disease=> 110 }
-    
-    ]
-    x=Rubyvis.Scale.linear(data, lambda {|d| d[:date]})
-    
-  end
   it "should respond to domain" do
     @y.domain.should==[0, 1000]
     @y.domain(1)