spire 0.2.4 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0

data/lib/spire/class/MainController.rb

@@ -21,8 +21,8 @@ module Spire
       if opts[:view].is_a? Array
         @storage = ""
         opts[:view].each do |file|          
-          file_path = File.join($base_path, 'views', file)
-          return Error.new(:status => 404) unless File.exists?(file_path)
+          file_path = File.join($base_path, 'views', file)      
+          return 404 unless File.exists?(file_path)
           contents = IO.read(file_path)
           extension = File.extname(file_path)
 
@@ -42,7 +42,7 @@ module Spire
       end
       
       file_path = File.join($base_path, 'views', opts[:view])
-      return Error.new(:status => 404) unless File.exists?(file_path)
+      return 404 unless File.exists?(file_path)
       contents = IO.read(file_path)
       extension = File.extname(file_path)
 

data/lib/spire/router.rb

@@ -30,6 +30,8 @@ module Spire
           elsif @request["controller"] == keys[1]
             @app["controller"] = values[0].capitalize
             @app["action"] = values[1]            
+          else
+            return Error.new :status => 404
           end
         end
       end
@@ -62,6 +64,10 @@ module Spire
       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
@@ -69,7 +75,7 @@ module Spire
       if @class.instance_variable_get(:@content_type) 
         content_type = @class.instance_variable_get(:content_type) 
       end
-      
+            
       return Response.new(result, content_type, status)
     end
 

data/spire.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.2.4"
+  s.version = "0.3.0"
 
   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.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70270452034600 !ruby/object:Gem::Requirement
+  requirement: &70249786093500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70270452034600
+  version_requirements: *70249786093500
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
-  requirement: &70270452033320 !ruby/object:Gem::Requirement
+  requirement: &70249785897640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70270452033320
+  version_requirements: *70249785897640
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70270452031420 !ruby/object:Gem::Requirement
+  requirement: &70249785896340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70270452031420
+  version_requirements: *70249785896340
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70270452030140 !ruby/object:Gem::Requirement
+  requirement: &70249785894940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70270452030140
+  version_requirements: *70249785894940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70270452001980 !ruby/object:Gem::Requirement
+  requirement: &70249785893500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70270452001980
+  version_requirements: *70249785893500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70270452001000 !ruby/object:Gem::Requirement
+  requirement: &70249785892400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70270452001000
+  version_requirements: *70249785892400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70270451999840 !ruby/object:Gem::Requirement
+  requirement: &70249785890800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70270451999840
+  version_requirements: *70249785890800
 description: ! "Light rack-based framework with controllers, static views and a router
   \n    with templating engine support coming soon"
 email: scott@scottnicol.co.uk
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 829611496356220362
+      hash: -2038922023174616458
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: