rubyvis 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0920b8934ac03cbc5cdcdd9e018b270c755c9a99
-  data.tar.gz: d581b5a9847a03c8dd5d05c6db260448164ad6e0
+SHA256:
+  metadata.gz: 1bc738ddd37028cbaddb2ee55bd9ff57b05a5786a0b858f386cf11bbe2794bc5
+  data.tar.gz: 4c5badd172bfd35d57409eef36b2538f8a4a7782e0468ea0fc3173bda8c5d1e7
 SHA512:
-  metadata.gz: 6cd729bb91aa0d934def2639956cb577d7656d57435adaacef8c5e37ee1a91347a0462da8d253ce0a0429a7ee46fe90ec6029b32d5aa819001303e83122f97d5
-  data.tar.gz: cc3455449762a6cba3acabb67130bac1ede70814241867be0792ae4daf2264777c3f2d7f5e09d9ef9d04f16419be2b7d6fe0ae8215b85404af1fe4c9626aaa78
+  metadata.gz: c79254660bab8923c66feac95ea8aa8edc4ccbf5d42d9092e4575f80341df1c0b632edf8d12da5a4fef1bfe53eba060a531d889e1742ba279b5e6799b3fe27e3
+  data.tar.gz: 7555b9d7944701a60ff82dd3ad8f29b4713203fc02db3430d712490f2a59c9d3d180f8f97a62efe8d649f8fc13073739278f51ca61410907e1d6ae55dd44fb4f

data/.travis.yml

@@ -2,12 +2,12 @@ language:
   ruby
 
 rvm:
-  - '1.9.2'
-  - '1.9.3'
-  - '2.0.0'
-  - '2.1.1'
-  - jruby-19mode # JRuby in 1.9 mode
+  - '2.1.9'
+  - '2.2.10'
+  - '2.5.0'
+  - '2.6.0'
+  - 'jruby-head'
 #  - rbx-2.1.1
 
 script:
-  bundle exec rake spec 
+  bundle exec rspec 

data/Gemfile

@@ -5,4 +5,4 @@ gem 'coderay'
 gem 'haml'
 gem 'rspec'
 gem 'rspec-mocks'
-gem 'RedCloth'
+#gem 'RedCloth'

data/Gemfile.lock

@@ -1,37 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    RedCloth (4.2.9)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    haml (4.0.5)
+    coderay (1.1.2)
+    diff-lcs (1.3)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
-    mini_portile (0.6.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    rake (10.3.2)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    mini_portile2 (2.4.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.9.1-java)
+    rake (12.3.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
-    tilt (2.0.1)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    temple (0.8.0)
+    tilt (2.0.9)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  RedCloth
   coderay
   haml
   nokogiri
   rake
   rspec
   rspec-mocks
+
+BUNDLED WITH
+   1.17.2

data/History.txt

@@ -1,10 +1,19 @@
+=== 0.7.0 / 2019-01-02
+
+* Version for API and Protovis version in lib/rubyvis/version.rb
+* Travis.CI: Updated to jruby-head, ruby 2.5 and 2.6
+* Added view_box property
+* Update rspec tests to new style, fix all warnings
+
 === 0.6.1 / 2014-08-07
+
 * Change license to BSD 2-Clause
 * Merge pull request #19 from pivotal-cloudplanner/master
 * Added travis and bundler support
 * Resolved bug #15
 
 === 0.6.0 / 2013-07-10
+
 + Added support for dashed lines (ex.: stroke_dasharray('9,5,3'))
 - Raises an exception on log scale when domain includes 0 or negative values
 
@@ -28,6 +37,7 @@
 
 
 === 0.4.1 / 2011-01-26
+
 * All tests run on ruby 1.8.7. Not all pass, because on ruby<1.9 hash order are not preserved
 * Removed warnings for Ruby 1.9+
 * Changed SvgScene.implicit and Color.names with constants

data/lib/rubyvis.rb

@@ -4,6 +4,7 @@ require 'rexml/document'
 require 'rexml/formatters/default'
 
 require 'pp'
+require 'rubyvis/version'
 require 'rubyvis/internals'
 require 'rubyvis/vector'
 
@@ -33,10 +34,6 @@ require 'rubyvis/mark/shorcut_methods'
 # 
 module Rubyvis
   @@nokogiri=nil
-  # Rubyvis version
-  VERSION = '0.6.1' 
-  # Protovis API on which current Rubyvis is based
-  PROTOVIS_API_VERSION='3.3'
   # You actually can do it! http://snipplr.com/view/2137/uses-for-infinity-in-ruby/
   Infinity=1.0 / 0 
   #

data/lib/rubyvis/mark/panel.rb

@@ -9,7 +9,7 @@ module Rubyvis
     end
 
     @properties=Bar.properties.dup
-    attr_accessor_dsl :transform, :overflow, :canvas
+    attr_accessor_dsl :transform, :overflow, :canvas, :view_box
     attr_accessor :children, :root
     def initialize
       @children=[]

data/lib/rubyvis/scene/svg_line.rb

@@ -43,7 +43,6 @@ module Rubyvis
         "fill-opacity"=> (fill.opacity==0.0) ? nil : fill.opacity,
         "stroke"=> stroke.color,
         "stroke-opacity"=> (stroke.opacity==0.0) ? nil : stroke.opacity,
-        "stroke-dasharray"=> s.stroke_dasharray, # strokeDasharray from Jamie Love (protovis mod)
         "stroke-width"=> (stroke.opacity>0) ? s.line_width / self.scale : nil,
         "stroke-linejoin"=> s.line_join
       });

data/lib/rubyvis/scene/svg_panel.rb

@@ -44,6 +44,9 @@ module Rubyvis
               'width'=>s.width+s.left+s.right,
               'height'=>s.height+s.top+s.bottom
           })
+          if not s.view_box.nil?
+            g.set_attribute('viewBox', s.view_box)
+          end
           #g.attributes['width']=s.width+s.left+s.right
           #g.attributes['height']=s.height+s.top+s.bottom
         end

data/lib/rubyvis/scene/svg_rule.rb

@@ -17,7 +17,6 @@ module Rubyvis
           'y2'=>s.top+s.height,
           "stroke"=> stroke.color,
           "stroke-opacity"=> stroke.opacity,
-          "stroke-dasharray"=> s.stroke_dasharray,
           "stroke-width"=> s.line_width / self.scale
         })
 

data/lib/rubyvis/sceneelement.rb

@@ -101,6 +101,7 @@ module Rubyvis
     attr_accessor :type
     attr_accessor :url
     attr_accessor :width
+    attr_accessor :view_box
     
     def []=(v,i)
       if v.is_a? Numeric

data/lib/rubyvis/version.rb

@@ -0,0 +1,6 @@
+module Rubyvis
+  # Rubyvis version
+  VERSION="0.7.0"
+    # Protovis API on which current Rubyvis is based
+  PROTOVIS_API_VERSION='3.3'
+end

data/rubyvis.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.unshift(File.expand_path(File.dirname(__FILE__)+"/lib"))
-require File.expand_path("../lib/rubyvis", __FILE__)
+require_relative "lib/rubyvis/version.rb"
 
 Gem::Specification.new do |s|
   s.name = "rubyvis"

data/spec/anchor_spec.rb

@@ -4,12 +4,12 @@ describe Rubyvis::Anchor do
   
   it "should have correct properties" do
     props=[:antialias, :bottom, :cursor, :data, :events, :id,  :left, :name, :reverse, :right,  :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
-    Rubyvis::Anchor.properties.should==props
+    expect(Rubyvis::Anchor.properties).to eq(props)
   end
   it "should be initialized with an object which respond to parent" do
     my_mock=double('mark')
-    my_mock.stub(:parent)
-    my_mock.should_receive(:parent).with(no_args())
+    allow(my_mock).to receive(:parent)
+    expect(my_mock).to receive(:parent).with(no_args())
     Rubyvis.Anchor(my_mock)
     
   end
@@ -42,15 +42,15 @@ describe Rubyvis::Anchor do
     end
     if(true)
     it "first loop correct" do
-      @data_p1.should==@expected_p1
+      expect(@data_p1).to eq(@expected_p1)
     end
     it "second loop correct" do
-      @data_p2.should==@expected_p2
+      expect(@data_p2).to eq(@expected_p2)
     end
     end
     
     it "label loop correct" do
-      @data_l.should==@expected_l
+      expect(@data_l).to eq(@expected_l)
     end
   end
   
@@ -85,7 +85,7 @@ describe Rubyvis::Anchor do
     expected=[]
     a1.each {|a| a2.each {|b| expected.push([b,b,a,nil])}}
     vis.render
-    adatas.should==expected
+    expect(adatas).to eq(expected)
     
   end
   
@@ -104,7 +104,7 @@ describe Rubyvis::Anchor do
       @vis.render
       expected=[]
       @values.each {|a| @values.each {|b| expected.push([b,b,a,nil])}}
-      datas.should==expected
+      expect(datas).to eq(expected)
     end
   end
   it "should render equal to protovis 'anchor.html' example" do
@@ -122,7 +122,7 @@ describe Rubyvis::Anchor do
         text("bottom")
       @vis.render
       @pv_out=fixture_svg_read("anchor.svg")
-      @vis.to_svg.should have_same_svg_elements(@pv_out)
+      expect(@vis.to_svg).to have_same_svg_elements(@pv_out)
   end
   context "Panel-bar assigment" do 
     before do
@@ -140,7 +140,7 @@ describe Rubyvis::Anchor do
       expected=[[1,nil],[2,nil],[3,nil]]
       @label.text(lambda {|*args| datas.push args})
       @vis.render
-      datas.should==expected
+      expect(datas).to eq(expected)
     end
     
     it "should have correct data for two levels of data" do
@@ -150,7 +150,7 @@ describe Rubyvis::Anchor do
       %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
+      expect(datas).to eq(expected)
     end
   end  
 end

data/spec/area_spec.rb

@@ -4,10 +4,10 @@ describe Rubyvis::Area do
   include Rubyvis::GeneralSpec
   it "should have correct properties" do
     props=[:antialias, :bottom, :cursor, :data, :events, :fill_style, :height, :id, :interpolate, :left, :line_width, :reverse, :right, :segmented, :stroke_dasharray, :stroke_style, :tension, :title, :top, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
-    Rubyvis::Area.properties.should==props
+    expect(Rubyvis::Area.properties).to eq(props)
   end
   it "Rubyvis.Area be the same as Rubyvis::Area" do
-    Rubyvis.Area.should eql Rubyvis::Area
+    expect(Rubyvis.Area).to eql Rubyvis::Area
   end
   it "should render equal to protovis 'area-segmented.html' test" do
     data=Rubyvis.range(0, 6, 0.1).map {|x| Math.sin(x)}
@@ -28,7 +28,7 @@ height(lambda {|d| (d + 1) / 2.0 * 200 + 50}).
 fill_style(lambda {|d| "hsl(#{(d + 1) * 180.0},50,50)"})
      vis.render()
      pv_out=fixture_svg_read("area_segmented.svg")
-     vis.to_svg.should have_same_svg_elements(pv_out)
+     expect(vis.to_svg).to have_same_svg_elements(pv_out)
   end
   
   it "should render correctly 'area_interpolation.html' example" do
@@ -83,7 +83,7 @@ top(5)
     end
     vis.render()
     pv_out=fixture_svg_read("area_interpolation.svg")
-    vis.to_svg.should have_same_svg_elements(pv_out)
+    expect(vis.to_svg).to have_same_svg_elements(pv_out)
   end
   
   
@@ -107,38 +107,38 @@ top(5)
 
       doc=Nokogiri::XML(@vis.to_svg)
       # <svg font-size="10px" font-family="sans-serif" fill="none" stroke="none" stroke-width="1.5" width="200" height="200"><g><path d="M0,180L20,200L20,200L0,200ZM20,200L40,160L40,200L20,200Z" fill="rgb(31,119,180)"/></g></svg>
-      doc.at_xpath("//xmlns:path").should have_path_data_close_to  "M0,180L20,200L20,200L0,200ZM20,200L40,160L40,200L20,200Z"
+      expect(doc.at_xpath("//xmlns:path")).to have_path_data_close_to  "M0,180L20,200L20,200L0,200ZM20,200L40,160L40,200L20,200Z"
     end
     
     
     it "should return correct default (linear) path" do
       @vis.render
       doc=Nokogiri::XML(@vis.to_svg)
-      doc.at_xpath("//xmlns:path").should have_path_data_close_to  "M0 180L20 160L40 180L60 120L80 180L100 100L100 200L80 200L60 200L40 200L20 200L0 200Z"
+      expect(doc.at_xpath("//xmlns:path")).to have_path_data_close_to  "M0 180L20 160L40 180L60 120L80 180L100 100L100 200L80 200L60 200L40 200L20 200L0 200Z"
     end
     it "should return correct path for interpolate=step-before" do
       @area.interpolate('step-before')
       @vis.render
       doc=Nokogiri::XML(@vis.to_svg)
-      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180V160L20 160V180L40 180V120L60 120V180L80 180V100L100 100L100 200H80L80 200H60L60 200H40L40 200H20L20 200H0L0 200Z"
+      expect(doc.at_xpath("//xmlns:path")).to have_path_data_close_to "M0 180V160L20 160V180L40 180V120L60 120V180L80 180V100L100 100L100 200H80L80 200H60L60 200H40L40 200H20L20 200H0L0 200Z"
     end
     it "should return correct path for interpolate=step-after" do
       @area.interpolate('step-after')
       @vis.render
       doc=Nokogiri::XML(@vis.to_svg)
-      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180H20L20 160H40L40 180H60L60 120H80L80 180H100L100 100L100 200V200L80 200V200L60 200V200L40 200V200L20 200V200L0 200Z"
+      expect(doc.at_xpath("//xmlns:path")).to have_path_data_close_to "M0 180H20L20 160H40L40 180H60L60 120H80L80 180H100L100 100L100 200V200L80 200V200L60 200V200L40 200V200L20 200V200L0 200Z"
     end
     it "should return correct path for interpolate=basis" do
       @area.interpolate('basis')
       @vis.render
       doc=Nokogiri::XML(@vis.to_svg)
-      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180C0 180 0 180 3.333333333333333 176.66666666666666C6.666666666666666 173.33333333333331 13.333333333333332 166.66666666666666 20 166.66666666666666C26.666666666666664 166.66666666666666 33.33333333333333 173.33333333333331 40 166.66666666666666C46.666666666666664 160 53.33333333333333 140 60 140C66.66666666666666 140 73.33333333333333 160 80 156.66666666666666C86.66666666666666 153.33333333333331 93.33333333333331 126.66666666666666 96.66666666666666 113.33333333333331C99.99999999999999 99.99999999999999 99.99999999999999 99.99999999999999 99.99999999999997 99.99999999999997L100 200C99.99999999999999 199.99999999999997 99.99999999999999 199.99999999999997 96.66666666666664 199.99999999999994C93.33333333333331 199.99999999999997 86.66666666666666 199.99999999999997 80 199.99999999999994C73.33333333333333 199.99999999999997 66.66666666666666 199.99999999999997 59.99999999999999 199.99999999999994C53.33333333333333 199.99999999999997 46.666666666666664 199.99999999999997 40 199.99999999999994C33.33333333333333 199.99999999999997 26.666666666666664 199.99999999999997 20 199.99999999999994C13.333333333333332 199.99999999999997 6.666666666666666 199.99999999999997 3.333333333333333 199.99999999999994C0 199.99999999999997 0 199.99999999999997 0 199.99999999999994Z"
+      expect(doc.at_xpath("//xmlns:path")).to have_path_data_close_to "M0 180C0 180 0 180 3.333333333333333 176.66666666666666C6.666666666666666 173.33333333333331 13.333333333333332 166.66666666666666 20 166.66666666666666C26.666666666666664 166.66666666666666 33.33333333333333 173.33333333333331 40 166.66666666666666C46.666666666666664 160 53.33333333333333 140 60 140C66.66666666666666 140 73.33333333333333 160 80 156.66666666666666C86.66666666666666 153.33333333333331 93.33333333333331 126.66666666666666 96.66666666666666 113.33333333333331C99.99999999999999 99.99999999999999 99.99999999999999 99.99999999999999 99.99999999999997 99.99999999999997L100 200C99.99999999999999 199.99999999999997 99.99999999999999 199.99999999999997 96.66666666666664 199.99999999999994C93.33333333333331 199.99999999999997 86.66666666666666 199.99999999999997 80 199.99999999999994C73.33333333333333 199.99999999999997 66.66666666666666 199.99999999999997 59.99999999999999 199.99999999999994C53.33333333333333 199.99999999999997 46.666666666666664 199.99999999999997 40 199.99999999999994C33.33333333333333 199.99999999999997 26.666666666666664 199.99999999999997 20 199.99999999999994C13.333333333333332 199.99999999999997 6.666666666666666 199.99999999999997 3.333333333333333 199.99999999999994C0 199.99999999999997 0 199.99999999999997 0 199.99999999999994Z"
     end   
     it "should return correct path for interpolate=cardinal" do 
       @area.interpolate('cardinal')
       @vis.render
       doc=Nokogiri::XML(@vis.to_svg)
-      doc.at_xpath("//xmlns:path").should have_path_data_close_to "M0 180Q16 160 20 160C26 160 34 186 40 180S54 120 60 120S74 183 80 180Q84 178 100 100L100 200Q84 200 80 200C74 200 66 200 60 200S46 200 40 200S26 200 20 200Q16 200 0 200Z"
+      expect(doc.at_xpath("//xmlns:path")).to have_path_data_close_to "M0 180Q16 160 20 160C26 160 34 186 40 180S54 120 60 120S74 183 80 180Q84 178 100 100L100 200Q84 200 80 200C74 200 66 200 60 200S46 200 40 200S26 200 20 200Q16 200 0 200Z"
     end
   end
 end

data/spec/bar_spec.rb

@@ -2,19 +2,19 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
   describe Rubyvis::Bar do
   it "should have correct properties" do
     props=[:antialias, :bottom, :cursor, :data, :events, :fill_style, :height, :id, :left, :line_width, :reverse, :right, :stroke_style, :title, :top, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
-    Rubyvis::Bar.properties.should==props
+    expect(Rubyvis::Bar.properties).to eq(props)
   end
   it "Rubyvis.Bar be the same as Rubyvis::Bar" do
-    Rubyvis.Bar.should eql Rubyvis::Bar
+    expect(Rubyvis.Bar).to eql Rubyvis::Bar
   end
   it "should return correct defaults" do
     props=Rubyvis::Bar.defaults._properties
-    props.size.should==2
-    props[0].name.should==:line_width
-    props[0].value.should==1.5
-    props[1].name.should==:fill_style
-    props[1].value.should be_instance_of Proc
-    Rubyvis::Bar.defaults.proto.should be_instance_of Rubyvis::Mark
+    expect(props.size).to eq(2)
+    expect(props[0].name).to eq(:line_width)
+    expect(props[0].value).to eq(1.5)
+    expect(props[1].name).to eq(:fill_style)
+    expect(props[1].value).to be_instance_of Proc
+    expect(Rubyvis::Bar.defaults.proto).to be_instance_of Rubyvis::Mark
     
   end
   context "on a Panel" do 
@@ -32,7 +32,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
       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)"]]
+      expect(attribs).to eq([["120","80","rgb(31,119,180)"],["40","160","rgb(31,119,180)"]])
     end
     
     it "should bould properly with string fill_style" do
@@ -40,14 +40,14 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
       @vis.render
       s=@vis.to_svg
       doc=Nokogiri::XML(s)
-      doc.at_xpath("//xmlns:rect").attributes['fill'].value.should=='rgb(255,0,0)'
+      expect(doc.at_xpath("//xmlns:rect").attributes['fill'].value).to eq('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)'
+      expect(doc.at_xpath("//xmlns:rect").attributes['fill'].value).to eq('rgb(255,0,0)')
     end
     it "should bould properly with pv.colors" do
       @bar.fill_style(pv.colors('black','red'))
@@ -55,7 +55,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
       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)']
+      expect(attr).to eq(['rgb(0,0,0)', 'rgb(255,0,0)'])
     end
     
     it "should bould propertly with double data" do
@@ -68,7 +68,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
       x=v.attributes['x'] ? v.attributes['x'].value : nil
         [x, v.attributes['y'].value, v.attributes['height'].value]
       }
-      attribs.should==[[nil,"90","10"], ["25","80","20"], [nil,"70","30"], ["25","40","60"]]
+      expect(attribs).to eq([[nil,"90","10"], ["25","80","20"], [nil,"70","30"], ["25","40","60"]])
     end
     
   end  

data/spec/color_spec.rb

@@ -2,9 +2,9 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe "Rubyvis color methods" do
   it "should return correct Rubyvis.ramp" do
     a=Rubyvis.ramp("white","red")
-    a[0].should eq Rubyvis.color("rgb(255,255,255)")
-    a[0.5].should eq Rubyvis.color("rgb(255,128,128)")
-    a[1].should eq Rubyvis.color("rgb(255,0,0)")
+    expect(a[0]).to eq Rubyvis.color("rgb(255,255,255)")
+    expect(a[0.5]).to eq Rubyvis.color("rgb(255,128,128)")
+    expect(a[1]).to eq Rubyvis.color("rgb(255,0,0)")
   end
   
   # <li>#f00 // #rgb
@@ -17,39 +17,39 @@ describe "Rubyvis color methods" do
   describe "Rubyvis.color" do 
     
     it "should return correct Rubyvis.color with three hex" do
-      Rubyvis.color("#f97").should eq Rubyvis::Color::Rgb.new("ff".to_i(16), "99".to_i(16),"77".to_i(16),1 )
+      expect(Rubyvis.color("#f97")).to eq Rubyvis::Color::Rgb.new("ff".to_i(16), "99".to_i(16),"77".to_i(16),1 )
     end
     it "should return correct Rubyvis.color with 6 hex" do
-      Rubyvis.color("#f19171").should eq Rubyvis::Color::Rgb.new("f1".to_i(16), "91".to_i(16),"71".to_i(16),1 )
+      expect(Rubyvis.color("#f19171")).to eq Rubyvis::Color::Rgb.new("f1".to_i(16), "91".to_i(16),"71".to_i(16),1 )
     end
     it "should return correct Rubyvis.color rbg() with integers" do
       r,g,b=rand(255),rand(255),rand(255)
-      Rubyvis.color("rgb(#{r},#{g},#{b})").should eq Rubyvis::Color::Rgb.new(r, g, b,1 )
+      expect(Rubyvis.color("rgb(#{r},#{g},#{b})")).to eq Rubyvis::Color::Rgb.new(r, g, b,1 )
     end
     it "should return correct Rubyvis.color rbga() with integers" do
       r,g,b,a=rand(255),rand(255),rand(255), rand()
-      Rubyvis.color("rgba(#{r},#{g},#{b},#{a})").should eq Rubyvis::Color::Rgb.new(r, g, b,"#{a}".to_f )
+      expect(Rubyvis.color("rgba(#{r},#{g},#{b},#{a})")).to eq Rubyvis::Color::Rgb.new(r, g, b,"#{a}".to_f )
     end
     it "should return correct Rubyvis.color rbg() with percents" do
       r,g,b=rand(100),rand(100),rand(100)
-      Rubyvis.color("rgb(#{r}%,#{g}%,#{b}%)").should eq Rubyvis::Color::Rgb.new((r*2.55).round, (g*2.55).round, (b*2.55).round,1 )
+      expect(Rubyvis.color("rgb(#{r}%,#{g}%,#{b}%)")).to eq Rubyvis::Color::Rgb.new((r*2.55).round, (g*2.55).round, (b*2.55).round,1 )
     end
     it "should return correct Rubyvis.color hsl" do
-      Rubyvis.color("hsl(100,50,50)").should eq Rubyvis::Color::Rgb.new(106,191,64,1)
+      expect(Rubyvis.color("hsl(100,50,50)")).to eq Rubyvis::Color::Rgb.new(106,191,64,1)
       
       h,s,l=rand(360),rand(100),rand(100)
       
-      Rubyvis.color("hsl(#{h},#{s},#{l})").should eq Rubyvis::Color::Hsl.new(h,s/100.0,l/100.0,1).rgb
+      expect(Rubyvis.color("hsl(#{h},#{s},#{l})")).to eq Rubyvis::Color::Hsl.new(h,s/100.0,l/100.0,1).rgb
     end
     it "should return correct Rubyvis.color hsla" do
       h,s,l,a=rand(360),rand(100),rand(100), rand()
-      Rubyvis.color("hsla(#{h},#{s},#{l},#{a})").should eq Rubyvis::Color::Hsl.new(h,s/100.0,l/100.0, "#{a}".to_f).rgb
+      expect(Rubyvis.color("hsla(#{h},#{s},#{l},#{a})")).to eq Rubyvis::Color::Hsl.new(h,s/100.0,l/100.0, "#{a}".to_f).rgb
     end
   end
   describe Rubyvis::Color::Hsl do
     it "convert some extreme value" do
-      Rubyvis.color("hsl(96,50,50)").should eq Rubyvis.color("rgb(115,191,64)")
-      Rubyvis.color("hsl(112.5,50.0,50.0)").should eq Rubyvis.color("rgb(80,191,64)")
+      expect(Rubyvis.color("hsl(96,50,50)")).to eq Rubyvis.color("rgb(115,191,64)")
+      expect(Rubyvis.color("hsl(112.5,50.0,50.0)")).to eq Rubyvis.color("rgb(80,191,64)")
 
     end
   end
@@ -59,32 +59,32 @@ describe "Rubyvis color methods" do
       @rgb=Rubyvis::Color::Rgb.new(@r,@g,@b,@a)
     end
     it "return correct ==" do
-      Rubyvis::Color::Rgb.new(0, 0,0,1 ).should eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
+      expect(Rubyvis::Color::Rgb.new(0, 0,0,1 )).to eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
       
-      Rubyvis::Color::Rgb.new(10, 0,0,1 ).should_not eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
+      expect(Rubyvis::Color::Rgb.new(10, 0,0,1 )).not_to eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
       
-      Rubyvis::Color::Rgb.new(0, 10,0,1 ).should_not eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
+      expect(Rubyvis::Color::Rgb.new(0, 10,0,1 )).not_to eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
       
-      Rubyvis::Color::Rgb.new(0, 0,10,1 ).should_not eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
-      Rubyvis::Color::Rgb.new(0, 0,0,0 ).should_not eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
+      expect(Rubyvis::Color::Rgb.new(0, 0,10,1 )).not_to eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
+      expect(Rubyvis::Color::Rgb.new(0, 0,0,0 )).not_to eq Rubyvis::Color::Rgb.new(0, 0,0,1 )
     end
     it "return correct red()" do
-      @rgb.red(255).should eq Rubyvis::Color::Rgb.new(255,@g,@b,@a)
+      expect(@rgb.red(255)).to eq Rubyvis::Color::Rgb.new(255,@g,@b,@a)
     end
     it "return correct green()" do
-      @rgb.green(255).should eq Rubyvis::Color::Rgb.new(@r,255,@b,@a)
+      expect(@rgb.green(255)).to eq Rubyvis::Color::Rgb.new(@r,255,@b,@a)
     end
     it "return correct blue()" do
-      @rgb.blue(255).should eq Rubyvis::Color::Rgb.new(@r,@g,255,@a)
+      expect(@rgb.blue(255)).to eq Rubyvis::Color::Rgb.new(@r,@g,255,@a)
     end
     it "return correct alpha()" do
-      @rgb.alpha(0.5).should eq Rubyvis::Color::Rgb.new(@r,@g,@b,0.5)
+      expect(@rgb.alpha(0.5)).to eq Rubyvis::Color::Rgb.new(@r,@g,@b,0.5)
     end
     it "return correct darker()" do
-      Rubyvis.color("red").darker().should eq Rubyvis::Color::Rgb.new(178,0,0,1)
+      expect(Rubyvis.color("red").darker()).to eq Rubyvis::Color::Rgb.new(178,0,0,1)
     end
     it "return correct brighter()" do
-      Rubyvis.color("rgb(100,110,120)").brighter().should eq Rubyvis::Color::Rgb.new(142,157,171,1)
+      expect(Rubyvis.color("rgb(100,110,120)").brighter()).to eq Rubyvis::Color::Rgb.new(142,157,171,1)
     end    
     
   end