rubyvis 0.1.0 → 0.1.1

data/examples/first.rb

@@ -6,7 +6,7 @@ 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});
+  left(lambda {self.index * 25})
 
 
 =begin
@@ -14,4 +14,4 @@ Should generate this
 <svg height="150" width="150" stroke-width="1.5" stroke="none" fill="none" font-family="sans-serif" font-size="10px"><g><rect fill="rgb(31,119,180)" height="80" width="20" y="70"></rect><rect fill="rgb(31,119,180)" height="96" width="20" y="54" x="25"></rect><rect fill="rgb(31,119,180)" height="136" width="20" y="14" x="50"></rect><rect fill="rgb(31,119,180)" height="120" width="20" y="30" x="75"></rect><rect fill="rgb(31,119,180)" height="56" width="20" y="94" x="100"></rect><rect fill="rgb(31,119,180)" height="24" width="20" y="126" x="125"></rect></g></svg>
 =end
 vis.render()
-puts vis.canvas.elements[1]
+puts vis.to_svg

data/examples/second.rb

@@ -3,12 +3,15 @@ require 'rubyvis'
 
 vis = pv.Panel.new().width(150).height(150);
 
-vis.add(pv.Rule).data(pv.range(0, 2, 0.5)).bottom(lambda {|d| d * 80 + 0.5}).add(pv.Label)
+vis.add(pv.Rule).data(pv.range(0, 2, 0.5)).bottom(lambda {|d| d * 80 + 0.5}).add(pv.Label).left(0)
 
 
-vis.add(pv.Bar).data([1, 1.2, 1.7, 1.5, 0.7]).width(20).height(lambda {|d|  d * 80}).bottom(0).left(lambda { self.index * 25 + 25}).anchor("bottom").add(pv.Label)
+vis.add(pv.Bar).data([1, 1.2, 1.7, 1.5, 0.7]).width(20).height(lambda {|d|  d * 80}).bottom(0).left(lambda { self.index * 25 + 25}).add(pv.Label)
+
+#puts vis.children_inspect
+#exit
 
 vis.render();
-puts vis.canvas
+puts vis.to_svg
 
 # <svg height="150" width="150" stroke-width="1.5" stroke="none" fill="none" font-family="sans-serif" font-size="10px"><g><line stroke-width="1" stroke="rgb(0,0,0)" y2="149.5" x2="150" y1="149.5" x1="0" shape-rendering="crispEdges"></line><line stroke-width="1" stroke="rgb(0,0,0)" y2="109.5" x2="150" y1="109.5" x1="0" shape-rendering="crispEdges"></line><line stroke-width="1" stroke="rgb(0,0,0)" y2="69.5" x2="150" y1="69.5" x1="0" shape-rendering="crispEdges"></line><line stroke-width="1" stroke="rgb(0,0,0)" y2="29.5" x2="150" y1="29.5" x1="0" shape-rendering="crispEdges"></line></g><g><text fill="rgb(0,0,0)" transform="translate(75, 149.5)" y="-3" x="3" pointer-events="none">0</text><text fill="rgb(0,0,0)" transform="translate(75, 109.5)" y="-3" x="3" pointer-events="none">0.5</text><text fill="rgb(0,0,0)" transform="translate(75, 69.5)" y="-3" x="3" pointer-events="none">1</text><text fill="rgb(0,0,0)" transform="translate(75, 29.5)" y="-3" x="3" pointer-events="none">1.5</text></g><g><rect fill="rgb(31,119,180)" height="80" width="20" y="70" x="25"></rect><rect fill="rgb(31,119,180)" height="96" width="20" y="54" x="50"></rect><rect fill="rgb(31,119,180)" height="136" width="20" y="14" x="75"></rect><rect fill="rgb(31,119,180)" height="120" width="20" y="30" x="100"></rect><rect fill="rgb(31,119,180)" height="56" width="20" y="94" x="125"></rect></g><g><text text-anchor="middle" fill="rgb(0,0,0)" transform="translate(35, 150)" y="-3" pointer-events="none">1</text><text text-anchor="middle" fill="rgb(0,0,0)" transform="translate(60, 150)" y="-3" pointer-events="none">1.2</text><text text-anchor="middle" fill="rgb(0,0,0)" transform="translate(85, 150)" y="-3" pointer-events="none">1.7</text><text text-anchor="middle" fill="rgb(0,0,0)" transform="translate(110, 150)" y="-3" pointer-events="none">1.5</text><text text-anchor="middle" fill="rgb(0,0,0)" transform="translate(135, 150)" y="-3" pointer-events="none">0.7</text></g></svg>

data/lib/rubyvis.rb

@@ -1,9 +1,12 @@
 require 'date'
 require 'ostruct'
 require 'rexml/document'
+require 'rexml/formatters/default'
+
 require 'pp'
 require 'rubyvis/internals'
 require 'rubyvis/sceneelement'
+require 'rubyvis/property'
 
 require 'rubyvis/javascript_behaviour'
 require 'rubyvis/format'
@@ -21,7 +24,7 @@ def pv
 end
 
 module Rubyvis
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   Infinity=1.0 / 0 # You actually can do it! http://snipplr.com/view/2137/uses-for-infinity-in-ruby/
   # :section: basic methods
   def self.identity
@@ -36,8 +39,20 @@ module Rubyvis
   def self.parent
     lambda {|*args| self.parent.index}
   end
+  def self.clear_document
+    @document=REXML::Document.new
+    @document.add_element("document")
+  end
   def self.document
-    @document||=REXML::Document.new
+    if @document.nil?
+      @document=REXML::Document.new
+      @document.add_element("document")
+    end
+    @document.root
+  end
+  def self.to_svg
+    s=""
+    @document.write(s)
+    s
   end
-    
 end

data/lib/rubyvis/mark.rb

@@ -19,7 +19,7 @@ module Rubyvis
          if arguments.size>0
            type=(!_def).to_i<<1 | (v.is_a? Proc).to_i
            property_value(name,(type & 1 !=0) ? lambda {|*args|  v.js_apply(self, args)} : v)._type=type
-           @_properties_types[name]=type
+           #@_properties_types[name]=type
            return self
          end
          i=instance()
@@ -33,10 +33,10 @@ module Rubyvis
        end
      end
      def property_value(name,v)
-       prop=OpenStruct.new({:name=>name, :id=>Rubyvis.id, :value=>v})
+       prop=Property.new({:name=>name, :id=>Rubyvis.id, :value=>v})
        @_properties.delete_if{|v| v.name==name}
        @_properties.push(prop)
-       @_properties_values[name]=v
+       #@_properties_values[name]=v
        return prop
      end
      def margin(n)
@@ -67,7 +67,8 @@ module Rubyvis
     end
     
     attr_accessor :parent, :root, :index, :child_index, :scene, :proto, :target, :scale
-    attr_accessor_dsl :data,:visible, :left, :right, :top, :bottom, :title, :reverse, :antialias, :id
+    attr_reader :_properties
+    attr_accessor_dsl :data,:visible, :left, :right, :top, :bottom, :cursor, :title, :reverse, :antialias, :events, :id 
    
     @scene=nil
     @stack=[]
@@ -75,10 +76,10 @@ module Rubyvis
     def self.properties
       @properties
     end
-    def self.index
+    def Mark.index
       @index
     end
-    def self.index=(v)
+    def Mark.index=(v)
       @index=v
     end
 
@@ -101,12 +102,12 @@ module Rubyvis
     end
     
     def initialize(opts=Hash.new)
-      @_properties_values={}
-      @_properties_types={}
+      #@_properties_values={}
+      #@_properties_types={}
       @_properties=[]
-      @options=defaults.merge opts
+      #@options=opts
       # @stack=[]
-      @options.each {|k,v|
+      opts.each {|k,v|
         self.send("#{k}=",v) if self.respond_to? k
       }
       @defs={}
@@ -119,35 +120,55 @@ module Rubyvis
     def type
       "mark"
     end
-    def _properties
-      out={}
-      @_properties_values.each {|k,v|
-        out[k]=OpenStruct.new({:name=>k.to_s,:value=>v, :_type=>@_properties_types[k]})
-      }
-      out
-    end
-   
-    
-   
-
-
-    
-    
-    def defaults
-      {:data=>lambda {|d| [d]}, :visible=>true, :antialias=>true}
+   def self.defaults
+      Mark.new({:data=>lambda {|d| [d]}, :visible=>true, :antialias=>true, :events=>'painted'})
     end
     def extend(proto)
       @proto=proto
-      @target=target
+      @target=proto.target
       self
     end
     
+    def instances(source)
+      
+  mark = self
+  index = []
+  scene=nil
+  while (!(scene = mark.scene)) do
+    source = source.parent;
+    index.push(OpenStruct.new({:index=>source.index, :child_index=>mark.child_index}))
+    mark = mark.parent
+  end
+  while (index.size>0) do
+    i = index.pop()
+    scene = scene[i.index].children[i.child_index]
+  end
+  #
+  # When the anchor target is also an ancestor, as in the case of adding
+  # to a panel anchor, only generate one instance per panel. Also, set
+  # the margins to zero, since they are offset by the enclosing panel.
+  # /
+  if (self.respond_to? :index and self.index) 
+    
+    s = scene[self.index].dup
+    s.right = s.top = s.left = s.bottom = 0;
+    return [s];
+  end
+  return scene;
+end
+
+    
+    
+    
+    
+    
+    
     def add(type)
       parent.add(type).extend(self)
     end
-    def anchor(name=nil)
-      name = "center" if (!name) # default anchor name
-      return Rubyvis::Anchor.new(self).name(name).data(lambda {
+    def anchor(name="center")
+      
+      anchor=Rubyvis::Anchor.new(self).name(name).data(lambda {
       self.scene.target.map {|s| s.data} }).visible(lambda {
       self.scene.target[self.index].visible
       }).id(lambda {self.scene.target[self.index].id}).left(lambda {
@@ -195,9 +216,9 @@ module Rubyvis
         'bottom'
       end
       })
-
       
       
+      return anchor
     end
     
     
@@ -210,11 +231,11 @@ module Rubyvis
       t=s.top
       b=s.bottom
       prop=self.properties
-      w = (prop[:width] and !prop[:width].nil?)  ? s.width : 0
-      h = (prop[:height] and !prop[:height].nil?)  ? s.height : 0
-      #puts "#{l},#{r},#{t},#{b}"
-      #puts "#{w},#{h}"
-      
+      #p self
+      w = (prop[:width])  ? s.width : 0
+      h = (prop[:height])  ? s.height : 0
+      #puts "l:#{l},r:#{r},t:#{t},b:#{b}"
+      #puts "w:#{w},h:#{h}"
       width=self.parent ? self.parent.width(): (w+(l.nil? ? 0 : l)+(r.nil? ? 0 :r))
       if w.nil?
         r||=0
@@ -264,23 +285,32 @@ module Rubyvis
       s.fill_style=Rubyvis::Color.transparent if prop[:fill_style] and !s.fill_style
       s.stroke_style=Rubyvis::Color.transparent if prop[:stroke_style] and !s.stroke_style
     end
-    
-    
-    
-    
-    def pr_svg(name)
-      res=self.send(name)
-      if res.nil?
-        "none"
-      else
-        res.to_s
+    def render
+      parent=self.parent
+      @stack=Mark.stack
+      if parent and !self.root.scene
+        root.render()
+        return 
+      end
+      @indexes=[]
+      mark=self
+      until mark.parent.nil?
+        @indexes.unshift(mark.child_index)
       end
+      bind      
+      while(parent and !parent.respond_to? :index) do
+        parent=parent.parent
+      end
+      
+      self.context( parent ? parent.scene : nil, parent ? parent.index : -1, lambda {render_render(self.root, 0,1)})
+      
     end
+    
     def render_render(mark,depth,scale)
       mark.scale=scale
       if (depth < @indexes.size) 
         @stack.unshift(nil)
-        if (mark.respond_to? :index) 
+        if (mark.respond_to? :index and mark.index) 
             render_instance(mark, depth, scale);
         else 
           mark.scene.size.times {|i|
@@ -323,16 +353,17 @@ module Rubyvis
     private :render_render, :render_instance
     def bind_bind(mark)
       begin
-        @_properties.each {|v|
-          k=v.name.to_s
+        mark._properties.each {|v|
+          #p v.name
+          k=v.name
           if !@seen.has_key?(k)
             @seen[k]=v
             case k
-              when "data"
+              when :data
                 @_data=v
-              when "visible"
+              when :visible
                 @_required.push(v)
-              when "id"
+              when :id
                 @_required.push(v)
               else
                 @types[v._type].push(v)
@@ -341,46 +372,31 @@ module Rubyvis
         }
       end while(mark = mark.proto)
     end
+    
     attr_accessor :binds
+    
     def bind()
       @seen={}
       @types={1=>[],2=>[],3=>[]}
       @_data=nil
       @_required=[]
       bind_bind(self)
+      bind_bind((self.class).defaults)
       @types[1].reverse!
       @types[3].reverse!
       mark=self
       begin
-      properties.each {|name,v|
-        if !@seen[name.to_s]
-          @seen[name.to_s]=OpenStruct.new(:name=>name.to_s, :_type=>2, :value=>nil)
-          @types[2].push(@seen[name.to_s])
-        end
-      }
+        properties.each {|name,v|
+          if !@seen[name]
+            @seen[name]=Property.new(:name=>name, :_type=>2, :value=>nil)
+            @types[2].push(@seen[name])
+          end
+        }
       end while(mark=mark.proto)
       @binds=OpenStruct.new({:properties=>@seen, :data=>@_data, :required=>@_required, :optional=>@types[1]+@types[2]+@types[3]
       })
     end
-    def render
-      parent=self.parent
-      @stack=Mark.stack
-      if parent and !self.root.scene
-        root.render()
-        return 
-      end
-      @indexes=[]
-      mark=self
-      until mark.parent.nil?
-        indexes.unshift(mark.child_index)
-      end
-      self.bind()
-      while(parent and !parent.respond_to? :index) do
-        parent=parent.parent
-      end
-      self.context( parent ? parent.scene : nil, parent ? parent.index : -1, lambda {render_render(self.root, 0,1)})
-      
-    end
+    
     
     def context_apply(scene,index)
       Mark.scene=scene
@@ -455,7 +471,7 @@ module Rubyvis
     def build
       scene=self.scene
       stack=Mark.stack
-      #p self.type
+      
       if(!scene)
         self.scene=SceneElement.new
         scene=self.scene
@@ -467,10 +483,12 @@ module Rubyvis
           scene.parent_index=self.parent.index
         end
       end
+      # Resolve anchor target
+      #puts "Resolve target"
       if(self.target)
         scene.target=self.target.instances(scene)
       end
-        
+      #pp self.binds
       data=self.binds.data
       #puts "stack:#{stack}"
       #puts "data_value:#{data.value}"
@@ -480,7 +498,7 @@ module Rubyvis
       
       stack.unshift(nil)
       scene.size=data.size
-      data.each_with_index {|d,i|
+      data.each_with_index {|d, i|
         Mark.index=self.index=i
         s=scene[i]
         if !s
@@ -508,7 +526,6 @@ module Rubyvis
         v=prop.value
 
         # p "#{prop.name}=#{v}"
-        
         if prop._type==3
           v=v.js_apply(self, Mark.stack)
         end
@@ -519,10 +536,11 @@ module Rubyvis
   end
 end
 
+require 'rubyvis/mark/anchor'
 require 'rubyvis/mark/bar'
 require 'rubyvis/mark/panel'
-require 'rubyvis/mark/rule'
 require 'rubyvis/mark/area'
-require 'rubyvis/mark/anchor'
+require 'rubyvis/mark/line'
+require 'rubyvis/mark/rule'
 require 'rubyvis/mark/label'
 

data/lib/rubyvis/mark/anchor.rb

@@ -4,18 +4,16 @@ module Rubyvis
   end
   
   class Anchor < Mark
-    @properties=Mark.properties
-    attr_accessor_dsl :name, :text_baseline, :text_align
-    def type
-      'area'
-    end
+    @properties=Mark.properties.dup
+    attr_accessor_dsl :name, :text_align, :text_baseline
+    
     def initialize(target)
       super()
       self.target=target
       self.parent=target.parent
     end
-    def _extend(proto)
-      self.proto=proto
+    def extend(proto)
+      @proto=proto
       return self
     end
   end

data/lib/rubyvis/mark/area.rb

@@ -2,33 +2,35 @@ module Rubyvis
   def self.Area
     Rubyvis::Area
   end
-  
+  module AreaPrototype
+    def area_anchor(name)
+      scene=nil
+      self.anchor(name).interpolate(lambda {
+          self.scene.target[self.index].interpolate
+      }).eccentricity(lambda {
+      self.scene.target[self.index].eccentricity
+      }).tension(lambda {
+      self.scene.target[self.index].tension
+      })
+    end
+  end
   class Area < Mark
-    @properties=Mark.properties
+    include AreaPrototype
+    @properties=Mark.properties.dup
     attr_accessor_dsl :width, :height, :line_width, :stroke_style, :fill_style, :segmented, :interpolate, :tension
     def type
       'area'
     end
-    def defaults
-      sd=super
-      return sd.merge({:line_width=>1.5, :fill_style=>pv.Colors.category20.by(pv.parent), :interpolate=>'linear', :tension=>0.7})
+    def self.defaults
+      Area.new.extend(Mark.defaults).line_width(1.5).fill_style(pv.Colors.category20.by(pv.parent)).interpolate('linear').tension(0.7)
+    end
+    def anchor(name)
+      area_anchor(name)
     end
     def build_implied(s)
       s.heigth=0 if s.height.nil?
       s.width=0 if s.width.nil?
       super(s)
     end
-    def self.anchor(name)
-      Mark.anchor(name).interpolate(lambda {
-          self.scene.target[self.index].interpolate
-      }).eccentricity(lambda {
-      self.scene.target[self.index].eccentricity
-      }).tension(lambda {
-      self.scene.target[self.index].tension
-      })
-    end
-    def anchor
-      (self.class).anchor(name)
-    end
   end
 end