spire 0.4.9 → 0.4.10

data/Gemfile

@@ -8,6 +8,5 @@ gem "erubis", ">= 2.7.0"
 group :development do
   gem "bundler", ">= 1.0.0"
   gem "jeweler", ">= 1.6.4"
-  gem "simplecov", ">= 0.6.0"
 end
 

data/Gemfile.lock

@@ -11,10 +11,6 @@ GEM
     multi_json (1.3.6)
     rack (1.3.5)
     rake (0.9.2.2)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
@@ -25,4 +21,3 @@ DEPENDENCIES
   haml (>= 3.1.0)
   jeweler (>= 1.6.4)
   rack (>= 1.3.0)
-  simplecov (>= 0.6.0)

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.4.10

data/lib/spire/class/MainController.rb

@@ -1,4 +1,4 @@
-require 'spire/http'
+require 'spire/response'
 require 'spire/resource/buffer'
  
 module Spire
@@ -6,8 +6,9 @@ module Spire
   class MainController
     attr_accessor :buffer
 
-    def initialize
+    def initialize(request)
       @buffer = Buffer.new
+      @request = request
     end
 
     def get_buffer
@@ -25,7 +26,8 @@ module Spire
       end
 
       if opts[:view]
-        file_path = File.join($base_path, 'views', opts[:view])
+        file_path = File.expand_path(__FILE__)
+        file_path["lib/spire/class/MainController.rb"] = "app/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

@@ -0,0 +1,37 @@
+module Spire
+	class Map
+		attr_accessor :auto
+
+		def initialize
+			@maps = Hash.new({})
+			@auto = false
+		end
+
+		def route(opts={})
+			@maps[opts[:url]] = opts[:to]
+		end
+
+		def get(url)
+			return @maps[url]
+		end
+
+		def should_use_auto(url)
+			if @maps[url] == {} && @auto
+				return true
+			end
+		end
+
+		def exists?(url)
+			if @maps[url] == {}
+				return false
+			else
+				return true
+			end
+		end
+
+		def disect(request)
+			return request.split("/")
+    end
+
+	end
+end

data/lib/spire/public.rb

@@ -5,36 +5,29 @@ module Spire
     def initialize(opts={:render=>true})
       @opts = opts
     end
-    
-    def extension_check
-      file_extension = File.extname(@opts[:file])
-      Mime.return_mimes.each do |ext, type|
-        if file_extension == ext
-          @content_type = type
-        end
-      end
-      
-      if @opts[:render]
-        self.create_response
-      else
-        return [false, @content_type]
-      end
-    end
 
     def self.return_file(file)
-      result = Public.new :file => file, :render => true
-      file = result.extension_check
-      puts file
-      if file == 404
-        return Error.return_error :status => 404, :message => "404 // File not found"
+      file_object = Public.new :file => file, :render => true
+      file = file_object.create_response
+
+      if file == 404  
+        return Error.return_error :status => 404
       else
         return Response.new(file[:file], file[:content_type], 200)
       end
     end
     
     def create_response
+      file_extension = File.extname(@opts[:file])
+      Mime.return_mimes ? @content_type = Mime.return_mimes[file_extension] : false
+      
+      if !@opts[:render]
+        return [false, @content_type]
+      end
+
       path = File.expand_path(__FILE__)
       path["lib/spire/public.rb"] = "public/#{@opts[:file]}"
+
       if File.exists?(path)
         file = IO.read(path)
         @return = {}

data/lib/spire/{http.rb → response.rb}

@@ -2,7 +2,7 @@ module Spire
   class Response
     attr_accessor :status_code, :headers, :content
 
-    def initialize(content='', content_type='text/html; charset=utf8', status=200)
+    def initialize(content='', content_type='text/html; charset=utf8', status=200, manual_headers=nil)
       @content = content
       @headers = {'Content-Type' => content_type}
       @status_code = status

data/lib/spire/router.rb

@@ -1,54 +1,37 @@
 module Spire
   class Router
-    def initialize(base_path, routes)
-      $base_path = base_path
-      @routes = routes
-      @app = {}
+    def initialize(map)
+      @map = map
     end
 
-    def disect(env)
-      req = env['REQUEST_PATH'].split("/")
-      @request = {"controller" => req[1], "action" => req[2]}
-    end
+    def route(env)
+      request = Rack::Request.new(env)
+      request_path = env["REQUEST_PATH"]
 
-    def route
-      @app["controller"] = nil
-      
-      if @request["controller"] == "favicon.ico"
-        favicon = Public.return_file("favicon.ico")
-        return favicon
+      if request_path == "/favicon.ico"
+        return Public.return_file "favicon.ico"
       end
-      
-      if @request["controller"] == nil
-         route = @routes['default'].split("#")
-         @app["controller"] = route[0].capitalize
-         @app["action"] = route[1]
-      else
-        @routes.each do |key, value|
-          keys = key.split("/")
-          values = value.split("#")
-          if @request["controller"] == keys[1] && @request["action"] == keys[3]
-            @app["controller"] = values[0].capitalize
-            @app["action"] = values[1]
-          elsif @request["controller"] == keys[1]
-            @app["controller"] = values[0].capitalize
-            @app["action"] = values[1]            
-          end
-        end
+
+      if !@map.exists? request_path
+        return Error.return_error :message => "No route was not found!", :status => 404
       end
-      
-      if !@app["controller"]
-        return Error.return_error :message => "Route not found in system/routes.rb", :status => 404
+
+      if @map.should_use_auto(request_path)
+        params = @map.disect(request_path)
+        return self.run({:controller => params[1], :action => params[2]})
       end
-      
-      return self.run
+
+      return self.run(@map.get(request_path), request)
     end 
     
-    def run
-      require "#{$base_path}/controllers/#{@app["controller"]}Controller"
-      @class = Kernel.const_get(@app["controller"]).new()
+    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)
     
-      result = @class.method(@app["action"]).call
+      result = @class.method(maps_to[:action]).call
       buffer = @class.get_buffer
       
       if !buffer && !result
@@ -63,7 +46,7 @@ module Spire
       end
       
       if @class.instance_variable_get(:@content_type) 
-        content_type = @class.instance_variable_get(:content_type) 
+        content_type = @class.instance_variable_get(:@content_type) 
       end
       
       if result
@@ -74,8 +57,7 @@ module Spire
     end
 
     def call(env)
-      self.disect(env)
-      response = self.route
+      response = self.route(env)
 
       puts response
       if response

data/lib/spire/templates/error/error.haml

@@ -5,7 +5,7 @@
 		body {
 			font-family: 'Helvetica Neue';
 			padding-left: 30px;
-			background: #fafafa;
+			background: #fff;
 			padding: 0;
 			margin: 0;
 			margin-bottom: 100px;
@@ -21,29 +21,7 @@
 			padding-left: 5%;
 			padding-right: 5%;
 		}
-		#trace {
-			font-size: 1.2em;
-			width: 80%;
-			margin-left: auto;
-			margin-right: auto;
-			border: 2px solid #D64C49;
-			padding-top: 30px;
-			padding-bottom: 30px;
-		}
-		#footer {
-			position: fixed;
-			bottom: 0px;
-			height: 45px;
-			width: 100%;
-			background-color: #E0FFD3;
-			border-top: 2px solid #484939;
-		}
+
 %body	
 	%h1= @error_code
 	%p= @error_message
-	- if @extended_message
-		%p#trace= @extended_message
-	#footer
-		%a{:href => "http://spire.heroku.com"} Powered by Spire
-		#cocoon
-			%a{:href => "http://wearecocoon.com"} by Cocoon

data/lib/spire.rb

@@ -1,6 +1,7 @@
 require 'spire/error'
+require 'spire/map'
 require 'spire/router'
-require 'spire/http'
+require 'spire/response'
 require 'spire/public'
 
 require 'spire/class/MainController'

data/spire.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "spire"
-  s.version = "0.4.9"
+  s.version = "0.4.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Nicol"]
-  s.date = "2012-08-11"
+  s.date = "2012-08-29"
   s.description = "Light rack-based framework with controllers, HAML/ERB views, router & error handler"
   s.email = "scott@scottnicol.co.uk"
   s.executables = ["spire"]
@@ -26,10 +26,11 @@ Gem::Specification.new do |s|
     "lib/spire.rb",
     "lib/spire/class/MainController.rb",
     "lib/spire/error.rb",
-    "lib/spire/http.rb",
+    "lib/spire/map.rb",
     "lib/spire/public.rb",
     "lib/spire/resource/buffer.rb",
     "lib/spire/resource/mime.rb",
+    "lib/spire/response.rb",
     "lib/spire/router.rb",
     "lib/spire/templates/error/error.haml",
     "spire.gemspec"
@@ -49,14 +50,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<erubis>, [">= 2.7.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.6.0"])
     else
       s.add_dependency(%q<rack>, [">= 1.3.0"])
       s.add_dependency(%q<haml>, [">= 3.1.0"])
       s.add_dependency(%q<erubis>, [">= 2.7.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
-      s.add_dependency(%q<simplecov>, [">= 0.6.0"])
     end
   else
     s.add_dependency(%q<rack>, [">= 1.3.0"])
@@ -64,7 +63,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<erubis>, [">= 2.7.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.6.4"])
-    s.add_dependency(%q<simplecov>, [">= 0.6.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spire
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.4
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
 description: Light rack-based framework with controllers, HAML/ERB views, router &
   error handler
 email: scott@scottnicol.co.uk
@@ -125,10 +109,11 @@ files:
 - lib/spire.rb
 - lib/spire/class/MainController.rb
 - lib/spire/error.rb
-- lib/spire/http.rb
+- lib/spire/map.rb
 - lib/spire/public.rb
 - lib/spire/resource/buffer.rb
 - lib/spire/resource/mime.rb
+- lib/spire/response.rb
 - lib/spire/router.rb
 - lib/spire/templates/error/error.haml
 - spire.gemspec
@@ -147,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3109762138428974111
+      hash: 3764740053052310701
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: