spire 0.2.4 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.4
1
+ 0.3.0
@@ -21,8 +21,8 @@ module Spire
21
21
  if opts[:view].is_a? Array
22
22
  @storage = ""
23
23
  opts[:view].each do |file|
24
- file_path = File.join($base_path, 'views', file)
25
- return Error.new(:status => 404) unless File.exists?(file_path)
24
+ file_path = File.join($base_path, 'views', file)
25
+ return 404 unless File.exists?(file_path)
26
26
  contents = IO.read(file_path)
27
27
  extension = File.extname(file_path)
28
28
 
@@ -42,7 +42,7 @@ module Spire
42
42
  end
43
43
 
44
44
  file_path = File.join($base_path, 'views', opts[:view])
45
- return Error.new(:status => 404) unless File.exists?(file_path)
45
+ return 404 unless File.exists?(file_path)
46
46
  contents = IO.read(file_path)
47
47
  extension = File.extname(file_path)
48
48
 
data/lib/spire/router.rb CHANGED
@@ -30,6 +30,8 @@ module Spire
30
30
  elsif @request["controller"] == keys[1]
31
31
  @app["controller"] = values[0].capitalize
32
32
  @app["action"] = values[1]
33
+ else
34
+ return Error.new :status => 404
33
35
  end
34
36
  end
35
37
  end
@@ -62,6 +64,10 @@ module Spire
62
64
  content_type = "text/html;"
63
65
  status = 200
64
66
 
67
+ if result == 404
68
+ return Error.new :status => 404
69
+ end
70
+
65
71
  if @class.instance_variable_get(:@status)
66
72
  status = @class.instance_variable_get(:@status)
67
73
  end
@@ -69,7 +75,7 @@ module Spire
69
75
  if @class.instance_variable_get(:@content_type)
70
76
  content_type = @class.instance_variable_get(:content_type)
71
77
  end
72
-
78
+
73
79
  return Response.new(result, content_type, status)
74
80
  end
75
81
 
data/spire.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "spire"
8
- s.version = "0.2.4"
8
+ s.version = "0.3.0"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Scott Nicol"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spire
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.3.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-10-19 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rack
16
- requirement: &70270452034600 !ruby/object:Gem::Requirement
16
+ requirement: &70249786093500 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.3.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70270452034600
24
+ version_requirements: *70249786093500
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack-rewrite
27
- requirement: &70270452033320 !ruby/object:Gem::Requirement
27
+ requirement: &70249785897640 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.2.1
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70270452033320
35
+ version_requirements: *70249785897640
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: haml
38
- requirement: &70270452031420 !ruby/object:Gem::Requirement
38
+ requirement: &70249785896340 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 3.1.0
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70270452031420
46
+ version_requirements: *70249785896340
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: erubis
49
- requirement: &70270452030140 !ruby/object:Gem::Requirement
49
+ requirement: &70249785894940 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.7.0
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70270452030140
57
+ version_requirements: *70249785894940
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &70270452001980 !ruby/object:Gem::Requirement
60
+ requirement: &70249785893500 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.0.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70270452001980
68
+ version_requirements: *70249785893500
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: jeweler
71
- requirement: &70270452001000 !ruby/object:Gem::Requirement
71
+ requirement: &70249785892400 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 1.6.4
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70270452001000
79
+ version_requirements: *70249785892400
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rcov
82
- requirement: &70270451999840 !ruby/object:Gem::Requirement
82
+ requirement: &70249785890800 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70270451999840
90
+ version_requirements: *70249785890800
91
91
  description: ! "Light rack-based framework with controllers, static views and a router
92
92
  \n with templating engine support coming soon"
93
93
  email: scott@scottnicol.co.uk
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
126
126
  version: '0'
127
127
  segments:
128
128
  - 0
129
- hash: 829611496356220362
129
+ hash: -2038922023174616458
130
130
  required_rubygems_version: !ruby/object:Gem::Requirement
131
131
  none: false
132
132
  requirements: