spire 0.3.2 → 0.3.3

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.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/lib/spire/router.rb +3 -3
  3. data/spire.gemspec +1 -1
  4. metadata +16 -16
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.2
1
+ 0.3.3
data/lib/spire/router.rb CHANGED
@@ -12,6 +12,8 @@ module Spire
12
12
  end
13
13
 
14
14
  def route
15
+ @app["controller"] = nil
16
+
15
17
  if @request["controller"] == "public"
16
18
  self.return_file
17
19
  end
@@ -30,13 +32,11 @@ module Spire
30
32
  elsif @request["controller"] == keys[1]
31
33
  @app["controller"] = values[0].capitalize
32
34
  @app["action"] = values[1]
33
- else
34
- return Error.new :status => 404
35
35
  end
36
36
  end
37
37
  end
38
38
 
39
- unless @app["controller"]
39
+ unless @app["controller"]
40
40
  return Error.new :status => 404
41
41
  end
42
42
 
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.3.2"
8
+ s.version = "0.3.3"
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.3.2
4
+ version: 0.3.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-10-20 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rack
16
- requirement: &70297015087660 !ruby/object:Gem::Requirement
16
+ requirement: &70258656997880 !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: *70297015087660
24
+ version_requirements: *70258656997880
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack-rewrite
27
- requirement: &70297015087180 !ruby/object:Gem::Requirement
27
+ requirement: &70258656997400 !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: *70297015087180
35
+ version_requirements: *70258656997400
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: haml
38
- requirement: &70297015086700 !ruby/object:Gem::Requirement
38
+ requirement: &70258656996920 !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: *70297015086700
46
+ version_requirements: *70258656996920
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: erubis
49
- requirement: &70297015102600 !ruby/object:Gem::Requirement
49
+ requirement: &70258656996440 !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: *70297015102600
57
+ version_requirements: *70258656996440
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &70297015102120 !ruby/object:Gem::Requirement
60
+ requirement: &70258656995960 !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: *70297015102120
68
+ version_requirements: *70258656995960
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: jeweler
71
- requirement: &70297015101640 !ruby/object:Gem::Requirement
71
+ requirement: &70258656995480 !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: *70297015101640
79
+ version_requirements: *70258656995480
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rcov
82
- requirement: &70297015101160 !ruby/object:Gem::Requirement
82
+ requirement: &70258656995000 !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: *70297015101160
90
+ version_requirements: *70258656995000
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
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
127
127
  version: '0'
128
128
  segments:
129
129
  - 0
130
- hash: -4383538789172512163
130
+ hash: 1719392172410138947
131
131
  required_rubygems_version: !ruby/object:Gem::Requirement
132
132
  none: false
133
133
  requirements: