roda 2.2.0 → 2.3.0

data/spec/plugin/error_handler_spec.rb

@@ -18,10 +18,10 @@ describe "error_handler plugin" do
       end
     end
 
-    body("/a").should == 'found'
-    status("/a").should == 200
-    body.should == 'bad idea'
-    status.should == 500
+    body("/a").must_equal 'found'
+    status("/a").must_equal 200
+    body.must_equal 'bad idea'
+    status.must_equal 500
   end
 
   it "executes on SyntaxError exceptions" do
@@ -41,10 +41,10 @@ describe "error_handler plugin" do
       end
     end
 
-    body("/a").should == 'found'
-    status("/a").should == 200
-    body.should == 'bad idea'
-    status.should == 500
+    body("/a").must_equal 'found'
+    status("/a").must_equal 200
+    body.must_equal 'bad idea'
+    status.must_equal 500
   end
 
   it "can override status inside error block" do
@@ -59,7 +59,7 @@ describe "error_handler plugin" do
       end
     end
 
-    status.should == 501
+    status.must_equal 501
   end
 
   it "calculates correct Content-Length" do
@@ -73,7 +73,7 @@ describe "error_handler plugin" do
       end
     end
 
-    header('Content-Length').should == "1"
+    header('Content-Length').must_equal "1"
   end
 
   it "clears existing headers" do
@@ -89,8 +89,8 @@ describe "error_handler plugin" do
       end
     end
 
-    header('Content-Type').should == 'text/html'
-    header('Foo').should == nil
+    header('Content-Type').must_equal 'text/html'
+    header('Foo').must_equal nil
   end
 
   it "can set error via the plugin block" do
@@ -104,7 +104,7 @@ describe "error_handler plugin" do
       end
     end
 
-    body.should == 'bad idea'
+    body.must_equal 'bad idea'
   end
 
   it "has default error handler also raise" do
@@ -116,6 +116,6 @@ describe "error_handler plugin" do
       end
     end
 
-    proc{req}.should raise_error(ArgumentError)
+    proc{req}.must_raise(ArgumentError)
   end
 end

data/spec/plugin/flash_spec.rb

@@ -14,7 +14,7 @@ describe "flash plugin" do
       end
     end
 
-    body.should == 'b'
+    body.must_equal 'b'
   end
 
   it "flash[] sets flash for next page" do
@@ -36,88 +36,89 @@ describe "flash plugin" do
 
     env = proc{|h| h['Set-Cookie'] ? {'HTTP_COOKIE'=>h['Set-Cookie'].sub("; path=/; HttpOnly", '')} : {}}
     _, h, b = req
-    b.join.should == ''
+    b.join.must_equal ''
     _, h, b = req(env[h])
-    b.join.should == 'b'
+    b.join.must_equal 'b'
     _, h, b = req(env[h])
-    b.join.should == 'bb'
+    b.join.must_equal 'bb'
     _, h, b = req('/a', env[h])
-    b.join.should == 'cbbb'
+    b.join.must_equal 'cbbb'
     _, h, b = req(env[h])
-    b.join.should == ''
+    b.join.must_equal ''
     _, h, b = req(env[h])
-    b.join.should == 'b'
+    b.join.must_equal 'b'
     _, h, b = req(env[h])
-    b.join.should == 'bb'
+    b.join.must_equal 'bb'
   end
 end
 
 describe "FlashHash" do 
   before do
+    require 'roda/plugins/flash'
     @h = Roda::RodaPlugins::Flash::FlashHash.new
   end
 
   it ".new should accept nil for empty hash" do
     @h = Roda::RodaPlugins::Flash::FlashHash.new(nil)
-    @h.now.should == {}
-    @h.next.should == {}
+    @h.now.must_equal({})
+    @h.next.must_equal({})
   end
 
   it ".new should accept a hash" do
     @h = Roda::RodaPlugins::Flash::FlashHash.new(1=>2)
-    @h.now.should == {1=>2}
-    @h.next.should == {}
+    @h.now.must_equal(1=>2)
+    @h.next.must_equal({})
   end
 
   it "#[]= assigns to next flash" do
     @h[1] = 2
-    @h.now.should == {}
-    @h.next.should == {1=>2}
+    @h.now.must_equal({})
+    @h.next.must_equal(1=>2)
   end
 
   it "#discard removes given key from next hash" do
     @h[1] = 2
     @h[nil] = 3
-    @h.next.should == {1=>2, nil=>3}
+    @h.next.must_equal(1=>2, nil=>3)
     @h.discard(nil)
-    @h.next.should == {1=>2}
+    @h.next.must_equal(1=>2)
     @h.discard(1)
-    @h.next.should == {}
+    @h.next.must_equal({})
   end
 
   it "#discard removes all entries from next hash with no arguments" do
     @h[1] = 2
     @h[nil] = 3
-    @h.next.should == {1=>2, nil=>3}
+    @h.next.must_equal(1=>2, nil=>3)
     @h.discard
-    @h.next.should == {}
+    @h.next.must_equal({})
   end
 
   it "#keep copies entry for key from current hash to next hash" do
     @h.now[1] = 2
     @h.now[nil] = 3
-    @h.next.should == {}
+    @h.next.must_equal({})
     @h.keep(nil)
-    @h.next.should == {nil=>3}
+    @h.next.must_equal(nil=>3)
     @h.keep(1)
-    @h.next.should == {1=>2, nil=>3}
+    @h.next.must_equal(1=>2, nil=>3)
   end
 
   it "#keep copies all entries from current hash to next hash" do
     @h.now[1] = 2
     @h.now[nil] = 3
-    @h.next.should == {}
+    @h.next.must_equal({})
     @h.keep
-    @h.next.should == {1=>2, nil=>3}
+    @h.next.must_equal(1=>2, nil=>3)
   end
 
   it "#sweep replaces current hash with next hash" do
     @h[1] = 2
     @h[nil] = 3
-    @h.next.should == {1=>2, nil=>3}
-    @h.now.should == {}
-    @h.sweep.should == {1=>2, nil=>3}
-    @h.next.should == {}
-    @h.now.should == {1=>2, nil=>3}
+    @h.next.must_equal(1=>2, nil=>3)
+    @h.now.must_equal({})
+    @h.sweep.must_equal(1=>2, nil=>3)
+    @h.next.must_equal({})
+    @h.now.must_equal(1=>2, nil=>3)
   end
 end

data/spec/plugin/h_spec.rb

@@ -6,6 +6,6 @@ describe "h plugin" do
       h("<form>") + h(:form)
     end
 
-    body.should == '&lt;form&gt;form'
+    body.must_equal '&lt;form&gt;form'
   end
 end

data/spec/plugin/halt_spec.rb

@@ -6,7 +6,7 @@ describe "halt plugin" do
       r.halt [200, {}, ['foo']]
     end
 
-    body.should ==  "foo"
+    body.must_equal  "foo"
   end
 
   it "should consider string argument as response body" do
@@ -14,7 +14,7 @@ describe "halt plugin" do
       r.halt "foo"
     end
 
-    body.should ==  "foo"
+    body.must_equal  "foo"
   end
 
   it "should consider integer argument as response status" do
@@ -22,7 +22,7 @@ describe "halt plugin" do
       r.halt 300
     end
 
-    status.should == 300 
+    status.must_equal 300 
   end
 
   it "should consider other single arguments similar to block bodies" do
@@ -34,7 +34,7 @@ describe "halt plugin" do
       end
     end
 
-    body.should ==  '{"a":1}'
+    body.must_equal  '{"a":1}'
   end
 
   it "should consider 2 arguments as response status and body" do
@@ -42,8 +42,8 @@ describe "halt plugin" do
       r.halt 300, "foo"
     end
 
-    status.should == 300 
-    body.should == "foo"
+    status.must_equal 300 
+    body.must_equal "foo"
   end
 
   it "should handle 2nd of 2 arguments similar to block bodies" do
@@ -55,8 +55,8 @@ describe "halt plugin" do
       end
     end
 
-    status.should == 300 
-    body.should ==  '{"a":1}'
+    status.must_equal 300 
+    body.must_equal  '{"a":1}'
   end
 
   it "should consider 3 arguments as response" do
@@ -64,9 +64,9 @@ describe "halt plugin" do
       r.halt 300, {'a'=>'b'}, "foo"
     end
 
-    status.should == 300 
-    header('a').should == 'b'
-    body.should == "foo"
+    status.must_equal 300 
+    header('a').must_equal 'b'
+    body.must_equal "foo"
   end
 
   it "should handle 3rd of 3 arguments similar to block bodies" do
@@ -78,9 +78,9 @@ describe "halt plugin" do
       end
     end
 
-    status.should == 300 
-    header('a').should == 'b'
-    body.should ==  '{"a":1}'
+    status.must_equal 300 
+    header('a').must_equal 'b'
+    body.must_equal  '{"a":1}'
   end
 
   it "should raise an error for too many arguments" do
@@ -88,7 +88,7 @@ describe "halt plugin" do
       r.halt 300, {'a'=>'b'}, "foo", 1
     end
 
-    proc{req}.should raise_error(Roda::RodaError)
+    proc{req}.must_raise(Roda::RodaError)
   end
 
   it "should raise an error for single argument not integer, String, or Array" do
@@ -96,6 +96,6 @@ describe "halt plugin" do
       r.halt('a'=>'b')
     end
 
-    proc{req}.should raise_error(Roda::RodaError)
+    proc{req}.must_raise(Roda::RodaError)
   end
 end

data/spec/plugin/hash_matcher_spec.rb

@@ -18,10 +18,10 @@ describe "hash_matcher plugin" do
       end
     end
 
-    body("/foo").should == '1foo'
-    body("/foofoo").should == '2foofoo'
-    body("/foofoofoo").should == '3foofoofoo'
-    status("/foofoofoofoo").should == 404
-    status.should == 404
+    body("/foo").must_equal '1foo'
+    body("/foofoo").must_equal '2foofoo'
+    body("/foofoofoo").must_equal '3foofoofoo'
+    status("/foofoofoofoo").must_equal 404
+    status.must_equal 404
   end
 end

data/spec/plugin/head_spec.rb

@@ -17,19 +17,19 @@ describe "head plugin" do
     end
 
     s, h, b = req
-    s.should == 200
-    h['Content-Length'].should == '4'
-    b.should == ['root']
+    s.must_equal 200
+    h['Content-Length'].must_equal '4'
+    b.must_equal ['root']
 
     s, h, b = req('REQUEST_METHOD' => 'HEAD')
-    s.should == 200
-    h['Content-Length'].should == '4'
-    b.should == []
+    s.must_equal 200
+    h['Content-Length'].must_equal '4'
+    b.must_equal []
 
-    body('/a').should == 'a'
-    status('/a', 'REQUEST_METHOD' => 'HEAD').should == 200
+    body('/a').must_equal 'a'
+    status('/a', 'REQUEST_METHOD' => 'HEAD').must_equal 200
 
-    body('/b').should == 'b'
-    status('/b', 'REQUEST_METHOD' => 'HEAD').should == 200
+    body('/b').must_equal 'b'
+    status('/b', 'REQUEST_METHOD' => 'HEAD').must_equal 200
   end
 end

data/spec/plugin/header_matchers_spec.rb

@@ -8,8 +8,8 @@ describe "accept matcher" do
       end
     end
 
-    body("HTTP_ACCEPT" => "application/xml").should ==  "application/xml"
-    status.should == 404
+    body("HTTP_ACCEPT" => "application/xml").must_equal  "application/xml"
+    status.must_equal 404
   end
 end
 
@@ -21,8 +21,8 @@ describe "header matcher" do
       end
     end
 
-    body("HTTP_ACCEPT" => "application/xml").should ==  "bar"
-    status.should == 404
+    body("HTTP_ACCEPT" => "application/xml").must_equal  "bar"
+    status.must_equal 404
   end
 
   it "should yield the header value if :match_header_yield option is present" do
@@ -36,8 +36,8 @@ describe "header matcher" do
       end
     end
 
-    body("HTTP_ACCEPT" => "application/xml").should ==  "bar-application/xml"
-    status.should == 404
+    body("HTTP_ACCEPT" => "application/xml").must_equal  "bar-application/xml"
+    status.must_equal 404
   end
 end
 
@@ -49,8 +49,8 @@ describe "host matcher" do
       end
     end
 
-    body("HTTP_HOST" => "example.com").should == 'worked'
-    status("HTTP_HOST" => "foo.com").should == 404
+    body("HTTP_HOST" => "example.com").must_equal 'worked'
+    status("HTTP_HOST" => "foo.com").must_equal 404
   end
 
   it "should match a host with a regexp" do
@@ -60,8 +60,8 @@ describe "host matcher" do
       end
     end
 
-    body("HTTP_HOST" => "example.com").should == 'worked'
-    status("HTTP_HOST" => "foo.com").should == 404
+    body("HTTP_HOST" => "example.com").must_equal 'worked'
+    status("HTTP_HOST" => "foo.com").must_equal 404
   end
 
   it "doesn't yield HOST" do
@@ -71,7 +71,7 @@ describe "host matcher" do
       end
     end
 
-    body("HTTP_HOST" => "example.com").should == '0'
+    body("HTTP_HOST" => "example.com").must_equal '0'
   end
 end
 
@@ -83,8 +83,8 @@ describe "user_agent matcher" do
       end
     end
 
-    body("HTTP_USER_AGENT" => "chrome31").should ==  "a-chrome-31"
-    status.should == 404
+    body("HTTP_USER_AGENT" => "chrome31").must_equal  "a-chrome-31"
+    status.must_equal 404
   end
 end
 

data/spec/plugin/heartbeat_spec.rb

@@ -0,0 +1,74 @@
+require File.expand_path("spec_helper", File.dirname(File.dirname(__FILE__)))
+
+describe "heartbeat plugin" do 
+  it "should return heartbeat response for heartbeat paths only" do
+    app(:bare) do
+      plugin :heartbeat
+      route do |r|
+        r.on 'a' do
+          "a"
+        end
+      end
+    end
+
+    body('/a').must_equal 'a'
+    status.must_equal 404
+    status('/heartbeat').must_equal 200
+    body('/heartbeat').must_equal 'OK'
+  end
+
+  it "should support custom heartbeat paths" do
+    app(:bare) do
+      plugin :heartbeat, :path=>'/heartbeat2'
+      route do |r|
+        r.on 'a' do
+          "a"
+        end
+      end
+    end
+
+    body('/a').must_equal 'a'
+    status.must_equal 404
+    status('/heartbeat').must_equal 404
+    status('/heartbeat2').must_equal 200
+    body('/heartbeat2').must_equal 'OK'
+  end
+
+  it "should work when using sessions" do
+    app(:bare) do
+      use Rack::Session::Cookie, :secret=>'foo'
+      plugin :heartbeat
+
+      route do |r|
+        session.clear
+        r.on "a" do
+          "a"
+        end
+      end
+    end
+
+    body('/a').must_equal 'a'
+    status.must_equal 404
+    status('/heartbeat').must_equal 200
+    body('/heartbeat').must_equal 'OK'
+  end
+
+  it "should work when redirecting" do
+    app(:bare) do
+      plugin :heartbeat
+
+      route do |r|
+        r.on "a" do
+          "a"
+        end
+        r.redirect '/a'
+      end
+    end
+
+    body('/a').must_equal 'a'
+    status.must_equal 302
+    status('/heartbeat').must_equal 200
+    body('/heartbeat').must_equal 'OK'
+  end
+end
+