spire 0.1.1 → 0.1.2
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +1 -1
- data/Gemfile.lock +2 -2
- data/VERSION +1 -1
- data/app/controllers/IndexController.rb +3 -2
- data/app/views/index.haml +1 -0
- data/config.ru +1 -0
- data/lib/spire/class/MainController.rb +7 -3
- data/lib/spire/router.rb +3 -1
- data/spire.gemspec +5 -4
- metadata +16 -15
data/Gemfile
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
source "http://rubygems.org"
|
2
2
|
|
3
3
|
gem "rack", ">= 1.3.0"
|
4
|
+
gem "haml", ">= 3.1.0"
|
4
5
|
|
5
6
|
# Add dependencies to develop your gem here.
|
6
7
|
# Include everything needed to run rake, tests, features, etc.
|
7
8
|
group :development do
|
8
|
-
gem "shoulda", ">= 0"
|
9
9
|
gem "bundler", "~> 1.0.0"
|
10
10
|
gem "jeweler", "~> 1.6.4"
|
11
11
|
gem "rcov", ">= 0"
|
data/Gemfile.lock
CHANGED
@@ -2,6 +2,7 @@ GEM
|
|
2
2
|
remote: http://rubygems.org/
|
3
3
|
specs:
|
4
4
|
git (1.2.5)
|
5
|
+
haml (3.1.3)
|
5
6
|
jeweler (1.6.4)
|
6
7
|
bundler (~> 1.0)
|
7
8
|
git (>= 1.2.5)
|
@@ -9,14 +10,13 @@ GEM
|
|
9
10
|
rack (1.3.3)
|
10
11
|
rake (0.9.2)
|
11
12
|
rcov (0.9.10)
|
12
|
-
shoulda (2.11.3)
|
13
13
|
|
14
14
|
PLATFORMS
|
15
15
|
ruby
|
16
16
|
|
17
17
|
DEPENDENCIES
|
18
18
|
bundler (~> 1.0.0)
|
19
|
+
haml (>= 3.1.0)
|
19
20
|
jeweler (~> 1.6.4)
|
20
21
|
rack (>= 1.3.0)
|
21
22
|
rcov
|
22
|
-
shoulda
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.1.
|
1
|
+
0.1.2
|
@@ -0,0 +1 @@
|
|
1
|
+
%h1 Test
|
data/config.ru
CHANGED
@@ -2,9 +2,13 @@ require 'spire/http'
|
|
2
2
|
|
3
3
|
module Spire
|
4
4
|
class MainController
|
5
|
-
def render(view)
|
6
|
-
|
7
|
-
|
5
|
+
def render(view, type="haml")
|
6
|
+
if type == "html"
|
7
|
+
return File.open('./app/views/'+view+'.html', 'r').read
|
8
|
+
elsif type == "haml"
|
9
|
+
file = File.open('./app/views/'+view+'.haml', 'r').read
|
10
|
+
return Haml::Engine.new(file).render(s)
|
11
|
+
end
|
8
12
|
end
|
9
13
|
end
|
10
14
|
end
|
data/lib/spire/router.rb
CHANGED
@@ -43,7 +43,9 @@ module Spire
|
|
43
43
|
def run
|
44
44
|
require "#{@base_path}/controllers/#{@controller_value}Controller"
|
45
45
|
@app = Kernel.const_get(@controller_value).new
|
46
|
-
@
|
46
|
+
@return = {}
|
47
|
+
@return = @app.method(@action_value).call
|
48
|
+
Spire::Response.new(@return)
|
47
49
|
end
|
48
50
|
|
49
51
|
def call(env)
|
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.1.
|
8
|
+
s.version = "0.1.2"
|
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"]
|
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
|
|
23
23
|
"Rakefile",
|
24
24
|
"VERSION",
|
25
25
|
"app/controllers/IndexController.rb",
|
26
|
+
"app/views/index.haml",
|
26
27
|
"app/views/index.html",
|
27
28
|
"config.ru",
|
28
29
|
"lib/spire.rb",
|
@@ -44,20 +45,20 @@ Gem::Specification.new do |s|
|
|
44
45
|
|
45
46
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
46
47
|
s.add_runtime_dependency(%q<rack>, [">= 1.3.0"])
|
47
|
-
s.
|
48
|
+
s.add_runtime_dependency(%q<haml>, [">= 3.1.0"])
|
48
49
|
s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
|
49
50
|
s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
|
50
51
|
s.add_development_dependency(%q<rcov>, [">= 0"])
|
51
52
|
else
|
52
53
|
s.add_dependency(%q<rack>, [">= 1.3.0"])
|
53
|
-
s.add_dependency(%q<
|
54
|
+
s.add_dependency(%q<haml>, [">= 3.1.0"])
|
54
55
|
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
|
55
56
|
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
|
56
57
|
s.add_dependency(%q<rcov>, [">= 0"])
|
57
58
|
end
|
58
59
|
else
|
59
60
|
s.add_dependency(%q<rack>, [">= 1.3.0"])
|
60
|
-
s.add_dependency(%q<
|
61
|
+
s.add_dependency(%q<haml>, [">= 3.1.0"])
|
61
62
|
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
|
62
63
|
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
|
63
64
|
s.add_dependency(%q<rcov>, [">= 0"])
|
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.1.
|
4
|
+
version: 0.1.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2011-09-26 00:00:00.000000000Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rack
|
16
|
-
requirement: &
|
16
|
+
requirement: &70154277774060 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,21 +21,21 @@ dependencies:
|
|
21
21
|
version: 1.3.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70154277774060
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
|
-
name:
|
27
|
-
requirement: &
|
26
|
+
name: haml
|
27
|
+
requirement: &70154277773460 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version:
|
33
|
-
type: :
|
32
|
+
version: 3.1.0
|
33
|
+
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70154277773460
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: bundler
|
38
|
-
requirement: &
|
38
|
+
requirement: &70154277772860 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 1.0.0
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70154277772860
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: jeweler
|
49
|
-
requirement: &
|
49
|
+
requirement: &70154277772160 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 1.6.4
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70154277772160
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: rcov
|
60
|
-
requirement: &
|
60
|
+
requirement: &70154277760460 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,7 +65,7 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *70154277760460
|
69
69
|
description: ! "Light rack-based framework with controllers, static views and a router
|
70
70
|
\n with templating engine support coming soon"
|
71
71
|
email: scott@scottnicol.co.uk
|
@@ -81,6 +81,7 @@ files:
|
|
81
81
|
- Rakefile
|
82
82
|
- VERSION
|
83
83
|
- app/controllers/IndexController.rb
|
84
|
+
- app/views/index.haml
|
84
85
|
- app/views/index.html
|
85
86
|
- config.ru
|
86
87
|
- lib/spire.rb
|
@@ -105,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
105
106
|
version: '0'
|
106
107
|
segments:
|
107
108
|
- 0
|
108
|
-
hash:
|
109
|
+
hash: 2085978523116185766
|
109
110
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
110
111
|
none: false
|
111
112
|
requirements:
|