lib/spire/router.rb in spire-0.4.4 vs lib/spire/router.rb in spire-0.4.5

- old
+ new

@@ -13,13 +13,12 @@ def route @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 route = @routes['default'].split("#") @app["controller"] = route[0].capitalize @@ -36,10 +35,10 @@ @app["action"] = values[1] end end end - unless @app["controller"] + unless @app["controller"] return Error.new :message => "404 // Route not found in system/routes.rb", :status => 404 end return self.run end