jellyfish 1.0.0 → 1.0.1

data/test/sinatra/test_error.rb

@@ -2,11 +2,11 @@
 require 'jellyfish/test'
 
 describe 'Sinatra mapped_error_test.rb' do
-  behaves_like :jellyfish
+  paste :jellyfish
 
   exp = Class.new(RuntimeError)
 
-  should 'invoke handlers registered with handle when raised' do
+  would 'invoke handlers registered with handle when raised' do
     app = Class.new{
       include Jellyfish
       handle(exp){ 'Foo!' }
@@ -20,7 +20,7 @@ describe 'Sinatra mapped_error_test.rb' do
     body  .should.eq ['Foo!']
   end
 
-  should 'pass the exception object to the error handler' do
+  would 'pass the exception object to the error handler' do
     app = Class.new{
       include Jellyfish
       handle(exp){ |e| e.should.kind_of?(exp) }
@@ -29,7 +29,7 @@ describe 'Sinatra mapped_error_test.rb' do
     get('/', app)
   end
 
-  should 'use the StandardError handler if no matching handler found' do
+  would 'use the StandardError handler if no matching handler found' do
     app = Class.new{
       include Jellyfish
       handle(StandardError){ 'StandardError!' }
@@ -41,7 +41,7 @@ describe 'Sinatra mapped_error_test.rb' do
     body  .should.eq ['StandardError!']
   end
 
-  should 'favour subclass handler over superclass handler if available' do
+  would 'favour subclass handler over superclass handler if available' do
     app = Class.new{
       include Jellyfish
       handle(StandardError){ 'StandardError!' }
@@ -58,7 +58,7 @@ describe 'Sinatra mapped_error_test.rb' do
     handlers[exp].should.eq handlers[RuntimeError]
   end
 
-  should 'pass the exception to the handler' do
+  would 'pass the exception to the handler' do
     app = Class.new{
       include Jellyfish
       handle(exp){ |e|
@@ -72,7 +72,7 @@ describe 'Sinatra mapped_error_test.rb' do
     body.should.eq ['looks good']
   end
 
-  should 'raise errors from the app when handle_exceptions is false' do
+  would 'raise errors from the app when handle_exceptions is false' do
     app = Class.new{
       include Jellyfish
       handle_exceptions false
@@ -82,7 +82,7 @@ describe 'Sinatra mapped_error_test.rb' do
     lambda{ get('/', app) }.should.raise(exp)
   end
 
-  should 'call error handlers even when handle_exceptions is false' do
+  would 'call error handlers even when handle_exceptions is false' do
     app = Class.new{
       include Jellyfish
       handle_exceptions false
@@ -94,7 +94,7 @@ describe 'Sinatra mapped_error_test.rb' do
     body.should.eq ["she's there."]
   end
 
-  should 'catch Jellyfish::NotFound' do
+  would 'catch Jellyfish::NotFound' do
     app = Class.new{
       include Jellyfish
       get('/'){ not_found }
@@ -104,7 +104,7 @@ describe 'Sinatra mapped_error_test.rb' do
     status.should.eq 404
   end
 
-  should 'handle subclasses of Jellyfish::NotFound' do
+  would 'handle subclasses of Jellyfish::NotFound' do
     e   = Class.new(Jellyfish::NotFound)
     app = Class.new{
       include Jellyfish
@@ -115,7 +115,7 @@ describe 'Sinatra mapped_error_test.rb' do
     status.should.eq 404
   end
 
-  should 'no longer cascade with Jellyfish::NotFound' do
+  would 'no longer cascade with Jellyfish::NotFound' do
     app = Class.new{
       include Jellyfish
       get('/'){ not_found }
@@ -128,7 +128,7 @@ describe 'Sinatra mapped_error_test.rb' do
     status.should.eq 404
   end
 
-  should 'cascade with Jellyfish::Cascade' do
+  would 'cascade with Jellyfish::Cascade' do
     app = Class.new{
       include Jellyfish
       get('/'){ cascade }
@@ -142,7 +142,7 @@ describe 'Sinatra mapped_error_test.rb' do
     body  .should.eq ['reach']
   end
 
-  should 'inherit error mappings from base class' do
+  would 'inherit error mappings from base class' do
     sup = Class.new{
       include Jellyfish
       handle(exp){ 'sup' }
@@ -155,7 +155,7 @@ describe 'Sinatra mapped_error_test.rb' do
     body.should.eq ['sup']
   end
 
-  should 'override error mappings in base class' do
+  would 'override error mappings in base class' do
     sup = Class.new{
       include Jellyfish
       handle(exp){ 'sup' }
@@ -165,7 +165,6 @@ describe 'Sinatra mapped_error_test.rb' do
       get('/'){ raise exp }
     }.new
 
-
     _, _, body = get('/', app)
     body.should.eq ['sub']
   end

data/test/sinatra/test_multi_actions.rb

@@ -3,7 +3,7 @@ require 'jellyfish/test'
 
 # stolen from sinatra
 describe 'Sinatra filter_test.rb' do
-  behaves_like :jellyfish
+  paste :jellyfish
 
   def new_app base=Object, &block
     Class.new(base){
@@ -13,7 +13,7 @@ describe 'Sinatra filter_test.rb' do
     }.new
   end
 
-  should 'executes filters in the order defined' do
+  would 'executes filters in the order defined' do
     count = 0
     app = new_app{
       get     { count.should.eq 0; count = 1 }
@@ -27,7 +27,7 @@ describe 'Sinatra filter_test.rb' do
     body  .should.eq ['Hello World']
   end
 
-  should 'modify env' do
+  would 'modify env' do
     app = new_app{
       get{ env['BOO'] = 'MOO' }
       get('/foo'){ env['BOO'] }
@@ -38,7 +38,7 @@ describe 'Sinatra filter_test.rb' do
     body  .should.eq ['MOO']
   end
 
-  should 'modify instance variables available to routes' do
+  would 'modify instance variables available to routes' do
     app = new_app{
       get{ @foo = 'bar' }
       get('/foo') { @foo }
@@ -49,7 +49,7 @@ describe 'Sinatra filter_test.rb' do
     body  .should.eq ['bar']
   end
 
-  should 'allows redirects' do
+  would 'allows redirects' do
     app = new_app{
       get{ found '/bar' }
       get('/foo') do
@@ -64,7 +64,7 @@ describe 'Sinatra filter_test.rb' do
     body.join          .should =~ %r{<h1>Jellyfish found: /bar</h1>}
   end
 
-  should 'not modify the response with its return value' do
+  would 'not modify the response with its return value' do
     app = new_app{
       get{ 'Hello World!' }
       get '/foo' do
@@ -78,7 +78,7 @@ describe 'Sinatra filter_test.rb' do
     body  .should.eq ['cool']
   end
 
-  should 'modify the response with halt' do
+  would 'modify the response with halt' do
     app = new_app{
       get('/foo'){ halt [302, {}, ['Hi']] }
       get('/foo'){ 'should not happen' }
@@ -90,7 +90,7 @@ describe 'Sinatra filter_test.rb' do
     get('/bar', app).should.eq [402, {}, ['Ho']]
   end
 
-  should 'give you access to params' do
+  would 'give you access to params' do
     app = new_app{
       get{ @foo = Rack::Request.new(env).params['foo'] }
       get('/foo'){ @foo.reverse }
@@ -101,7 +101,7 @@ describe 'Sinatra filter_test.rb' do
     body  .should.eq ['looc']
   end
 
-  should 'run filters defined in superclasses' do
+  would 'run filters defined in superclasses' do
     sup = new_app{ get{ @foo = 'hello from superclass' } }.class
     app = new_app(sup){ get('/foo'){ @foo } }
 
@@ -112,7 +112,7 @@ describe 'Sinatra filter_test.rb' do
     app.class.routes['get'].size.should.eq 2
   end
 
-  should 'take an optional route pattern' do
+  would 'take an optional route pattern' do
     ran_filter = false
     app = new_app{
       get(%r{^/b}){ ran_filter = true }
@@ -125,7 +125,7 @@ describe 'Sinatra filter_test.rb' do
     ran_filter.should.eq true
   end
 
-  should 'generate block arguments from route pattern' do
+  would 'generate block arguments from route pattern' do
     subpath = nil
     app = new_app{
       get(%r{^/foo/(\w+)}){ |m| subpath = m[1] }
@@ -134,7 +134,7 @@ describe 'Sinatra filter_test.rb' do
     subpath.should.eq 'bar'
   end
 
-  should 'execute before and after filters in correct order' do
+  would 'execute before and after filters in correct order' do
     invoked = 0
     app = new_app{
       get     { invoked  = 2 }
@@ -148,7 +148,7 @@ describe 'Sinatra filter_test.rb' do
     invoked.should.eq 8
   end
 
-  should 'execute filters in the order defined' do
+  would 'execute filters in the order defined' do
     count = 0
     app = new_app{
       get('/'){ body 'Hello World' }
@@ -168,7 +168,7 @@ describe 'Sinatra filter_test.rb' do
     body  .should.eq ['Hello World']
   end
 
-  should 'allow redirects' do
+  would 'allow redirects' do
     app = new_app{
       get('/foo'){ 'ORLY' }
       get        { found '/bar' }
@@ -180,7 +180,7 @@ describe 'Sinatra filter_test.rb' do
     body.join          .should =~ %r{<h1>Jellyfish found: /bar</h1>}
   end
 
-  should 'not modify the response with its return value' do
+  would 'not modify the response with its return value' do
     app = new_app{
       get('/foo'){ body 'cool' }
       get        { 'Hello World!' }
@@ -191,7 +191,7 @@ describe 'Sinatra filter_test.rb' do
     body  .should.eq ['cool']
   end
 
-  should 'modify the response with halt' do
+  would 'modify the response with halt' do
     app = new_app{
       get('/foo'){ 'should not be returned' }
       get{ halt [302, {}, ['Hi']] }
@@ -202,7 +202,7 @@ describe 'Sinatra filter_test.rb' do
     body  .should.eq ['Hi']
   end
 
-  should 'take an optional route pattern' do
+  would 'take an optional route pattern' do
     ran_filter = false
     app = new_app{
       get('/foo') {}

data/test/sinatra/test_routing.rb

@@ -19,10 +19,10 @@ end
 
 # stolen from sinatra
 describe 'Sinatra routing_test.rb' do
-  behaves_like :jellyfish
+  paste :jellyfish
 
   %w[get put post delete options patch head].each do |verb|
-    should "define #{verb.upcase} request handlers with #{verb}" do
+    would "define #{verb.upcase} request handlers with #{verb}" do
       app = Class.new{
         include Jellyfish
         send verb, '/hello' do
@@ -36,7 +36,7 @@ describe 'Sinatra routing_test.rb' do
     end
   end
 
-  should '404s when no route satisfies the request' do
+  would '404s when no route satisfies the request' do
     app = Class.new{
       include Jellyfish
       get('/foo'){}
@@ -45,7 +45,7 @@ describe 'Sinatra routing_test.rb' do
     status.should.eq 404
   end
 
-  should 'allows using unicode' do
+  would 'allows using unicode' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedPath
@@ -55,7 +55,7 @@ describe 'Sinatra routing_test.rb' do
     status.should.eq 200
   end
 
-  should 'handle encoded slashes correctly' do
+  would 'handle encoded slashes correctly' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedPath
@@ -66,7 +66,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['foo/bar']
   end
 
-  should 'override the content-type in error handlers' do
+  would 'override the content-type in error handlers' do
     app = Class.new{
       include Jellyfish
       get{
@@ -91,7 +91,7 @@ describe 'Sinatra routing_test.rb' do
     body                   .should.eq ['<h1>Not Found</h1>']
   end
 
-  should 'match empty PATH_INFO to "/" if no route is defined for ""' do
+  would 'match empty PATH_INFO to "/" if no route is defined for ""' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedPath
@@ -103,7 +103,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['worked']
   end
 
-  should 'exposes params with indifferent hash' do
+  would 'exposes params with indifferent hash' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedParams
@@ -119,7 +119,7 @@ describe 'Sinatra routing_test.rb' do
     body.should.eq ['well, alright']
   end
 
-  should 'merges named params and query string params in params' do
+  would 'merges named params and query string params in params' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedParams
@@ -134,7 +134,7 @@ describe 'Sinatra routing_test.rb' do
     status.should.eq 200
   end
 
-  should 'support named captures like %r{/hello/(?<person>[^/?#]+)}' do
+  would 'support named captures like %r{/hello/(?<person>[^/?#]+)}' do
     app = Class.new{
       include Jellyfish
       get Regexp.new('/hello/(?<person>[^/?#]+)') do |m|
@@ -146,7 +146,7 @@ describe 'Sinatra routing_test.rb' do
     body.should.eq ['Hello Frank']
   end
 
-  should 'support optional named captures' do
+  would 'support optional named captures' do
     app = Class.new{
       include Jellyfish
       get Regexp.new('/page(?<format>.[^/?#]+)?') do |m|
@@ -167,7 +167,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['format=']
   end
 
-  should 'not concatinate params with the same name' do
+  would 'not concatinate params with the same name' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedParams
@@ -179,7 +179,7 @@ describe 'Sinatra routing_test.rb' do
     body.should.eq ['a']
   end
 
-  should 'support basic nested params' do
+  would 'support basic nested params' do
     app = Class.new{
       include Jellyfish
       get('/hi'){ request.params['person']['name'] }
@@ -191,7 +191,7 @@ describe 'Sinatra routing_test.rb' do
     body.should.eq ['John Doe']
   end
 
-  should "expose nested params with indifferent hash" do
+  would "expose nested params with indifferent hash" do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedParams
@@ -207,7 +207,7 @@ describe 'Sinatra routing_test.rb' do
     body.should.eq ['well, alright']
   end
 
-  should 'preserve non-nested params' do
+  would 'preserve non-nested params' do
     app = Class.new{
       include Jellyfish
       get '/foo' do
@@ -224,7 +224,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['looks good']
   end
 
-  should 'match paths that include spaces encoded with %20' do
+  would 'match paths that include spaces encoded with %20' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedPath
@@ -236,7 +236,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['looks good']
   end
 
-  should 'match paths that include spaces encoded with +' do
+  would 'match paths that include spaces encoded with +' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedPath
@@ -248,7 +248,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['looks good']
   end
 
-  should 'make regular expression captures available' do
+  would 'make regular expression captures available' do
     app = Class.new{
       include Jellyfish
       get(/^\/fo(.*)\/ba(.*)/) do |m|
@@ -262,7 +262,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['right on']
   end
 
-  it 'supports regular expression look-alike routes' do
+  would 'support regular expression look-alike routes' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::NormalizedParams
@@ -287,12 +287,12 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['right on']
   end
 
-  should 'raise a TypeError when pattern is not a String or Regexp' do
+  would 'raise a TypeError when pattern is not a String or Regexp' do
     lambda{ Class.new{ include Jellyfish; get(42){} } }.
       should.raise(TypeError)
   end
 
-  should 'return response immediately on next or halt' do
+  would 'return response immediately on next or halt' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::MultiActions
@@ -316,7 +316,7 @@ describe 'Sinatra routing_test.rb' do
     end
   end
 
-  should 'halt with a response tuple' do
+  would 'halt with a response tuple' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::MultiActions
@@ -332,7 +332,7 @@ describe 'Sinatra routing_test.rb' do
     body                   .should.eq ['Hello World']
   end
 
-  should 'transition to the next matching route on next' do
+  would 'transition to the next matching route on next' do
     app = Class.new{
       include Jellyfish
       controller_include Jellyfish::MultiActions, Jellyfish::NormalizedParams
@@ -352,7 +352,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['Hello World']
   end
 
-  should 'match routes defined in superclasses' do
+  would 'match routes defined in superclasses' do
     sup = Class.new{
       include Jellyfish
       get('/foo'){ 'foo' }
@@ -368,7 +368,7 @@ describe 'Sinatra routing_test.rb' do
     end
   end
 
-  should 'match routes itself first then downward app' do
+  would 'match routes itself first then downward app' do
     sup = Class.new{
       include Jellyfish
       get('/foo'){ 'foo sup' }
@@ -388,7 +388,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['bar sup']
   end
 
-  should 'allow using call to fire another request internally' do
+  would 'allow using call to fire another request internally' do
     app = Class.new{
       include Jellyfish
       get '/foo' do
@@ -408,7 +408,7 @@ describe 'Sinatra routing_test.rb' do
     body  .should.eq ['BAR']
   end
 
-  should 'play well with other routing middleware' do
+  would 'play well with other routing middleware' do
     middleware = Class.new{include Jellyfish}
     inner_app  = Class.new{include Jellyfish; get('/foo'){ 'hello' } }
     app = Rack::Builder.app do