spire 0.1.8 → 0.1.9

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 (6) hide show
  1. data/VERSION +1 -1
  2. data/config.ru +4 -1
  3. data/lib/spire/class/MainController.rb +10 -2
  4. data/lib/spire/router.rb +1 -1
  5. data/spire.gemspec +1 -1
  6. metadata +12 -12
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.8
1
+ 0.1.9
data/config.ru CHANGED
@@ -3,7 +3,10 @@ $:.unshift File.join(File.dirname(__FILE__), 'lib')
3
3
  require 'rack'
4
4
  require 'spire'
5
5
 
6
- run Spire::Router.new('./app', {
6
+ path = File.expand_path(__FILE__)
7
+ path["config.ru"] = "app"
8
+
9
+ run Spire::Router.new(path, {
7
10
  "default" => "index#index", # the default route!
8
11
  "/index" => "index#index",
9
12
  })
data/lib/spire/class/MainController.rb CHANGED
@@ -3,13 +3,21 @@ require 'haml'
3
3
 
4
4
  module Spire
5
5
  class MainController
6
+
7
+ def initialize(base_path)
8
+ @base_path = base_path
9
+ end
10
+
6
11
  def render(view, type="haml", data="")
7
12
  if type == "html"
8
- File.open('./app/views/'+view+'.html', 'r').read
13
+ puts @base_path
14
+ File.open(@base_path+'/views/'+view+'.html', 'r').read
9
15
  elsif type == "haml"
10
- file = File.open('./app/views/'+view+'.haml', 'r').read
16
+ puts @base_path
17
+ file = File.open(@base_path+'/views/'+view+'.haml', 'r').read
11
18
  Haml::Engine.new(file).render(Object.new, :data => data)
12
19
  end
13
20
  end
21
+
14
22
  end
15
23
  end
data/lib/spire/router.rb CHANGED
@@ -42,7 +42,7 @@ module Spire
42
42
 
43
43
  def run
44
44
  require "#{@base_path}/controllers/#{@controller_value}Controller"
45
- @app = Kernel.const_get(@controller_value).new
45
+ @app = Kernel.const_get(@controller_value).new(@base_path)
46
46
  return @app.method(@action_value).call
47
47
  end
48
48
 
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"
8
+ s.version = "0.1.9"
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.1.8
4
+ version: 0.1.9
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-09-27 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rack
16
- requirement: &70286752235140 !ruby/object:Gem::Requirement
16
+ requirement: &70123496714380 !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: *70286752235140
24
+ version_requirements: *70123496714380
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: haml
27
- requirement: &70286752234540 !ruby/object:Gem::Requirement
27
+ requirement: &70123496713640 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 3.1.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70286752234540
35
+ version_requirements: *70123496713640
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: bundler
38
- requirement: &70286752233920 !ruby/object:Gem::Requirement
38
+ requirement: &70123496712920 !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: *70286752233920
46
+ version_requirements: *70123496712920
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: jeweler
49
- requirement: &70286752231900 !ruby/object:Gem::Requirement
49
+ requirement: &70123496712200 !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: *70286752231900
57
+ version_requirements: *70123496712200
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rcov
60
- requirement: &70286752205960 !ruby/object:Gem::Requirement
60
+ requirement: &70123496711620 !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: *70286752205960
68
+ version_requirements: *70123496711620
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
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
105
105
  version: '0'
106
106
  segments:
107
107
  - 0
108
- hash: -4386937449783624757
108
+ hash: -1170845005632461558
109
109
  required_rubygems_version: !ruby/object:Gem::Requirement
110
110
  none: false
111
111
  requirements: