spire 0.4.0 → 0.4.1

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.0
1
+ 0.4.1
data/lib/spire/public.rb CHANGED
@@ -26,12 +26,15 @@ module Spire
26
26
  def create_response
27
27
  path = File.expand_path(__FILE__)
28
28
  path["lib/spire/public.rb"] = "public/#{@opts[:file]}"
29
- return Error.new(:status => 404, :message => "404 // File not found") unless File.exists?(path)
30
- file = IO.read(path)
31
- @return = {}
32
- @return[:file] = file
33
- @return[:content_type] = @content_type
34
- return @return
29
+ if File.exists?(path)
30
+ file = IO.read(path)
31
+ @return = {}
32
+ @return[:file] = file
33
+ @return[:content_type] = @content_type
34
+ return @return
35
+ else
36
+ return 404
37
+ end
35
38
  end
36
39
 
37
40
  end
data/lib/spire/router.rb CHANGED
@@ -45,7 +45,11 @@ module Spire
45
45
  def return_file(file)
46
46
  result = Public.new :file => file, :render => true
47
47
  file = result.extension_check
48
- return Response.new(file[:file], file[:content_type], 200)
48
+ if file == 404
49
+ return Error.new :status => 404, :message => "404 // File not found"
50
+ else
51
+ return Response.new(file[:file], file[:content_type], 200)
52
+ end
49
53
  end
50
54
 
51
55
  def run
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.4.0"
8
+ s.version = "0.4.1"
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.4.0
4
+ version: 0.4.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-10-21 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rack
16
- requirement: &70167713606260 !ruby/object:Gem::Requirement
16
+ requirement: &70347412506520 !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: *70167713606260
24
+ version_requirements: *70347412506520
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack-rewrite
27
- requirement: &70167713605780 !ruby/object:Gem::Requirement
27
+ requirement: &70347412506040 !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: *70167713605780
35
+ version_requirements: *70347412506040
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: haml
38
- requirement: &70167713605300 !ruby/object:Gem::Requirement
38
+ requirement: &70347412505560 !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: *70167713605300
46
+ version_requirements: *70347412505560
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: erubis
49
- requirement: &70167713604820 !ruby/object:Gem::Requirement
49
+ requirement: &70347412505080 !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: *70167713604820
57
+ version_requirements: *70347412505080
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &70167713604340 !ruby/object:Gem::Requirement
60
+ requirement: &70347412504600 !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: *70167713604340
68
+ version_requirements: *70347412504600
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: jeweler
71
- requirement: &70167713603860 !ruby/object:Gem::Requirement
71
+ requirement: &70347412504120 !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: *70167713603860
79
+ version_requirements: *70347412504120
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rcov
82
- requirement: &70167713603380 !ruby/object:Gem::Requirement
82
+ requirement: &70347412503640 !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: *70167713603380
90
+ version_requirements: *70347412503640
91
91
  description: Light rack-based framework with controllers, HAML/ERB views, router &
92
92
  error handler
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: 2784368830073330069
129
+ hash: 2376289371976416627
130
130
  required_rubygems_version: !ruby/object:Gem::Requirement
131
131
  none: false
132
132
  requirements: