rubyvis 0.1.4 → 0.1.5

data.tar.gz.sig

@@ -1 +1 @@
-d!FA&{���Ap��O�WC��Q!v���!��a:-�!�	N���[5������z\��譋�LV��?�y��d'ПP}���,u�b�~��p T�$�N%�̗����z��
BtP��SX
+O�Ly���N^

data/History.txt

@@ -1,4 +1,9 @@
-=== 0.1.4 / 2010-10-20
+=== 0.1.5 / 2010-10-22
+
+* Bug fix: styles considered properly, so font attribute works right now.
+* Bug fix: anchors have proper parent assignation.
+
+=== 0.1.4 / 2010-10-20
 
 * Bug fix: Order now works on Nest
 * Added log scale spec. domain, range, scale, invert and ticks works like javascript version

data/examples/antibiotics/antibiotics.rb

@@ -29,9 +29,9 @@ cell = vis.add(pv.Panel)
 
 #/* Label. */
 cell.anchor("center").add(pv.Label)
-    .visible(lambda {|d, y, x| puts d,y,x; return  x == y})
+.visible(lambda {|d,y, x| return  x == y})
     .font("bold 14px sans-serif")
-    .text(lambda {|d, y, x|  x});
+    .text(lambda {|d, y, x| x});
 
 #/* Dot plot and frame. */
 plot = cell.add(pv.Panel)

data/examples/bar_column_chart.rb

@@ -38,7 +38,7 @@ bar.anchor("left").add(pv.Label)
     .text_margin(5)
     .text_align("right")
     .text(lambda { "ABCDEFGHIJK"[self.index,1]});
-
+ 
 #/* X-axis ticks. */
 vis.add(pv.Rule)
     .data(x.ticks(5))

data/examples/scatterplot.rb

@@ -49,7 +49,7 @@ vis.add(pv.Panel)
   .stroke_style(lambda {|d| c.scale(d.z)})
   .fill_style(lambda {|d| c.scale(d.z).alpha(0.2)})
   .shape_size(lambda {|d| d.z})
-  .title(lambda {|d| d.z})
+  .title(lambda {|d| "%0.1f" % d.z})
 
 vis.render()
 puts vis.to_svg

data/lib/rubyvis.rb

@@ -28,7 +28,7 @@ end
 
 module Rubyvis
   @document=nil
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
   API_VERSION='3.3'
   Infinity=1.0 / 0 # You actually can do it! http://snipplr.com/view/2137/uses-for-infinity-in-ruby/
   # :section: basic methods

data/lib/rubyvis/layout.rb

@@ -22,4 +22,4 @@ module Rubyvis
   end
 end
 
-#require 'rubyvis/layout/stack'
+require 'rubyvis/layout/stack'

data/lib/rubyvis/mark.rb

@@ -59,7 +59,24 @@ module Rubyvis
       }
       end
     end
-
+    
+    def delete_index
+      @index=nil
+      @index_defined=false
+    end
+    def index
+      @index
+    end
+    
+    def index_defined?
+      @index_defined
+    end
+    def index=(v)
+      @index_defined=true
+      @index=v
+      v
+    end
+    
     
     def property_value(name,v)
       prop=Property.new({:name=>name, :id=>Rubyvis.id, :value=>v})
@@ -74,15 +91,15 @@ module Rubyvis
     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]
+      
+      index = index_defined? ? self.index : default_index
+      # "defined?: #{index_defined?} : type: #{type}, self.index: #{self.index}, index:#{index}"
+      scene[index<0 ? scene.size-1: index]
     end
 
 
 
-    attr_accessor :parent, :root, :index, :child_index, :scene, :proto, :target, :scale
+    attr_accessor :parent, :root, :child_index, :scene, :proto, :target, :scale
     attr_reader :_properties
     
     
@@ -91,6 +108,7 @@ module Rubyvis
     @scene=nil
     @stack=[]
     @index=nil
+
     def self.properties
       @properties
     end
@@ -127,6 +145,7 @@ module Rubyvis
       @defs={}
       @child_index=-1
       @index=-1
+      @index_defined = true
       @scale=1
       @scene=nil
 
@@ -144,18 +163,18 @@ module Rubyvis
     end
 
     def instances(source)
-
       mark = self
-      index = []
+      _index = []
       scene=nil
+      
       while (!(scene = mark.scene)) do
         source = source.parent;
-        index.push(OpenStruct.new({:index=>source.index, :child_index=>mark.child_index}))
+        _index.push(OpenStruct.new({:index=>source.index, :child_index=>mark.child_index}))
         mark = mark.parent
       end
 
-      while (index.size>0) do
-        i = index.pop()
+      while (_index.size>0) do
+        i = _index.pop()
         scene = scene[i.index].children[i.child_index]
       end
       #
@@ -163,8 +182,8 @@ module Rubyvis
       # 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)
-
+      
+      if (index_defined?)
         s = scene[self.index].dup
         s.right = s.top = s.left = s.bottom = 0;
         return [s];
@@ -186,9 +205,12 @@ module Rubyvis
       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 {
+          pp self.scene.target if $DEBUG
+      a=self.scene.target.map {|s| puts "s:#{s.data}" if $DEBUG; s.data}
+      p a if $DEBUG
+      a 
+      }).visible(lambda {
         self.scene.target[self.index].visible
       }).id(lambda {self.scene.target[self.index].id}).left(lambda {
         s = self.scene.target[self.index]
@@ -333,14 +355,14 @@ module Rubyvis
       mark.scale=scale
       if (depth < @indexes.size)
         @stack.unshift(nil)
-        if (mark.respond_to? :index and mark.index)
+        if (mark.index_defined?)
           render_instance(mark, depth, scale);
         else
           mark.scene.size.times {|i|
             mark.index = i;
             render_instance(mark, depth, scale);
           }
-          mark.index=nil
+          mark.delete_index
         end
         stack.shift
       else
@@ -350,6 +372,8 @@ module Rubyvis
       end
       mark.scale=nil
     end
+    
+    
     def render_instance(mark,depth,scale)
       s=mark.scene[mark.index]
       if s.visible
@@ -471,7 +495,7 @@ module Rubyvis
       mark=that
       begin
         Mark.stack.pop
-        if(mark.parent)
+        if(mark.parent)                 
           mark.scene=nil
           mark.scale=nil
         end
@@ -524,7 +548,8 @@ module Rubyvis
       stack.unshift(nil)
       scene.size=data.size
       data.each_with_index {|d, i|
-        Mark.index=self.index=i
+        Mark.index=i
+        self.index=i
         s=scene[i]
         if !s
           scene[i]=s=SceneElement.new
@@ -534,10 +559,11 @@ module Rubyvis
         build_instance(s)
       }
       Mark.index=-1
-      self.index=nil
+      delete_index
       stack.shift()
-      return self
+      self
     end
+
     def build_instance(s)
       mark_build_instance(s)
     end

data/lib/rubyvis/mark/anchor.rb

@@ -14,7 +14,7 @@ module Rubyvis
     end
     def extend(proto)
       @proto=proto
-      return self
+      self
     end
   end
 end

data/lib/rubyvis/mark/bar.rb

@@ -9,6 +9,7 @@ module Rubyvis
 
     @properties=Mark.properties.dup
     attr_accessor_dsl :width, :height, :line_width, [:stroke_style, lambda {|d| pv.color(d)}], [:fill_style, lambda {|d| pv.color(d)}]
+    
     def self.defaults
       a=Rubyvis.Colors.category20()
       Bar.new.extend(Mark.defaults).line_width(1.5).fill_style( lambda {

data/lib/rubyvis/mark/label.rb

@@ -10,7 +10,7 @@ module Rubyvis
       'label'
     end
     def self.defaults
-      Label.new.extend(Mark.defaults).events('none').text(lambda{|x| x}).font("10px sans-serif" ).text_angle( 0 ).text_style( 'black' ).text_align( 'left' ).text_baseline( 'bottom' ).text_margin(3)
+      Label.new.extend(Mark.defaults).events('none').text(pv.identity).font("10px sans-serif" ).text_angle( 0 ).text_style( 'black' ).text_align( 'left' ).text_baseline( 'bottom' ).text_margin(3)
     end
   end
 end

data/lib/rubyvis/mark/panel.rb

@@ -46,6 +46,11 @@ module Rubyvis
         c.bind()
       }
     end
+    def anchor(name)
+      anchor=mark_anchor(name)
+      anchor.parent=self
+      anchor
+    end
     def build_instance(s)
       super(s)
       return if !s.visible

data/lib/rubyvis/scene/svg_scene.rb

@@ -112,15 +112,27 @@ module Rubyvis
           e.attributes[name]=value
         end
       }
+      
       if(style)
+        base_style=e.attributes['style']
+        base_style||=""
+        array_styles={}
+        base_style.split(";").each {|v|
+          v=~/\s*(.+)\s*:\s*(.+)/
+          array_styles[$1]=$2
+        }
         style.each {|name,value|
           value=nil if value==self.implicit[:css][name]
           if (value.nil?)
-            e.delete_attribute(name)
+            array_styles.delete(name)
           else
-            e.style[name] = value;
+            
+            array_styles[name]=value
           end
         }
+        if array_styles.size>0
+          e.attributes["style"]=array_styles.map {|k,v| "#{k}:#{v}"}.join(";")
+        end
       end
       e
     end

data/spec/anchor_spec.rb

@@ -0,0 +1,126 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe Rubyvis::Anchor do
+  describe "inner anchor data should work fine" do
+    before  do
+      w=200
+      h=200
+      data_p1=[]
+      data_p2=[]
+      data_l=[]
+      @expected_l=[]
+      @expected_p2=[]  
+      vis = pv.Panel.new().width(w).height(h)      
+      cell=vis.add(pv.Panel).
+        data([1,2]).top(lambda {|*args| data_p1.push(args); return 100}).
+        add(pv.Panel). data(['a','b']).top(lambda {|*args| data_p2.push(args); return 100;})
+      
+      cell.anchor('center').add(pv.Bar).top(lambda {|*args| data_l.push args; return 1})
+
+      [1,2].each {|a| %w{a b}.each {|b| 
+        @expected_l.push([b,b,a,nil])
+        @expected_p2.push([b,a,nil])
+      }}
+      @expected_p1=[[1,nil],[2,nil]]
+      @data_p1=data_p1
+      @data_p2=data_p2
+      @data_l=data_l
+      vis.render
+      
+    end
+    if(true)
+    it "first loop correct" do
+      @data_p1.should==@expected_p1
+    end
+    it "second loop correct" do
+      @data_p2.should==@expected_p2
+    end
+    end
+    
+    it "label loop correct" do
+      @data_l.should==@expected_l
+    end
+  end
+  
+  it "antibiotics example should render correct data" do
+
+    a1=['a','b','c']
+    a2=[1,2,3]
+    antibiotics=["penicillin", "streptomycin", "neomycin"]
+    adatas=[]
+    s = 180
+    _p = 20
+    vis = pv.Panel.new()
+    .height(s * antibiotics.size + _p * (antibiotics.size - 1))
+    .width(s * antibiotics.size + _p * (antibiotics.size - 1))
+    .top(14.5)
+    .left(14.5)
+    .bottom(44)
+    .right(14)
+
+    cell = vis.add(pv.Panel)
+    .data(a1)
+    .width(s)
+    .left(lambda {(s + _p) * self.index})
+  .add(pv.Panel)
+    .data(a2)
+    .height(s)
+    .top(lambda {(s + _p) * self.index});
+
+    
+    cell.anchor("center").add(pv.Label).text(lambda {|*args| adatas.push args})
+    
+    expected=[]
+    a1.each {|a| a2.each {|b| expected.push([b,b,a,nil])}}
+    vis.render
+    adatas.should==expected
+    
+  end
+  
+  context "Panel-Panel-label assigment" do
+    before do
+      @h=200
+      @w=200
+      @values=["a","b","c"]
+      @vis = Rubyvis.Panel.new.width(@w).height(@h). add(pv.Panel).data(@values). add(pv.Panel).data(@values)
+      @anchor=@vis.anchor('center')
+      @label=@vis.add(pv.Label)
+    end
+    it "should have correct data" do
+      datas=[]
+      @label.text(lambda {|*args| datas.push args})
+      @vis.render
+      expected=[]
+      @values.each {|a| @values.each {|b| expected.push([b,b,a,nil])}}
+      datas.should==expected
+    end
+  end
+  context "Panel-bar assigment" do 
+    before do
+      @h=200
+      @w=200
+      @vis = Rubyvis.Panel.new.width(@w).height(@h)
+      @bar = @vis.add(Rubyvis::Bar).data([1,2,3])
+      @anchor=@bar.anchor('center')
+      @label=@anchor.add(Rubyvis::Label)
+      
+    end
+    
+    it "should have correct data for direct asigment" do
+      datas=[]
+      expected=[[1,nil],[2,nil],[3,nil]]
+      @label.text(lambda {|*args| datas.push args})
+      @vis.render
+      datas.should==expected
+    end
+    
+    it "should have correct data for two levels of data" do
+      datas=[]
+      @vis.data(%w{a b c})
+      expected=[]
+      %w{a b c}.each {|a| [1,2,3].each {|b| expected.push([b,a])}}
+      @label.text(lambda {|*args| datas.push args})
+      @vis.render
+      datas.should==expected
+    end
+  end  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-10-20 00:00:00 -03:00
+date: 2010-10-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -289,6 +289,7 @@ test_files:
 - spec/panel_spec.rb
 - spec/scale_log_spec.rb
 - spec/scale_linear_datetime_spec.rb
+- spec/anchor_spec.rb
 - spec/scale_spec.rb
 - spec/scale_linear_spec.rb
 - spec/label_spec.rb