rocketio 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51fdeef94b06a674a04316766088ddff1366635a
-  data.tar.gz: 8804955067cd66dbbbe011f53481484f69d072fb
+  metadata.gz: 36eba071bea110611c309b5fe6aa7ff394e7bbd2
+  data.tar.gz: 23f34bab298dbe32d802a727bffc2e9d34203672
 SHA512:
-  metadata.gz: 178ba8589ad57652cd19595dbddef2fe6d4b06e3aa999cc7ea170eafffbb59f9e96e385fa598b11df833ffbea49f241d5a8fe3c8f93eeb8f18d0f658b16db9c3
-  data.tar.gz: c86a96c3d50ba9bc0cb466958550a1b06945f3f040d29225e1e0653b45bb132d2b0fd0dd799b01c58761255a9d54a560667a74888e20383539405fb417630e7f
+  metadata.gz: 2f95ee86bbb12c1ceec9d8288e526940dd8ea036f6c9566162dcfa7a03583b159ecee1e0fed8fc3a962bc4b589c01be2ad149408e47195c1ac7b718e5ebe128a
+  data.tar.gz: 613c888e3704cddb848c36a177428b09de78934a26e1d96335e2994af4075eac17622ad03c943fb1b000b79b086ace61376c76360fc4e8fc8197f82046b14759

data/lib/rocketio/application.rb

@@ -4,7 +4,7 @@ module RocketIO
     def initialize *args, &block
       controllers = args.empty? ? RocketIO.controllers : args.flatten
       if block
-        controllers.each {|c| c.class_exec {define_method(:call!, block)}}
+        controllers.each {|c| c.class_exec {private define_method(:__run__, block)}}
       end
       @router = Router.new(*controllers)
     end

data/lib/rocketio/controller.rb

@@ -26,33 +26,41 @@ module RocketIO
     #
     def call env
       catch :__response__ do
-        begin
-          self.env = env
-          validate_or_request_authentication_if_needed
-          validate_or_request_authorization_if_needed
-          validate_parameters
-
-          call! proc {
-            invoke_before_filter
-            invoke_around_filter proc {
-              response.body = public_send(requested_method, *path_params_array)
-            }
-            invoke_after_filter
-          }
-          response.body ||= RocketIO::EMPTY_ARRAY
-          response.body = [] if head? # dropping body on HEAD requests
-          response.finish
-        rescue Exception => e
-          if RocketIO.development?
-            puts "\e[0;31m%s\e[0m" % e.inspect
-            e.backtrace.each {|l| puts "  \e[0;36m%s\e[0m" % l}
+        if error_handlers[500]
+          begin
+            __call__(env)
+          rescue Exception => e
+            if RocketIO.development?
+              puts "\e[0;31m%s\e[0m" % e.inspect
+              e.backtrace.each {|l| puts "  \e[0;36m%s\e[0m" % l}
+            end
+            error(500, e)
           end
-          error(500, e)
+        else
+          __call__(env)
         end
       end
     end
 
-    def call! app
+    private def __call__ env
+      self.env = env
+      validate_or_request_authentication_if_needed
+      validate_or_request_authorization_if_needed
+      validate_parameters
+
+      __run__ proc {
+        invoke_before_filter
+        invoke_around_filter proc {
+          response.body = public_send(requested_method, *path_params_array)
+        }
+        invoke_after_filter
+      }
+      response.body ||= RocketIO::EMPTY_ARRAY
+      response.body = [] if head? # dropping body on HEAD requests
+      response.finish
+    end
+
+    private def __run__ app
       app.call
     end
 

data/lib/rocketio/controller/error_handlers.rb

@@ -75,12 +75,6 @@ module RocketIO
       })
     end
 
-    # 500: Fatal Error
-    error 500 do |error|
-      error = StandardError.new(error) unless Exception === error
-      RocketIO.error_renderer(500, xhr?, env: env, error: error)
-    end
-
     # 501: Not Implemented
     error 501 do
       RocketIO.error_renderer(501, xhr?, env: env)

data/lib/rocketio/version.rb

@@ -1,3 +1,3 @@
 module RocketIO
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/test/cache_control_test.rb

@@ -108,8 +108,7 @@ spec 'expires' do
   end
 
   it 'fails when Time.parse raises an ArgumentError' do
-    get '/boom'
-    assert(last_response.status) == 500
+    assert {get '/boom'}.raise ArgumentError, /argument out of range/
   end
 end
 

data/test/content_type_test.rb

@@ -104,9 +104,7 @@ spec :ContentType do
         "I AM FOO"
       end
     }
-    get
-    assert(last_response.status) == 500
-    assert(last_response.body) =~ /Unknown media type: :bizzle/
+    assert { get }.raise ArgumentError, /Unknown media type: :bizzle/
   end
 
 

data/test/error_handlers_test.rb

@@ -65,13 +65,11 @@ spec :ErrorHandlers do
   end
 
   context '500: Fatal Error' do
-    it 'uses default handler' do
+    it 'raises when no handler defined' do
       app mock_controller {
         def get; raise end
       }
-      get
-      assert(last_response.status) == 500
-      assert(last_response.body) =~ /500.+fatal/i
+      assert {get}.raise RuntimeError
     end
 
     it 'uses custom handler' do
@@ -94,7 +92,7 @@ spec :ErrorHandlers do
       get
       assert(called) == true
       assert(last_response.status) == 500
-      assert(last_response.body) =~ /500.+badgirl/im
+      assert(last_response.body) =~ /badgirl/im
     end
   end
 

data/test/etag_test.rb

@@ -438,8 +438,6 @@ spec :etag do
 
   it 'raises an ArgumentError for an invalid strength' do
     run_with(:get, "that's weak, dude.") {etag 'FOO', :w00t}
-    get
-    assert(last_response.status) == 500
-    assert(last_response.body) =~ /:strong or :weak expected/
+    assert {get}.raise ArgumentError, /:strong or :weak expected/
   end
 end

data/test/halt_test.rb

@@ -59,9 +59,7 @@ spec :HaltTest do
   end
 
   it 'returns a fatal error unless given array\'s second element is a Hash' do
-    halt_app [200, 'wrong headers', 'boby']
-    assert(last_response.status) == 500
-    assert(last_response.body) =~ /no implicit conversion of String into Hash/
+    assert {halt_app [200, 'wrong headers', 'boby']}.raise TypeError, /no implicit conversion of String into Hash/
   end
 
   it 'halts right away ignoring other arguments if a Rack::Response passed as first argument' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketio
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -146,7 +146,6 @@ files:
 - lib/rocketio/controller/websocket.rb
 - lib/rocketio/error_templates/404.html
 - lib/rocketio/error_templates/409.html
-- lib/rocketio/error_templates/500.html
 - lib/rocketio/error_templates/501.html
 - lib/rocketio/error_templates/layout.html
 - lib/rocketio/exceptions.rb
@@ -208,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: '["rocketio-0.0.1", "Simple, fast, scalable web framework for Ruby"]'
+summary: '["rocketio-0.0.2", "Simple, fast, scalable web framework for Ruby"]'
 test_files: []

data/lib/rocketio/error_templates/500.html

@@ -1,3 +0,0 @@
-<h1>500: Fatal Error</h1>
-<hr>
-<h4>{{error.message}}</h4>