rubyvis 0.1.3 → 0.1.4

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(pv.color('black')).text_align('left').text_baseline('bottom').text_margin(3)
+      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)
     end
   end
 end

data/lib/rubyvis/mark/line.rb

@@ -31,7 +31,8 @@ module Rubyvis
       area_build_instance(*args)
     end
     def self.defaults
-      Line.new.extend(Mark.defaults).line_join('miter').line_width(1.5).stroke_style( lambda {return Rubyvis::Colors.category10().scale(self.parent.index)}).interpolate('linear').eccentricity(0).tension(7)
+      a=Rubyvis::Colors.category10()
+      Line.new.extend(Mark.defaults).line_join('miter').line_width(1.5).stroke_style( lambda {return a.scale(self.parent.index)}).interpolate('linear').eccentricity(0).tension(7)
     end
   end
 end

data/lib/rubyvis/mark/panel.rb

@@ -50,7 +50,7 @@ module Rubyvis
       super(s)
       return if !s.visible
       s.children=[] if !s.children
-      scale=self.scale*s.transform.k
+      scale=self.scale * s.transform.k
       n=self.children.size
       Mark.index=-1
       n.times {|i|
@@ -77,12 +77,14 @@ module Rubyvis
       }.join
     end
     def build_implied(s)
+      panel_build_implied(s)
+    end
+    def panel_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?
@@ -103,10 +105,8 @@ module Rubyvis
         end
         s.canvas=c
       end
-
       s.transform=Rubyvis.Transform.identity if (s.transform.nil?)
-      super(s)
-
+      mark_build_implied(s)
     end
 
   end

data/lib/rubyvis/mark/wedge.rb

@@ -9,7 +9,8 @@ module Rubyvis
     @properties=Mark.properties.dup
     attr_accessor_dsl :start_angle, :end_angle, :angle, :inner_radius, :outer_radius, :line_width, [:stroke_style, lambda {|d| pv.color(d)}], [:fill_style, lambda {|d| pv.color(d)}]
     def self.defaults
-      Wedge.new.extend(Mark.defaults).start_angle(lambda  {s=self.sibling; s ? s.end_angle: -Math::PI.quo(2) } ).inner_radius( 0 ).line_width( 1.5 ).stroke_style( nil ).fill_style( lambda {Rubyvis.Colors.category20().scale(self.parent.index)})
+      a=Rubyvis.Colors.category20()
+      Wedge.new.extend(Mark.defaults).start_angle(lambda  {s=self.sibling; s ? s.end_angle: -Math::PI.quo(2) } ).inner_radius( 0 ).line_width( 1.5 ).stroke_style( nil ).fill_style( lambda {a.scale(self.index)})
     end
     def mid_radius
       (inner_radius+outer_radius) / 2.0

data/lib/rubyvis/nest.rb

@@ -83,7 +83,7 @@ module Rubyvis
       return self
     end
     def sort_keys(order=nil)
-      #keys[keys.size-1].order = order.nil? ? pv.natural_order : order
+      keys[keys.size-1].order = order.nil? ? pv.natural_order : order
       return self
     end
     def sort_values(order=nil)
@@ -91,7 +91,7 @@ module Rubyvis
       return self
     end
     def map
-      i=0
+      #i=0
       map={} 
       values=[]
       @array.each_with_index {|x,j|
@@ -111,7 +111,7 @@ module Rubyvis
       }
       if(self.order)
         values.each_with_index {|v,vi|
-          values[vi].sort(&self.order)
+          values[vi].sort!(&self.order)
         }
       end
       map
@@ -129,16 +129,15 @@ module Rubyvis
     def entries_sort(array,i)
       o=keys[i].order
       if o
-        array.sort {|a,b| o(a.key, b.key)}
+        array.sort! {|a,b| o.call(a.key, b.key)}
       end
       i+=1
       if (i<keys.size)
         array.each {|v|
           entries_sort(v, i)
         }
-        
       end
-      return array
+      array
       
     end
     def rollup_rollup(map,f)

data/lib/rubyvis/scale/log.rb

@@ -9,8 +9,7 @@ module Rubyvis
       base(10)
     end
     def log(x)
-      
-      Math.log(x+1e15) / @_p
+      Math.log(x) / @_p.to_f
     end
     def pow(y)
       @b**y
@@ -24,32 +23,39 @@ module Rubyvis
       end
       return @b
     end
+    def nice
+      d=domain
+      domain(pv.log_floor(d[0],@b), pv.log_ceil(d[1],@b))
+    end
     def ticks
       d = domain
-      n = d[0] < 0,
+      n = d[0] < 0
+      
+     # puts "dom: #{d[0]} -> #{n}"
+      
       i = (n ? -log(-d[0]) : log(d[0])).floor
       j = (n ? -log(-d[1]) : log(d[1])).ceil
       ticks = [];
-      if n 
+      if n
         ticks.push(-pow(-i))
         (i..j).each {|ii|
-          ((b-1)...0).each {|k|
+          ((@b-1)...0).each {|k|
             ticks.push(-pow(-ii) * k)
           }
         }
       else
         (i...j).each {|ii|
-          (1...b).each {|k|
-            ticks.push(pow(i) * k)
+          (1...@b).each {|k|
+            ticks.push(pow(ii) * k)
           }
         }
-        ticks.push(pow(i));
+        ticks.push(pow(j));
       end
       
       #for (i = 0; ticks[i] < d[0]; i++); // strip small values
       #for (j = ticks.length; ticks[j - 1] > d[1]; j--); // strip big values
       #return ticks.slice(i, j);
-      ticks
+      ticks.find_all {|v| v>=d[0] and v<=d[1]}
     end
   end
 end

data/lib/rubyvis/scene/svg_area.rb

@@ -15,11 +15,11 @@ module Rubyvis
       
       return e if (fill.opacity==0 and stroke.opacity==0) 
       # /** @private Computes the straight path for the range [i, j]. */
-      path=lambda {|i,j|
+      path=lambda {|ii,j|
         p1 = []
         p2 = [];
         k=j
-        (i..k).each {|i|
+        (ii..k).each {|i|
           si = scenes[i]
           sj = scenes[j]
           pi = "#{si.left},#{si.top}"
@@ -48,7 +48,7 @@ module Rubyvis
       }
         
       # @private Computes the curved path for the range [i, j]. */
-      path_curve=lambda {|i, j|
+      path_curve=lambda {|ii, j|
         pointsT = []
         pointsB = []
         pathT=nil
@@ -56,7 +56,7 @@ module Rubyvis
         
         
         k=j
-        (i..k).each {|i|
+        (ii..k).each {|i|
           sj = scenes[j];
           pointsT.push(scenes[i])
           pointsB.push(OpenStruct.new({:left=> sj.left + sj.width, :top=> sj.top + sj.height}))
@@ -112,9 +112,9 @@ module Rubyvis
               "stroke-width"=> stroke.opacity!=0 ? s.line_width / self.scale : nil
             });
           return self.append(e, scenes, 0);
-        end
+    end
         
-        def self.area_segment(scenes)
+    def self.area_segment(scenes)
           
           e = scenes._g.elements[1]
           s = scenes[0]
@@ -191,7 +191,7 @@ module Rubyvis
             e = self.append(e, scenes, i);
           }
           return e;
-        end
-      end
+    end
+  end
 end
 

data/lib/rubyvis/scene/svg_line.rb

@@ -118,14 +118,14 @@ module Rubyvis
         e = 1 - s1.eccentricity
         r = Math.sqrt(dx * dx + dy * dy) / (2 * e)
         if !((e<=0) and (e>1))
-          return "A" + r + "," + r + " 0 0," + l + " " + s2.left + "," + s2.top
+          return "A#{r},#{r} 0 0,#{l} #{s2.left},#{s2.top}"
         end
       when "step-before"
-        return "V" + s2.top + "H" + s2.left
+        return "V#{s2.top}H#{s2.left}"
       when "step-after"
-        return "H" + s2.left + "V" + s2.top
+        return "H#{s2.left}V#{s2.top}"
       end
-      return "L" + s2.left.to_s + "," + s2.top.to_s
+      return "L#{s2.left},#{s2.top}"
     end
 
     #/** @private Line-line intersection, per Akenine-Moller 16.16.1. */

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, :line_join, :eccentricity, :shape_size, :shape, :shape_angle, :shape_radius, :start_angle, :end_angle, :angle, :inner_radius, :outer_radius
+    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, :shape_size, :shape, :shape_angle, :shape_radius, :start_angle, :end_angle, :angle, :inner_radius, :outer_radius, :layers, :orient, :offset, :order
     
     def []=(v,i)
       if v.is_a? Numeric

data/spec/scale_log_spec.rb

@@ -0,0 +1,105 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe Rubyvis::Scale::Log do
+  if Rubyvis::JohnsonLoader.available?
+    context "direct protovis API comparison" do 
+      before(:all) do
+        @rt=  Rubyvis::JohnsonLoader.new("/data/LogScale.js").runtime
+      end
+      before do 
+        @h=280
+        @h_dom=1000
+        @y = Rubyvis.Scale.log(1, @h_dom).range(1,@h)
+        @rt[:h_dom] = @h_dom
+        @rt[:h] = @h
+        @y_js=@rt.evaluate("y=pv.Scale.log(1, h_dom).range(1,h)")
+        @v1,@v2,@v3=rand()+1,rand()+3,rand()+5
+        @rt[:v1]=@v1
+        @rt[:v2]=@v2
+        @rt[:v3]=@v3
+
+      end
+      it "domain() implemented equally" do
+        @y.domain(@v1)
+        @rt.evaluate("y.domain(v1)")
+        @y.domain.should==@rt.evaluate("y.domain()").to_a
+        @y.domain(@v1,@v2,@v3)
+        @rt.evaluate("y.domain(v1,v2,v3)")
+        @y.domain.should==@rt.evaluate("y.domain()").to_a        
+      end
+      it "scale() implemented equally for complex domain" do
+        @y.domain(@v1,@v2,@v3)
+        @rt.evaluate("y.domain(v1,v2,v3)")
+        @y.scale(@v1+1).should==@rt.evaluate("y(v1+1)")
+        @y.scale(@v2+1).should==@rt.evaluate("y(v2+1)")
+        @y.scale(@v3+1).should==@rt.evaluate("y(v3+1)")
+      end
+      it "invert() implemented equally" do
+        @y.domain(@v1,@v2,@v3)
+        @rt.evaluate("y.domain(v1,v2,v3)")
+        @y.invert(@v1+1).should==@rt.evaluate("y.invert(v1+1)")
+        @y.invert(@v2+1).should==@rt.evaluate("y.invert(v2+1)")
+        @y.invert(@v3+1).should==@rt.evaluate("y.invert(v3+1)")
+      end
+      it "ticks() implemented equally for numbers" do
+        @y.ticks.should==@rt.evaluate("y.ticks()").to_a
+        
+      end
+      it "nice() implemented equally" do
+        @y.domain(@v1,@v2)
+        @rt.evaluate("y.domain(v1,v2)")
+        @y.nice
+        @rt.evaluate("y.nice()")
+        @y.domain.should==@rt.evaluate("y.domain()").to_a
+      end
+   
+    end
+    
+  end
+  it "should be created as Javascript" do
+    h=280
+    y = Rubyvis.Scale.log(1, 1500)
+  end
+  
+  before do
+    @h=280
+    @h_dom=1000
+    @y = Rubyvis.Scale.log(1, @h_dom).range(1,@h)
+  end
+  it "y should be a Scale" do
+    @y.should be_a(Rubyvis::Scale::Log)
+  end
+  it "should respond to domain" do
+    @y.domain.should==[1, 1000]
+    @y.domain(1)
+    @y.domain.should==[1,1]
+    @y.domain(1,100,300)
+    @y.domain.should==[1,100,300]
+  end
+  it "should respond to range" do
+    @y.range.should==[1, 280]
+    @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(@h_dom).should==280
+    @y[@h_dom].should==280
+    val=20
+    @y.scale(val).should be_close(121.995, 0.001)
+  end
+  it "should returns correct invert" do
+    @y.invert(100).should be_close(11.601, 0.001)
+    @y.invert(200).should be_close(137.970, 0.001)
+  end
+  it "should returns correct ticks" do
+    t=1,2,3,4,5,6,7,8,9,10,20,30,40,50,60,70,80,90,100,200,300,400,500,600,700,800,900,1000
+    @y.ticks.should==t
+
+  end
+  it "should nice nicely" do
+    @y.domain([0.20147987687960267, 0.996679553296417])
+    @y.nice
+    @y.domain().should==[0.1,1]
+  end  
+end

data/spec/spec.opts

@@ -1,2 +1,3 @@
 --color
--f s 
+-f s
+-b  

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-10-08 00:00:00 -04:00
+date: 2010-10-20 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,10 +93,13 @@ files:
 - examples/crimea/crimea_line.rb
 - examples/dot.rb
 - examples/first.rb
+- examples/grouped_charts.rb
 - examples/line.rb
+- examples/line_and_step.rb
 - examples/pie_and_donut.rb
 - examples/scatterplot.rb
 - examples/second.rb
+- examples/stacked_charts.rb
 - examples/third.rb
 - lib/rubyvis.rb
 - lib/rubyvis/color/color.rb
@@ -108,6 +111,8 @@ files:
 - lib/rubyvis/internals.rb
 - lib/rubyvis/javascript_behaviour.rb
 - lib/rubyvis/label.rb
+- lib/rubyvis/layout.rb
+- lib/rubyvis/layout/stack.rb
 - lib/rubyvis/mark.rb
 - lib/rubyvis/mark/anchor.rb
 - lib/rubyvis/mark/area.rb
@@ -282,6 +287,7 @@ test_files:
 - spec/scale_ordinal_spec.rb
 - spec/internal_spec.rb
 - spec/panel_spec.rb
+- spec/scale_log_spec.rb
 - spec/scale_linear_datetime_spec.rb
 - spec/scale_spec.rb
 - spec/scale_linear_spec.rb