utopia 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2de92361694a0d93055b13141f7373bdca9ba4c8
-  data.tar.gz: abf743ebf57a07d8850fb22719ee62085e4c1166
+  metadata.gz: d79188e4c82a0e063f4d4d322b9c9f6ede2abac6
+  data.tar.gz: 066c1fd1bece542a5a6e310bfdcff65670a0e91e
 SHA512:
-  metadata.gz: bdeeca349e075376b9a5a65c97195e92e4e67c3b6c21077ab93fbf86395dd4745b41c63cc0362371a9af1b8162ece2a7c65011c081b617ef6e1cd05c0920280d
-  data.tar.gz: 0a135fa1fd8069f1a8b90ea8f040bd1dad4f71891e37735099184a3579d2191f21a8e8bf0b87955ffe6d4835561ce28f9b21d97423ba7b423b9a8b0d4afaeec7
+  metadata.gz: 39c11885cf3802fd246bcc6b551afc9164d4d9e3f13f27823be4a59f9a1a8212517f81c9b630f8706ef565adfead313209f28e37a81180b086f8081aeec9e1c3
+  data.tar.gz: abb2c8242bcfd5d9a4213de4458756b78d4dbc1be049800100e888c0487e367112a277a40a5c19e74c374a2000fada23b3dde9b89a2176df75c2b71d1877587b

data/lib/utopia/exception_handler.rb

@@ -45,7 +45,7 @@ module Utopia
 			return [400, {"Content-Type" => "text/html"}, body]
 		end
 
-		def redirect(env, ex)
+		def redirect(env, exception)
 			return @app.call(env.merge('PATH_INFO' => @location, 'REQUEST_METHOD' => 'GET'))
 		end
 
@@ -58,19 +58,19 @@ module Utopia
 				
 				log.error "Exception #{exception.to_s.dump}!"
 				
-				ex.backtrace.each do |bt|
-					log.error bt
+				exception.backtrace.each do |line|
+					log.error line
 				end
 				
 				# If the error occurred while accessing the error handler, we finish with a fatal error:
 				if env['PATH_INFO'] == @location
-					return fatal_error(env, ex)
+					return fatal_error(env, exception)
 				else
 					# If redirection fails, we also finish with a fatal error:
 					begin
-						return redirect(env, ex)
+						return redirect(env, exception)
 					rescue
-						return fatal_error(env, ex)
+						return fatal_error(env, exception)
 					end
 				end
 			end

data/lib/utopia/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "1.0.0"
+	VERSION = "1.0.1"
 end

data/spec/utopia/exception_handler_spec.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env rspec
+
+# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'spec_helper'
+
+require 'rack/mock'
+require 'rack/test'
+
+require 'utopia/exception_handler'
+
+module Utopia::ExceptionHandlerSpec
+	describe Utopia::ExceptionHandler do
+		include Rack::Test::Methods
+		
+		let(:app) {Rack::Builder.parse_file(File.expand_path('../exception_handler_spec.ru', __FILE__)).first}
+		
+		it "should successfully call the controller method" do
+			get "/controller/blow"
+			
+			expect(last_response.status).to be == 400
+			expect(last_response.body).to be_include 'Fatal Error'
+		end
+	end
+end

data/spec/utopia/exception_handler_spec.ru

@@ -0,0 +1,6 @@
+
+use Utopia::ExceptionHandler, '/controller/exception'
+
+use Utopia::Controller, root: File.expand_path('../pages', __FILE__)
+
+run lambda {|env| [404, {}, []]}

data/spec/utopia/pages/controller/controller.rb

@@ -25,4 +25,15 @@ end
 
 on 'index' do
 	success! content: 'Hello World'
+end
+
+class TharSheBlows < StandardError
+end
+
+on 'blow' do
+	raise TharSheBlows.new("Arrrh!")
+end
+
+on 'exception' do
+	raise TharSheBlows.new("Yarrh!")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -228,6 +228,8 @@ files:
 - spec/utopia/content_spec.ru
 - spec/utopia/controller_spec.rb
 - spec/utopia/controller_spec.ru
+- spec/utopia/exception_handler_spec.rb
+- spec/utopia/exception_handler_spec.ru
 - spec/utopia/extensions_spec.rb
 - spec/utopia/localization_spec.rb
 - spec/utopia/localization_spec.ru
@@ -305,6 +307,8 @@ test_files:
 - spec/utopia/content_spec.ru
 - spec/utopia/controller_spec.rb
 - spec/utopia/controller_spec.ru
+- spec/utopia/exception_handler_spec.rb
+- spec/utopia/exception_handler_spec.ru
 - spec/utopia/extensions_spec.rb
 - spec/utopia/localization_spec.rb
 - spec/utopia/localization_spec.ru