nut 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19def3f8c723375cf6a2710b6d6dc1fdd5ce0e5b
-  data.tar.gz: d70138e71b04c33cae1bab25ca8c771157e17aaf
+  metadata.gz: 2874b58315b705be099b8b9da8ff696994df0cd6
+  data.tar.gz: ea95d1b9adcb54b33a6ce4e6b5e379471a9c96c5
 SHA512:
-  metadata.gz: 6945558f671b19235c41f31ea5ead0099655f3cd265e71c50d87a83ee05d86c019fab9b372fd314833e8361d3f396f4d10100d21e65255e405b1e653ef4f3092
-  data.tar.gz: 5187aa6fba2b0e888956c2ef2876d98d5b2e3aec2ac0e65f9ec1ca9216d8fea86ddd5af8c919d601208300203e6f81fb503aaeb0f7f034da00ec7326a6f73a5c
+  metadata.gz: e4dde8c5cdd60bc7fea8789efc11129dddc3759ec339b209620d5e267839b62df3b7b2c23500c740b95b2d33f43373d7d3d37d2dfe434f4502e929bf7f730cd2
+  data.tar.gz: 00dfe351ef2919bc747e8b37c1ec6b7237f721603576594bac9d5ab3fd28dce10170476e69119a1d9d3bd097cfbc545dce8ceaabc3e3ceaadfc135f78103ea80

data/README.md

@@ -159,6 +159,26 @@ end
 n = Nut::Service.new ExampleRequestHandler
 ```
 
+### Handling Errors
+
+When an exception is raised inside the *handle* method, Nut will catch it and immediately throw up a *500 Internal Server Error*, with a description of the exception in the response body.
+While this is suitable for testing / debugging, production apps should overload this behaviour to serve a less 'verbose' error page.
+To overload the behaviour, simply define an *on_err* method in the Request Handler Module:
+
+```ruby
+# Request Handler Module
+module ExampleRequestHandler
+	def handle request, response
+		# ...
+	end
+	
+	def on_err exception, request, response
+		response[:code] = 500
+		response[:body] = "Something went wrong: #{exception}"
+	end
+end
+```
+
 ### Best Practice
 
 While anything is possible, the recommended pattern for using Nut is to extend the Nut Service class, and embed the Request Handler Module inside the new Service Class.

data/lib/nut/codes.rb

@@ -20,6 +20,8 @@ module Nut
 		301 => 'Moved',
 		302 => 'Found',
 		404 => 'Not Found',
-	    501 => 'Not Implemented'
+		500 => 'Internal Server Error',
+		501 => 'Not Implemented',
+	    505 => 'HTTP Version Not Supported'
 	}
 end

data/lib/nut/handler.rb

@@ -158,8 +158,21 @@ module Nut
 			# Prepare Response
 			response = { body: '' }
 
-			# Pass to Request Handler
-			client[:serv].request_handler.handle request, response
+			# Acquire Request Handler
+			rh = client[:serv].request_handler
+
+			# Begin
+			begin
+
+				# Pass to Request Handler
+				rh.handle request, response
+
+			# Rescue (Catch Exceptions raised during request handling)
+			rescue Exception => e
+
+				# Handle Error
+				(rh.respond_to?(:on_err) ? rh : self).on_err e, request, response
+			end
 
 			# Respond to Client
 			serve_response client, response
@@ -173,5 +186,21 @@ module Nut
 			# Send out Response String
 			write client, Response.build_response(response)
 		end
+
+		# Default Error Handler:
+		# Throws up a 500 Internal Server Error, with a description of the exception in the response body.
+		# @param [Exception] ex An exception that was raised inside the handle method
+		# @param [Hash] request Request Hash
+		# @param [Hash] response Response Hash
+		def self.on_err ex, request, response
+
+			# Throw up a 500 Internal Server Error
+			response[:code] = 500
+
+			# Spit out Exception in Response Body
+			response[:body] << '<h1>Internal Server Error</h1>'
+			response[:body] << "<h2>#{ex}</h2>"
+			ex.backtrace.each { |b| response[:body] << " -> #{b}<br/>" }
+		end
 	end
 end

data/lib/nut/version.rb

@@ -5,5 +5,5 @@
 module Nut
 
 	# Version
-	VERSION = '1.0.0'
+	VERSION = '1.1.0'
 end

data/nut.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency 'bundler'
 	spec.add_development_dependency 'rake'
 	spec.add_runtime_dependency 'minitest'
+	spec.add_runtime_dependency 'rest-client'
 	spec.add_runtime_dependency 'aromat'
 	spec.add_runtime_dependency 'typor'
 	spec.add_runtime_dependency 'rxio'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nut
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Eresse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aromat
   requirement: !ruby/object:Gem::Requirement