mojito 0.1.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.3

data/lib/mojito.rb

@@ -4,65 +4,42 @@ require 'extlib'
 
 module Mojito
 	
-	PLUGINS = {}
-	
 	require 'mojito/request_extensions'
 	require 'mojito/helpers'
+	require 'mojito/controllers'
 	require 'mojito/base'
 	require 'mojito/utils/status_codes'
 	require 'mojito/rendering'
-	require 'mojito/matchers'
 	
 	R = Rendering
-	M = Matchers
 	H = Helpers
+	C = Controllers
 	
-	
-	def self.included(type)
-		type.instance_exec do
-			ALL_HELPERS.reverse.each do |mod|
-				include mod
-			end
-		end
-	end
-	
-	def self.base_application(*helpers, &block)
-		Class.new.tap do |cl|
-			cl.instance_exec do
+	class << self
+		
+		def included(type)
+			type.instance_exec do
 				include Mojito::Base
-				helpers.reverse.each do |helper|
-					case helper
-					when Symbol
-						include PLUGINS[helper]
-					when Module
-						include helper
-					end
-				end
 			end
-			cl.routes &block if block
-		end		
-	end
+			type.extend ClassMethods
+		end
+		
+		def mode
+			(ENV['RACK_ENV'] || :development).to_sym
+		end
 	
-	def self.application(*helpers, &block)
-		Class.new.tap do |cl|
-			cl.instance_exec do
-				include Mojito
-				helpers.reverse.each do |helper|
-					include helper
-				end
-			end
-			cl.routes &block if block
+		def development?
+			mode == :development
 		end
+		
 	end
 	
-	def self.mode
-		(ENV['RACK_ENV'] || :development).to_sym
-	end
-
-	def self.development?
-		mode == :development
+	module ClassMethods
+		
+		def mock_request
+			Rack::MockRequest.new self
+		end
+		
 	end
-	
-	ALL_HELPERS = [Mojito::Matchers, Mojito::Rendering, Mojito::Helpers::ExceptionHandling, Mojito::Helpers::Shortcuts, Mojito::Base]
 
 end

data/lib/mojito/base.rb

@@ -10,8 +10,13 @@ module Mojito
 			type.extend ClassMethods
 		end
 		
-		def initialize(env)
-			@__request = Rack::Request.new env.dup
+		def initialize(request)
+			@__request = case request 
+			when Rack::Request
+				request.dup
+			when Hash, Mash
+				Rack::Request.new(request.dup)
+			end
 			self.env['MOJITO/CONTEXT_PATH'] = self.env['SCRIPT_NAME']
 		end
 		
@@ -25,17 +30,22 @@ module Mojito
 		
 		def response
 			@__response ||= Rack::Response.new.tap do |res|
-				if extension = request.path[/(?<=\.)\w+$/]
-					type = MIME::Types.type_for(extension).first
-					res.headers['Content-Type'] = type.to_s if type
-				end
+				res.headers.delete 'Content-Type'
 			end
 		end
 		
 		def halt!(resp = response)
 			throw :halt, case resp
 			when Rack::Response
-				resp.finish
+				resp.tap {|res|
+					unless res.headers.include? 'Content-Type'
+						if extension = request.path[/(?<=\.)\w+$/] and res.status == 200 and type = MIME::Types.type_for(extension).first
+							res.headers['Content-Type'] = type.to_s
+						else
+							res.headers['Content-Type'] = 'text/html'
+						end
+					end
+				}.finish
 			when Array
 				resp
 			when Symbol, Integer
@@ -46,62 +56,23 @@ module Mojito
 			end
 		end
 		
-		##
-		# Dispatches the current request to the matching routes.
-		def dispatch
-			instance_exec &self.class.routes if self.class.routes
-			[404, { 'Content-Type' => 'application/octet-stream' }, []]
-		end
+	end
+	
+	module ClassMethods
 		
-		##
-		# Defines a route which is matched when all given matchers evaluate to +true+.
-		def on(*matchers, &block)
-			env_backup = env.dup
-			param_size = request.captures.length
-			return unless matchers.all? {|m| __match?(m) }
-			params = request.captures[param_size..-1][0..block.arity].collect {|p| Rack::Utils.unescape(p) }
-			instance_exec *params, &block
-		ensure
-			@__env = env_backup
-			request.instance_exec { @env = env_backup }
+		def call(env)
+			catch :halt do
+				request = Rack::Request.new env
+				call_with_handlers request
+			end
 		end
 		
-		##
-		# Evaluates a single matcher, returning whether it matched or not. Please be aware that matchers (most prominently 
-		# the PATH matcher) may alter the current request, however a matcher is only allowed to do that when it matches.
-		def __match?(matcher)
-			case matcher
-			when String, Regexp
-				instance_exec &Mojito::Matchers::PATH(matcher)
-			when Proc
-				instance_exec &matcher
-			else
-				matcher
-			end
+		def call_with_handlers(request)
+			dispatch request
 		end
-		private :__match?
 		
-		module ClassMethods
-			
-			def call(env)
-				catch :halt do
-					self.new(env).dispatch
-				end
-			end
-			
-			def routes(&block)
-				@__routing = block if block
-				@__routing
-			end
-			
-			def to_app
-				self
-			end
-			
-			def mock_request
-				Rack::MockRequest.new self
-			end
-			
+		def dispatch(request)
+			self.new(request).__dispatch
 		end
 		
 	end

data/lib/mojito/controllers.rb

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+
+module Mojito::Controllers
+	require 'mojito/controllers/method'
+	require 'mojito/controllers/runtime'
+	require 'mojito/controllers/sinatra'
+	
+	
+	
+end

data/lib/mojito/controllers/method.rb

@@ -0,0 +1,65 @@
+# encoding: UTF-8
+
+module Mojito::Controllers
+	
+	module Method
+		require 'cgi'
+		
+		def __dispatch
+			if m = %r{^/?(?<meth>\w+)(?:/|$)}.match(request.path_info)
+				meth = m['meth'].to_sym
+				if respond_to?(meth.to_sym)
+					env['SCRIPT_NAME'] += m.to_s
+					arity = method(meth).arity
+					args, env['PATH_INFO'] = Method.args_for(arity, m.post_match)
+					args.collect! {|a| CGI.unescape a } if args
+					if args
+						send meth, *args
+						ok!
+					else
+						Mojito::R::StatusCodes.instance_method(:not_found!).bind(self).call
+					end
+				else
+					Mojito::R::StatusCodes.instance_method(:not_found!).bind(self).call
+				end
+			else
+				Mojito::R::StatusCodes.instance_method(:not_found!).bind(self).call
+			end
+		end
+		
+		def self.args_for(arity, path_info)
+			if arity >= 0
+				args = path_info.split('/', arity + 1)
+				if args.length == arity
+					[args, '']
+				elsif args.length == arity + 1
+					[args, args.pop]
+				else
+					[nil, path_info]
+				end
+			else
+				args = path_info.split('/')
+				if args.length >= arity.abs - 1
+					[args, '']
+				else
+					[nil, path_info]
+				end
+			end
+		end
+		
+	end
+	
+	def self.method_controller(*modules, &block)
+		Class.new.tap do |controller|
+			controller.instance_exec do
+				include Mojito::Base
+				include Mojito::Controllers::Method
+				modules.each do |mod|
+					include mod
+				end
+			end
+			controller.class_exec &block if block
+		end
+	end
+	
+end

data/lib/mojito/controllers/runtime.rb

@@ -0,0 +1,80 @@
+# encoding: UTF-8
+
+module Mojito::Controllers
+	
+	module Runtime
+		require 'mojito/controllers/runtime/environment'
+		require 'mojito/controllers/runtime/methods'
+		require 'mojito/controllers/runtime/path'
+		require 'mojito/controllers/runtime/url_scheme'
+		require 'mojito/controllers/runtime/virtual_host'
+		
+		def self.included(type)
+			type.extend ClassMethods
+			type.instance_exec do
+				include Environment
+				include Methods
+				include Path
+				include UrlScheme
+				include VirtualHost
+			end
+		end
+		
+		##
+		# Defines a route which is matched when all given matchers evaluate to +true+.
+		def on(*matchers, &block)
+			env_backup = env.dup
+			param_size = request.captures.length
+			return unless matchers.all? {|m| __match?(m) }
+			params = request.captures[param_size..-1][0..block.arity].collect {|p| Rack::Utils.unescape(p) }
+			instance_exec *params, &block
+		ensure
+			@__env = env_backup
+			request.instance_exec { @env = env_backup }
+		end
+		
+		##
+		# Evaluates a single matcher, returning whether it matched or not. Please be aware that matchers (most prominently 
+		# the PATH matcher) may alter the current request, however a matcher is only allowed to do that when it matches.
+		def __match?(matcher)
+			case matcher
+			when String, Regexp
+				instance_exec &PATH(matcher)
+			when Proc
+				instance_exec &matcher
+			else
+				matcher
+			end
+		end
+		private :__match?
+		
+		##
+		# Dispatches the current request to the matching routes.
+		def __dispatch
+			instance_exec &self.class.routes if self.class.routes
+			[404, { 'Content-Type' => 'application/octet-stream' }, []]
+		end
+		
+		module ClassMethods
+			
+			def routes(&block)
+				@routes = block if block
+				@routes
+			end
+			
+		end
+		
+	end
+	
+	def self.runtime_controller(*modules, &block)
+		Class.new do
+			include Mojito
+			include Mojito::C::Runtime
+			modules.each do |mod|
+				include mod
+			end
+			routes &block
+		end
+	end
+	
+end

data/lib/mojito/{matchers → controllers/runtime}/environment.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module Mojito::Matchers
+module Mojito::Controllers::Runtime
 	
 	module Environment
 		
@@ -10,6 +10,4 @@ module Mojito::Matchers
 		
 	end
 	
-	Mojito::PLUGINS[:environment] = Environment
-	
 end

data/lib/mojito/{matchers → controllers/runtime}/methods.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module Mojito::Matchers
+module Mojito::Controllers::Runtime
 	
 	module Methods
 		
@@ -30,6 +30,4 @@ module Mojito::Matchers
 		
 	end
 	
-	Mojito::PLUGINS[:methods] = Methods
-	
 end

data/lib/mojito/{matchers → controllers/runtime}/path.rb

@@ -1,16 +1,17 @@
 # encoding: UTF-8
 
-module Mojito::Matchers
+module Mojito::Controllers::Runtime
 	
 	module Path
+		require 'cgi'
 		
 		def PATH(pattern, delimiter = %r{/|\z})
 			consume_path = proc do |pattern|
 				if match = env['PATH_INFO'].match(%r<\A/*#{pattern}(?=#{delimiter})>)
 					env['SCRIPT_NAME'] = match.to_s
 					env['PATH_INFO'] = match.post_match
-					request.locals.update match.names.inject({}) {|hash, name| hash[name.to_sym] = match[name] ; hash }
-					request.captures.push *match.captures
+					request.locals.update match.names.inject({}) {|hash, name| hash[name.to_sym] = CGI.unescape(match[name]) ; hash }
+					request.captures.push *(match.captures.collect {|c| CGI.unescape c })
 					true
 				else
 					false
@@ -32,6 +33,4 @@ module Mojito::Matchers
 		
 	end
 	
-	Mojito::PLUGINS[:path] = Path
-	
 end

data/lib/mojito/{matchers → controllers/runtime}/session.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module Mojito::Matchers
+module Mojito::Controllers::Runtime
 	
 	module Session
 
@@ -10,6 +10,4 @@ module Mojito::Matchers
 		
 	end
 	
-	Mojito::PLUGINS[:session] = Session
-	
 end

data/lib/mojito/{matchers → controllers/runtime}/url_scheme.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module Mojito::Matchers
+module Mojito::Controllers::Runtime
 	
 	module UrlScheme
 		
@@ -19,6 +19,4 @@ module Mojito::Matchers
 		
 	end
 	
-	Mojito::PLUGINS[:url_scheme] = UrlScheme
-	
 end