rubyvis 0.1.1 → 0.1.2

data/lib/rubyvis/color/colors.rb

@@ -11,15 +11,15 @@ module Rubyvis
     def pv
       Rubyvis
     end
-     def self.category10(*arguments)
+    def self.category10(*arguments)
       scale = pv.colors(
-     "#1f77b4", "#ff7f0e", "#2ca02c", "#d62728", "#9467bd",
+      "#1f77b4", "#ff7f0e", "#2ca02c", "#d62728", "#9467bd",
       "#8c564b", "#e377c2", "#7f7f7f", "#bcbd22", "#17becf")
       scale.domain(*arguments);
       scale
     end
     def self.category19(*arguments)
-       scale = pv.colors(
+      scale = pv.colors(
       "#9c9ede", "#7375b5", "#4a5584", "#cedb9c", "#b5cf6b",
       "#8ca252", "#637939", "#e7cb94", "#e7ba52", "#bd9e39",
       "#8c6d31", "#e7969c", "#d6616b", "#ad494a", "#843c39",
@@ -37,4 +37,4 @@ module Rubyvis
       scale
     end
   end
-end
+end

data/lib/rubyvis/color/ramp.rb

@@ -0,0 +1 @@
+

data/lib/rubyvis/format.rb

@@ -2,7 +2,7 @@ module Rubyvis
   def self.Format
     Rubyvis::Format
   end
-  
+
   module Format
     def self.re(s)
       s.gsub(/[\\\^\$\*\+\?\[\]\(\)\.\{\}]/, "\\$&")
@@ -16,4 +16,4 @@ module Rubyvis
   end
 end
 require 'rubyvis/format/number'
-require 'rubyvis/format/date'
+require 'rubyvis/format/date'

data/lib/rubyvis/format/date.rb

@@ -10,9 +10,16 @@ module Rubyvis
       def format(d)
         d.strftime(pattern)
       end
+      def format_lambda
+        pat=pattern
+        lambda {|d| 
+          d.strftime(pat)
+        }
+      end
       def parse(s)
-        ::Date.strptime(s, pattern)
+        time=::DateTime.strptime(s, pattern)
+        Time.utc(time.year, time.month, time.day, time.hour, time.min, time.sec, 0)
       end
     end
   end
-end
+end

data/lib/rubyvis/format/number.rb

@@ -15,7 +15,7 @@ module Rubyvis
         @np = "\u2212" # default negative prefix
         @ns = "" # default negative suffix
       end
-      def fraction_digits(*arguments) 
+      def fraction_digits(*arguments)
         if (arguments.size>0)
           min=arguments[0]
           max=arguments[1]
@@ -24,8 +24,8 @@ module Rubyvis
           @maxk = 10**@maxf
           return self
         end
-        [minf, maxf]      
+        [minf, maxf]
       end
     end
   end
-end
+end

data/lib/rubyvis/internals.rb

@@ -8,7 +8,7 @@ module Rubyvis
     (f.is_a? Proc) ? f : lambda {f}
   end
   # :section: /data/Arrays.js
-  
+
   def self.map(array, f=nil)
     if f
       array.size.times.map {|i|
@@ -75,9 +75,9 @@ module Rubyvis
   def self.reverse_order(a,b)
     -(a<=>b)
   end
-  
+
   def self.search(array, value, f=nil)
-    f = Rubyvis.identity if (f.nil?) 
+    f = Rubyvis.identity if (f.nil?)
     low = 0
     high = array.size - 1;
     while (low <= high)
@@ -97,11 +97,11 @@ module Rubyvis
     i=Rubyvis.search(array,value,f)
     (i < 0 ) ? (-i-1) : i;
   end
-  
-  
+
+
   # :section: /data/Numbers.js
-  
-    def self.range(*arguments)
+
+  def self.range(*arguments)
     start, stop, step=arguments
     if (arguments.size == 1)
       stop = start;
@@ -114,12 +114,12 @@ module Rubyvis
     stop = stop- (stop - start) * 1e-10 #// floating point precision!
     j = start + step * i
     if (step < 0)
-      while (j > stop) 
+      while (j > stop)
         array.push(j)
         i+=1
         j = start + step * i
       end
-     else 
+    else
       while (j < stop)
         array.push(j)
         i+=1
@@ -130,14 +130,14 @@ module Rubyvis
   end
   def self.random(*arguments)
     start,stop,step=arguments
-    if (arguments.size == 1) 
+    if (arguments.size == 1)
       stop = start;
       start = 0;
     end
     step||= 1;
     return step ? ((rand() * (stop - start).quo(step)).floor * step + start) : (rand() * (stop - start) + start);
   end
-  
+
   def self.sum(array,f=nil)
     if f.nil?
       array.inject(0) {|ac,v| ac+v}
@@ -172,9 +172,9 @@ module Rubyvis
     Rubyvis.sum(array,f).quo(array.size)
   end
   def self.median(array,f=nil)
-    return (array.length - 1).quo(2) if (f == pv.index) 
+    return (array.length - 1).quo(2) if (f == pv.index)
     array = Rubyvis.map(array, f).sort{|a,b| Rubyvis.natural_order(a,b)}
-    return array[array.size.quo(2).floor] if (array.length % 2>0) 
+    return array[array.size.quo(2).floor] if (array.length % 2>0)
     i = array.size.quo(2);
     return (array[i - 1] + array[i]).quo(2);
   end

data/lib/rubyvis/javascript_behaviour.rb

@@ -56,9 +56,9 @@ class Proc
     else
       obj.instance_exec(*arguments,&self)
     end
-	end
+  end
   # Same as js_apply, but using explicit arguments
-	def js_call(obj,*args)
+  def js_call(obj,*args)
     js_apply(obj,args)
-	end
+  end
 end

data/lib/rubyvis/label.rb

@@ -0,0 +1 @@
+

data/lib/rubyvis/mark.rb

@@ -1,61 +1,59 @@
 module Rubyvis
-   # Represents a data-driven graphical mark. The <tt>Mark</tt> class is
-   # the base class for all graphical marks in Protovis; it does not provide any
-   # specific rendering functionality, but together with {@link Panel} establishes
-   # the core framework.
+  # Represents a data-driven graphical mark. The <tt>Mark</tt> class is
+  # the base class for all graphical marks in Protovis; it does not provide any
+  # specific rendering functionality, but together with {@link Panel} establishes
+  # the core framework.
   class Mark
-     @properties={}
-     
-     def self.property_method(name,_def)
-       define_method(name) do |*arguments|
-         v,dummy = arguments
-         if _def and self.scene
-           if arguments.size>0
-             defs[name]=OpenStruct.new({:id=>(v.nil?) ? 0 : Rubyvis.id, :value=> v})
-             return self
-           end
-           return defs[name]
-         end
-         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
-           return self
-         end
-         i=instance()
-         if i.nil?
-           raise "No instancia para #{name}"
-         else
-           #puts "Instancia para #{name}"
-           
-           i.send(name)
-         end
-       end
-     end
-     def property_value(name,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
-       return prop
-     end
-     def margin(n)
-       self.left(n).right(n).top(n).bottom(n)
-     end
-     def instance(default_index=nil)
-       scene=self.scene
-       scene||=self.parent.instance(-1).children[self.child_index]
-       if(default_index)
-         index=self.respond_to?(:index) ? self.index : default_index
-       else
-         index=scene.size-1
-       end
-       #puts "index:#{index} , scene.size:#{scene.size}, default_index:#{default_index}"
-       scene[index]
-     end
-     
-     
-     def self.attr_accessor_dsl(*attr)
+    @properties={}
+
+    def self.property_method(name,_def)
+      return if Mark.method_defined? name
+      Mark.send(:define_method, name) do |*arguments|
+        v,dummy = arguments
+        if _def and self.scene
+          if arguments.size>0
+            defs[name]=OpenStruct.new({:id=>(v.nil?) ? 0 : Rubyvis.id, :value=> v})
+            return self
+          end
+          return defs[name]
+        end
+        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
+          return self
+        end
+        i=instance()
+        if i.nil?
+          raise "No instance for #{self} on #{name}"
+        else
+          #puts "Instancia para #{name}"
+          #puts "index:#{self.index}, name:#{name}, val:#{i.send(name)}"
+          i.send(name)
+        end
+      end
+    end
+    def property_value(name,v)
+      prop=Property.new({:name=>name, :id=>Rubyvis.id, :value=>v})
+      @_properties.delete_if{|v1| v1.name==name}
+      @_properties.push(prop)
+      #@_properties_values[name]=v
+      return prop
+    end
+    def margin(n)
+      self.left(n).right(n).top(n).bottom(n)
+    end
+    def instance(default_index=nil)
+      scene=self.scene
+      scene||=self.parent.instance(-1).children[self.child_index]
+
+      index = self.respond_to?(:index) ? self.index : default_index
+      #puts "type: #{type}, self.index: #{self.index}, index:#{index}"
+      scene[index<0 ? scene.length-1: index]
+    end
+
+
+    def self.attr_accessor_dsl(*attr)
       attr.each  do |sym|
         @properties[sym]=true
         sym_w_sm=sym.to_s.gsub(":","")
@@ -65,11 +63,11 @@ module Rubyvis
         }
       end
     end
-    
+
     attr_accessor :parent, :root, :index, :child_index, :scene, :proto, :target, :scale
     attr_reader :_properties
-    attr_accessor_dsl :data,:visible, :left, :right, :top, :bottom, :cursor, :title, :reverse, :antialias, :events, :id 
-   
+    attr_accessor_dsl :data,:visible, :left, :right, :top, :bottom, :cursor, :title, :reverse, :antialias, :events, :id
+
     @scene=nil
     @stack=[]
     @index=nil
@@ -100,7 +98,7 @@ module Rubyvis
     def Mark.stack=(v)
       @stack=v
     end
-    
+
     def initialize(opts=Hash.new)
       #@_properties_values={}
       #@_properties_types={}
@@ -115,12 +113,12 @@ module Rubyvis
       @index=-1
       @scale=1
       @scene=nil
-      
+
     end
     def type
       "mark"
     end
-   def self.defaults
+    def self.defaults
       Mark.new({:data=>lambda {|d| [d]}, :visible=>true, :antialias=>true, :events=>'painted'})
     end
     def extend(proto)
@@ -128,49 +126,53 @@ module Rubyvis
       @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
 
-    
-    
-    
-    
-    
-    
+      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="center")
-      
+    def anchor(name='center')
+      mark_anchor(name)
+    end
+    def mark_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
+        self.scene.target[self.index].visible
       }).id(lambda {self.scene.target[self.index].id}).left(lambda {
         s = self.scene.target[self.index]
         w = s.width
@@ -183,10 +185,10 @@ end
           s.left + w
         end
       }).top(lambda {
-       s = self.scene.target[self.index]
-       h = s.height
-       h||= 0
-       if ['left','right','center'].include? self.name
+        s = self.scene.target[self.index]
+        h = s.height
+        h||= 0
+        if ['left','right','center'].include? self.name
           s.top+h/2.0
         elsif self.name=='top'
           nil
@@ -200,32 +202,34 @@ end
         s = self.scene.target[self.index];
         self.name() == "top" ? s.bottom + (s.height ? s.height : 0) : nil;
       }).text_align(lambda {
-      if ['bottom','top','center'].include? self.name
-        'center'
-      elsif self.name=='right'
-        'right'
-      else
-        'left'
-      end
+        if ['bottom','top','center'].include? self.name
+          'center'
+        elsif self.name=='right'
+          'right'
+        else
+          'left'
+        end
       }).text_baseline(lambda {
-      if ['right','left','center'].include? self.name
-        'middle'
-      elsif self.name=='top'
-        'top'
-      else
-        'bottom'
-      end
+        if ['right','left','center'].include? self.name
+          'middle'
+        elsif self.name=='top'
+          'top'
+        else
+          'bottom'
+        end
       })
-      
-      
+
+
       return anchor
     end
-    
-    
-    
-    
-    
+
+
+
     def build_implied(s)
+      mark_build_implied(s)
+    end
+
+    def mark_build_implied(s)
       l=s.left
       r=s.right
       t=s.top
@@ -243,7 +247,7 @@ end
         w=width-r-l
       elsif r.nil?
         if l.nil?
-          
+
           r=(width-w) / (2.0)
           l=r
         else
@@ -252,9 +256,9 @@ end
       elsif l.nil?
         l=width-w-r
       end
-      
+
       height=self.parent ? self.parent.height(): (h+(t.nil? ? 0 : t )+(b.nil? ? 0 : b))
-      
+
       if h.nil?
         t||=0
         b||=0
@@ -269,16 +273,16 @@ end
       elsif t.nil?
         t=height-h-b
       end
-      
-      
-      
+
+
+
       s.left=l
       s.right=r
       s.top=t
       s.bottom=b
-      
+
       # puts "#{l},#{r},#{t},#{b}"
-      
+
       s.width=w if prop[:width]
       s.height=h if prop[:height]
       s.text_style=Rubyvis::Color.transparent if prop[:text_style] and !s.text_style
@@ -290,38 +294,38 @@ end
       @stack=Mark.stack
       if parent and !self.root.scene
         root.render()
-        return 
+        return
       end
       @indexes=[]
       mark=self
       until mark.parent.nil?
         @indexes.unshift(mark.child_index)
       end
-      bind      
+      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) 
+      if (depth < @indexes.size)
         @stack.unshift(nil)
-        if (mark.respond_to? :index and mark.index) 
-            render_instance(mark, depth, scale);
-        else 
+        if (mark.respond_to? :index and mark.index)
+          render_instance(mark, depth, scale);
+        else
           mark.scene.size.times {|i|
             mark.index = i;
             render_instance(mark, depth, scale);
           }
-        mark.index=nil
+          mark.index=nil
         end
-        stack.shift();
-      else 
-        mark.build();
+        stack.shift
+      else
+        mark.build
         pv.Scene.scale = scale;
         pv.Scene.update_all(mark.scene);
       end
@@ -336,7 +340,7 @@ end
           mark.children[i].scene=s.children[i]
         }
         Mark.stack[0]=s.data
-        
+
         if (child.scene)
           render_render(child,depth+1,scale*s.transform.k)
         else
@@ -347,7 +351,7 @@ end
         child_index.times {|i|
           mark.children[i].scene=nil
         }
-        
+
       end
     end
     private :render_render, :render_instance
@@ -359,23 +363,25 @@ end
           if !@seen.has_key?(k)
             @seen[k]=v
             case k
-              when :data
-                @_data=v
-              when :visible
-                @_required.push(v)
-              when :id
-                @_required.push(v)
-              else
-                @types[v._type].push(v)
+            when :data
+              @_data=v
+            when :visible
+              @_required.push(v)
+            when :id
+              @_required.push(v)
+            else
+              @types[v._type].push(v)
             end
           end
         }
       end while(mark = mark.proto)
     end
-    
+
     attr_accessor :binds
-    
-    def bind()
+    def bind
+      mark_bind
+    end
+    def mark_bind()
       @seen={}
       @types={1=>[],2=>[],3=>[]}
       @_data=nil
@@ -396,8 +402,8 @@ end
       @binds=OpenStruct.new({:properties=>@seen, :data=>@_data, :required=>@_required, :optional=>@types[1]+@types[2]+@types[3]
       })
     end
-    
-    
+
+
     def context_apply(scene,index)
       Mark.scene=scene
       Mark.index=index
@@ -421,15 +427,15 @@ end
         k=k*mark.scene[mark.index].transform.k
       }
       if (that.children)
-        n=than.children.size
+        n=that.children.size
         n.times {|i|
           mark=that.children[i]
           mark.scene=that.scene[that.index].children[i]
           mark.scale=k
         }
-        
+
       end
-      
+
     end
     def context_clear(scene,index)
       return if !scene
@@ -441,7 +447,7 @@ end
           mark.scene=nil
           mark.scale=nil
         }
-        
+
       end
       mark=that
       begin
@@ -467,11 +473,11 @@ end
         context_apply(oscene,oindex)
       end
     end
-    
+
     def build
       scene=self.scene
       stack=Mark.stack
-      
+
       if(!scene)
         self.scene=SceneElement.new
         scene=self.scene
@@ -492,10 +498,10 @@ end
       data=self.binds.data
       #puts "stack:#{stack}"
       #puts "data_value:#{data.value}"
-      
+
       data=(data._type & 1)>0 ? data.value.js_apply(self, stack) : data.value
       #puts "data:#{data}"
-      
+
       stack.unshift(nil)
       scene.size=data.size
       data.each_with_index {|d, i|
@@ -513,7 +519,10 @@ end
       stack.shift()
       return self
     end
-    def build_instance(s1)
+    def build_instance(s)
+      mark_build_instance(s)
+    end
+    def mark_build_instance(s1)
       build_properties(s1, self.binds.required)
       if s1.visible
         build_properties(s1,self.binds.optional)
@@ -531,7 +540,7 @@ end
         end
         ss.send((prop.name.to_s+"=").to_sym, v)
       end
-      #p ss
+      # p ss
     end
   end
 end