rubyvis 0.5.2 → 0.6.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 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
+
 === 0.5.2 / 2012-07-21
 
 - Fixed image bug (#13), and updated example for image. Web creation is updated, too

data/Manifest.txt

@@ -106,6 +106,8 @@ lib/rubyvis/scene/svg_wedge.rb
 lib/rubyvis/sceneelement.rb
 lib/rubyvis/transform.rb
 lib/rubyvis/vector.rb
+lib/rspec/expectations/differ.rb
+lib/rspec/expectations/differ_spec.rb
 spec/anchor_spec.rb
 spec/area_spec.rb
 spec/bar_spec.rb

data/README.txt

@@ -37,7 +37,7 @@ Using protovis examples[http://vis.stanford.edu/protovis/ex/] as reference
  * Arc
  * Matrix
  
-I try to maintain, when posible, complete compatibility with Javascript API, including camel case naming of functions. Johnson [http://github.com/jbarnette/johnson] - the lovely Javascript wrapper inside Ruby embrace - is our friend to test implementation of basic object. 
+I try to maintain, when posible, complete compatibility with Javascript API, including camel case naming of functions.  
 
 User could use +pv+ freely, cause is defined as a global method which call Rubyvis.
 

data/Rakefile

@@ -7,16 +7,18 @@ require 'hoe'
 require 'rubyvis'
 require 'rspec'
 require 'rspec/core/rake_task'
+require './lib/rspec/expectations/differ'
 require 'rubyforge'
 
 Hoe.plugin :git
+Hoe.plugin :gemspec
 
 h=Hoe.spec 'rubyvis' do
   self.testlib=:rspec
   self.rspec_options << "-c" << "-b"
   self.developer('Claudio Bustos', 'clbustos_at_gmail.com')
   self.version=Rubyvis::VERSION
-  self.extra_dev_deps << ["coderay",">=0"] << ["haml",">=0"] << ["nokogiri", ">=0"] << ["rspec",">=2.0"] << ["RedCloth",">=0"]
+  self.extra_dev_deps << ["coderay",">=0"] << ["haml",">=0"] << ["nokogiri", ">=0"] << ["rspec",">=2.7"] << ["RedCloth",">=0"]
 end
 desc "Publicar docs en rubyforge"
 task :publicar_docs => [:clean, :docs] do

data/lib/rspec/expectations/differ.rb

@@ -0,0 +1,73 @@
+# Borrowed from:
+# https://github.com/pcreux/rspec-expectations/commit/b5f8d5ab7c9a3e8d470c6ec3241179be0b78f3ac#diff-1
+
+require 'diff/lcs'
+require 'diff/lcs/hunk'
+require 'pp'
+
+module RSpec
+  module Expectations
+    class Differ
+
+
+      # This is snagged from diff/lcs/ldiff.rb (which is a commandline tool)
+      def diff_as_string(data_new, data_old)
+        data_old = data_old.split(/\n/).map! { |e| e.chomp }
+        data_new = data_new.split(/\n/).map! { |e| e.chomp }
+        output = ""
+        diffs = Diff::LCS.diff(data_old, data_new)
+        return output if diffs.empty?
+        oldhunk = hunk = nil
+        file_length_difference = 0
+        diffs.each do |piece|
+          begin
+            hunk = Diff::LCS::Hunk.new(
+              data_old, data_new, piece, context_lines, file_length_difference
+            )
+            file_length_difference = hunk.file_length_difference
+            next unless oldhunk
+            # Hunks may overlap, which is why we need to be careful when our
+            # diff includes lines of context. Otherwise, we might print
+            # redundant lines.
+            if (context_lines > 0) and hunk.overlaps?(oldhunk)
+              hunk.unshift(oldhunk)
+            else
+              output << oldhunk.diff(format)
+            end
+          ensure
+            oldhunk = hunk
+            output << "\n"
+          end
+        end
+        #Handle the last remaining hunk
+        output << oldhunk.diff(format) << "\n"
+      end
+
+
+      def diff_as_object(actual,expected)
+        actual = object_to_string(actual)
+        expected = object_to_string(expected)
+        diff_as_string(actual, expected)
+      end
+
+    protected
+
+      def format; :unified; end
+      def context_lines; 3; end
+
+      def object_to_string(object)
+        case object
+        when Hash
+          object.keys.sort_by { |k| k.to_s }.map do |k|
+            %(#{PP.singleline_pp(k, "")} => #{PP.singleline_pp(object[k], "")})
+          end.join(",\n")
+        when String
+          object
+        else
+          PP.pp(object,"")
+        end
+      end
+
+    end
+  end
+end

data/lib/rspec/expectations/differ_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper'
+require 'ostruct'
+
+module RSpec
+  module Fixtures
+    class Animal
+      def initialize(name,species)
+        @name,@species = name,species
+      end
+
+      def inspect
+        <<-EOA
+<Animal
+  name=#{@name},
+  species=#{@species}
+>
+        EOA
+      end
+    end
+  end
+end
+
+describe "Diff" do
+  before(:each) do
+    @options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
+    @differ = RSpec::Expectations::Differ.new(@options)
+  end
+
+  it "outputs unified diff of two strings" do
+    expected="foo\nbar\nzap\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nline\n"
+    actual="foo\nzap\nbar\nthis\nis\nsoo\nvery\nvery\nequal\ninsert\na\nanother\nline\n"
+    expected_diff= <<'EOD'
+
+
+@@ -1,6 +1,6 @@
+ foo
+-zap
+ bar
++zap
+ this
+ is
+ soo
+@@ -9,6 +9,5 @@
+ equal
+ insert
+ a
+-another
+ line
+EOD
+
+    diff = @differ.diff_as_string(expected, actual)
+    diff.should eql(expected_diff)
+  end
+
+  it "outputs unified diff message of two arrays" do
+    expected = [ :foo, 'bar', :baz, 'quux', :metasyntactic, 'variable', :delta, 'charlie', :width, 'quite wide' ]
+    actual   = [ :foo, 'bar', :baz, 'quux', :metasyntactic, 'variable', :delta, 'tango'  , :width, 'very wide'  ]
+
+    expected_diff = <<'EOD'
+
+
+@@ -5,7 +5,7 @@
+  :metasyntactic,
+  "variable",
+  :delta,
+- "tango",
++ "charlie",
+  :width,
+- "very wide"]
++ "quite wide"]
+EOD
+
+
+    diff = @differ.diff_as_object(expected,actual)
+    diff.should == expected_diff
+  end
+
+  it "outputs unified diff message of two objects" do
+    expected = RSpec::Fixtures::Animal.new "bob", "giraffe"
+    actual   = RSpec::Fixtures::Animal.new "bob", "tortoise"
+
+    expected_diff = <<'EOD'
+
+@@ -1,5 +1,5 @@
+ <Animal
+   name=bob,
+-  species=tortoise
++  species=giraffe
+ >
+EOD
+
+    diff = @differ.diff_as_object(expected,actual)
+    diff.should == expected_diff
+  end
+
+  it "outputs unified diff message of two hashes" do
+    expected = { :foo => 'bar', :baz => 'quux', :metasyntactic => 'variable', :delta => 'charlie', :width =>'quite wide' }
+    actual   = { :foo => 'bar', :metasyntactic => 'variable', :delta => 'charlotte', :width =>'quite wide' }
+
+    expected_diff = <<'EOD'
+
+@@ -1,4 +1,5 @@
+-:delta => "charlotte",
++:baz => "quux",
++:delta => "charlie",
+ :foo => "bar",
+ :metasyntactic => "variable",
+ :width => "quite wide"
+EOD
+
+
+    diff = @differ.diff_as_object(expected,actual)
+    diff.should == expected_diff
+  end
+
+end
+

data/lib/rubyvis.rb

@@ -34,7 +34,7 @@ require 'rubyvis/mark/shorcut_methods'
 module Rubyvis
   @@nokogiri=nil
   # Rubyvis version
-  VERSION = '0.5.2' 
+  VERSION = '0.6.0' 
   # 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/

data/lib/rubyvis/mark/area.rb

@@ -12,6 +12,7 @@ module Rubyvis
         :stroke_style=> true,
         :fill_style=> true,
         :segmented=> true,
+        :stroke_dasharray => true, # SVG strokeDasharray (Jamie Love protovis mod)
         :interpolate=> true,
         :tension=> true
       }
@@ -201,7 +202,7 @@ module Rubyvis
     
     
     
-    attr_accessor_dsl :width, :height, :line_width, [:stroke_style, lambda {|d| Rubyvis.color(d)}], [:fill_style, lambda {|d| Rubyvis.color(d)}], :segmented, :interpolate, :tension
+    attr_accessor_dsl :width, :height, :line_width, [:stroke_style, lambda {|d| Rubyvis.color(d)}], [:fill_style, lambda {|d| Rubyvis.color(d)}], :segmented, :stroke_dasharray, :interpolate, :tension
     def type
       'area'
     end

data/lib/rubyvis/mark/label.rb

@@ -94,7 +94,7 @@ module Rubyvis
     # See {CSS3 text}[http://www.w3.org/TR/css3-text/#text-decoration]
     
     
-    attr_accessor_dsl :text, :font, :text_angle, [:text_style, lambda {|d| Rubyvis.color(d)}], :text_align, :text_baseline, :text_margin, :text_decoration, :text_shadow
+    attr_accessor_dsl :text, :font, :text_angle, [:text_style, lambda {|d| Rubyvis.color(d)}], :text_align, :text_baseline, :text_margin, :text_decoration, :text_shadow, :font_family, :font_style, :font_variant, :font_weight, :font_size
     # Mark type
     def type
       'label'

data/lib/rubyvis/mark/line.rb

@@ -73,7 +73,13 @@ module Rubyvis
     # Whether the line is segmented; whether variations in stroke style, line width and the other properties are treated as fixed. Rendering segmented lines is noticeably slower than non-segmented lines.
     # <p>This property is <i>fixed</i>. See Rubyvis.Mark    
     
+
+    ##
+    # :attr: stroke_dasharray
+    # Whether the line is dashed using the strokeDasharray SVG property.
+    # <p>This property is <i>fixed</i>. See Rubyvis.Mark    
     
+
     ##
     # :attr: interpolate
     # How to interpolate between values. Linear interpolation ("linear") is the
@@ -105,7 +111,7 @@ module Rubyvis
     #
     # <p>This property is <i>fixed</i>. See Rubyvis.Mark    
     
-    attr_accessor_dsl :line_width, :line_join, [:stroke_style, lambda {|d| Rubyvis.color(d)}], [:fill_style, lambda {|d| Rubyvis.color(d)}], :segmented, :interpolate, :eccentricity, :tension
+    attr_accessor_dsl :line_width, :line_join, [:stroke_style, lambda {|d| Rubyvis.color(d)}], [:fill_style, lambda {|d| Rubyvis.color(d)}], :stroke_dasharray, :segmented, :interpolate, :eccentricity, :tension
     # Type of line
     def type
       "line"
@@ -146,7 +152,14 @@ module Rubyvis
 
     def self.defaults
       a=Rubyvis::Colors.category10()
-      Line.new.mark_extend(Mark.defaults).line_join('miter').line_width(1.5).stroke_style( lambda { a.scale(parent.index)}).interpolate('linear').eccentricity(0).tension(0.7)
+      Line.new.mark_extend(Mark.defaults).
+        line_join('miter').
+        line_width(1.5).
+        stroke_style( lambda { a.scale(parent.index)}).
+        stroke_dasharray('').
+        interpolate('linear').
+        eccentricity(0).
+        tension(0.7)
     end
   end
 end

data/lib/rubyvis/mark/rule.rb

@@ -6,7 +6,7 @@ module Rubyvis
   class Rule < Mark
     include LinePrototype
     @properties=Mark.properties.dup
-    attr_accessor_dsl :width, :height, :line_width, [:stroke_style, lambda {|d| Rubyvis.color(d)}]
+    attr_accessor_dsl :width, :height, :line_width, [:stroke_style, lambda {|d| Rubyvis.color(d)}], :stroke_dasharray
     def self.defaults
       Rule.new.mark_extend(Mark.defaults).line_width(1).stroke_style('black').antialias(false)
     end

data/lib/rubyvis/scale/log.rb

@@ -3,9 +3,9 @@ module Rubyvis
   class Scale::Log < Rubyvis::Scale::Quantitative
     def initialize(*args)
       super(*args)
+      raise(ArgumentError,"left side of domain should be >0") if(@d.first<=0)
       @b=nil
       @_p=nil
-      
       base(10)
     end
     def log(x)
@@ -37,7 +37,7 @@ module Rubyvis
       d = domain
       n = d[0] < 0
       subdivisions||=@b
-      span=@b.to_f/subdivisions
+      span=@b.to_f / subdivisions
      # puts "dom: #{d[0]} -> #{n}"
       
       i = (n ? -log(-d[0]) : log(d[0])).floor

data/lib/rubyvis/scene/svg_label.rb

@@ -41,7 +41,14 @@ module Rubyvis
           "fill-opacity"=> fill.opacity==0 ? nil : fill.opacity,
           "text-anchor"=> anchor
         }, {
-        "font"=> s.font, "text-shadow"=> s.text_shadow, "text-decoration"=> s.text_decoration})
+        "font"=> s.font, 
+        "font-family"=> s.font_family.nil? ? nil : s.font_family,
+        "font-style"=> s.font_style.nil? ? nil: s.font_style,
+        "font-variant"=> s.font_variant.nil? ? nil : s.font_variant,
+        "font-weight"=>  s.font_weight.nil? ? nil: s.font_weight,
+        "font-size"=>    s.font_size.nil? ? nil: s.font_size,
+        "text-shadow"=> s.text_shadow, 
+        "text-decoration"=> s.text_decoration})
         
         e.text=s.text.frozen? ? s.text.dup : s.text
 

data/lib/rubyvis/scene/svg_line.rb

@@ -43,6 +43,7 @@ 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_rule.rb

@@ -17,6 +17,7 @@ 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

@@ -8,7 +8,99 @@ 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, :layers, :orient, :offset, :order,:url, :image_width, :image_height, :image, :_id, :nodes, :round, :links, :padding_left, :padding_right, :padding_top, :padding_bottom, :mode, :group, :depth, :breadth, :spacing, :rows, :cols, :_grid,:bands, :background_style, :positive_style, :negative_style,:directed, :_matrix
+
+    ## ACCESSOR 
+    ## If you implement new accessor on a scene element
+    ## you should add it here
+    
+    attr_accessor :_g
+    attr_accessor :_grid
+    attr_accessor :_id
+    attr_accessor :_matrix
+    attr_accessor :angle
+    attr_accessor :antialias
+    attr_accessor :background_style
+    attr_accessor :bands
+    attr_accessor :bottom
+    attr_accessor :breadth
+    attr_accessor :canvas
+    attr_accessor :child_index
+    attr_accessor :children
+    attr_accessor :cols
+    attr_accessor :cursor
+    attr_accessor :data
+    attr_accessor :defs
+    attr_accessor :depth
+    attr_accessor :directed
+    attr_accessor :eccentricity
+    attr_accessor :end_angle
+    attr_accessor :events
+    attr_accessor :fill_style
+    attr_accessor :font
+    attr_accessor :font_family
+    attr_accessor :font_size
+    attr_accessor :font_style
+    attr_accessor :font_variant
+    attr_accessor :font_weight
+    attr_accessor :group
+    attr_accessor :height
+    attr_accessor :id
+    attr_accessor :image
+    attr_accessor :image_height
+    attr_accessor :image_width
+    attr_accessor :inner_radius
+    attr_accessor :interpolate
+    attr_accessor :layers
+    attr_accessor :left
+    attr_accessor :line_join
+    attr_accessor :line_width
+    attr_accessor :links
+    attr_accessor :mark
+    attr_accessor :mode
+    attr_accessor :name
+    attr_accessor :negative_style
+    attr_accessor :nodes
+    attr_accessor :offset
+    attr_accessor :order
+    attr_accessor :orient
+    attr_accessor :outer_radius
+    attr_accessor :overflow
+    attr_accessor :padding_bottom
+    attr_accessor :padding_left
+    attr_accessor :padding_right
+    attr_accessor :padding_top
+    attr_accessor :parent
+    attr_accessor :parent_index
+    attr_accessor :positive_style
+    attr_accessor :reverse
+    attr_accessor :right
+    attr_accessor :round
+    attr_accessor :rows
+    attr_accessor :segmented
+    attr_accessor :shape
+    attr_accessor :shape_angle
+    attr_accessor :shape_radius
+    attr_accessor :shape_size
+    attr_accessor :spacing
+    attr_accessor :start_angle
+    attr_accessor :stroke_dasharray
+    attr_accessor :stroke_style
+    attr_accessor :target
+    attr_accessor :tension
+    attr_accessor :text
+    attr_accessor :text_align
+    attr_accessor :text_angle
+    attr_accessor :text_baseline
+    attr_accessor :text_decoration
+    attr_accessor :text_margin
+    attr_accessor :text_shadow
+    attr_accessor :text_style
+    attr_accessor :title
+    attr_accessor :top
+    attr_accessor :transform
+    attr_accessor :type
+    attr_accessor :url
+    attr_accessor :width
     
     def []=(v,i)
       if v.is_a? Numeric

data/spec/area_spec.rb

@@ -1,8 +1,9 @@
+require File.expand_path(File.dirname(__FILE__)+"/../lib/rspec/expectations/differ.rb")
 require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 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_style, :tension, :title, :top, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    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
   end
   it "Rubyvis.Area be the same as Rubyvis::Area" do
@@ -140,4 +141,4 @@ top(5)
       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"
     end
   end
-end
+end

data/spec/label_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
   describe Rubyvis::Label do
   it "should have correct properties" do
-    props=[:antialias, :bottom, :cursor, :data, :events, :font, :id, :left, :reverse, :right, :text, :text_align, :text_angle, :text_baseline, :text_decoration, :text_margin, :text_shadow, :text_style, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :cursor, :data, :events, :font, :font_family, :font_style, :font_variant, :font_weight, :font_size, :id, :left, :reverse, :right, :text, :text_align, :text_angle, :text_baseline, :text_decoration, :text_margin, :text_shadow, :text_style, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
     
     Rubyvis::Label.properties.should==props
   end
@@ -18,24 +18,36 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
   context "on a Panel" do 
     before do
       #Rubyvis.clear_document
-    @h=100
-    @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}).add(pv.Label)
+      @h=100
+      @w=200
+      @vis = Rubyvis.Panel.new.width(@w).height(@h)
+      @bar=@vis.add(pv.Bar).data([1,2]).width(20).height(lambda {|d| d * 80}).bottom(0).left(lambda {self.index * 25})
+      @label=@bar.add(pv.Label)
     end
-    it "should bould propertly" do
+    it "should bould properly with font_size" do
+      @label.font_size('20px')
+      @vis.render
+      s=@vis.to_svg
+      doc=Nokogiri::XML(s)
+      #p doc.at_xpath("//xmlns:text")
+      doc.at_xpath("//xmlns:text").attributes['style'].value.should=='font-size:20px'
+    end
+    
+    it "should bould basic stuff properly " do
       @vis.render
       s=@vis.to_svg
       #p s
       #File.open("test.svg","w") {|f| f.puts s}
 
       doc=Nokogiri::XML(s)
+      #p doc.at_xpath("//xmlns:text")
       
       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    
+    end
+    
   end  
   
   
-end
+end

data/spec/line_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Line do
   include Rubyvis::GeneralSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :cursor, :data, :eccentricity, :events, :fill_style, :id, :interpolate, :left, :line_join, :line_width, :reverse, :right, :segmented, :stroke_style, :tension, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :cursor, :data, :eccentricity, :events, :fill_style, :id, :interpolate, :left, :line_join, :line_width, :reverse, :right, :segmented, :stroke_dasharray, :stroke_style, :tension, :title, :top, :visible].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Line.properties.should==props
   end
   it "should render correctly 'line_interpolation.html' example" do

data/spec/rule_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
 describe Rubyvis::Rule do
   include Rubyvis::GeneralSpec
   it "should have correct properties" do
-    props=[:antialias, :bottom, :cursor, :data, :events, :height,  :id, :left, :line_width, :reverse, :right, :stroke_style, :title, :top, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
+    props=[:antialias, :bottom, :cursor, :data, :events, :height,  :id, :left, :line_width, :reverse, :right, :stroke_style, :stroke_dasharray, :title, :top, :visible, :width].inject({}) {|ac, v| ac[v]=true; ac}
     Rubyvis::Rule.properties.should==props
   end
   it "Rubyvis.Rule be the same as Rubyvis::Rule" do
@@ -30,4 +30,4 @@ describe Rubyvis::Rule do
     vis.to_svg.should have_same_svg_elements(pv_out)
   end  
   
-end
+end

data/spec/scale_log_spec.rb

@@ -96,6 +96,12 @@ describe Rubyvis::Scale::Log 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 return :ArgumentError on domain that includes 0 or less" do
+    h=280
+    h_dom=1000
+    expect {Rubyvis.Scale.log(-1, @h_dom)}.to raise_error(ArgumentError)
+    
+  end
   it "should returns correct ticks with subdivisions" do
     t=1,5,10,50,100,500,1000
     @y.ticks(2).should==t
@@ -111,4 +117,4 @@ describe Rubyvis::Scale::Log do
     @y.nice
     @y.domain().should==[0.1,1]
   end  
-end
+end

data/web/examples.haml

@@ -1,6 +1,7 @@
 !!!
 %html
   %head
+    %meta{"http-equiv"=>"Content-Type", :content=>"text/html", :charset=>"UTF-8"}
     %link{:type=>"text/css", :rel=>"stylesheet", :href=>"../style.css"}
     %title="Rubyvis - Example: #{title}"
   %body

data/web/index.haml

@@ -1,6 +1,7 @@
 !!!
 %html
   %head
+    %meta{"http-equiv"=>"Content-Type", :content=>"text/html", :charset=>"UTF-8"}  
     %link{:type=>"text/css", :rel=>"stylesheet", :href=>"style.css"}
     %title Rubyvis: Ruby version of Protovis
   %body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyvis
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 description: Ruby port of Protovis[http://vis.stanford.edu/protovis/], a Javascript
   visualization toolkit.
 email:
@@ -242,6 +242,8 @@ files:
 - lib/rubyvis/sceneelement.rb
 - lib/rubyvis/transform.rb
 - lib/rubyvis/vector.rb
+- lib/rspec/expectations/differ.rb
+- lib/rspec/expectations/differ_spec.rb
 - spec/anchor_spec.rb
 - spec/area_spec.rb
 - spec/bar_spec.rb