Merge pull request #747 from nesquena/chore/update-to-rr-3

Chore/update to rr 3

rabl.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency 'riot',     '~> 0.12.3'
-  s.add_development_dependency 'rr',       '~> 1.0.2'
+  s.add_development_dependency 'rr'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'tilt'
   s.add_development_dependency 'oj'

test/builder_test.rb

@@ -255,7 +255,7 @@
       b = builder nil, :glue => [{ :data => @user, :options => {}, :block => lambda { |u| attribute :name }}]
       e = Rabl::Engine.new('')
       mock(e).render.returns({:user => 'xyz'})
-      mock(b).object_to_engine(@user, { :root => false }).returns(e).subject
+      mock(b).object_to_engine(@user, :root => false).returns(e).subject
       b.to_hash(@user)
     end.equivalent_to({ :user => 'xyz' })
 
@@ -268,7 +268,7 @@
       b = builder nil, :glue => [{ :data => @user, :options => {}, :block => lambda { |u| attribute :name }}]
       e = Rabl::Engine.new('')
       mock(e).render.returns({})
-      mock(b).object_to_engine(@user,{ :root => false }).returns(e).subject
+      mock(b).object_to_engine(@user, :root => false).returns(e).subject
       b.to_hash(@user)
     end.equals({})
   end

test/engine_test.rb

@@ -475,7 +475,7 @@
 
         any_instance_of(Rabl::Engine) do |b|
           mock(b).fetch_source("foo/bar", :view_path => nil).once
-          mock(b).object_to_engine(@user, :locals => { :foo => "bar" }, :source => nil, :source_location => nil, :template => 'foo/bar').returns(e)
+          mock(b).object_to_engine(@user, { :locals => { :foo => "bar" }, :source => nil, :source_location => nil, :template => 'foo/bar' }).returns(e)
         end
         JSON.parse(template.render(scope))
       end.equals JSON.parse("{ \"foo\" : {\"name\":\"leo\",\"city\":\"LA\",\"age\":12} }")