lib/spire/router.rb in spire-0.2.4 vs lib/spire/router.rb in spire-0.3.0

@@ -28,10 +28,12 @@
             @app["controller"] = values[0].capitalize
             @app["action"] = values[1]
           elsif @request["controller"] == keys[1]
             @app["controller"] = values[0].capitalize
             @app["action"] = values[1]            
+          else
+            return Error.new :status => 404
           end
         end
       end
       
       unless @app["controller"]
@@ -60,17 +62,21 @@
       end
       
       content_type = "text/html;"
       status = 200
       
+      if result == 404
+        return Error.new :status => 404
+      end
+      
       if @class.instance_variable_get(:@status)
         status = @class.instance_variable_get(:@status)
       end
       
       if @class.instance_variable_get(:@content_type) 
         content_type = @class.instance_variable_get(:content_type) 
       end
-      
+            
       return Response.new(result, content_type, status)
     end
 
     def call(env)
       self.disect(env)