roda 2.29.0 → 3.0.0

data/spec/plugin/heartbeat_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "heartbeat plugin" do 
   it "should return heartbeat response for heartbeat paths only" do

data/spec/plugin/hooks_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "hooks plugin" do 
   before do

data/spec/plugin/indifferent_params_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "indifferent_params plugin" do 
   it "allows indifferent access to request params via params method" do

data/spec/plugin/json_parser_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "json_parser plugin" do 
   before do
@@ -69,4 +69,15 @@ describe "json_parser plugin" do
     end
     body('rack.input'=>StringIO.new('{}'), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal '{}:/'
   end
+
+  it "supports resetting :include_request option to false" do
+    app(:bare) do
+      plugin :json_parser, :include_request => true
+      plugin :json_parser, :include_request => false
+      route do |r|
+        r.params['a']['b'].to_s
+      end
+    end
+    body('rack.input'=>StringIO.new('{"a":{"b":1}}'), 'CONTENT_TYPE'=>'text/json', 'REQUEST_METHOD'=>'POST').must_equal '1'
+  end
 end

data/spec/plugin/json_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "json plugin" do
   before do
@@ -69,6 +69,13 @@ describe "json plugin" do
     body("/hash").must_equal 'b:/hash'
   end
 
+  it "should allow resetting :include_request to false" do
+    app.plugin :json, :include_request => true
+    app.plugin :json, :include_request => false
+
+    body("/hash").must_equal '{"a":"b"}'
+  end
+
   it "should allow custom content type for a response" do
     app.plugin :json, :content_type => "application/xml"
     header('Content-Type', "/array").must_equal 'application/xml'

data/spec/plugin/mailer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'mail'

data/spec/plugin/match_affix_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "match_affix plugin" do 
   it "allows changing the match prefix/suffix" do

data/spec/plugin/middleware_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "middleware plugin" do 
   it "turns Roda app into middlware" do
@@ -57,6 +57,20 @@ describe "middleware plugin" do
     body.must_equal 'a'
   end
 
+  it "makes middleware always use a subclass of the app" do
+    app(:middleware) do |r|
+      r.get{opts[:a]}
+    end
+    app.opts[:a] = 'a'
+    a = app
+    app(:bare) do
+      use a
+      route{}
+    end
+    a.opts[:a] = 'b'
+    body.must_equal 'a'
+  end
+
   it "should raise error if attempting to use options for Roda application that does not support configurable middleware" do
     a1 = app(:bare){plugin :middleware}
     proc{app(:bare){use a1, :foo; route{}; build_rack_app}}.must_raise Roda::RodaError

data/spec/plugin/module_include_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "module_include plugin" do 
   it "must_include given module in request or response class" do

data/spec/plugin/multi_route_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "multi_route plugin" do 
   before do
@@ -171,12 +171,14 @@ describe "multi_route plugin" do
 end
 
 describe "multi_route plugin" do
-  deprecated "r.multi_route works even without routes defined" do
+  it "r.multi_route raises error for invalid namespace" do
     app(:multi_route) do |r|
+      r.is('a'){r.multi_route('foo')}
       r.multi_route
       'a'
     end
-    body.must_equal 'a'
+    proc{body}.must_raise Roda::RodaError
+    proc{body('/a')}.must_raise Roda::RodaError
   end
 end
 

data/spec/plugin/multi_run_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "multi_run plugin" do 
   it "adds Roda.run method for setting up prefix delegations to other rack apps" do

data/spec/plugin/multi_view_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'

data/spec/plugin/named_templates_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'

data/spec/plugin/not_allowed_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "not_allowed plugin" do 
   it "skips the current block if pass is called" do

data/spec/plugin/not_found_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "not_found plugin" do 
   it "executes on no arguments" do

data/spec/plugin/optimized_string_matchers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "optimized_string_matchers plugin" do 
   it "should support on_branch and is_exactly match methods" do

data/spec/plugin/padrino_render_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'

data/spec/plugin/param_matchers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "param_matchers plugin" do 
   it "param! matcher should yield a param only if given and not empty" do

data/spec/plugin/params_capturing_spec.rb

@@ -1,26 +1,26 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "params_capturing plugin" do 
   it "should add captures to r.params for symbol matchers" do
     app(:params_capturing) do |r|
       r.on('foo', :y, :z, :w) do |y, z, w|
-        (r.params.values_at('y', 'z', 'w') + [y, z, w, r[:captures].length]).join('-')
+        (r.params.values_at('y', 'z', 'w') + [y, z, w, r.params['captures'].length]).join('-')
       end
 
       r.on(/(quux)/, /(foo)(bar)/) do |q, foo, bar|
-        "y-#{r[:captures].join}-#{q}-#{foo}-#{bar}"
+        "y-#{r.params['captures'].join}-#{q}-#{foo}-#{bar}"
       end
 
       r.on(/(quux)/, :y) do |q, y|
         r.on(:x) do |x|
-          "y-#{r[:y]}-#{r[:x]}-#{q}-#{y}-#{x}-#{r[:captures].length}"
+          "y-#{r.params['y']}-#{r.params['x']}-#{q}-#{y}-#{x}-#{r.params['captures'].length}"
         end
 
-        "y-#{r[:y]}-#{q}-#{y}-#{r[:captures].length}"
+        "y-#{r.params['y']}-#{q}-#{y}-#{r.params['captures'].length}"
       end
 
       r.on(:x) do |x|
-        "x-#{x}-#{r[:x]}-#{r[:captures].length}"
+        "x-#{x}-#{r.params['x']}-#{r.params['captures'].length}"
       end
     end
 
@@ -30,20 +30,4 @@ describe "params_capturing plugin" do
     body('/quux/asdf', 'rack.input'=>StringIO.new).must_equal 'y--quux-asdf-2'
     body('/quux/asdf/890', 'rack.input'=>StringIO.new).must_equal 'y--890-quux-asdf-890-3'
   end
-
-  deprecated "should add captures to r.params for string matchers" do
-    app(:params_capturing) do |r|
-      r.on("bar/:foo") do |foo|
-        "b-#{foo}-#{r[:foo]}-#{r[:captures].length}"
-      end
-
-      r.on("baz/:bar", :foo) do |bar, foo|
-        "b-#{bar}-#{foo}-#{r[:bar]}-#{r[:foo]}-#{r[:captures].length}"
-      end
-    end
-    app.opts[:verbatim_string_matcher] = false
-
-    body('/bar/banana', 'rack.input'=>StringIO.new).must_equal 'b-banana-banana-1'
-    body('/baz/ban/ana', 'rack.input'=>StringIO.new).must_equal 'b-ban-ana-ban-ana-2'
-  end
 end

data/spec/plugin/partials_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'

data/spec/plugin/pass_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "pass plugin" do 
   it "skips the current block if pass is called" do

data/spec/plugin/path_matchers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "path_matchers plugin" do 
   it ":extension matcher should match given file extension" do

data/spec/plugin/path_rewriter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "path_rewriter plugin" do 
   it "allows rewriting remaining path or PATH_INFO" do

data/spec/plugin/path_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "path plugin" do 
   def path_app(*args, &block)

data/spec/plugin/placeholder_string_matchers_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "placeholder_string_matchers plugin" do
   it "should handle string with embedded param" do
@@ -57,11 +57,11 @@ describe "placeholder_string_matchers plugin" do
 
       route do |r|
         r.on("bar/:foo") do |foo|
-          "b-#{foo}-#{r[:foo]}-#{r[:captures].length}"
+          "b-#{foo}-#{r.params['foo']}-#{r.params['captures'].length}"
         end
 
         r.on("baz/:bar", :foo) do |bar, foo|
-          "b-#{bar}-#{foo}-#{r[:bar]}-#{r[:foo]}-#{r[:captures].length}"
+          "b-#{bar}-#{foo}-#{r.params['bar']}-#{r.params['foo']}-#{r.params['captures'].length}"
         end
       end
     end
@@ -123,37 +123,4 @@ describe "placeholder_string_matchers plugin" do
     body('/thing/q').must_equal 'thingq'
     body('/thing2/q').must_equal 'thing2q'
   end
-
-  deprecated "works with symbol_matchers plugin and deprecated matchers" do
-    app(:bare) do
-      plugin :placeholder_string_matchers
-      plugin :symbol_matchers
-      symbol_matcher(:f, /(f+)/)
-
-      route do |r|
-        r.is "foo:optd" do |o|
-          "foo#{o.inspect}"
-        end
-
-        r.is "bar:opt" do |o|
-          "bar#{o.inspect}"
-        end
-
-        r.is "format:format" do |f|
-          "format#{f.inspect}"
-        end
-      end
-    end
-
-    body("/foo").must_equal 'foonil'
-    body("/foo/123").must_equal 'foo"123"'
-    status("/foo/bar").must_equal 404
-    status("/foo/123/a").must_equal 404
-    body("/bar").must_equal 'barnil'
-    body("/bar/foo").must_equal 'bar"foo"'
-    status("/bar/foo/baz").must_equal 404
-    body("/format").must_equal 'formatnil'
-    body("/format.json").must_equal 'format"json"'
-    status("/format.").must_equal 404
-  end
 end

data/spec/plugin/precompile_templates_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'
@@ -39,22 +39,6 @@ describe "precompile_templates plugin" do
     body.strip.must_equal '<h1>1</h1>'
   end
 
-  it "adds support for template precompilation with sorting :locals" do
-    app(:bare) do
-      plugin :render, :views=>'spec/views'
-      plugin :precompile_templates, :sort_locals=>true
-      route do |r|
-        render('home', :locals=>{:name => "Agent Smith", :title => "Home"})
-      end
-    end
-
-    app.render_opts[:cache][File.expand_path('spec/views/home.erb')].must_be_nil
-    app.precompile_templates 'spec/views/h*.erb', :locals=>[:title, :name]
-    app.render_opts[:cache][File.expand_path('spec/views/home.erb')].wont_equal nil
-    app.render_opts[:cache][File.expand_path('spec/views/home.erb')].instance_variable_get(:@compiled_method)[[:name, :title]].wont_equal nil
-    body.strip.must_equal "<h1>Home</h1>\n<p>Hello Agent Smith</p>"
-  end
-
   it "adds support for template precompilation with :inline" do
     app(:bare) do
       plugin :render, :views=>'spec/views'

data/spec/plugin/public_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 describe "public plugin" do 
   it "adds r.public for serving static files from public folder" do
@@ -48,13 +48,12 @@ describe "public plugin" do
     body('/about.erb').must_equal File.read('spec/views/about.erb')
     header('Content-Encoding', '/about.erb').must_be_nil
 
-    meth = RUBY_VERSION >= '1.9' ? :binread : :read
-    body('/about/_test.erb', 'HTTP_ACCEPT_ENCODING'=>'deflate, gzip').must_equal File.send(meth, 'spec/views/about/_test.erb.gz')
+    body('/about/_test.erb', 'HTTP_ACCEPT_ENCODING'=>'deflate, gzip').must_equal File.binread('spec/views/about/_test.erb.gz')
     h = req('/about/_test.erb', 'HTTP_ACCEPT_ENCODING'=>'deflate, gzip')[1]
     h['Content-Encoding'].must_equal 'gzip'
     h['Content-Type'].must_equal 'text/plain'
 
-    body('/about/_test.css', 'HTTP_ACCEPT_ENCODING'=>'deflate, gzip').must_equal File.send(meth, 'spec/views/about/_test.css.gz')
+    body('/about/_test.css', 'HTTP_ACCEPT_ENCODING'=>'deflate, gzip').must_equal File.binread('spec/views/about/_test.css.gz')
     h = req('/about/_test.css', 'HTTP_ACCEPT_ENCODING'=>'deflate, gzip')[1]
     h['Content-Encoding'].must_equal 'gzip'
     h['Content-Type'].must_equal 'text/css'

data/spec/plugin/render_each_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'

data/spec/plugin/render_locals_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'

data/spec/plugin/render_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+require_relative "../spec_helper"
 
 begin
   require 'tilt/erb'
@@ -50,13 +50,6 @@ describe "render plugin" do
     body("/inline").strip.must_equal "Hello <%= name %>"
   end
 
-  deprecated "with str as ext" do
-    app.plugin :render, :ext => "str"
-    body("/about").strip.must_equal "<h1>About Roda</h1>"
-    body("/home").strip.must_equal "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
-    body("/inline").strip.must_equal "Hello <%= name %>" 
-  end
-
   it "custom default layout support" do
     app.plugin :render, :layout => "layout-alternative"
     body("/home").strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
@@ -68,30 +61,6 @@ describe "render plugin" do
   end
 end
 
-describe "render plugin with :layout_opts=>{:merge_locals=>true}" do
-  deprecated "should choose method opts before plugin opts, and layout specific before locals" do
-    app(:bare) do
-      plugin :render, :views=>"./spec/views", :check_paths=>true, :locals=>{:a=>1, :b=>2, :c=>3, :d=>4, :e=>5}, :layout_opts=>{:inline=>'<%= a %>|<%= b %>|<%= c %>|<%= d %>|<%= e %>|<%= f %>|<%= yield %>', :merge_locals=>true, :locals=>{:a=>-1, :f=>6}}
-
-      route do |r|
-        r.on "base" do
-          view(:inline=>'(<%= a %>|<%= b %>|<%= c %>|<%= d %>|<%= e %>)')
-        end
-        r.on "override" do
-          view(:inline=>'(<%= a %>|<%= b %>|<%= c %>|<%= d %>|<%= e %>)', :locals=>{:b=>-2, :d=>-4, :f=>-6}, :layout_opts=>{:locals=>{:d=>0, :c=>-3, :e=>-5}})
-        end
-        r.on "no_merge" do
-          view(:inline=>'(<%= a %>|<%= b %>|<%= c %>|<%= d %>|<%= e %>)', :locals=>{:b=>-2, :d=>-4, :f=>-6}, :layout_opts=>{:merge_locals=>false, :locals=>{:d=>0, :c=>-3, :e=>-5}})
-        end
-      end
-    end
-
-    body("/base").must_equal '-1|2|3|4|5|6|(1|2|3|4|5)'
-    body("/override").must_equal '-1|-2|-3|0|-5|-6|(1|-2|3|-4|5)'
-    body("/no_merge").must_equal '-1|2|-3|0|-5|6|(1|-2|3|-4|5)'
-  end
-end
-
 describe "render plugin" do
   it "simple layout support" do
     app(:bare) do
@@ -144,21 +113,9 @@ describe "render plugin" do
     body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
   end
 
-  deprecated "locals overrides" do
+  it ":layout=>true/false/string/hash/not-present respects plugin layout switch and template" do
     app(:bare) do
-      plugin :render, :views=>"./spec/views", :locals=>{:title=>'Home', :b=>'B'}, :layout_opts=>{:template=>'multiple-layout', :locals=>{:title=>'Roda', :a=>'A'}}
-      
-      route do |r|
-        view("multiple", :locals=>{:b=>"BB"}, :layout_opts=>{:locals=>{:a=>'AA'}})
-      end
-    end
-
-    body.strip.must_equal "Roda:AA::Home:BB"
-  end
-
-  deprecated ":layout=>true/false/string/hash/not-present respects plugin layout switch and template" do
-    app(:bare) do
-      plugin :render, :views=>"./spec/views", :layout_opts=>{:template=>'layout-yield', :locals=>{:title=>'a'}}
+      plugin :render, :views=>"./spec/views", :layout_opts=>{:template=>'layout-yield'}
       
       route do |r|
         opts = {:content=>'bar'}
@@ -166,6 +123,7 @@ describe "render plugin" do
         opts[:layout] = false if r.path == '/f'
         opts[:layout] = 'layout' if r.path == '/s'
         opts[:layout] = {:template=>'layout'} if r.path == '/h'
+        opts[:layout_opts] = {:locals=>{:title=>'a'}}
         view(opts)
       end
     end
@@ -373,24 +331,24 @@ describe "render plugin" do
     app.render_opts[:explicit_cache].must_equal false
   end
 
-  deprecated "Support :cache=>false plugin option to disable template caching, even when :cache=>true method option is given" do
+  it "Support :cache=>false plugin option to disable template caching by default, except :cache=>true method option is given" do
     app(:bare) do
       plugin :render, :views=>"./spec/views", :cache=>false
 
       route do |r|
         @a = 'a'
-        r.is('a'){render('iv', :cache=>false)}
-        r.is('b'){render('iv', :cache=>true)}
-        render('iv')
+        r.is('a'){render('iv', :cache=>false, :cache_key=>:a)}
+        r.is('b'){render('iv', :cache=>true, :cache_key=>:a)}
+        render('iv', :cache_key=>:a)
       end
     end
 
     body('/a').strip.must_equal "a"
-    app.render_opts[:cache].must_equal false
+    app.render_opts[:cache][:a].must_be_nil
     body('/b').strip.must_equal "a"
-    app.render_opts[:cache].must_equal false
+    app.render_opts[:cache][:a].wont_be_nil
     body('/c').strip.must_equal "a"
-    app.render_opts[:cache].must_equal false
+    app.render_opts[:cache][:a].wont_be_nil
   end
 
   it "Support :cache=>false option to disable template caching" do
@@ -519,20 +477,17 @@ describe "render plugin" do
     body.must_equal "1-2"
   end
 
-  it "should dup render_opts when subclasses, including an empty cache" do
+  it "should dup render_opts when subclassing" do
     c = Class.new(Roda)
-    c.plugin :render
-    c.render_opts[:cache][:foo] = 1
+    c.plugin :render, :foo=>:bar
     sc = Class.new(c)
-
     c.render_opts.wont_be_same_as(sc.render_opts)
-    c.render_opts[:cache].wont_be_same_as(sc.render_opts[:cache])
-    sc.render_opts[:cache][:foo].must_be_nil
+    c.render_opts[:foo].must_equal :bar
   end
 
-  it "should use a copy of superclass's cache when inheriting if :inherit_cache option is used" do
+  it "should use a copy of superclass's cache when subclassing" do
     c = Class.new(Roda)
-    c.plugin :render, :inherit_cache=>true
+    c.plugin :render
     c.render_opts[:cache][:foo] = 1
     sc = Class.new(c)
 
@@ -545,13 +500,17 @@ describe "render plugin" do
     c = Class.new(Roda)
     c.plugin :render
     cache = c.render_opts[:cache]
+    c.render_opts[:explicit_cache].must_equal false
     c.plugin :render
     c.render_opts[:cache].must_be_same_as cache
+    c.render_opts[:explicit_cache].must_equal false
 
     c.plugin :render, :cache=>false
-    c.render_opts[:cache].must_equal false
+    c.render_opts[:cache].must_be_same_as cache
+    c.render_opts[:explicit_cache].must_equal true
     c.plugin :render
-    c.render_opts[:cache].must_equal false
+    c.render_opts[:cache].must_be_same_as cache
+    c.render_opts[:explicit_cache].must_equal true
   end
 
   it "render plugin call should not override existing options" do
@@ -561,18 +520,17 @@ describe "render plugin" do
     c.render_opts[:layout].must_equal :foo
   end
 
-  it "should not use cache in subclass if caching disabled in superclass" do
+  it "should not use cache by default in subclass if not caching by default in superclass" do
     app(:bare) do
       plugin :render, :views=>"./spec/views", :cache=>false
       
       route do |r|
-        view(:inline=>"Hello <%= name %>: <%= render_opts[:cache] %>", :locals=>{:name => "Agent Smith"}, :layout=>nil)
+        view(:inline=>"Hello <%= name %>", :cache_key=>:a, :locals=>{:name => "Agent Smith"}, :layout=>nil)
       end
     end
 
-    body("/inline").strip.must_equal "Hello Agent Smith: false"
-
-    Class.new(app).render_opts[:cache].must_equal false
+    body("/inline").strip.must_equal "Hello Agent Smith"
+    Class.new(app).render_opts[:cache][:a].must_be_nil
   end
 
   it "with :check_paths=>true plugin option used" do
@@ -630,50 +588,6 @@ describe "render plugin" do
     req("/c")
   end
 
-  deprecated "with :check_paths plugin option not set" do
-    render_opts = {}
-    app(:bare) do
-      plugin :render, :views=>"./spec/views"
-      
-      route do |r|
-        r.get 'a' do
-          render("a", render_opts)
-        end
-
-        r.get 'c' do
-          render("about/_test", :locals=>{:title=>'a'})
-        end
-
-        render("b", render_opts)
-      end
-    end
-
-    body.strip.must_equal "b"
-    body("/a").strip.must_equal 'a'
-    body("/c").strip.must_equal "<h1>Subdir: a</h1>"
-
-    app.plugin :render, :allowed_paths=>[]
-    body.strip.must_equal "b"
-    body("/a").strip.must_equal 'a'
-    body("/c").strip.must_equal "<h1>Subdir: a</h1>"
-
-    app.plugin :render, :allowed_paths=>['spec/views/about']
-    body.strip.must_equal "b"
-    body("/a").strip.must_equal 'a'
-    body("/c").strip.must_equal "<h1>Subdir: a</h1>"
-
-    app.plugin :render, :allowed_paths=>%w'spec/views/about spec/views/b'
-    body.strip.must_equal "b"
-    body("/a").strip.must_equal 'a'
-    body("/c").strip.must_equal "<h1>Subdir: a</h1>"
-
-    render_opts[:check_paths] = true
-    app.plugin :render, :check_paths=>false
-    body.strip.must_equal "b"
-    proc{req("/a")}.must_raise Roda::RodaError
-    body("/c").strip.must_equal "<h1>Subdir: a</h1>"
-  end
-
   it "with a cache_class set" do
     app(:bare) do
       test_cache = Class.new(Roda::RodaCache) do
@@ -706,9 +620,9 @@ begin
   require 'tilt'
   require 'tilt/erubi'
 rescue LoadError
-  warn "tilt 2 or erubi not installed, skipping render :escape=>:erubi test"  
+  warn "tilt 2 or erubi not installed, skipping render :escape=>true test"  
 else
-describe "_erubis_escaping plugin" do
+describe ":render plugin :escape option" do
   before do
     if defined?(Tilt::ErubiTemplate) && ::Tilt['erb'] != Tilt::ErubiTemplate
       # Set erubi as default erb template handler