rubyvis 0.1.2 → 0.1.3

data/lib/rubyvis/scene/svg_label.rb

@@ -11,21 +11,23 @@ module Rubyvis
         dy=0
         anchor='start'
         case s.text_baseline
-        when 'middle'
-          dy=".35em"
-        when "top"
-          dy = ".71em"; y = s.text_margin
-        when "bottom"
-          y = "-" + s.text_margin.to_s
+          when 'middle'
+            dy=".35em"
+          when "top"
+            dy = ".71em"
+            y = s.text_margin
+          when "bottom"
+            y = "-" + s.text_margin.to_s
         end
+        
         case s.text_align
-        when 'rigth'
-          anchor = "end"; x = "-" + s.text_margin.to_s
-        when "center"
-          anchor = "middle"
-
-        when "left"
-          x = s.text_margin
+          when 'right'
+            anchor = "end"
+            x = "-" + s.text_margin.to_s
+          when "center"
+            anchor = "middle"
+          when "left"
+            x = s.text_margin
         end
         e=SvgScene.expect(e,'text', {
           "pointer-events"=> s.events,
@@ -33,9 +35,9 @@ module Rubyvis
           "x"=> x,
           "y"=> y,
           "dy"=> dy,
-          "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 + ")" : ""),
+          "transform"=> "translate(#{s.left},#{s.top})" + (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,
+          "fill-opacity"=> fill.opacity==0 ? nil : fill.opacity,
           "text-anchor"=> anchor
         }, {
         "font"=> s.font, "text-shadow"=> s.text_shadow, "text-decoration"=> s.text_decoration      })

data/lib/rubyvis/scene/svg_line.rb

@@ -1,11 +1,9 @@
 module Rubyvis
   module SvgScene
     def self.line(scenes)
-
       e=scenes._g.elements[1]
       return e if (scenes.size < 2)
       s = scenes[0]
-
       # segmented */
       return self.line_segment(scenes) if (s.segmented)
 

data/lib/rubyvis/scene/svg_rule.rb

@@ -5,7 +5,7 @@ module Rubyvis
       scenes.each_with_index do |s,i|
         next unless s.visible
         stroke=s.stroke_style
-        next if(!stroke.opacity)
+        next if(stroke.opacity==0.0)
         e=SvgScene.expect(e,'line', {
           "shape-rendering"=> s.antialias ? nil : "crispEdges",
           "pointer-events"=> s.events,
@@ -16,7 +16,7 @@ module Rubyvis
           'y2'=>s.top+s.height,
           "stroke"=> stroke.color,
           "stroke-opacity"=> stroke.opacity,
-          "stroke-width"=> s.line_width/self.scale.to_f
+          "stroke-width"=> s.line_width / self.scale
         })
 
         e=SvgScene.append(e,scenes,i)

data/lib/rubyvis/scene/svg_scene.rb

@@ -3,6 +3,9 @@ require 'rubyvis/scene/svg_bar'
 require 'rubyvis/scene/svg_rule'
 require 'rubyvis/scene/svg_label'
 require 'rubyvis/scene/svg_line'
+require 'rubyvis/scene/svg_dot'
+require 'rubyvis/scene/svg_area'
+require 'rubyvis/scene/svg_wedge'
 
 class REXML::Element
   attr_accessor :_scene
@@ -71,7 +74,11 @@ module Rubyvis
     end
     def self.create(type)
       el=Element.new "#{type}"
-      el.add_namespace('svg',self.svg) if type=='svg'
+      if type=='svg'
+        el.add_namespace(self.svg)
+        #el.add_namespace("xmlns:xmlns", self.xmlns)
+        #el.add_namespace("xlink", self.xlink)
+      end
       el
     end
 

data/lib/rubyvis/scene/svg_wedge.rb

@@ -0,0 +1,56 @@
+module Rubyvis
+  module SvgScene
+    def self.wedge(scenes)
+      e=scenes._g.elements[1]
+      scenes.each_with_index do |s,i|
+        next unless s.visible
+        fill=s.fill_style
+        stroke=s.stroke_style
+        next if(fill.opacity==0.0 and stroke.opacity==0.0)
+        # /* points */
+        
+        r1 = s.inner_radius
+        r2 = s.outer_radius
+        a = (s.angle).abs
+        _p=nil
+        
+        if (a >= 2 * Math::PI) 
+          if (r1) 
+            _p = "M0,#{r2 }A#{r2},#{r2} 0 1,1 0,#{-r2}A#{r2 },#{r2 } 0 1,1 0,#{r2}M0,#{r1}A#{r1},#{r1} 0 1,1 0,#{-r1}A#{r1},#{r1} 0 1,1 0,#{r1 }Z"
+          else 
+            _p = "M0,#{r2}A#{r2},#{r2} 0 1,1 0,#{-r2}A#{r2},#{r2} 0 1,1 0,#{r2 }Z"
+          end
+        else 
+          sa = [s.start_angle, s.end_angle].min
+          ea = [s.start_angle, s.end_angle].max
+          c1 = Math.cos(sa)
+          c2 = Math.cos(ea)
+          s1 = Math.sin(sa)
+          s2 = Math.sin(ea)
+          if (r1)
+            _p = "M#{r2 * c1},#{r2 * s1}A#{r2},#{r2} 0 #{((a < Math::PI) ? "0" : "1")},1 #{r2 * c2},#{r2 * s2}L#{r1 * c2},#{r1 * s2}A#{r1},#{r1} 0 #{((a < Math::PI) ? "0" : "1")},0 #{r1 * c1},#{r1 * s1}Z"
+          else 
+            _p = "M#{r2 * c1},#{r2 * s1}A#{r2},#{r2} 0 #{((a < Math.PI) ? "0" : "1")},1 #{r2 * c2},#{r2 * s2}L0,0Z"
+          end
+        end
+        
+        e = self.expect(e, "path", {
+          "shape-rendering"=> s.antialias ? nil : "crispEdges",
+          "pointer-events"=> s.events,
+          "cursor"=> s.cursor,
+          "transform"=> "translate(#{s.left},#{s.top})",
+          "d"=> _p,
+          "fill"=> fill.color,
+          "fill-rule"=> "evenodd",
+          "fill-opacity"=>  (fill.opacity==0) ? nil : fill.opacity,
+          "stroke"=> stroke.color,
+          "stroke-opacity"=> (stroke.opacity==0) ? nil : stroke.opacity,
+          "stroke-width"=> stroke.opacity>0 ? s.line_width / self.scale.to_f : nil
+        });
+        e=SvgScene.append(e,scenes,i)
+
+      end
+      e
+    end
+  end
+end

data/lib/rubyvis/sceneelement.rb

@@ -5,7 +5,8 @@ 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
+    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
+    
     def []=(v,i)
       if v.is_a? Numeric
         @scenes[v]=i

data/spec/bar_spec.rb

@@ -20,24 +20,48 @@ require File.dirname(__FILE__)+"/spec_helper.rb"
     @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});
+    @bar=@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|
+      attribs=doc.xpath("//xmlns: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 properly with string fill_style" do
+      @bar.fill_style('red')
+      @vis.render
+      s=@vis.to_svg
+      doc=Nokogiri::XML(s)
+      doc.at_xpath("//xmlns:rect").attributes['fill'].value.should=='rgb(255,0,0)'
+    end
+    it "should bould properly with pv.color" do
+      @bar.fill_style(pv.color('red'))
+      @vis.render
+      s=@vis.to_svg
+      doc=Nokogiri::XML(s)
+      doc.at_xpath("//xmlns:rect").attributes['fill'].value.should=='rgb(255,0,0)'
+    end
+    it "should bould properly with pv.colors" do
+      @bar.fill_style(pv.colors('black','red'))
+      @vis.render
+      s=@vis.to_svg
+      doc=Nokogiri::XML(s)
+      attr=doc.xpath("//xmlns:rect").map {|x| x.attributes['fill'].value}
+      attr.should==['rgb(0,0,0)', 'rgb(255,0,0)']
+    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|
+      attribs=doc.xpath("//xmlns:rect").map {|v|
       x=v.attributes['x'] ? v.attributes['x'].value : nil
         [x, v.attributes['y'].value, v.attributes['height'].value]
       }

data/spec/label_spec.rb

@@ -31,7 +31,7 @@ require File.dirname(__FILE__)+"/spec_helper.rb"
 
       doc=Nokogiri::XML(s)
       
-      attribs=doc.xpath("//svg/g/text").map {|v|
+      attribs=doc.xpath("//xmlns: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    

data/spec/nest_spec.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe Rubyvis::Nest do
+  before do
+    @data=[
+    { :year=>2010, :city=>'London',:value=>1},
+    { :year=>2010, :city=>'France',:value=>2},
+    { :year=>2011, :city=>'London',:value=>5},
+    { :year=>2011, :city=>'France',:value=>6},
+    
+  ]
+  end
+  it "should generate correct map" do
+    nest = pv.nest(@data).key(lambda {|d| d[:year]}).key(lambda {|d|  d[:city]}).map();
+    expected={2010=>{"London"=>[{:year=>2010, :city=>"London", :value=>1}], "France"=>[{:year=>2010, :city=>"France", :value=>2}]}, 2011=>{"London"=>[{:year=>2011, :city=>"London", :value=>5}], "France"=>[{:year=>2011, :city=>"France", :value=>6}]}}
+    nest.should==expected
+
+  end
+  it "should generate correct entries" do
+    nest = pv.nest(@data).key(lambda {|d| d[:year]}).key(lambda {|d|  d[:city]}).entries();
+    expected=[
+    Rubyvis::NestedArray.new(:key=>2010, :values=>
+      [
+        Rubyvis::NestedArray.new(:key=>'London', :values=>
+          [{:year=>2010, :city=>'London',:value=>1}]),
+        Rubyvis::NestedArray.new(:key=>'France', :values=>
+          [{:year=>2010, :city=>'France',:value=>2}])
+      ]),
+    Rubyvis::NestedArray.new(:key=>2011, :values=>
+      [
+        Rubyvis::NestedArray.new(:key=>'London', :values=>
+          [{:year=>2011, :city=>'London',:value=>3}]),
+        Rubyvis::NestedArray.new(:key=>'France', :values=>
+          [{:year=>2011, :city=>'France',:value=>4}])
+      ])
+    ]
+    
+    nest.should==expected
+      
+  end
+  
+end

data/spec/panel_spec.rb

@@ -20,7 +20,7 @@ describe Rubyvis::Panel do
     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
+      doc.at_xpath("//xmlns:svg").attributes[k].value.should==v
     }
   end
 end

data/spec/scale_linear_spec.rb

@@ -101,11 +101,11 @@ describe Rubyvis::Scale::Linear do
     @y.ticks(5).should==[0,200,400,600,800,1000]
 
   end
-  it "should returns correct tick_format"
   it "should nice nicely" do
     @y.domain([0.20147987687960267, 0.996679553296417])
     @y.nice
     @y.domain().should==[0.2,1]
-    
   end
+  
+  it "should returns correct tick_format"
 end

data/spec/scale_ordinal_spec.rb

@@ -0,0 +1,81 @@
+require File.dirname(__FILE__)+"/spec_helper.rb"
+describe Rubyvis::Scale::Ordinal do
+  if Rubyvis::JohnsonLoader.available?
+    context "direct protovis API comparison" do 
+      before(:all) do
+        @rt=  Rubyvis::JohnsonLoader.new("/data/OrdinalScale.js").runtime
+      end
+      before do 
+        @base  = %w{a b c d e f}
+        @range = %w{black red white orange yellow blue}
+        @n=rand(3)+3
+        @base=@base[0,@n]
+        @range=@range[0,@n]        
+        @y = Rubyvis.Scale.ordinal(@base).range(@range)
+        @rt[:domain] = @base
+        @rt[:range] = @range
+        @y_js=@rt.evaluate("y=pv.Scale.ordinal(domain).range(range)")
+
+      end
+      
+      it "domain() implemented equally" do
+        @y.domain(@base[0])
+        @rt.evaluate("y.domain(domain[0])")
+        @y.domain.should==@rt.evaluate("y.domain()").to_a
+        @y.domain(@base[0],@base[1])
+        @rt.evaluate("y.domain(domain[0],domain[1])")
+        @y.domain.should==@rt.evaluate("y.domain()").to_a        
+      end
+      
+    end
+  end
+  describe "on ruby domain" do 
+    it "should be created as Javascript" do
+      lambda {y = Rubyvis.Scale.ordinal(%w{a b c}).range(%w{red blue black})}.should_not raise_exception
+    end
+    
+    before do
+      @domain=%w{a b c}
+      @range=%w{red white blue}
+      @y = Rubyvis.Scale.ordinal(@domain).range(@range)
+    end
+    it "y should be a Scale::Ordinal" do
+      @y.should be_a(Rubyvis::Scale::Ordinal)
+    end
+    it "should respond to domain" do
+      @y.domain.should==%w{a b c}
+      @y.domain(%w{a})
+      @y.domain.should==%w{a}
+      @y.domain(1,100,300)
+      @y.domain.should==[1,100,300]
+    end
+    it "should respond to range" do
+      @y.range.should==@range.map {|c| pv.color(c)}
+      @y.range('red')
+      @y.range.should==[pv.color('red')]
+      @y.range('black','white')
+      @y.range.should==[pv.color('black'), pv.color('white')]
+    end
+    it "should returns correct scale with unknown values" do
+      @y.scale(1).should==pv.color('red')
+      @y.scale('x').should==pv.color('white')
+      @y.scale(9).should==pv.color('blue')
+      @y.scale(1).should==pv.color('red')      
+    end
+    it "should returns correct scale with known values" do
+      @y.scale('a').should==pv.color('red')
+      @y.scale('b').should==pv.color('white')
+      @y.scale('c').should==pv.color('blue')
+    end
+    it "should return correct by" do
+      @y = Rubyvis.Scale.ordinal(@domain).range(@range).by(lambda {|v| v.nombre})
+      a=OpenStruct.new({:nombre=>'c'})
+      b=OpenStruct.new({:nombre=>'b'})
+      c=OpenStruct.new({:nombre=>'a'})
+      @y.call(a).should==pv.color('blue')
+      @y.call(b).should==pv.color('white')
+      @y.call(c).should==pv.color('red')
+      
+    end
+  end
+end

data/spec/spec.opts

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Claudio Bustos
@@ -35,7 +35,7 @@ cert_chain:
   rpP0jjs0
   -----END CERTIFICATE-----
 
-date: 2010-10-04 00:00:00 -04:00
+date: 2010-10-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,10 +82,20 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- examples/antibiotics/antibiotics.rb
+- examples/antibiotics/antibiotics_data.rb
+- examples/area.rb
+- examples/bar_column_chart.rb
 - examples/barley/barley.rb
+- examples/barley/barley_data.rb
 - examples/crimea/crimea.rb
+- examples/crimea/crimea_grouped_bar.rb
 - examples/crimea/crimea_line.rb
+- examples/dot.rb
 - examples/first.rb
+- examples/line.rb
+- examples/pie_and_donut.rb
+- examples/scatterplot.rb
 - examples/second.rb
 - examples/third.rb
 - lib/rubyvis.rb
@@ -102,21 +112,28 @@ files:
 - lib/rubyvis/mark/anchor.rb
 - lib/rubyvis/mark/area.rb
 - lib/rubyvis/mark/bar.rb
+- lib/rubyvis/mark/dot.rb
 - lib/rubyvis/mark/label.rb
 - lib/rubyvis/mark/line.rb
 - lib/rubyvis/mark/panel.rb
 - lib/rubyvis/mark/rule.rb
+- lib/rubyvis/mark/wedge.rb
+- lib/rubyvis/nest.rb
 - lib/rubyvis/property.rb
 - lib/rubyvis/scale.rb
 - lib/rubyvis/scale/linear.rb
+- lib/rubyvis/scale/log.rb
 - lib/rubyvis/scale/ordinal.rb
 - lib/rubyvis/scale/quantitative.rb
+- lib/rubyvis/scene/svg_area.rb
 - lib/rubyvis/scene/svg_bar.rb
+- lib/rubyvis/scene/svg_dot.rb
 - lib/rubyvis/scene/svg_label.rb
 - lib/rubyvis/scene/svg_line.rb
 - lib/rubyvis/scene/svg_panel.rb
 - lib/rubyvis/scene/svg_rule.rb
 - lib/rubyvis/scene/svg_scene.rb
+- lib/rubyvis/scene/svg_wedge.rb
 - lib/rubyvis/sceneelement.rb
 - lib/rubyvis/transform.rb
 - spec/bar_spec.rb
@@ -124,9 +141,11 @@ files:
 - spec/javascript_behaviour_spec.rb
 - spec/label_spec.rb
 - spec/mark_spec.rb
+- spec/nest_spec.rb
 - spec/panel_spec.rb
 - spec/scale_linear_datetime_spec.rb
 - spec/scale_linear_spec.rb
+- spec/scale_ordinal_spec.rb
 - spec/scale_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -259,6 +278,8 @@ specification_version: 3
 summary: Ruby port of Protovis, a great visualization toolkit
 test_files: 
 - spec/bar_spec.rb
+- spec/nest_spec.rb
+- spec/scale_ordinal_spec.rb
 - spec/internal_spec.rb
 - spec/panel_spec.rb
 - spec/scale_linear_datetime_spec.rb