mojito 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/mojito.rb

@@ -3,6 +3,9 @@ require 'rack'
 require 'extlib'
 
 module Mojito
+	
+	PLUGINS = {}
+	
 	require 'mojito/request_extensions'
 	require 'mojito/helpers'
 	require 'mojito/base'
@@ -14,6 +17,7 @@ module Mojito
 	M = Matchers
 	H = Helpers
 	
+	
 	def self.included(type)
 		type.instance_exec do
 			ALL_HELPERS.reverse.each do |mod|
@@ -27,7 +31,12 @@ module Mojito
 			cl.instance_exec do
 				include Mojito::Base
 				helpers.reverse.each do |helper|
-					include helper
+					case helper
+					when Symbol
+						include PLUGINS[helper]
+					when Module
+						include helper
+					end
 				end
 			end
 			cl.routes &block if block
@@ -50,6 +59,9 @@ module Mojito
 		(ENV['RACK_ENV'] || :development).to_sym
 	end
 
+	def self.development?
+		mode == :development
+	end
 	
 	ALL_HELPERS = [Mojito::Matchers, Mojito::Rendering, Mojito::Helpers::ExceptionHandling, Mojito::Helpers::Shortcuts, Mojito::Base]
 

data/lib/mojito/base.rb

@@ -1,5 +1,7 @@
 # encoding: UTF-8
 
+require 'mime/types'
+
 module Mojito
 	
 	module Base
@@ -9,19 +11,25 @@ module Mojito
 		end
 		
 		def initialize(env)
-			@__env = env
+			@__request = Rack::Request.new env.dup
+			self.env['MOJITO/CONTEXT_PATH'] = self.env['SCRIPT_NAME']
 		end
 		
 		def env
-			@__env
+			request.env
 		end
 		
 		def request
-			@__request ||= Rack::Request.new(env)
+			@__request
 		end
 		
 		def response
-			@__response ||= Rack::Response.new
+			@__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
+			end
 		end
 		
 		def halt!(resp = response)
@@ -42,7 +50,7 @@ module Mojito
 		# Dispatches the current request to the matching routes.
 		def dispatch
 			instance_exec &self.class.routes if self.class.routes
-			Rack::Response.new [], 404, 'Content-Type' => 'application/octet-stream'
+			[404, { 'Content-Type' => 'application/octet-stream' }, []]
 		end
 		
 		##
@@ -64,7 +72,7 @@ module Mojito
 		def __match?(matcher)
 			case matcher
 			when String, Regexp
-				instance_exec &Matchers::PATH(matcher)
+				instance_exec &Mojito::Matchers::PATH(matcher)
 			when Proc
 				instance_exec &matcher
 			else
@@ -77,7 +85,7 @@ module Mojito
 			
 			def call(env)
 				catch :halt do
-					new(env).dispatch
+					self.new(env).dispatch
 				end
 			end
 			

data/lib/mojito/helpers/exception_handling.rb

@@ -79,6 +79,8 @@ module Mojito
 			
 		end
 		
+		Mojito::PLUGINS[:exception_handling] = ExceptionHandling
+
 	end
 
 end

data/lib/mojito/helpers/shortcuts.rb

@@ -1,31 +1,37 @@
 # encoding: UTF-8
 
-module Mojito::Helpers::Shortcuts
+module Mojito::Helpers
 	
-	def captures
-		request.captures
-	end
-	
-	def locals
-		request.locals
-	end
-	
-	def script_name
-		request.script_name
-	end
-	
-	def path_info
-		request.path_info
-	end
+	module Shortcuts
 	
-	def session
-		request.session
-	end
-	
-	module ClassMethods
+		def captures
+			request.captures
+		end
+		
+		def locals
+			request.locals
+		end
 		
+		def script_name
+			request.script_name
+		end
 		
+		def path_info
+			request.path_info
+		end
+		
+		def session
+			request.session
+		end
+		
+		module ClassMethods
+			
+			
+			
+		end
 		
 	end
 	
+	Mojito::PLUGINS[:shortcuts] = Shortcuts
+	
 end

data/lib/mojito/matchers/environment.rb

@@ -10,4 +10,6 @@ module Mojito::Matchers
 		
 	end
 	
+	Mojito::PLUGINS[:environment] = Environment
+	
 end

data/lib/mojito/matchers/methods.rb

@@ -30,4 +30,6 @@ module Mojito::Matchers
 		
 	end
 	
+	Mojito::PLUGINS[:methods] = Methods
+	
 end

data/lib/mojito/matchers/path.rb

@@ -4,9 +4,9 @@ module Mojito::Matchers
 	
 	module Path
 		
-		def PATH(pattern)
+		def PATH(pattern, delimiter = %r{/|\z})
 			consume_path = proc do |pattern|
-				if match = env['PATH_INFO'].match(%r<\A/*#{pattern}(?=/|\z)>)
+				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 }
@@ -19,7 +19,7 @@ module Mojito::Matchers
 			proc do
 				if p = case pattern
 					when String
-						pattern.gsub(%r{/?:\?\w+}) {|name| "(?:/(?<#{name[2..-1]}>[^/]+))?" }.gsub(%r{:\w+}) {|name| "(?<#{name[1..-1]}>[^/]+)" }
+						pattern.gsub(%r{/?:\?\w+}) {|name| "(?:/(?<#{name[2..-1]}>[^/]+?))?" }.gsub(%r{:\w+}) {|name| "(?<#{name[1..-1]}>[^/]+?)" }
 					when Regexp
 						pattern
 					end
@@ -32,4 +32,6 @@ module Mojito::Matchers
 		
 	end
 	
+	Mojito::PLUGINS[:path] = Path
+	
 end

data/lib/mojito/matchers/session.rb

@@ -10,4 +10,6 @@ module Mojito::Matchers
 		
 	end
 	
+	Mojito::PLUGINS[:session] = Session
+	
 end

data/lib/mojito/matchers/url_scheme.rb

@@ -19,4 +19,6 @@ module Mojito::Matchers
 		
 	end
 	
-end
+	Mojito::PLUGINS[:url_scheme] = UrlScheme
+	
+end

data/lib/mojito/matchers/virtual_host.rb

@@ -19,4 +19,6 @@ module Mojito::Matchers
 		
 	end
 	
+	Mojito::PLUGINS[:virtual_host] = VirtualHost
+	
 end

data/lib/mojito/rendering/content.rb

@@ -8,6 +8,17 @@ module Mojito::Rendering
 			response.write content
 		end
 		
+		def render_as(type, content, *args)
+			renderer = "to_#{type}".to_sym
+			if content.respond_to? renderer
+				response.write(content.send(renderer, *args[0...content.method(renderer).arity]))
+			else
+				Mojito::Rendering::StatusCodes.instance_method(:not_found!).bind(self).call
+			end
+		end
+		
 	end
 
+	Mojito::PLUGINS[:content] = Content
+	
 end

data/lib/mojito/rendering/content_types.rb

@@ -17,4 +17,6 @@ module Mojito::Rendering
 		
 	end
 	
+	Mojito::PLUGINS[:content_types] = ContentTypes
+	
 end

data/lib/mojito/rendering/delegation.rb

@@ -10,4 +10,6 @@ module Mojito::Rendering
 		
 	end
 	
+	Mojito::PLUGINS[:delegation] = Delegation
+	
 end

data/lib/mojito/rendering/file.rb

@@ -6,9 +6,10 @@ module Mojito::Rendering
 		require 'pathname'
 		require 'mime/types'
 		require 'time'
+		require 'where'
 		
 		def file!(filename)
-			path = Pathname === filename ? filename : Pathname.new(filename.to_s)
+			path = Where.cdir(1) + filename
 			restrict_path! path if respond_to? :restrict_path!
 			if path.readable? and path.file?
 				body = FileResponse.new path
@@ -50,4 +51,6 @@ module Mojito::Rendering
 		
 	end
 	
+	Mojito::PLUGINS[:file] = File
+
 end

data/lib/mojito/rendering/status_codes.rb

@@ -35,4 +35,6 @@ module Mojito::Rendering
 		
 	end
 	
+	Mojito::PLUGINS[:status_codes] = StatusCodes
+	
 end

data/lib/mojito/rendering/templates.rb

@@ -13,6 +13,7 @@ module Mojito::Rendering
 				Tilt[args.first].new { args.last }
 			elsif args.size == 1
 				file = Where.cdir(1) + args.first
+				Mojito::R::StatusCodes.instance_method(:not_found!).bind(self).call unless file.exist?
 				if %r{\.(?<extension>\w+)\.\w+$} =~ file.to_s
 					response['Content-Type'] = MIME::Types.type_for(extension)
 				end
@@ -23,4 +24,6 @@ module Mojito::Rendering
 		
 	end
 	
+	Mojito::PLUGINS[:templates] = Templates
+
 end

data/lib/mojito/request_extensions.rb

@@ -10,6 +10,10 @@ class ::Rack::Request
 		@env['mojito/locals'] ||= Mash.new
 	end
 	
+	def context_path
+		@env['MOJITO/CONTEXT_PATH']
+	end
+	
 	def script_name
 		@env['SCRIPT_NAME']
 	end

data/spec/mojito/base_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Base do
+	
+	subject do
+		Mojito.base_application :status_codes do
+			on Mojito::Matchers::PATH('test.:extension') do ok! end
+		end.mock_request
+	end
+	
+	it { subject.get('/test.html').headers.should include('Content-Type') }
+	it { subject.get('/test.html').headers['Content-Type'].should == 'text/html' }
+	it { subject.get('/test.txt').headers.should include('Content-Type') }
+	it { subject.get('/test.txt').headers['Content-Type'].should == 'text/plain' }
+	it { subject.get('/test.rb').headers.should include('Content-Type') }
+	it { subject.get('/test.rb').headers['Content-Type'].should == 'application/x-ruby' }
+	
+end

data/spec/mojito/rendering/delegation_spec.rb

@@ -7,21 +7,23 @@ require 'mojito'
 describe Mojito::Rendering::Delegation do
 	
 	subject do
-		sub_app = Mojito.base_application Mojito::R::Content, Mojito::R::Delegation do
+		sub_app = Mojito.base_application Mojito::R::Content, Mojito::M::Path do
+			on PATH('this/is/the/sub-application') do write request.context_path ; halt! end
 			on true do write 'sub-application' ; halt! end
 		end
 		Mojito.base_application Mojito::Rendering::Content, Mojito::Rendering::Delegation do
-			on true do run! sub_app end
+			on 'to/sub/app' do run! sub_app end
 		end.mock_request
 	end
 	
-	it { subject.get('/').status.should == 200 }
-	it { subject.get('/').body.should == 'sub-application' }
+	it { subject.get('/to/sub/app').status.should == 200 }
+	it { subject.get('/to/sub/app').body.should == 'sub-application' }
+	it { subject.get('/to/sub/app/this/is/the/sub-application').body.should == '/to/sub/app' }
 	
 	context do
 		
 		subject do
-			sub_app = Mojito.base_application Mojito::R::Content, Mojito::R::Delegation, Mojito::H::Shortcuts do
+			sub_app = Mojito.base_application Mojito::R::Content, Mojito::H::Shortcuts do
 				on true do write("#{path_info} #{captures.first}") ; halt! end
 			end
 			Mojito.base_application Mojito::M::Path, Mojito::R::Content, Mojito::R::Delegation do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojito
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &19113520 !ruby/object:Gem::Requirement
+  requirement: &15854720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *19113520
+  version_requirements: *15854720
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &19113040 !ruby/object:Gem::Requirement
+  requirement: &15854100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.18'
   type: :runtime
   prerelease: false
-  version_requirements: *19113040
+  version_requirements: *15854100
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &19112500 !ruby/object:Gem::Requirement
+  requirement: &15853440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *19112500
+  version_requirements: *15853440
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &19111980 !ruby/object:Gem::Requirement
+  requirement: &15852680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.15
   type: :runtime
   prerelease: false
-  version_requirements: *19111980
+  version_requirements: *15852680
 - !ruby/object:Gem::Dependency
   name: where-am-i
-  requirement: &19111420 !ruby/object:Gem::Requirement
+  requirement: &15851760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19111420
+  version_requirements: *15851760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19110940 !ruby/object:Gem::Requirement
+  requirement: &15850760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *19110940
+  version_requirements: *15850760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19110400 !ruby/object:Gem::Requirement
+  requirement: &15850180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *19110400
+  version_requirements: *15850180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &19109880 !ruby/object:Gem::Requirement
+  requirement: &15849540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *19109880
+  version_requirements: *15849540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19208400 !ruby/object:Gem::Requirement
+  requirement: &15848960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *19208400
+  version_requirements: *15848960
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &19207820 !ruby/object:Gem::Requirement
+  requirement: &15848300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19207820
+  version_requirements: *15848300
 description: A simple yet powerful webframework largely inspired by Rum and Cuba
 email: dev@trense.info
 executables: []
@@ -152,6 +152,7 @@ files:
 - lib/mojito/rendering/templates.rb
 - lib/mojito/request_extensions.rb
 - lib/mojito/utils/status_codes.rb
+- spec/mojito/base_spec.rb
 - spec/mojito/helpers_spec.rb
 - spec/mojito/matchers/methods_spec.rb
 - spec/mojito/matchers/path_spec.rb