rocketio 0.1.0 → 0.2.0

data/test/authorization_test.rb

@@ -6,13 +6,15 @@ spec :AuthorizationTest do
       a = mock_controller {
         token_auth {|t| t == 'x'}
       }
-      b = mock_controller(a)
+      b = mock_controller(a) {
+        def index; end
+      }
       app(b)
       get
       assert(last_response.status) == 401
       token_authorize 'x'
       get
-      assert(last_response.status) == 501
+      assert(last_response.status) == 200
     end
 
     it 'directly overrides token auth inherited from superclass' do
@@ -21,16 +23,17 @@ spec :AuthorizationTest do
       }
       b = mock_controller(a) {
         token_auth {|t| t == 'y'}
+        def index; end
       }
       app(b)
       get
       assert(last_response.status) == 401
       token_authorize 'y'
       get
-      assert(last_response.status) == 501
+      assert(last_response.status) == 200
     end
 
-    it 'uses `inherit` to override token auth inherited from superclass' do
+    it 'uses `import` to override token auth inherited from superclass' do
       a = mock_controller {
         token_auth {|t| t == 'x'}
       }
@@ -39,53 +42,61 @@ spec :AuthorizationTest do
       }
       c = mock_controller(a) {
         import :token_auth, from: b
+        def index; end
       }
       app(c)
       get
       assert(last_response.status) == 401
       token_authorize 'y'
       get
-      assert(last_response.status) == 501
+      assert(last_response.status) == 200
     end
 
-    it 'inherits token auth procedures via `inherit`' do
+    it 'inherits token auth procedures via `import`' do
       a = mock_controller {
         token_auth {|t| t == 'x'}
       }
       b = mock_controller {
         import :token_auth, from: a
+        def index; end
       }
       app(b)
       get
       assert(last_response.status) == 401
       token_authorize 'x'
       get
-      assert(last_response.status) == 501
+      assert(last_response.status) == 200
     end
   end
 
-  context 'protect all request methods' do
+  context 'protect all methods on any request method' do
     before do
       app mock_controller {
-        token_auth {|t| t == 'st'}
-        define_method(:get) {}
+        token_auth {|t| t == 'x'}
+        def index; end
       }
     end
 
     it 'return "401 Unauthorized" if token missing' do
-      get
-      assert(last_response.status) == 401
+      RocketIO::REQUEST_METHODS.each_value do |rqm|
+        send(rqm)
+        assert(last_response.status) == 401
+      end
     end
 
     it 'return "401 Unauthorized" if token is wrong' do
-      get
-      assert(last_response.status) == 401
+      RocketIO::REQUEST_METHODS.each_value do |rqm|
+        send(rqm)
+        assert(last_response.status) == 401
+      end
     end
 
     it 'return "200 Ok" when correct token provided' do
-      token_auth 'st'
-      get
-      assert(last_response.status) == 200
+      token_auth 'x'
+      RocketIO::REQUEST_METHODS.each_value do |rqm|
+        send(rqm)
+        assert(last_response.status) == 200
+      end
     end
   end
 end

data/test/cache_control_test.rb

@@ -28,13 +28,13 @@ require 'setup'
 spec 'cache_control' do
   before do
     a = mock_controller('/foo') {
-      def get
+      def index
         cache_control :public, :no_cache, :max_age => 60.0
         'Hello World'
       end
     }
     b = mock_controller('/bar') {
-      def get
+      def index
         cache_control :public, :no_cache
         'Hello World'
       end
@@ -56,19 +56,19 @@ end
 spec 'expires' do
   before do
     foo = mock_controller('/foo') {
-      def get
+      def index
         expires 60, :public, :no_cache
         'Hello World'
       end
     }
     bar = mock_controller('/bar') {
-      def get; expires Time.now end
+      def index; expires Time.now end
     }
     baz = mock_controller('/baz') {
-      def get; expires Time.at(0) end
+      def index; expires Time.at(0) end
     }
     blah = mock_controller('/blah') {
-      def get
+      def index
         obj = Object.new
         def obj.method_missing(*a, &b) 60.send(*a, &b) end
         def obj.is_a?(thing) 60.is_a?(thing) end
@@ -77,7 +77,7 @@ spec 'expires' do
       end
     }
     boom = mock_controller('/boom') {
-      def get; expires '9999' end
+      def index; expires '9999' end
     }
     app mock_app(foo, bar, baz, blah, boom)
   end
@@ -115,7 +115,7 @@ end
 spec 'last_modified' do
   it 'ignores nil' do
     app mock_controller {
-      def get; last_modified nil; ''; end
+      def index; last_modified nil; ''; end
     }
 
     get
@@ -124,7 +124,7 @@ spec 'last_modified' do
 
   it 'does not change a status other than 200' do
     app mock_controller {
-      def get
+      def index
         response.status = 299
         last_modified Time.at(0)
         'ok'
@@ -147,12 +147,12 @@ spec 'last_modified' do
     context "with #{last_modified_time.class.name}" do
       before do
         app mock_controller {
-          define_method :get do
+          define_method :index do
             last_modified(last_modified_time)
             'Boo!'
           end
         }
-        @last_modified_time = mock_controller.initialize_controller.time_for(last_modified_time)
+        @last_modified_time = mock_controller.new.time_for(last_modified_time)
       end
 
       context "when there's no If-Modified-Since header" do
@@ -199,7 +199,7 @@ spec 'last_modified' do
 
         it 'does not rely on string comparison' do
           app mock_controller {
-            def get
+            def index
               last_modified "Mon, 18 Oct 2010 20:57:11 GMT"
               "foo"
             end

data/test/content_type_test.rb

@@ -29,7 +29,7 @@ spec :ContentType do
 
   it 'sets the Content-Type header' do
     app mock_controller {
-      define_method :get do
+      def index
         content_type 'text/plain'
         'Hello World'
       end
@@ -42,7 +42,7 @@ spec :ContentType do
 
   it 'takes media type parameters (like charset=)' do
     app mock_controller {
-      define_method :get do
+      def index
         content_type 'text/html', charset: 'latin1'
         "<h1>Hello, World</h1>"
       end
@@ -56,7 +56,7 @@ spec :ContentType do
 
   it 'updates charset for default content type' do
     app mock_controller {
-      def get
+      def index
         charset('latin1')
         "<h1>Hello, World</h1>"
       end
@@ -70,7 +70,7 @@ spec :ContentType do
 
   it 'updates charset without alter actual mimetype nor params' do
     app mock_controller {
-      def get
+      def index
         content_type('.json', level: 1)
         charset('utf-8')
         'ok'
@@ -85,7 +85,7 @@ spec :ContentType do
   it "looks up symbols in Rack's mime types dictionary" do
     Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
     app mock_controller('/foo.xml') {
-      define_method :get do
+      def index
         content_type :foo
         "I AM FOO"
       end
@@ -99,7 +99,7 @@ spec :ContentType do
 
   it 'fails when no mime type is registered for the argument provided' do
     app mock_controller {
-      def get
+      def index
         content_type :bizzle
         "I AM FOO"
       end
@@ -110,7 +110,7 @@ spec :ContentType do
 
   it 'handles already present params' do
     app mock_controller {
-      def get
+      def index
         content_type 'foo/bar;level=1', :charset => 'utf-8'
         'ok'
       end

data/test/cookies_test.rb

@@ -3,7 +3,7 @@ require 'setup'
 spec :Cookies do
   it 'reads cookies' do
     app mock_controller {
-      def get; cookies[:x] end
+      def index; cookies[:x] end
     }
     cookies['x'] = 'y'
     get
@@ -12,7 +12,7 @@ spec :Cookies do
 
   it 'sets cookies' do
     app mock_controller {
-      def get; cookies[:x] = 'y' end
+      def index; cookies[:x] = 'y' end
     }
     get
     assert(cookies['x']) == 'y'
@@ -20,7 +20,7 @@ spec :Cookies do
 
   it 'deletes cookies' do
     app mock_controller {
-      def get; cookies.delete(:x) end
+      def index; cookies.delete(:x) end
     }
     cookies['x'] = 'y'
     assert(cookies['x']) == 'y'
@@ -31,7 +31,7 @@ spec :Cookies do
   it 'accepts a Hash with various options' do
     expires = Time.now
     app mock_controller {
-      define_method :get do
+      define_method :index do
         cookies[:x] = {
           value: 'y',
           path: '/',

data/test/error_handlers_test.rb

@@ -2,6 +2,7 @@ require 'setup'
 
 spec :ErrorHandlers do
   context '501: Not Implemented' do
+
     it 'uses default handler' do
       app mock_controller
       get
@@ -23,7 +24,7 @@ spec :ErrorHandlers do
     it 'can be triggered manually' do
       called = false
       app mock_controller {
-        define_method(:get) {called = true; error(501)}
+        define_method(:index) {called = true; error(501)}
       }
       get
       assert(called) == true
@@ -32,18 +33,19 @@ spec :ErrorHandlers do
   end
 
   context 'Parameters Error' do
+
     it 'uses default handler' do
       app mock_app(mock_controller {
-        def get; end
+        def index; end
       })
       get :x
       assert(last_response.status) == 409
-      assert(last_response.body) =~ /wrong number of arguments/i
+      assert(last_response.body) =~ /wrong arguments/i
     end
 
     it 'uses custom handler' do
       app mock_app(mock_controller {
-        def get; end
+        def index; end
         error 409 do
           'noway'
         end
@@ -56,7 +58,7 @@ spec :ErrorHandlers do
     it 'can be triggered manually' do
       called = false
       app mock_app(mock_controller {
-        define_method(:get) {called = true; error(409)}
+        define_method(:index) {called = true; error(409)}
       })
       get
       assert(called) == true
@@ -65,16 +67,17 @@ spec :ErrorHandlers do
   end
 
   context '500: Fatal Error' do
+
     it 'raises when no handler defined' do
       app mock_controller {
-        def get; raise end
+        def index; raise end
       }
       assert {get}.raise RuntimeError
     end
 
     it 'uses custom handler' do
       app mock_controller {
-        def get; raise('badboy') end
+        def index; raise('badboy') end
         error 500 do |e|
           e.message
         end
@@ -87,7 +90,7 @@ spec :ErrorHandlers do
     it 'can be triggered manually' do
       called = false
       app mock_controller {
-        define_method(:get) {called = true; error(500, 'badgirl')}
+        define_method(:index) {called = true; error(500, 'badgirl')}
       }
       get
       assert(called) == true
@@ -97,10 +100,9 @@ spec :ErrorHandlers do
   end
 
   context '404: Not Found' do
+
     it 'uses default handler' do
-      app mock_app(mock_controller(:x) {
-        def get; end
-      })
+      app mock_app(mock_controller(:x))
       get '/y'
       assert(last_response.status) == 404
       assert(last_response.body) =~ /404/
@@ -109,7 +111,7 @@ spec :ErrorHandlers do
     it 'can be triggered manually and use custom handler' do
       called = false
       app mock_controller {
-        define_method(:get) {called = true; error(404)}
+        define_method(:index) {called = true; error(404)}
         error 404 do
           'trymore'
         end

data/test/etag_test.rb

@@ -28,9 +28,9 @@ require 'setup'
 spec :etag do
 
   def run_with *args, &block
-    request_method = args.shift || :get
+    method = args.shift || :index
     app mock_controller {
-      define_method request_method do
+      define_method method do
         instance_exec(&block) if block
         args.shift || 'ok'
       end
@@ -191,7 +191,7 @@ spec :etag do
 
   context "idempotent requests" do
     it 'returns 200 for normal requests' do
-      run_with(:put) {etag 'foo'}
+      run_with {etag 'foo'}
 
       put
       assert(last_response).is_ok_with_body('ok')
@@ -199,7 +199,7 @@ spec :etag do
 
     context "If-None-Match" do
       it 'returns 412 when If-None-Match is *' do
-        run_with(:put) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_NONE_MATCH'] = '*'
         put
@@ -207,7 +207,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-None-Match is * for new resources' do
-        run_with(:put) {etag 'foo', :new_resource => true}
+        run_with {etag 'foo', :new_resource => true}
 
         env['HTTP_IF_NONE_MATCH'] = '*'
         put
@@ -215,7 +215,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-None-Match is * for existing resources' do
-        run_with(:put) {etag 'foo', :new_resource => false}
+        run_with {etag 'foo', :new_resource => false}
 
         env['HTTP_IF_NONE_MATCH'] = '*'
         put
@@ -223,7 +223,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-None-Match is the etag' do
-        run_with(:put) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_NONE_MATCH'] = '"foo"'
         put
@@ -231,7 +231,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-None-Match includes the etag' do
-        run_with(:put) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_NONE_MATCH'] = '"bar", "foo"'
         put
@@ -239,7 +239,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-None-Match does not include the etag' do
-        run_with(:put) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_NONE_MATCH'] = '"bar"'
         put
@@ -247,7 +247,7 @@ spec :etag do
       end
 
       it 'ignores If-Modified-Since if If-None-Match does not match' do
-        run_with(:put) {
+        run_with {
           etag 'foo'
           last_modified Time.at(0)
         }
@@ -260,7 +260,7 @@ spec :etag do
 
     context "If-Match" do
       it 'returns 200 when If-Match is the etag' do
-        run_with(:put) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_MATCH'] = '"foo"'
         put
@@ -268,7 +268,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-Match includes the etag' do
-        run_with(:put) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_MATCH'] = '"foo", "bar"'
         put
@@ -276,7 +276,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-Match is *' do
-        run_with(:put) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_MATCH'] = '*'
         put
@@ -284,7 +284,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-Match is * for new resources' do
-        run_with(:put) {etag 'foo', :new_resource => true}
+        run_with {etag 'foo', :new_resource => true}
 
         env['HTTP_IF_MATCH'] = '*'
         put
@@ -292,7 +292,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-Match is * for existing resources' do
-        run_with(:put) {etag 'foo', :new_resource => false}
+        run_with {etag 'foo', :new_resource => false}
 
         env['HTTP_IF_MATCH'] = '*'
         put
@@ -300,7 +300,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-Match does not include the etag' do
-        run_with(:put) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_MATCH'] = '"bar"'
         put
@@ -311,7 +311,7 @@ spec :etag do
 
   context "post requests" do
     it 'returns 200 for normal requests' do
-      run_with(:post) {etag 'foo'}
+      run_with {etag 'foo'}
 
       post
       assert(last_response).is_ok_with_body('ok')
@@ -319,7 +319,7 @@ spec :etag do
 
     context "If-None-Match" do
       it 'returns 200 when If-None-Match is *' do
-        run_with(:post) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_NONE_MATCH'] = '*'
         post
@@ -327,7 +327,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-None-Match is * for new resources' do
-        run_with(:post) {etag 'foo', :new_resource => true}
+        run_with {etag 'foo', :new_resource => true}
 
         env['HTTP_IF_NONE_MATCH'] = '*'
         post
@@ -335,7 +335,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-None-Match is * for existing resources' do
-        run_with(:post) {etag 'foo', :new_resource => false}
+        run_with {etag 'foo', :new_resource => false}
 
         env['HTTP_IF_NONE_MATCH'] = '*'
         post
@@ -343,7 +343,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-None-Match is the etag' do
-        run_with(:post) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_NONE_MATCH'] = '"foo"'
         post
@@ -351,7 +351,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-None-Match includes the etag' do
-        run_with(:post) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_NONE_MATCH'] = '"bar", "foo"'
         post
@@ -359,7 +359,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-None-Match does not include the etag' do
-        run_with(:post) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_NONE_MATCH'] = '"bar"'
         post
@@ -367,7 +367,7 @@ spec :etag do
       end
 
       it 'ignores If-Modified-Since if If-None-Match does not match' do
-        run_with(:post) {
+        run_with {
           etag 'foo'
           last_modified Time.at(0)
         }
@@ -380,7 +380,7 @@ spec :etag do
 
     context "If-Match" do
       it 'returns 200 when If-Match is the etag' do
-        run_with(:post) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_MATCH'] = '"foo"'
         post
@@ -388,7 +388,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-Match includes the etag' do
-        run_with(:post) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_MATCH'] = '"foo", "bar"'
         post
@@ -396,7 +396,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-Match is *' do
-        run_with(:post) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_MATCH'] = '*'
         post
@@ -404,7 +404,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-Match is * for new resources' do
-        run_with(:post) {etag 'foo', :new_resource => true}
+        run_with {etag 'foo', :new_resource => true}
 
         env['HTTP_IF_MATCH'] = '*'
         post
@@ -412,7 +412,7 @@ spec :etag do
       end
 
       it 'returns 200 when If-Match is * for existing resources' do
-        run_with(:post) {etag 'foo', :new_resource => false}
+        run_with {etag 'foo', :new_resource => false}
 
         env['HTTP_IF_MATCH'] = '*'
         post
@@ -420,7 +420,7 @@ spec :etag do
       end
 
       it 'returns 412 when If-Match does not include the etag' do
-        run_with(:post) {etag 'foo'}
+        run_with {etag 'foo'}
 
         env['HTTP_IF_MATCH'] = '"bar"'
         post
@@ -430,14 +430,14 @@ spec :etag do
   end
 
   it 'uses a weak etag with the :weak option' do
-    run_with(:get, "that's weak, dude.") {etag 'FOO', :weak}
+    run_with(:index, "that's weak, dude.") {etag 'FOO', :weak}
 
     get
     assert(last_response['ETag']) == 'W/"FOO"'
   end
 
   it 'raises an ArgumentError for an invalid strength' do
-    run_with(:get, "that's weak, dude.") {etag 'FOO', :w00t}
+    run_with(:index, "that's weak, dude.") {etag 'FOO', :w00t}
     assert {get}.raise ArgumentError, /:strong or :weak expected/
   end
 end