spire 0.4.8 → 0.4.9

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/spire/error.rb

@@ -1,54 +1,18 @@
 module Spire
     class Error
-        def initialize(opts={:status => 200, :message=> "Unknown Error"})
-            case opts[:status]
-            when 200
-                self.return_error(opts[:message], opts[:status])
-            when 404
-              if opts[:message]
-                self.return_error(opts[:message], opts[:status])
-              else
-                self.return_404
-              end
-            when 444
-                self.return_444
-            when 401
-                self.return_401
-            when 204
-                self.return_204
-            when 301
-                self.return_301
-            end
-        end
+        def self.return_error(opts={:status => 200, :message => "An unknown error occured", :extended_message => ""})
+            spec = Gem::Specification.find_by_name("spire")
+            gem_root = spec.gem_dir
 
-        def return_204
-            @return = Response.new(self.style_error("204 - No content"), 'text/html;', 204)
+            contents = IO.read("#{gem_root}/lib/spire/templates/error/error.haml")
+            require 'haml'
+            
+            error_template = Haml::Engine.new(contents).render(Object.new, {:@error_code => opts[:status], :@error_message => opts[:message], :@extended_message => opts[:extended_message]})
+            return Response.new(error_template, 'text/html;', opts[:status])
         end
 
-        def return_301
-            @return = Response.new(self.style_error("301 - Moved permanently"), 'text/html;', 301)
-        end
-        
-        def return_401
-            @return = Response.new(self.style_error("401 - Not authorized"), 'text/html;', 401)
-        end
-        
-        def return_404
-            @return = Response.new(self.style_error("404 - File not found"), 'text/html;', 404)
-        end
-        
-        def return_444
-            @return = Response.new(self.style_error("No response made by the server, check for a valid response"), 'text/html;', 404)
-        end
-        
-        def style_error(message)
-            return "<h2 style=\"font-family: 'Helvetica Neue', HelveticaNeue, Arial, Helvetica, sans-serif; \">
-                      #{message}
-                    </h2>"
-        end
-        
-        def return_error(message, status)
-            @return = Response.new(self.style_error(message), 'text/html;', status)
+        def self.manual_error(opts={:status => 200, :message => "An unknown error occured"})
+            return Response.new(opts[:message], 'text/html;', opts[:status])
         end
 
         def to_rack

data/lib/spire/public.rb

@@ -26,7 +26,7 @@ module Spire
       file = result.extension_check
       puts file
       if file == 404
-        return Error.new :status => 404, :message => "404 // File not found"
+        return Error.return_error :status => 404, :message => "404 // File not found"
       else
         return Response.new(file[:file], file[:content_type], 200)
       end

data/lib/spire/router.rb

@@ -38,7 +38,7 @@ module Spire
       end
       
       if !@app["controller"]
-        return Error.new :message => "Route not found in system/routes.rb", :status => 404
+        return Error.return_error :message => "Route not found in system/routes.rb", :status => 404
       end
       
       return self.run
@@ -52,7 +52,7 @@ module Spire
       buffer = @class.get_buffer
       
       if !buffer && !result
-        return Error.new :message => "No method/Response from method. See #{@app["controller"]}##{@app["action"]} and check for a response", :status => 404
+        return Error.return_error :message => "No method/Response from method. See #{@app["controller"]}##{@app["action"]} and check for a response", :status => 404
       end
 
       content_type = "text/html;"
@@ -65,7 +65,7 @@ module Spire
       if @class.instance_variable_get(:@content_type) 
         content_type = @class.instance_variable_get(:content_type) 
       end
-
+      
       if result
         buffer = buffer + result
       end
@@ -81,7 +81,7 @@ module Spire
       if response
         response.to_rack
       else
-        Error.new :status => 444
+        Error.return_error :status => 444
       end
     end
   end

data/lib/spire/templates/error/error.haml

@@ -0,0 +1,49 @@
+!!! 5
+%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"}
+%head
+	:css
+		body {
+			font-family: 'Helvetica Neue';
+			padding-left: 30px;
+			background: #fafafa;
+			padding: 0;
+			margin: 0;
+			margin-bottom: 100px;
+		}
+		h1 {
+			font-size: 2.8em;
+			text-shadow: 0px 2px grey;
+			padding-left: 5%;
+		}
+		p {
+			font-size: 1.8em;
+			text-shadow: 0px 1px grey;
+			padding-left: 5%;
+			padding-right: 5%;
+		}
+		#trace {
+			font-size: 1.2em;
+			width: 80%;
+			margin-left: auto;
+			margin-right: auto;
+			border: 2px solid #D64C49;
+			padding-top: 30px;
+			padding-bottom: 30px;
+		}
+		#footer {
+			position: fixed;
+			bottom: 0px;
+			height: 45px;
+			width: 100%;
+			background-color: #E0FFD3;
+			border-top: 2px solid #484939;
+		}
+%body	
+	%h1= @error_code
+	%p= @error_message
+	- if @extended_message
+		%p#trace= @extended_message
+	#footer
+		%a{:href => "http://spire.heroku.com"} Powered by Spire
+		#cocoon
+			%a{:href => "http://wearecocoon.com"} by Cocoon

data/spire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]
-  s.date = "2012-08-08"
+  s.date = "2012-08-11"
   s.description = "Light rack-based framework with controllers, HAML/ERB views, router & error handler"
   s.email = "scott@scottnicol.co.uk"
   s.executables = ["spire"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/spire/resource/buffer.rb",
     "lib/spire/resource/mime.rb",
     "lib/spire/router.rb",
+    "lib/spire/templates/error/error.haml",
     "spire.gemspec"
   ]
   s.homepage = "http://github.com/snicol/spire"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -130,6 +130,7 @@ files:
 - lib/spire/resource/buffer.rb
 - lib/spire/resource/mime.rb
 - lib/spire/router.rb
+- lib/spire/templates/error/error.haml
 - spire.gemspec
 homepage: http://github.com/snicol/spire
 licenses:
@@ -146,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 657964652971798131
+      hash: -3109762138428974111
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: