rubyvis 0.1.0 → 0.1.1

data/lib/rubyvis/mark/bar.rb

@@ -7,17 +7,10 @@ module Rubyvis
       "bar"
     end
 
-    @properties=Mark.properties
+    @properties=Mark.properties.dup
     attr_accessor_dsl :width, :height, :line_width, :stroke_style, :fill_style
-    def defaults
-      sd=super
-      return sd.merge({:line_width=>1.5, :fill_style=>Rubyvis.Colors.category20().by(Rubyvis.parent)})
-    end
-    def svg_render_pre
-      "<rect fill='#{pr_svg(:fill_style)}' height='#{pr_svg(:height)}' width='#{pr_svg(:width)}' x='#{pr_svg(:left)}' y='#{pr_svg(:top)}'>"
-    end
-    def svg_render_post
-      "</rect>"
+    def self.defaults
+      Bar.new.extend(Mark.defaults).line_width(1.5).fill_style(Rubyvis.Colors.category20().by(Rubyvis.parent))
     end
   end
 end

data/lib/rubyvis/mark/label.rb

@@ -4,14 +4,13 @@ module Rubyvis
   end
   
   class Label < Mark
-    @properties=Mark.properties
+    @properties=Mark.properties.dup
     attr_accessor_dsl :text, :font, :text_angle, :text_style, :text_align, :text_baseline, :text_margin, :text_decoration, :text_shadow
     def type
       'label'
     end
-    def defaults
-      sd=super
-      return sd.merge({:events=>'none', :text=>lambda{|x| puts "->#{x}"; x}, :font=>"10px sans-serif", :text_angle=>0, :text_style=>pv.color('black'), :text_align=>'left', :text_baseline=>'bottom', :text_margin=>3})
+    def self.defaults
+      Label.new.extend(Mark.defaults).events('none').text(lambda{|x| x}).font("10px sans-serif").text_angle(0).text_style(pv.color('black')).text_align('left').text_baseline('bottom').text_margin(3)
     end
   end
 end

data/lib/rubyvis/mark/line.rb

@@ -2,13 +2,29 @@ module Rubyvis
   def self.Line
     Rubyvis::Line
   end
-  
+  module LinePrototype
+    include AreaPrototype  
+    def line_anchor(name)
+      area_anchor(name).text_align(lambda {|d|
+         {'left'=>'right','bottom'=>'center','top'=>'center','center'=>'center','right'=>'left'}[d]
+      }).text_baseline(lambda{|d|
+         {'top'=>'bottom','right'=>'middle','left'=>'middle','center'=>'middle','bottom'=>'top'}[d]
+      })
+    end
+  end
   class Line < Mark
-    @properties=Mark.properties
+    include AreaPrototype
+    include LinePrototype
+    @properties=Mark.properties.dup
     attr_accessor_dsl :line_width, :line_join, :stroke_style, :fill_style, :segmented, :interporale, :eccentricity, :tension
+    def type
+      "line"
+    end
+    def anchor(name)
+      line_anchor(name)
+    end
     def defaults
-      sd=super
-      return sd.merge({:line_join=>'miter', :line_width=>1.5, :stroke_style=>RubyVis::Color.category10().by(pv.parent), :interpolate=>'linear', :eccentricity=>0, :tension=>7})
+      Line.new.extend(Rubyvis::Mark).line_join('miter').line_width(1.5).stroke_style(RubyVis::Color.category10().by(pv.parent)).interpolate('linear').eccentricity(0).tension(7)
     end
   end
 end

data/lib/rubyvis/mark/panel.rb

@@ -7,7 +7,7 @@ module Rubyvis
       "panel"
     end
 
-    @properties=Bar.properties
+    @properties=Bar.properties.dup
     attr_accessor_dsl :transform, :overflow, :canvas
     attr_accessor :children, :root
     def initialize
@@ -15,9 +15,20 @@ module Rubyvis
       @children=[]
       @root=self
     end
-    def defaults
-      sd=super
-      return sd.merge({:fill_style=>nil, :overflow=>'visible', :canvas=>Rubyvis.document.add_element("canvas")})
+    def children_inspect(level=0)
+      out=[]
+      @children.each do |c|
+        out << ("  "*level)+"- #{c.type} (#{c.object_id}) proto:#{c.proto.object_id} target:#{c.target.object_id}"
+        if c.respond_to? :children and c.children
+          out <<c.children_inspect(level+1)
+        end
+      end
+      out
+      
+    end
+    
+    def self.defaults
+      Panel.new.extend(Bar.defaults).fill_style(nil).overflow('visible')
     end
     def add(type)
       child=type.new
@@ -56,10 +67,23 @@ module Rubyvis
       }
       s.children=s.children[0,n]
     end
+    def to_svg
+      @_canvas.sort.map {|v|
+        bar = REXML::Formatters::Default.new
+        out = String.new
+        bar.write(v[1].elements[1], out)
+        out
+      }.join
+    end
     def build_implied(s)
       if(!self.parent)
         c=s.canvas
         if(c)
+          if(c._panel!=self)
+            c._panel=self
+            p "hola"
+            c.delete_if? {true}
+          end
           if s.width.nil?
             w=Rubyvis.css(c,'width')
             s.width=w-s.left-s.right
@@ -68,16 +92,17 @@ module Rubyvis
             w=Rubyvis.css(c,'height')
             s.height=h-s.top-s.bottom
           end
+          
         else
           @_canvas||={}
           cache=@_canvas
           if(!(c=cache[self.index]))
-            c=cache[this.index]=Rubyvis.add_element('span')
+            c=cache[self.index]=Rubyvis.document.add_element('span')
           end
         end
         s.canvas=c
       end
-      
+     
       s.transform=Rubyvis.Transform.identity if (s.transform.nil?)
       super(s)
       

data/lib/rubyvis/mark/rule.rb

@@ -3,15 +3,19 @@ module Rubyvis
     Rubyvis::Rule
   end
   class Rule < Mark
-    @properties=Mark.properties
+    include LinePrototype
+    @properties=Mark.properties.dup
     attr_accessor_dsl :width, :height, :line_width, :stroke_style
-    def defaults
-      sd=super
-      return sd.merge({:line_width=>1,:stroke_style=>pv.color('black'),:antialias=>false})
+    def self.defaults
+      Rule.new.extend(Mark.defaults).line_width(1).stroke_style(pv.color('black')).antialias(false)
     end
     def type
       'rule'
     end
+    
+    def anchor(name)
+      line_anchor(name)
+    end
     def build_implied(s)
       l=s.left
       r=s.right

data/lib/rubyvis/property.rb

@@ -0,0 +1,11 @@
+module Rubyvis
+  class Property
+    attr_accessor :name, :id, :value, :_type
+    def initialize(opts=Hash.new)
+      @id=opts[:id]
+      @name=opts[:name]
+      @value=opts[:value]
+      @_type=opts[:_type]
+    end
+  end
+end

data/lib/rubyvis/scene/svg_label.rb

@@ -33,7 +33,7 @@ module Rubyvis
         "x"=> x,
         "y"=> y,
         "dy"=> dy,
-        "transform"=> "translate(" + s.left.to_s + "," + s.top.to_s + ")" + (s.text_angle ? " rotate(" + (180 * s.text_angle / Math::PI).to_s + ")" : "") + (self.scale != 1 ? " scale(" + 1 / self.scale + ")" : ""),
+        "transform"=> "translate(" + s.left.to_s + "," + s.top.to_s + ")" + (s.text_angle!=0 ? " rotate(" + (180 * s.text_angle / Math::PI).to_s + ")" : "") + (self.scale != 1 ? " scale(" + 1 / self.scale + ")" : ""),
         "fill"=> fill.color,
         "fill-opacity"=> fill.opacity || nil,
         "text-anchor"=> anchor

data/lib/rubyvis/scene/svg_scene.rb

@@ -68,7 +68,8 @@ module Rubyvis
     end
     def self.create(type)
       el=Element.new "#{type}"
-      #el.add_namespace('svg',self.svg)
+      el.add_namespace('svg',self.svg) if type=='svg'
+      el
     end
     
     def self.append(e,scenes,index)

data/lib/rubyvis/sceneelement.rb

@@ -16,6 +16,8 @@ module Rubyvis
     def [](v)
       if v.is_a? Numeric
         @scenes[v]
+      elsif v.nil?
+        nil
       elsif self.respond_to? v
         self.send(v)
       end

data/spec/bar_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+  describe Rubyvis::Bar do
+  it "should have correct properties" do
+    props=[:antialias, :bottom, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :reverse, :right, :stroke_style, :title, :top, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    Rubyvis::Bar.properties.should==props
+  end
+  it "should return correct defaults" do
+    props=Rubyvis::Bar.defaults._properties
+    props.size.should==2
+    props[0].name.should==:line_width
+    props[0].value.should==1.5
+    props[1].name.should==:fill_style
+    props[1].value.should be_instance_of Proc
+    Rubyvis::Bar.defaults.proto.should be_instance_of Rubyvis::Mark
+    
+  end
+  context "on a Panel" do 
+    before do
+      #Rubyvis.clear_document
+    @h=200
+    @w=200
+    @vis = Rubyvis.Panel.new.width(@w).height(@h)
+    @vis.add(pv.Bar).data([1,2]).width(20).height(lambda {|d| d * 80}).bottom(0).left(lambda {self.index * 25});
+    end
+    it "should bould propertly" do
+      @vis.render
+      s=@vis.to_svg
+      doc=Nokogiri::XML(s)
+      attribs=doc.xpath("//svg/g/rect").map {|v|
+      [v.attributes['y'].value, v.attributes['height'].value, v.attributes['fill'].value]
+      }
+      attribs.should==[["120","80","rgb(31,119,180)"],["40","160","rgb(31,119,180)"]]
+    end
+    it "should bould propertly with double data" do
+      @vis = Rubyvis.Panel.new.width(@w).height(100)
+      @vis.add(pv.Bar).data([1,2]).width(20).height(lambda {|d| d * 10}).bottom(0).left(lambda {self.index * 25}).add(pv.Bar).width(10).height(lambda {|d| d * 30}).bottom(0).left(lambda {self.index * 25});
+      @vis.render
+      s=@vis.to_svg
+      doc=Nokogiri::XML(s)
+      attribs=doc.xpath("//svg/g/rect").map {|v|
+      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"]]
+    end
+    
+  end  
+  
+  
+end

data/spec/label_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+  describe Rubyvis::Label do
+  it "should have correct properties" do
+    props=[:antialias, :bottom, :cursor, :data, :events, :font, :id, :left, :reverse, :right, :text, :text_align, :text_angle, :text_baseline, :text_decoration, :text_margin, :text_shadow, :text_style, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
+    
+    Rubyvis::Label.properties.should==props
+  end
+  it "should return correct defaults" do
+    props=Rubyvis::Bar.defaults._properties
+    props.size.should==2
+    props[0].name.should==:line_width
+    props[0].value.should==1.5
+    props[1].name.should==:fill_style
+    props[1].value.should be_instance_of Proc
+    Rubyvis::Bar.defaults.proto.should be_instance_of Rubyvis::Mark
+    
+  end
+  context "on a Panel" do 
+    before do
+      #Rubyvis.clear_document
+    @h=100
+    @w=200
+    @vis = Rubyvis.Panel.new.width(@w).height(@h)
+    @vis.add(pv.Bar).data([1,2]).width(20).height(lambda {|d| d * 80}).bottom(0).left(lambda {self.index * 25}).add(pv.Label)
+    end
+    it "should bould propertly" do
+      @vis.render
+      s=@vis.to_svg
+      #p s
+      #File.open("test.svg","w") {|f| f.puts s}
+
+      doc=Nokogiri::XML(s)
+      
+      attribs=doc.xpath("//svg/g/text").map {|v|
+      [v.attributes['y'].value, v.attributes['transform'].value, v.text] }
+      attribs.should==[["-3","translate(0,100)","1"],["-3","translate(25,100)","2"]]
+    end    
+  end  
+  
+  
+end

data/spec/mark_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe Rubyvis::Mark do
+  it "should have correct properties" do
+    props=[:antialias, :bottom, :cursor, :data, :events, :id, :left, :reverse, :right, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
+    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
+  end
+  
+end

data/spec/panel_spec.rb

@@ -1,8 +1,26 @@
 require File.dirname(__FILE__)+"/spec_helper.rb"
 describe Rubyvis::Panel do
-  it "should be created as Javascript" do
-    w,h=200,100
-    vis = Rubyvis.Panel.new.width(w).height(h).margin(19.5).right(40)
+  before do
+    @h=200
+    @w=200
+    @vis = Rubyvis.Panel.new.width(@w).height(@h)
+  end
+  it "should have correct properties" do
+    props=[:antialias, :bottom, :canvas, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :overflow, :reverse, :right, :stroke_style, :title, :top, :transform, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    Rubyvis::Panel.properties.should==props
+  end
+  it "should have correct defaults" do
+    Rubyvis::Panel.defaults._properties.size.should==2
+  end
+  it "should build propertly" do
+    lambda {@vis.render}.should_not raise_exception
+  end
+  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("//svg").attributes[k].value.should==v
+    }
   end
-  
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'spec'
 require 'spec/autorun'
 require 'rubyvis'
 require 'pp'
+require 'nokogiri'
 $PROTOVIS_DIR=File.dirname(__FILE__)+"/../vendor/protovis/src"
 module Rubyvis
   class JohnsonLoader

data/vendor/FUTURE

@@ -0,0 +1,62 @@
+*
+- use === and !== instead of == and !=
+- force type conversion of input arguments in public API?
+- use array push rather than string concatentation to improve performance?
+- use Object.create instead of pv.extend, if available
+
+data/?
+- AJAX helper? or refer to jQuery
+
+data/Scale.js
+- allow customization of data ticks (e.g., "3 months", "5 minutes")
+- greedily convert range to the expected type (for colors?)
+- ignore undefined values when computing min/max for domains
+
+mark/Mark.js
+- event handlers should be inherited?
+- antialias doesn't always work as expected; requires pixel rounding?
+- allow mixin rather than single inheritance?
+- linear and radial gradient fills
+- pattern fills
+- drop shadows, blurring, other graphical effects?
+- animation
+- faster incremental rendering (detect properties)
+- remove first, last, cousin, sibling methods?
+- dot-dash strokes using stroke-dasharray
+
+mark/Bar.js
+- rounded corners
+
+mark/Line.js
+- support fillStyle on segmented lines
+- spline interpolation
+- arrows (markers)?
+
+mark/Label.js
+- text metrics API for smart label placement
+
+mark/Area.js
+- spline interpolation
+
+mark/Area.Radial.js
+mark/Line.Radial.js
+mark/Bar.Radial.js
+
+mark/Image.js
+- scale / tile / center / fill / preserveAspectRatio
+
+physics/LinkConstraint.js
+- should support an alpha parameter, like pv.Constraint.position
+
+layout/Tree.js
+- allow depth and breadth offset to be computed automatically
+
+layout/Force.js
+- smarter default rest length / charge force constant
+
+behavior/Pan.js
+- custom bounds
+- lock one axis
+
+behavior/Point.js
+- compute true distance from mouse to perimeter (e.g., wedge)

data/vendor/Makefile

@@ -0,0 +1,138 @@
+JS_LANG_FILES = \
+	src/lang/Array.js
+
+JS_CORE_FILES = \
+	src/pv.js \
+	src/pv-internals.js \
+	src/lang/init.js \
+	src/text/Format.js \
+	src/text/DateFormat.js \
+	src/text/TimeFormat.js \
+	src/text/NumberFormat.js \
+	src/data/Arrays.js \
+	src/data/Numbers.js \
+	src/data/Objects.js \
+	src/data/Dom.js \
+	src/data/Tree.js \
+	src/data/Nest.js \
+	src/data/Flatten.js \
+	src/data/Vector.js \
+	src/data/Transform.js \
+	src/data/Scale.js \
+	src/data/QuantitativeScale.js \
+	src/data/LinearScale.js \
+	src/data/LogScale.js \
+	src/data/RootScale.js \
+	src/data/OrdinalScale.js \
+	src/data/QuantileScale.js \
+	src/data/Histogram.js \
+	src/color/Color.js \
+	src/color/Colors.js \
+	src/color/Ramp.js \
+	src/scene/SvgScene.js \
+	src/scene/SvgCurve.js \
+	src/scene/SvgArea.js \
+	src/scene/SvgBar.js \
+	src/scene/SvgDot.js \
+	src/scene/SvgImage.js \
+	src/scene/SvgLabel.js \
+	src/scene/SvgLine.js \
+	src/scene/SvgPanel.js \
+	src/scene/SvgRule.js \
+	src/scene/SvgWedge.js \
+	src/mark/Mark.js \
+	src/mark/Anchor.js \
+	src/mark/Area.js \
+	src/mark/Bar.js \
+	src/mark/Dot.js \
+	src/mark/Label.js \
+	src/mark/Line.js \
+	src/mark/Rule.js \
+	src/mark/Panel.js \
+	src/mark/Image.js \
+	src/mark/Wedge.js \
+	src/mark/Ease.js \
+	src/mark/Transition.js \
+	src/mark/Transient.js
+
+JS_LAYOUT_FILES = \
+	src/physics/Particle.js \
+	src/physics/Simulation.js \
+	src/physics/Quadtree.js \
+	src/physics/Force.js \
+	src/physics/ChargeForce.js \
+	src/physics/DragForce.js \
+	src/physics/SpringForce.js \
+	src/physics/Constraint.js \
+	src/physics/CollisionConstraint.js \
+	src/physics/PositionConstraint.js \
+	src/physics/BoundConstraint.js \
+	src/layout/Layout.js \
+	src/layout/Network.js \
+	src/layout/Hierarchy.js \
+	src/layout/Grid.js \
+	src/layout/Stack.js \
+	src/layout/Treemap.js \
+	src/layout/Tree.js \
+	src/layout/Indent.js \
+	src/layout/Pack.js \
+	src/layout/Force.js \
+	src/layout/Cluster.js \
+	src/layout/Partition.js \
+	src/layout/Arc.js \
+	src/layout/Horizon.js \
+	src/layout/Rollup.js \
+	src/layout/Matrix.js \
+	src/layout/Bullet.js \
+	src/behavior/Behavior.js \
+	src/behavior/Drag.js \
+	src/behavior/Point.js \
+	src/behavior/Select.js \
+	src/behavior/Resize.js \
+	src/behavior/Pan.js \
+	src/behavior/Zoom.js
+
+JS_GEO_FILES = \
+	src/geo/Geo.js \
+	src/geo/LatLng.js \
+	src/geo/Projection.js \
+	src/geo/Projections.js \
+	src/geo/GeoScale.js
+
+JS_FILES = \
+	$(JS_LANG_FILES) \
+	$(JS_CORE_FILES) \
+	$(JS_LAYOUT_FILES) \
+	$(JS_GEO_FILES)
+
+JS_COMPILER = \
+	java -jar lib/google-compiler/compiler-20100201.jar \
+	--charset UTF-8 \
+	--warning_level=QUIET
+
+JSDOC_HOME = /Library/jsdoc-toolkit
+JSDOC = java -jar $(JSDOC_HOME)/jsrun.jar $(JSDOC_HOME)/app/run.js
+
+all: protovis-d3.3.js protovis-r3.3.js
+protovis-d3.3.js: $(JS_FILES)
+protovis-r3.3.js: $(JS_FILES)
+
+%-d3.3.js: Makefile
+	grep '	' -Hn $(filter %.js,$^) && echo "ERROR: tab" && exit 1 || true
+	grep '
+	grep ' $$' -Hn $(filter %.js,$^) && echo "ERROR: trailing space" && exit 1 || true
+	rm -f $@
+	echo "// $(shell git rev-parse HEAD)" >> $@
+	cat $(filter %.js,$^) >> $@
+
+%-r3.3.js:: Makefile
+	rm -f $@
+	echo "// $(shell git rev-parse --short HEAD)" >> $@
+	cat $(filter %.js,$^) | $(JS_COMPILER) >> $@
+
+jsdoc: $(JS_FILES) Makefile
+	rm -rf jsdoc
+	$(JSDOC) -a -t=$(JSDOC_HOME)/templates/jsdoc -d=$@ -E="^pv-" $(JS_FILES)
+
+clean:
+	rm -rf protovis-d3.3.js protovis-r3.3.js jsdoc