spire 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/spire/error.rb

@@ -22,27 +22,33 @@ module Spire
         end
 
         def return_204
-            @return = Response.new("<h1 style='font-family: 'Helvetica Neue', HelveticaNeue, Arial, Helvetica, sans-serif; '>204 - No content<h1>", 'text/html;', 204)
+            @return = Response.new(self.style_error("204 - No content"), 'text/html;', 204)
         end
 
         def return_301
-            @return = Response.new("<h1 style='font-family: 'Helvetica Neue', HelveticaNeue, Arial, Helvetica, sans-serif; '>301 - Moved permanently<h1>", 'text/html;', 301)
+            @return = Response.new(self.style_error("301 - Moved permanently"), 'text/html;', 301)
         end
         
         def return_401
-            @return = Response.new("<h1 style='font-family: 'Helvetica Neue', HelveticaNeue, Arial, Helvetica, sans-serif; '>401 - Not authorized<h1>", 'text/html;', 401)
+            @return = Response.new(self.style_error("401 - Not authorized"), 'text/html;', 401)
         end
         
         def return_404
-            @return = Response.new("<h1 style='font-family: 'Helvetica Neue', HelveticaNeue, Arial, Helvetica, sans-serif; '>404 - Page not found<h1>", 'text/html;', 404)
+            @return = Response.new(self.style_error("404 - Page not found"), 'text/html;', 404)
         end
         
         def return_444
-            @return = Response.new("<h1 style='font-family: 'Helvetica Neue', HelveticaNeue, Arial, Helvetica, sans-serif; '>No response made by the server, check for a valid response<h1>", 'text/html;', 404)
+            @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(message, 'text/html;', status)
+            @return = Response.new(self.style_error(message), 'text/html;', status)
         end
 
         def to_rack

data/spire.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70315678749700 !ruby/object:Gem::Requirement
+  requirement: &70280841893160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70315678749700
+  version_requirements: *70280841893160
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
-  requirement: &70315678749040 !ruby/object:Gem::Requirement
+  requirement: &70280842012880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70315678749040
+  version_requirements: *70280842012880
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70315678748460 !ruby/object:Gem::Requirement
+  requirement: &70280842015600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70315678748460
+  version_requirements: *70280842015600
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70315678747980 !ruby/object:Gem::Requirement
+  requirement: &70280842017300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70315678747980
+  version_requirements: *70280842017300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70315678747380 !ruby/object:Gem::Requirement
+  requirement: &70280842019320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70315678747380
+  version_requirements: *70280842019320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70315678746780 !ruby/object:Gem::Requirement
+  requirement: &70280842021720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70315678746780
+  version_requirements: *70280842021720
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70315678746280 !ruby/object:Gem::Requirement
+  requirement: &70280842023380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315678746280
+  version_requirements: *70280842023380
 description: Light rack-based framework with controllers, HAML/ERB views, router &
   error handler
 email: scott@scottnicol.co.uk
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1082199286965217618
+      hash: 2756815043673532844
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: