spire 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/spire/public.rb

@@ -36,18 +36,6 @@ module Spire
         return 404
       end
     end
-    
-    # this is an explicit function and should be avoided
-    def return_file!(file)
-      path = File.expand_path(__FILE__)
-      path["lib/spire/public.rb"] = "public/#{file}"
-      if File.exists?(path)
-        file = IO.read(path)
-        return file
-      else
-        return false
-      end
-    end
-        
+            
   end
 end

data/lib/spire/router.rb

@@ -15,9 +15,8 @@ module Spire
       @app["controller"] = nil
       
       if @request["controller"] == "favicon.ico"
-        favicon = Public.new
-        response = favicon.return_file!("favicon.ico")
-        return Response.new(response, "image/x-icon", 200)
+        self.return_file("favicon.ico")
+        @request["controller"] = nil
       end
       
       if @request["controller"] == nil
@@ -38,7 +37,7 @@ module Spire
         end
       end
       
-      unless @app["controller"]     
+      unless @app["controller"]
         return Error.new :message => "404 // Route not found in system/routes.rb", :status => 404
       end
       

data/spire.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   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.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70126420185900 !ruby/object:Gem::Requirement
+  requirement: &70315678749700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70126420185900
+  version_requirements: *70315678749700
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
-  requirement: &70126420185360 !ruby/object:Gem::Requirement
+  requirement: &70315678749040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70126420185360
+  version_requirements: *70315678749040
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70126420184740 !ruby/object:Gem::Requirement
+  requirement: &70315678748460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70126420184740
+  version_requirements: *70315678748460
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70126420184040 !ruby/object:Gem::Requirement
+  requirement: &70315678747980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70126420184040
+  version_requirements: *70315678747980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70126420183340 !ruby/object:Gem::Requirement
+  requirement: &70315678747380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70126420183340
+  version_requirements: *70315678747380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70126420182640 !ruby/object:Gem::Requirement
+  requirement: &70315678746780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70126420182640
+  version_requirements: *70315678746780
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70126420182160 !ruby/object:Gem::Requirement
+  requirement: &70315678746280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70126420182160
+  version_requirements: *70315678746280
 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: -177694787737480869
+      hash: 1082199286965217618
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: