roda 2.2.0 → 2.3.0

data/spec/plugin/render_each_spec.rb

@@ -32,10 +32,10 @@ describe "render_each plugin" do
       end
     end
 
-    body.should == 'rfoo1 rfoo2 rfoo3 '
-    body("/a").should == 'rbar14 rbar24 rbar34 '
-    body("/b").should == 'rbar rbar rbar '
-    body("/c").should == 'rbar41 rbar42 rbar43 '
+    body.must_equal 'rfoo1 rfoo2 rfoo3 '
+    body("/a").must_equal 'rbar14 rbar24 rbar34 '
+    body("/b").must_equal 'rbar rbar rbar '
+    body("/c").must_equal 'rbar41 rbar42 rbar43 '
   end
 end
 end

data/spec/plugin/render_spec.rb

@@ -36,35 +36,35 @@ describe "render plugin" do
   end
 
   it "default actions" do
-    body("/about").strip.should == "<h1>About Roda</h1>"
-    body("/home").strip.should == "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
-    body("/inline").strip.should == "Hello Agent Smith"
-    body("/path").strip.should == "<h1>Path</h1>"
-    body("/content").strip.should == "<title>Roda: Home</title>\nbar"
+    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 Agent Smith"
+    body("/path").strip.must_equal "<h1>Path</h1>"
+    body("/content").strip.must_equal "<title>Roda: Home</title>\nbar"
   end
 
   it "with str as engine" do
     app.plugin :render, :engine => "str"
-    body("/about").strip.should == "<h1>About Roda</h1>"
-    body("/home").strip.should == "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
-    body("/inline").strip.should == "Hello <%= name %>"
+    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 "with str as ext" do
     app.plugin :render, :ext => "str"
-    body("/about").strip.should == "<h1>About Roda</h1>"
-    body("/home").strip.should == "<title>Roda: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
-    body("/inline").strip.should == "Hello Agent Smith"
+    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.should == "<title>Alternative Layout: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
+    body("/home").strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
   end
 
   it "using hash for :layout" do
     app.plugin :render, :layout => {:inline=> 'a<%= yield %>b'}
-    body("/home").strip.should == "a<h1>Home</h1>\n<p>Hello Agent Smith</p>\nb"
+    body("/home").strip.must_equal "a<h1>Home</h1>\n<p>Hello Agent Smith</p>\nb"
   end
 end
 
@@ -80,7 +80,7 @@ describe "render plugin" do
       end
     end
 
-    body.gsub(/\n+/, "\n").should == "Header\nThis is the actual content.\nFooter\n"
+    body.gsub(/\n+/, "\n").must_equal "Header\nThis is the actual content.\nFooter\n"
   end
 
   it "views without default layouts" do
@@ -92,7 +92,7 @@ describe "render plugin" do
       end
     end
 
-    body.strip.should == "<h1>Home</h1>\n<p>Hello Agent Smith</p>"
+    body.strip.must_equal "<h1>Home</h1>\n<p>Hello Agent Smith</p>"
   end
 
   it "layout overrides" do
@@ -104,7 +104,7 @@ describe "render plugin" do
       end
     end
 
-    body.strip.should == "<title>Alternative Layout: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
+    body.strip.must_equal "<title>Alternative Layout: Home</title>\n<h1>Home</h1>\n<p>Hello Agent Smith</p>"
   end
 
   it "locals overrides" do
@@ -116,7 +116,7 @@ describe "render plugin" do
       end
     end
 
-    body.strip.should == "Roda:AA::Home:BB"
+    body.strip.must_equal "Roda:AA::Home:BB"
   end
 
   it ":layout=>true/false/string/hash/not-present respects plugin layout switch and template" do
@@ -133,73 +133,73 @@ describe "render plugin" do
       end
     end
 
-    body.gsub("\n", '').should == "HeaderbarFooter"
-    body('/a').gsub("\n", '').should == "HeaderbarFooter"
-    body('/f').gsub("\n", '').should == "bar"
-    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
-    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body.gsub("\n", '').must_equal "HeaderbarFooter"
+    body('/a').gsub("\n", '').must_equal "HeaderbarFooter"
+    body('/f').gsub("\n", '').must_equal "bar"
+    body('/s').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
 
     app.plugin :render
-    body.gsub("\n", '').should == "HeaderbarFooter"
-    body('/a').gsub("\n", '').should == "HeaderbarFooter"
-    body('/f').gsub("\n", '').should == "bar"
-    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
-    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body.gsub("\n", '').must_equal "HeaderbarFooter"
+    body('/a').gsub("\n", '').must_equal "HeaderbarFooter"
+    body('/f').gsub("\n", '').must_equal "bar"
+    body('/s').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
 
     app.plugin :render, :layout=>true
-    body.gsub("\n", '').should == "HeaderbarFooter"
-    body('/a').gsub("\n", '').should == "HeaderbarFooter"
-    body('/f').gsub("\n", '').should == "bar"
-    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
-    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body.gsub("\n", '').must_equal "HeaderbarFooter"
+    body('/a').gsub("\n", '').must_equal "HeaderbarFooter"
+    body('/f').gsub("\n", '').must_equal "bar"
+    body('/s').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
 
     app.plugin :render, :layout=>'layout-alternative'
-    body.gsub("\n", '').should == "<title>Alternative Layout: a</title>bar"
-    body('/a').gsub("\n", '').should == "<title>Alternative Layout: a</title>bar"
-    body('/f').gsub("\n", '').should == "bar"
-    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
-    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body.gsub("\n", '').must_equal "<title>Alternative Layout: a</title>bar"
+    body('/a').gsub("\n", '').must_equal "<title>Alternative Layout: a</title>bar"
+    body('/f').gsub("\n", '').must_equal "bar"
+    body('/s').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
 
     app.plugin :render, :layout=>nil
-    body.gsub("\n", '').should == "HeaderbarFooter"
-    body('/a').gsub("\n", '').should == "bar"
-    body('/f').gsub("\n", '').should == "bar"
-    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
-    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body.gsub("\n", '').must_equal "HeaderbarFooter"
+    body('/a').gsub("\n", '').must_equal "bar"
+    body('/f').gsub("\n", '').must_equal "bar"
+    body('/s').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
 
     app.plugin :render, :layout=>false
-    body.gsub("\n", '').should == "HeaderbarFooter"
-    body('/a').gsub("\n", '').should == "bar"
-    body('/f').gsub("\n", '').should == "bar"
-    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
-    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body.gsub("\n", '').must_equal "HeaderbarFooter"
+    body('/a').gsub("\n", '').must_equal "bar"
+    body('/f').gsub("\n", '').must_equal "bar"
+    body('/s').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
 
     app.plugin :render, :layout_opts=>{:template=>'layout-alternative', :locals=>{:title=>'a'}}
-    body.gsub("\n", '').should == "<title>Alternative Layout: a</title>bar"
-    body('/a').gsub("\n", '').should == "bar"
-    body('/f').gsub("\n", '').should == "bar"
-    body('/s').gsub("\n", '').should == "<title>Roda: a</title>bar"
-    body('/h').gsub("\n", '').should == "<title>Roda: a</title>bar"
+    body.gsub("\n", '').must_equal "<title>Alternative Layout: a</title>bar"
+    body('/a').gsub("\n", '').must_equal "bar"
+    body('/f').gsub("\n", '').must_equal "bar"
+    body('/s').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
+    body('/h').gsub("\n", '').must_equal "<title>Roda: a</title>bar"
   end
 
   it "app :root option affects :views default" do
     app
     app.plugin :render
-    app.render_opts[:views].should == File.join(Dir.pwd, 'views')
+    app.render_opts[:views].must_equal File.join(Dir.pwd, 'views')
 
     app.opts[:root] = '/foo'
     app.plugin :render
-    app.render_opts[:views].should == '/foo/views'
+    app.render_opts[:views].must_equal '/foo/views'
 
     app.opts[:root] = '/foo/bar'
     app.plugin :render
-    app.render_opts[:views].should == '/foo/bar/views'
+    app.render_opts[:views].must_equal '/foo/bar/views'
 
     app.opts[:root] = nil
     app.plugin :render
-    app.render_opts[:views].should == File.join(Dir.pwd, 'views')
+    app.render_opts[:views].must_equal File.join(Dir.pwd, 'views')
     app.plugin :render, :views=>'bar'
-    app.render_opts[:views].should == File.join(Dir.pwd, 'bar')
+    app.render_opts[:views].must_equal File.join(Dir.pwd, 'bar')
   end
 
   it "inline layouts and inline views" do
@@ -207,7 +207,7 @@ describe "render plugin" do
       view({:inline=>'bar'}, :layout=>{:inline=>'Foo: <%= yield %>'})
     end
 
-    body.strip.should == "Foo: bar"
+    body.strip.must_equal "Foo: bar"
   end
 
   it "inline renders with opts" do
@@ -215,7 +215,7 @@ describe "render plugin" do
       render({:inline=>'<%= bar %>'}, {:engine=>'str'})
     end
 
-    body.strip.should == '<%= bar %>'
+    body.strip.must_equal '<%= bar %>'
   end
 
   it "template renders with :template opts" do
@@ -225,7 +225,7 @@ describe "render plugin" do
         render(:template=>"about", :locals=>{:title => "About Roda"})
       end
     end
-    body.strip.should == "<h1>About Roda</h1>"
+    body.strip.must_equal "<h1>About Roda</h1>"
   end
 
   it "template renders with :template_class opts" do
@@ -233,7 +233,22 @@ describe "render plugin" do
       @a = 1
       render(:inline=>'i#{@a}', :template_class=>::Tilt[:str])
     end
-    body.should == "i1"
+    body.must_equal "i1"
+  end
+
+  it "can specify engine-specific options via :engine_opts" do
+    app(:bare) do
+      plugin :render, :engine_opts=>{'a.erb'=>{:outvar=>'@a'}}
+      route do |r|
+        r.is('a') do
+          render(:inline=>'<%= @a.class.name %>', :engine=>'a.erb')
+        end
+        render(:inline=>'<%= @a.class.name %>')
+      end
+    end
+
+    body('/a').must_equal "String"
+    body.must_equal "NilClass"
   end
 
   it "template cache respects :template_opts" do
@@ -256,32 +271,120 @@ describe "render plugin" do
       end
     end
 
-    body('/a').should == "i-a"
-    body('/b').should == "i-b"
+    body('/a').must_equal "i-a"
+    body('/b').must_equal "i-b"
   end
 
-  it "template cache respects :template_opts" do
+  it "template cache respects :template_block" do
     c = Class.new do 
-      def initialize(path, _, opts)
+      def initialize(path, *, &block)
         @path = path
-        @opts = opts
+        @block = block
       end
       def render(*)
-        "#{@path}-#{@opts[:foo]}"
+        "#{@path}-#{@block.call}"
+      end
+    end 
+
+    proca = proc{'a'}
+    procb = proc{'b'}
+
+    app(:render) do |r|
+      r.is "a" do
+        render(:path=>"i", :template_class=>c, :template_block=>proca)
+      end
+      r.is "b" do
+        render(:path=>"i", :template_class=>c, :template_block=>procb)
       end
     end
 
+    body('/a').must_equal "i-a"
+    body('/b').must_equal "i-b"
+  end
+
+  it "template cache respects :locals" do
+    template = '<%= @a ? b : c %>'
+
     app(:render) do |r|
       r.is "a" do
-        render(:inline=>"i", :template_class=>c, :template_opts=>{:foo=>'a'})
+        @a = true
+        render(:inline=>template.dup, :locals=>{:b=>1})
       end
       r.is "b" do
-        render(:inline=>"i", :template_class=>c, :template_opts=>{:foo=>'b'})
+        @a = true
+        render(:inline=>template.dup, :locals=>{:b=>2, :c=>4})
+      end
+      r.is "c" do
+        render(:inline=>template.dup, :locals=>{:c=>3})
+      end
+    end
+
+    body('/a').must_equal "1"
+    body('/b').must_equal "2"
+    body('/c').must_equal "3"
+  end
+
+  it "Support :cache=>false option to disable template caching" do
+    app(:bare) do
+      plugin :render, :views=>"./spec/views"
+
+      route do |r|
+        @a = 'a'
+        r.is('a'){render('iv', :cache=>false)}
+        render('iv')
+      end
+    end
+
+    body('/a').strip.must_equal "a"
+    app.render_opts[:cache][File.expand_path('spec/views/iv.erb')].must_equal nil
+    body('/b').strip.must_equal "a"
+    app.render_opts[:cache][File.expand_path('spec/views/iv.erb')].wont_equal nil
+  end
+
+  it "Support :cache=>true option to enable template caching when :template_block is used" do
+    c = Class.new do 
+      def initialize(path, *, &block)
+        @path = path
+        @block = block
+      end
+      def render(*)
+        "#{@path}-#{@block.call}"
+      end
+    end 
+
+    proca = proc{'a'}
+
+    app(:bare) do
+      plugin :render, :views=>"./spec/views"
+
+      route do |r|
+        @a = 'a'
+        r.is('a'){render(:path=>'iv', :template_class=>c, :template_block=>proca)}
+        render(:path=>'iv', :template_class=>c, :template_block=>proca, :cache=>true)
+      end
+    end
+
+    body('/a').strip.must_equal "iv-a"
+    app.render_opts[:cache][['iv', c, nil, nil, proca]].must_equal nil
+    body('/b').strip.must_equal "iv-a"
+    app.render_opts[:cache][['iv', c, nil, nil, proca]].wont_equal nil
+  end
+
+  it "Support :cache_key option to force the key used when caching" do
+    app(:bare) do
+      plugin :render, :views=>"./spec/views"
+
+      route do |r|
+        @a = 'a'
+        r.is('a'){render('iv', :cache_key=>:a)}
+        r.is('about'){render('about', :cache_key=>:a, :cache=>false, :locals=>{:title=>'a'})}
+        render('about', :cache_key=>:a)
       end
     end
 
-    body('/a').should == "i-a"
-    body('/b').should == "i-b"
+    body('/a').strip.must_equal "a"
+    body('/b').strip.must_equal "a"
+    body('/about').strip.must_equal "<h1>a</h1>"
   end
 
   it "render_opts inheritance" do
@@ -289,15 +392,15 @@ describe "render plugin" do
     c.plugin :render
     sc = Class.new(c)
 
-    c.render_opts.should_not equal(sc.render_opts)
-    c.render_opts[:cache].should_not equal(sc.render_opts[:cache])
+    c.render_opts.wont_be_same_as(sc.render_opts)
+    c.render_opts[:cache].wont_be_same_as(sc.render_opts[:cache])
   end
 
   it "render plugin call should not override options" do
     c = Class.new(Roda)
     c.plugin :render, :layout=>:foo
     c.plugin :render
-    c.render_opts[:layout].should == :foo
+    c.render_opts[:layout].must_equal :foo
   end
 
   it "with caching disabled" do
@@ -309,9 +412,9 @@ describe "render plugin" do
       end
     end
 
-    body("/inline").strip.should == "Hello Agent Smith: false"
+    body("/inline").strip.must_equal "Hello Agent Smith: false"
 
-    Class.new(app).render_opts[:cache].should == false
+    Class.new(app).render_opts[:cache].must_equal false
   end
 end
 end

data/spec/plugin/shared_vars_spec.rb

@@ -9,7 +9,7 @@ describe "shared_vars plugin" do
       r.run old_app
     end
 
-    body.should == 'c'
+    body.must_equal 'c'
   end
 
   it "adds shared with hash merges the hash into the shared vars" do
@@ -18,7 +18,7 @@ describe "shared_vars plugin" do
       shared[:c]
     end
 
-    body.should == 'c'
+    body.must_equal 'c'
   end
 
   it "calling shared with hash and a block sets shared variables only for that block" do
@@ -33,13 +33,13 @@ describe "shared_vars plugin" do
       "#{shared[:c]}:#{shared[:d]}:#{c}:#{d}"
     end
 
-    body.should == 'b::c:d'
+    body.must_equal 'b::c:d'
   end
 
   it "calling shared with no arguments and a block raises an error" do
     app(:shared_vars) do |r|
       shared{}
     end
-    proc{body}.should raise_error(Roda::RodaError)
+    proc{body}.must_raise(Roda::RodaError)
   end
 end