roda 1.2.0 → 1.3.0

data/spec/plugin/delete_empty_headers_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "delete_empty_headers plugin" do 
+  it "automatically deletes headers that are empty" do
+    app(:delete_empty_headers) do |r|
+      response['Foo'] = ''
+      response['Content-Type'] = ''
+      response['Content-Length'] = ''
+      response['Bar'] = '1'
+      'a'
+    end
+
+    req[1].should == {'Bar'=>'1'}
+  end
+end

data/spec/plugin/error_handler_spec.rb

@@ -39,6 +39,37 @@ describe "error_handler plugin" do
     status.should == 501
   end
 
+  it "calculates correct Content-Length" do
+    app(:bare) do
+      plugin :error_handler do |e|
+        "a"
+      end
+
+      route do |r|
+        raise ArgumentError, "bad idea"
+      end
+    end
+
+    header('Content-Length').should == "1"
+  end
+
+  it "clears existing headers" do
+    app(:bare) do
+      plugin :error_handler do |e|
+        "a"
+      end
+
+      route do |r|
+        response['Content-Type'] = 'text/pdf'
+        response['Foo'] = 'bar'
+        raise ArgumentError, "bad idea"
+      end
+    end
+
+    header('Content-Type').should == 'text/html'
+    header('Foo').should == nil
+  end
+
   it "can set error via the plugin block" do
     app(:bare) do
       plugin :error_handler do |e|

data/spec/plugin/hash_matcher_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "hash_matcher plugin" do 
+  it "should enable the handling of arbitrary hash keys" do
+    app(:bare) do 
+      plugin :hash_matcher
+      hash_matcher(:foos){|v| consume(self.class.cached_matcher(:"foos-#{v}"){/((?:foo){#{v}})/})}
+      route do |r|
+        r.is :foos=>1 do |f|
+          "1#{f}"
+        end
+        r.is :foos=>2 do |f|
+          "2#{f}"
+        end
+        r.is :foos=>3 do |f|
+          "3#{f}"
+        end
+      end
+    end
+
+    body("/foo").should == '1foo'
+    body("/foofoo").should == '2foofoo'
+    body("/foofoofoo").should == '3foofoofoo'
+    status("/foofoofoofoo").should == 404
+    status.should == 404
+  end
+end

data/spec/plugin/header_matchers_spec.rb

@@ -24,6 +24,21 @@ describe "header matcher" do
     body("HTTP_ACCEPT" => "application/xml").should ==  "bar"
     status.should == 404
   end
+
+  it "should yield the header value if :match_header_yield option is present" do
+    app(:bare) do
+      plugin :header_matchers
+      opts[:match_header_yield] = true
+      route do |r|
+        r.on :header=>"http-accept" do |v|
+          "bar-#{v}"
+        end
+      end
+    end
+
+    body("HTTP_ACCEPT" => "application/xml").should ==  "bar-application/xml"
+    status.should == 404
+  end
 end
 
 describe "host matcher" do

data/spec/plugin/json_spec.rb

@@ -9,8 +9,7 @@ describe "json plugin" do
     end
 
     app(:bare) do
-      plugin :json
-      json_result_classes << c
+      plugin :json, :classes=>[Array, Hash, c]
 
       route do |r|
         r.is 'array' do

data/spec/plugin/mailer_spec.rb

@@ -91,7 +91,7 @@ describe "mailer plugin" do
 
   it "supports regular web requests in same application" do
     app(:mailer) do |r|
-      r.get "foo", :param=>'bar' do |bar|
+      r.get "foo/:bar" do |bar|
         "foo#{bar}"
       end
       r.mail "bar" do
@@ -100,7 +100,7 @@ describe "mailer plugin" do
       end
     end
 
-    body("/foo", 'QUERY_STRING'=>'bar=baz', 'rack.input'=>StringIO.new).should == 'foobaz'
+    body("/foo/baz", 'rack.input'=>StringIO.new).should == 'foobaz'
     app.mail('/bar').body.should == 'b'
   end
 

data/spec/plugin/module_include_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "module_include plugin" do 
+  it "should include given module in request or response class" do
+    app(:bare) do
+      plugin :module_include
+      request_module(Module.new{def h; halt response.finish end})
+      response_module(Module.new{def finish; [1, {}, []] end})
+
+      route do |r|
+        r.h
+      end
+    end
+
+    req.should == [1, {}, []]
+  end
+
+  it "should accept blocks and turn them into modules" do
+    app(:bare) do
+      plugin :module_include
+      request_module{def h; halt response.finish end}
+      response_module{def finish; [1, {}, []] end}
+
+      route do |r|
+        r.h
+      end
+    end
+
+    req.should == [1, {}, []]
+  end
+end

data/spec/plugin/multi_route_spec.rb

@@ -76,6 +76,20 @@ describe "multi_route plugin" do
     status('/c', 'REQUEST_METHOD'=>'POST').should == 404
   end
 
+  it "works when freezing the app" do
+    app.freeze
+    body.should == 'get'
+    body('REQUEST_METHOD'=>'POST').should == 'post'
+    body('/a').should == 'geta'
+    body('/a', 'REQUEST_METHOD'=>'POST').should == 'posta'
+    body('/b').should == 'getb'
+    body('/b', 'REQUEST_METHOD'=>'POST').should == 'postb'
+    status('/c').should == 404
+    status('/c', 'REQUEST_METHOD'=>'POST').should == 404
+
+    proc{app.route("foo"){}}.should raise_error
+  end
+
   it "uses multi_route to dispatch to any named route" do
     status('/foo').should == 404
     body('/foo/get/').should == 'get'

data/spec/plugin/multi_run_spec.rb

@@ -28,4 +28,45 @@ describe "multi_run plugin" do
     body("/b/a").should == 'b2'
     body.should == 'c'
   end
+
+  it "works when freezing the app" do
+    app(:multi_run) do |r|
+      r.multi_run
+      "c"
+    end
+
+    app.run "a", Class.new(Roda).class_eval{route{"a1"}; app}
+    app.run "b", Class.new(Roda).class_eval{route{"b1"}; app}
+    app.run "b/a", Class.new(Roda).class_eval{route{"b2"}; app}
+    app.freeze
+
+    body("/a").should == 'a1'
+    body("/b").should == 'b1'
+    body("/b/a").should == 'b2'
+    body.should == 'c'
+
+    proc{app.run "a", Class.new(Roda).class_eval{route{"a1"}; app}}.should raise_error
+  end
+
+  it "works when subclassing" do
+    app(:multi_run) do |r|
+      r.multi_run
+      "c"
+    end
+
+    app.run "a", Class.new(Roda).class_eval{route{"a1"}; app}
+    body("/a").should == 'a1'
+
+    a = app
+    @app = Class.new(a)
+
+    a.run "b", Class.new(Roda).class_eval{route{"b2"}; app}
+    app.run "b", Class.new(Roda).class_eval{route{"b1"}; app}
+
+    body("/a").should == 'a1'
+    body("/b").should == 'b1'
+
+    @app = a
+    body("/b").should == 'b2'
+  end
 end

data/spec/plugin/named_templates_spec.rb

@@ -25,6 +25,31 @@ describe "named_templates plugin" do
     body.should == 'bar13-foo12-baz'
   end
 
+  it "works when freezing the app" do
+    app(:bare) do
+      plugin :named_templates
+
+      template :foo do
+        @b = 2
+        "foo<%= @a %><%= @b %>"
+      end
+      template :layout, :engine=>:str do
+        @c = 3
+        'bar#{@a}#{@c}-#{yield}-baz'
+      end
+
+      route do |r|
+        @a = 1
+        view(:foo)
+      end
+    end
+
+    app.freeze
+    body.should == 'bar13-foo12-baz'
+
+    proc{app.template(:b){"a"}}.should raise_error
+  end
+
   it "works with the view_subdirs plugin" do
     app(:bare) do
       plugin :render

data/spec/plugin/not_found_spec.rb

@@ -38,6 +38,35 @@ describe "not_found plugin" do
     status.should == 403
   end
 
+  it "calculates correct Content-Length" do
+    app(:bare) do
+      plugin :not_found do
+        "a"
+      end
+
+      route{}
+    end
+
+    header('Content-Length').should == "1"
+  end
+
+  it "clears existing headers" do
+    app(:bare) do
+      plugin :not_found do ||
+        "a"
+      end
+
+      route do |r|
+        response['Content-Type'] = 'text/pdf'
+        response['Foo'] = 'bar'
+        nil
+      end
+    end
+
+    header('Content-Type').should == 'text/html'
+    header('Foo').should == nil
+  end
+
   it "does not modify behavior if not_found is not called" do
     app(:not_found) do |r|
       r.on "a" do

data/spec/plugin/param_matchers_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "param_matchers plugin" do 
+  it "param! matcher should yield a param only if given and not empty" do
+    app(:param_matchers) do |r|
+      r.get "signup", :param! => "email" do |email|
+        email
+      end
+
+      r.on do
+        "No email"
+      end
+    end
+
+    io = StringIO.new
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "email=john@doe.com").should == 'john@doe.com'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "").should == 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "email=").should == 'No email'
+  end
+
+  it "param matcheshould yield a param only if given" do
+    app(:param_matchers) do |r|
+      r.get "signup", :param=>"email" do |email|
+        email
+      end
+
+      r.on do
+        "No email"
+      end
+    end
+
+    io = StringIO.new
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "email=john@doe.com").should == 'john@doe.com'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "").should == 'No email'
+    body("/signup", "rack.input" => io, "QUERY_STRING" => "email=").should == ''
+  end
+end

data/spec/plugin/path_matchers_spec.rb

@@ -0,0 +1,42 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "path_matchers plugin" do 
+  it ":extension matcher should match given file extension" do
+    app(:path_matchers) do |r|
+      r.on "css" do
+        r.on :extension=>"css" do |file|
+          file
+        end
+      end
+    end
+
+    body("/css/reset.css").should == 'reset'
+    status("/css/reset.bar").should == 404
+  end
+
+  it ":suffix matcher should match given suffix" do
+    app(:path_matchers) do |r|
+      r.on "css" do
+        r.on :suffix=>".css" do |file|
+          file
+        end
+      end
+    end
+
+    body("/css/reset.css").should == 'reset'
+    status("/css/reset.bar").should == 404
+  end
+
+  it ":prefix matcher should match given prefix" do
+    app(:path_matchers) do |r|
+      r.on "css" do
+        r.on :prefix=>"reset" do |file|
+          file
+        end
+      end
+    end
+
+    body("/css/reset.css").should == '.css'
+    status("/css/foo.bar").should == 404
+  end
+end

data/spec/plugin/render_spec.rb

@@ -9,8 +9,7 @@ else
 describe "render plugin" do
   before do
     app(:bare) do
-      plugin :render
-      render_opts[:views] = "./spec/views"
+      plugin :render, :views=>"./spec/views"
 
       route do |r|
         r.on "home" do
@@ -45,14 +44,14 @@ describe "render plugin" do
   end
 
   it "with str as engine" do
-    app.render_opts[:engine] = "str"
+    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 %>"
   end
 
   it "with str as ext" do
-    app.render_opts[:ext] = "str"
+    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"
@@ -125,9 +124,11 @@ describe "render plugin" do
   end
 
   it "template renders with :template opts" do
-    app(:render) do
-      render_opts[:views] = "./spec/views"
-      render(:template=>"about", :locals=>{:title => "About Roda"})
+    app(:bare) do
+      plugin :render, :views => "./spec/views"
+      route do
+        render(:template=>"about", :locals=>{:title => "About Roda"})
+      end
     end
     body.strip.should == "<h1>About Roda</h1>"
   end
@@ -164,6 +165,30 @@ describe "render plugin" do
     body('/b').should == "i-b"
   end
 
+  it "template cache respects :template_opts" do
+    c = Class.new do 
+      def initialize(path, _, opts)
+        @path = path
+        @opts = opts
+      end
+      def render(*)
+        "#{@path}-#{@opts[:foo]}"
+      end
+    end
+
+    app(:render) do |r|
+      r.is "a" do
+        render(:inline=>"i", :template_class=>c, :template_opts=>{:foo=>'a'})
+      end
+      r.is "b" do
+        render(:inline=>"i", :template_class=>c, :template_opts=>{:foo=>'b'})
+      end
+    end
+
+    body('/a').should == "i-a"
+    body('/b').should == "i-b"
+  end
+
   it "render_opts inheritance" do
     c = Class.new(Roda)
     c.plugin :render
@@ -171,7 +196,7 @@ describe "render plugin" do
 
     c.render_opts.should_not equal(sc.render_opts)
     c.render_opts[:layout_opts].should_not equal(sc.render_opts[:layout_opts])
-    c.render_opts[:opts].should_not equal(sc.render_opts[:opts])
+    c.render_opts[:template_opts].should_not equal(sc.render_opts[:template_opts])
     c.render_opts[:cache].should_not equal(sc.render_opts[:cache])
   end