lib/spire/router.rb in spire-0.3.2 vs lib/spire/router.rb in spire-0.3.3

@@ -10,10 +10,12 @@
       req = env['REQUEST_PATH'].split("/")
       @request = {"controller" => req[1], "action" => req[2]}
     end
 
     def route
+      @app["controller"] = nil
+      
       if @request["controller"] == "public"
         self.return_file
       end
       
       if @request["controller"] == nil
@@ -28,16 +30,14 @@
             @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"]
+      unless @app["controller"] 
         return Error.new :status => 404
       end
       
       return self.run
     end