spire 0.4.10 → 0.4.11

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/lib/spire/class/MainController.rb

@@ -5,10 +5,12 @@ module Spire
   
   class MainController
     attr_accessor :buffer
+    attr_reader :request
 
-    def initialize(request)
+    def initialize(request, app_root)
       @buffer = Buffer.new
       @request = request
+      @app_root = app_root
     end
 
     def get_buffer
@@ -26,8 +28,7 @@ module Spire
       end
 
       if opts[:view]
-        file_path = File.expand_path(__FILE__)
-        file_path["lib/spire/class/MainController.rb"] = "app/views/#{opts[:view]}"
+        file_path = @app_root + "/views/#{opts[:view]}"
         return 404 unless File.exists?(file_path)
         contents = IO.read(file_path)
         extension = File.extname(file_path)

data/lib/spire/map.rb

@@ -22,9 +22,7 @@ module Spire
 		end
 
 		def exists?(url)
-			if @maps[url] == {}
-				return false
-			else
+			unless @maps[url] == {}
 				return true
 			end
 		end

data/lib/spire/router.rb

@@ -1,7 +1,9 @@
 module Spire
   class Router
-    def initialize(map)
+    def initialize(map, app_root)
       @map = map
+      app_root["config.ru"] = "app"
+      @app_root = app_root
     end
 
     def route(env)
@@ -25,11 +27,8 @@ module Spire
     end 
     
     def run(maps_to, request)
-      path = File.expand_path(__FILE__)
-      path["lib/spire/router.rb"] = "app/controllers"
-
-      require "#{path}/#{maps_to[:controller].capitalize}Controller.rb"
-      @class = Kernel.const_get(maps_to[:controller].capitalize).new(request)
+      require "#{@app_root}/controllers/#{maps_to[:controller].capitalize}Controller.rb"
+      @class = Kernel.const_get(maps_to[:controller].capitalize).new(request, @app_root)
     
       result = @class.method(maps_to[:action]).call
       buffer = @class.get_buffer

data/spire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]
-  s.date = "2012-08-29"
+  s.date = "2012-08-30"
   s.description = "Light rack-based framework with controllers, HAML/ERB views, router & error handler"
   s.email = "scott@scottnicol.co.uk"
   s.executables = ["spire"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3764740053052310701
+      hash: -1340064074791021364
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: