roda 1.0.0 → 1.1.0

data/spec/plugin/default_headers_spec.rb

@@ -7,6 +7,7 @@ describe "default_headers plugin" do
     app(:bare) do
       plugin :default_headers, h
       route do |r|
+        r.halt response.finish_with_body([])
       end
     end
 
@@ -22,6 +23,7 @@ describe "default_headers plugin" do
       plugin :default_headers
 
       route do |r|
+        r.halt response.finish_with_body([])
       end
     end
 
@@ -29,18 +31,17 @@ describe "default_headers plugin" do
   end
 
   it "should allow modifying the default headers at a later point" do
-    h = {'Content-Type'=>'text/json', 'Foo'=>'bar'}
-
     app(:bare) do
       plugin :default_headers
       default_headers['Content-Type'] = 'text/json'
-      default_headers['Foo'] = 'bar'
+      default_headers['Foo'] = 'baz'
 
       route do |r|
+        r.halt response.finish_with_body([])
       end
     end
 
-    req[1].should == h
+    req[1].should == {'Content-Type'=>'text/json', 'Foo'=>'baz'}
   end
 
   it "should work correctly in subclasses" do
@@ -52,11 +53,11 @@ describe "default_headers plugin" do
       default_headers['Foo'] = 'bar'
 
       route do |r|
+        r.halt response.finish_with_body([])
       end
     end
 
     @app = Class.new(@app)
-    @app.route{}
 
     req[1].should == h
   end

data/spec/plugin/error_email_spec.rb

@@ -0,0 +1,76 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "error_email plugin" do 
+  def app(opts={})
+    @emails = emails = [] unless defined?(@emails)
+    @app ||= super(:bare) do
+      plugin :error_email, {:to=>'t', :from=>'f', :emailer=>lambda{|h| emails << h}}.merge(opts)
+
+      route do |r|
+        raise ArgumentError rescue error_email($!)
+        'e'
+      end
+    end
+  end
+
+  def email
+    @emails.last
+  end
+
+  it "adds error_email method for emailing exceptions" do
+    app
+    body('rack.input'=>StringIO.new, 'QUERY_STRING'=>'b=c', 'rack.session'=>{'d'=>'e'}).should == 'e'
+    email[:to].should == 't'
+    email[:from].should == 'f'
+    email[:host].should == 'localhost'
+    email[:message].should =~ /^Subject: ArgumentError/
+    email[:message].should =~ /^Backtrace:$.+^ENV:$.+^"rack\.input" => .+^Params:$\s+^"b" => "c"$\s+^Session:$\s+^"d" => "e"$/m
+  end
+
+  it "uses :host option" do
+    app(:host=>'foo.bar.com')
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:host].should == 'foo.bar.com'
+  end
+
+  it "handles error messages with new lines" do
+    app.route do |r|
+      raise "foo\nbar\nbaz" rescue error_email($!)
+      'e'
+    end
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:message].should =~ %r{From: f\r\nSubject: RuntimeError: foo\r\n bar\r\n baz\r\nTo: t\r\n\r\n}
+  end
+
+  it "adds :prefix option to subject line" do
+    app(:prefix=>'TEST ')
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:message].should =~ /^Subject: TEST ArgumentError/
+  end
+
+  it "uses :headers option for additional headers" do
+    app(:headers=>{'Foo'=>'Bar', 'Baz'=>'Quux'})
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:message].should =~ /^Foo: Bar/
+    email[:message].should =~ /^Baz: Quux/
+  end
+
+  it "requires the :to and :from options" do
+    proc{app :from=>nil}.should raise_error(Roda::RodaError)
+    proc{app :to=>nil}.should raise_error(Roda::RodaError)
+  end
+
+  it "works correctly in subclasses" do
+    @app = Class.new(app)
+    @app.route do |r|
+      raise ArgumentError rescue error_email($!)
+      'e'
+    end
+    body('rack.input'=>StringIO.new).should == 'e'
+    email[:to].should == 't'
+    email[:from].should == 'f'
+    email[:host].should == 'localhost'
+    email[:message].should =~ /^Subject: ArgumentError/
+    email[:message].should =~ /Backtrace.*ENV/m
+  end
+end

data/spec/plugin/multi_route_spec.rb

@@ -13,6 +13,8 @@ describe "multi_route plugin" do
         r.is "a" do
           "geta"
         end
+
+        "getd"
       end
 
       route("post") do |r|
@@ -23,6 +25,14 @@ describe "multi_route plugin" do
         r.is "a" do
           "posta"
         end
+
+        "postd"
+      end
+
+      route(:p) do |r|
+        r.is do
+          'p'
+        end
       end
 
       route do |r|
@@ -30,6 +40,10 @@ describe "multi_route plugin" do
           r.multi_route do
             "foo"
           end
+
+          r.on "p" do
+            r.route(:p)
+          end
         end
 
         r.get do
@@ -71,6 +85,29 @@ describe "multi_route plugin" do
     body('/foo/post/b').should == 'foo'
   end
 
+  it "does not have multi_route match non-String named routes" do
+    body('/foo/p').should == 'p'
+    status('/foo/p/2').should == 404
+  end
+
+  it "has multi_route pick up routes newly added" do
+    body('/foo/get/').should == 'get'
+    status('/foo/delete').should == 404
+    app.route('delete'){|r| r.on{'delete'}}
+    body('/foo/delete').should == 'delete'
+  end
+
+  it "makes multi_route match longest route if multiple routes have the same prefix" do
+    app.route("post/a"){|r| r.on{"pa2"}}
+    app.route("get/a"){|r| r.on{"ga2"}}
+    status('/foo').should == 404
+    body('/foo/get/').should == 'get'
+    body('/foo/get/a').should == 'ga2'
+    body('/foo/post/').should == 'post'
+    body('/foo/post/a').should == 'pa2'
+    body('/foo/post/b').should == 'foo'
+  end
+
   it "handles loading the plugin multiple times correctly" do
     app.plugin :multi_route
     body.should == 'get'
@@ -111,4 +148,87 @@ describe "multi_route plugin" do
     status('/c').should == 404
     status('/c', 'REQUEST_METHOD'=>'POST').should == 404
   end
+
+  it "uses the named route return value in multi_route if no block is given" do
+    app.route{|r| r.multi_route}
+    body('/get').should == 'getd'
+    body('/post').should == 'postd'
+  end
+end
+
+describe "multi_route plugin" do 
+  before do
+    app(:bare) do
+      plugin :multi_route
+
+      route("foo", "foo") do |r|
+        "#{@p}ff"
+      end
+
+      route("bar", "foo") do |r|
+        "#{@p}fb"
+      end
+
+      route("foo", "bar") do |r|
+        "#{@p}bf"
+      end
+
+      route("bar", "bar") do |r|
+        "#{@p}bb"
+      end
+    end
+  end
+
+  it "handles namespaces in r.route" do
+    app.route("foo") do |r|
+      @p = 'f'
+      r.on("foo"){r.route("foo", "foo")}
+      r.on("bar"){r.route("bar", "foo")}
+      @p
+    end
+
+    app.route("bar") do |r|
+      @p = 'b'
+      r.on("foo"){r.route("foo", "bar")}
+      r.on("bar"){r.route("bar", "bar")}
+      @p
+    end
+
+    app.route do |r|
+      r.on("foo"){r.route("foo")}
+      r.on("bar"){r.route("bar")}
+    end
+
+    body('/foo').should == 'f'
+    body('/foo/foo').should == 'fff'
+    body('/foo/bar').should == 'ffb'
+    body('/bar').should == 'b'
+    body('/bar/foo').should == 'bbf'
+    body('/bar/bar').should == 'bbb'
+  end
+
+  it "handles namespaces in r.multi_route" do
+    app.route("foo") do |r|
+      @p = 'f'
+      r.multi_route("foo")
+      @p
+    end
+
+    app.route("bar") do |r|
+      @p = 'b'
+      r.multi_route("bar")
+      @p
+    end
+
+    app.route do |r|
+      r.multi_route
+    end
+
+    body('/foo').should == 'f'
+    body('/foo/foo').should == 'fff'
+    body('/foo/bar').should == 'ffb'
+    body('/bar').should == 'b'
+    body('/bar/foo').should == 'bbf'
+    body('/bar/bar').should == 'bbb'
+  end
 end

data/spec/plugin/not_allowed_spec.rb

@@ -19,14 +19,22 @@ describe "not_allowed plugin" do
         "c"
       end
 
+      r.on "q" do
+        r.is do
+          r.get do
+            "q"
+          end
+        end
+      end
+
       r.get do
         r.is 'b' do
           'b'
         end
-        r.is /(d)/ do |s|
+        r.is(/(d)/) do |s|
           s
         end
-        r.get /(e)/ do |s|
+        r.get(/(e)/) do |s|
           s
         end
       end
@@ -43,7 +51,10 @@ describe "not_allowed plugin" do
     status('/d', 'REQUEST_METHOD'=>'POST').should == 404
 
     body('/e').should == 'e'
-    status('/d', 'REQUEST_METHOD'=>'POST').should == 404
+    status('/e', 'REQUEST_METHOD'=>'POST').should == 404
+
+    body('/q').should == 'q'
+    status('/q', 'REQUEST_METHOD'=>'POST').should == 405
 
     body('/c').should == 'cg'
     body('/c').should == 'cg'

data/spec/plugin/path_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "path plugin" do 
+  it "adds path method for defining named paths" do
+    app(:bare) do
+      plugin :path
+      path :foo, "/foo"
+      path :bar do |o|
+        "/bar/#{o}"
+      end
+
+      route do |r|
+        "#{foo_path}#{bar_path('a')}"
+      end
+    end
+
+    body.should == '/foo/bar/a'
+  end
+
+  it "raises if both path and block are given" do
+    app.plugin :path
+    proc{app.path(:foo, '/foo'){}}.should raise_error(Roda::RodaError)
+  end
+
+  it "raises if neither path nor block are given" do
+    app.plugin :path
+    proc{app.path(:foo)}.should raise_error(Roda::RodaError)
+  end
+end

data/spec/plugin/render_each_spec.rb

@@ -5,7 +5,7 @@ describe "render_each plugin" do
     app(:bare) do
       plugin :render_each
       def render(t, opts)
-        "r#{t}#{opts[:locals][:foo] if opts[:locals]}#{opts[:bar]} "
+        "r#{t}#{opts[:locals][:foo] if opts[:locals]}#{opts[:bar]}#{opts[:locals][:bar] if opts[:locals]} "
       end 
 
       route do |r|
@@ -20,11 +20,16 @@ describe "render_each plugin" do
         r.is 'b' do
           render_each([1,2,3], :bar, :local=>nil)
         end
+
+        r.is 'c' do
+          render_each([1,2,3], :bar, :locals=>{:foo=>4})
+        end
       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 '
   end
 end

data/spec/plugin/symbol_matchers_spec.rb

@@ -23,12 +23,16 @@ describe "symbol_matchers plugin" do
           "format#{f.inspect}"
         end
 
+        r.is "thing/:thing" do |d|
+          "thing#{d}"
+        end
+
         r.is :f do |f|
           "f#{f}"
         end
 
-        r.is 'q:rest' do |r|
-          "rest#{r}"
+        r.is 'q:rest' do |rest|
+          "rest#{rest}"
         end
 
         r.is :w do |w|
@@ -64,5 +68,6 @@ describe "symbol_matchers plugin" do
     status("/1/f/a").should == 404
     body("/qa/b/c/d//f/g").should == 'resta/b/c/d//f/g'
     body('/q').should == 'rest'
+    body('/thing/q').should == 'thingq'
   end
 end

data/spec/request_spec.rb

@@ -62,3 +62,13 @@ describe "request.inspect" do
     body('REQUEST_METHOD'=>'POST').should ==  "#<Foo::RodaRequest POST />"
   end
 end
+
+describe "TERM.inspect" do
+  it "should return TERM" do
+    app do |r|
+      r.class::TERM.inspect
+    end
+
+    body.should ==  "TERM"
+  end
+end

data/spec/response_spec.rb

@@ -67,6 +67,16 @@ describe "response #finish" do
     body.should == 'a200text/html1'
   end
 
+  it "should set Content-Length header" do
+    app do |r|
+      response.write 'a'
+      response['Content-Length'].should == nil
+      throw :halt, response.finish
+    end
+
+    header('Content-Length').should == '1'
+  end
+
   it "should not overwrite existing status" do
     app do |r|
       response.status = 500
@@ -78,6 +88,43 @@ describe "response #finish" do
   end
 end
 
+describe "response #finish_with_body" do
+  it "should use given body" do
+    app do |r|
+      throw :halt, response.finish_with_body(['123'])
+    end
+
+    body.should == '123'
+  end
+
+  it "should set status to 200 if status has not been set" do
+    app do |r|
+      throw :halt, response.finish_with_body([])
+    end
+
+    status.should == 200
+  end
+
+  it "should not set Content-Length header" do
+    app do |r|
+      response.write 'a'
+      response['Content-Length'].should == nil
+      throw :halt, response.finish_with_body(['123'])
+    end
+
+    header('Content-Length').should == nil
+  end
+
+  it "should not overwrite existing status" do
+    app do |r|
+      response.status = 500
+      throw :halt, response.finish_with_body(['123'])
+    end
+
+    status.should == 500
+  end
+end
+
 describe "response #redirect" do
   it "should set location and status" do
     app do |r|