mojito 0.1.0 → 0.1.1

data/README.textile

@@ -2,7 +2,7 @@ h1. mojito - Next level Ruby webframework
 
 p. Mojito is a lean and simple webframework. 
 
-p. As the name implies mojito is Cuba-born (https://github.com/soveran/cuba). Many thanks to Michel and his cuba project for giving me some major insights on web-application-simplicity!
+p. As the name implies mojito derives from cuba (https://github.com/soveran/cuba). Many thanks to Michel and his cuba project for giving me some major insights on web-application-simplicity!
 
 h2. Installing
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/mojito.rb

@@ -46,6 +46,11 @@ module Mojito
 		end
 	end
 	
+	def self.mode
+		(ENV['RACK_ENV'] || :development).to_sym
+	end
+
+	
 	ALL_HELPERS = [Mojito::Matchers, Mojito::Rendering, Mojito::Helpers::ExceptionHandling, Mojito::Helpers::Shortcuts, Mojito::Base]
 
 end

data/lib/mojito/base.rb

@@ -55,6 +55,7 @@ module Mojito
 			instance_exec *params, &block
 		ensure
 			@__env = env_backup
+			request.instance_exec { @env = env_backup }
 		end
 		
 		##

data/lib/mojito/helpers/exception_handling.rb

@@ -50,13 +50,13 @@ module Mojito
 			def __handle_error(exception)
 				if handler = case exception
 					when MojitoException
+						response.status = exception.status
 						self.class.error_handlers[exception.status]
 					when Exception
 						self.class.error_handlers[exception.class]
 					end
 					instance_exec &handler
 				end
-				puts "Exception: #{exception.inspect}"
 				raise exception
 			end
 			

data/lib/mojito/matchers.rb

@@ -2,15 +2,22 @@
 
 module Mojito::Matchers
 	
+	require 'mojito/matchers/environment'
 	require 'mojito/matchers/methods'
 	require 'mojito/matchers/path'
+	require 'mojito/matchers/url_scheme'
 	require 'mojito/matchers/virtual_host'
 	
+	include Environment
 	include Methods
 	include Path
+	include UrlScheme
 	include VirtualHost
 	
+	extend Environment
+	extend Methods
 	extend Path
+	extend UrlScheme
 	extend VirtualHost
 	
 end

data/lib/mojito/matchers/environment.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+
+module Mojito::Matchers
+	
+	module Environment
+		
+		def MODE(mode)
+			proc { Mojito.mode == mode.to_sym }
+		end
+		
+	end
+	
+end

data/lib/mojito/matchers/path.rb

@@ -6,7 +6,7 @@ module Mojito::Matchers
 		
 		def PATH(pattern)
 			consume_path = proc do |pattern|
-				if match = env['PATH_INFO'].match(%r<\A/#{pattern}(?=/|\z)>)
+				if match = env['PATH_INFO'].match(%r<\A/*#{pattern}(?=/|\z)>)
 					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 }
@@ -23,7 +23,7 @@ module Mojito::Matchers
 					when Regexp
 						pattern
 					end
-					instance_exec p,  &consume_path
+					instance_exec p, &consume_path
 				else
 					false
 				end

data/lib/mojito/matchers/session.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+
+module Mojito::Matchers
+	
+	module Session
+
+		def SESSION(name)
+			proc { request.session.include? name.to_s }
+		end
+		
+	end
+	
+end

data/lib/mojito/matchers/url_scheme.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+module Mojito::Matchers
+	
+	module UrlScheme
+		
+		def SCHEME(scheme)
+			proc do
+				case scheme
+				when :https, :secure
+					request.scheme === 'https'
+				when :http, nil
+					request.scheme === 'http'
+				else
+					request.scheme === scheme.to_s
+				end
+			end
+		end
+		
+	end
+	
+end

data/lib/mojito/rendering.rb

@@ -7,11 +7,13 @@ module Mojito::Rendering
 	require 'mojito/rendering/delegation'
 	require 'mojito/rendering/file'
 	require 'mojito/rendering/status_codes'
+	require 'mojito/rendering/templates'
 	
 	include Content
 	include ContentTypes
 	include Delegation
 	include File
 	include StatusCodes
+	include Templates
 	
 end

data/lib/mojito/rendering/templates.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+
+module Mojito::Rendering
+	
+	module Templates
+		require 'tilt'
+		require 'where'
+		require 'mime/types'
+		
+		def template(*args, &block)
+			locals = Hash === args.last ? args.pop : self.locals
+			template = if args.size == 2
+				Tilt[args.first].new { args.last }
+			elsif args.size == 1
+				file = Where.cdir(1) + args.first
+				if %r{\.(?<extension>\w+)\.\w+$} =~ file.to_s
+					response['Content-Type'] = MIME::Types.type_for(extension)
+				end
+				Tilt[file.to_s].new file.to_s
+			end
+			response.write template.render(self, locals, &block)
+		end
+		
+	end
+	
+end

data/spec/mojito/matchers/methods_spec.rb

@@ -0,0 +1,27 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Matchers::Methods do
+	
+	subject do
+		Mojito.application Mojito::Matchers::Methods do
+			on GET() do write 'get' ; halt! end
+			on POST() do write 'post' ; halt! end
+			on HEAD() do write 'head' ; halt! end
+			on PUT() do write 'put' ; halt! end
+			on DELETE() do write 'delete' ; halt! end
+			on METHOD(:options) do write 'options' ; halt! end
+		end.mock_request
+	end
+	
+	it { subject.get('/').body.should == 'get' }
+	it { subject.post('/').body.should == 'post' }
+	it { subject.head('/').body.should == 'head' }
+	it { subject.put('/').body.should == 'put' }
+	it { subject.delete('/').body.should == 'delete' }
+	it { subject.request('OPTIONS', '/').body.should == 'options' }
+	
+end

data/spec/mojito/matchers/path_spec.rb

@@ -0,0 +1,74 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Matchers::Path do
+	
+	subject { Mojito.application.new Rack::MockRequest.env_for('http://localhost/hello/world/rest') }
+	
+	it do
+		subject.send(:__match?, Mojito::M::PATH('hello'))
+		subject.captures.should be_empty
+		subject.locals.should be_empty
+		subject.path_info.should == '/world/rest'
+	end
+	
+	it do
+		subject.send(:__match?, 'hello')
+		subject.captures.should be_empty
+		subject.locals.should be_empty
+		subject.path_info.should == '/world/rest'
+	end
+	
+	it do
+		subject.send(:__match?, Mojito::M::PATH('hello/:name'))
+		subject.request.captures.should == ['world']
+		subject.request.locals.should == { 'name' => 'world' }
+		subject.request.path_info.should == '/rest'
+	end
+	
+	it do
+		subject.send(:__match?, 'hello/:name')
+		subject.request.captures.should == ['world']
+		subject.request.locals.should == { 'name' => 'world' }
+		subject.request.path_info.should == '/rest'
+	end
+	
+	it do
+		subject.send(:__match?, Mojito::M::PATH(%r{hello/(?<name>[^/]+)}))
+		subject.request.captures.should == ['world']
+		subject.request.locals.should == { 'name' => 'world' }
+		subject.request.path_info.should == '/rest'
+	end
+	
+	it do
+		subject.send(:__match?, %r{hello/(?<name>[^/]+)})
+		subject.request.captures.should == ['world']
+		subject.request.locals.should == { 'name' => 'world' }
+		subject.request.path_info.should == '/rest'
+	end
+	
+	context do
+		subject do
+			Mojito.base_application Mojito::M::Path, Mojito::R::Content do
+				on PATH('hello/:name') do
+					on PATH('another/:name') do
+						write request.locals[:name]
+						halt!
+					end
+					write request.locals[:name]
+					halt!
+				end
+			end.mock_request
+		end
+		
+		it { subject.get('/hello/Fred').status.should == 200 }
+		it { subject.get('/hello/Fred').body.should == 'Fred' }
+		it { subject.get('/hello/Fred/another/Barney').status.should == 200 }
+		it { subject.get('/hello/Fred/another/Barney').body.should == 'Barney' }
+		
+	end
+	
+end

data/spec/mojito/matchers/session_spec.rb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+

data/spec/mojito/matchers/url_scheme_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Matchers::UrlScheme do
+	
+	subject do
+		Mojito.application Mojito::Matchers::UrlScheme do
+			on SCHEME(:http) do write 'insecure' ; halt! end
+			on SCHEME(:https) do write 'secure' ; halt! end
+		end.mock_request
+	end
+	
+	it { subject.get('http://localhost/').body.should == 'insecure' }
+	it { subject.get('http://localhost:7777/').body.should == 'insecure' }
+	it { subject.get('https://localhost:80/').body.should == 'secure' }
+	it { subject.get('https://localhost/').body.should == 'secure' }
+	it { subject.get('otherprotocol://test/').status.should == 404 }
+	
+end

data/spec/mojito/matchers/virtual_host_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Matchers::VirtualHost do
+	
+	subject do
+		Mojito.application Mojito::Matchers::VirtualHost do
+			on HOST('localhost') do write 'localhost' ; halt! end
+			on HOST('test:8080') do write 'test' ; halt! end
+		end.mock_request
+	end
+	
+	it { subject.get('http://localhost:4444/').body.should == 'localhost' }
+	it { subject.get('http://localhost/').body.should == 'localhost' }
+	it { subject.get('http://localhost:80/').body.should == 'localhost' }
+	it { subject.get('http://test:8080/').body.should == 'test' }
+	it { subject.get('http://test/').status.should == 404 }
+	
+end

data/spec/mojito/matchers_spec.rb

@@ -3,111 +3,3 @@ require 'simplecov' and SimpleCov.start do
 	add_filter "spec/"
 end
 require 'mojito'
-
-describe Mojito::Matchers::Methods do
-	
-	subject do
-		Mojito.application Mojito::Matchers::Methods do
-			on GET() do write 'get' ; halt! end
-			on POST() do write 'post' ; halt! end
-			on HEAD() do write 'head' ; halt! end
-			on PUT() do write 'put' ; halt! end
-			on DELETE() do write 'delete' ; halt! end
-			on METHOD(:options) do write 'options' ; halt! end
-		end.mock_request
-	end
-	
-	it { subject.get('/').body.should == 'get' }
-	it { subject.post('/').body.should == 'post' }
-	it { subject.head('/').body.should == 'head' }
-	it { subject.put('/').body.should == 'put' }
-	it { subject.delete('/').body.should == 'delete' }
-	it { subject.request('OPTIONS', '/').body.should == 'options' }
-	
-end
-
-describe Mojito::Matchers::Path do
-	
-	subject { Mojito.application.new Rack::MockRequest.env_for('http://localhost/hello/world/rest') }
-	
-	it do
-		subject.send(:__match?, Mojito::M::PATH('hello'))
-		subject.captures.should be_empty
-		subject.locals.should be_empty
-		subject.path_info.should == '/world/rest'
-	end
-	
-	it do
-		subject.send(:__match?, 'hello')
-		subject.captures.should be_empty
-		subject.locals.should be_empty
-		subject.path_info.should == '/world/rest'
-	end
-	
-	it do
-		subject.send(:__match?, Mojito::M::PATH('hello/:name'))
-		subject.request.captures.should == ['world']
-		subject.request.locals.should == { 'name' => 'world' }
-		subject.request.path_info.should == '/rest'
-	end
-	
-	it do
-		subject.send(:__match?, 'hello/:name')
-		subject.request.captures.should == ['world']
-		subject.request.locals.should == { 'name' => 'world' }
-		subject.request.path_info.should == '/rest'
-	end
-	
-	it do
-		subject.send(:__match?, Mojito::M::PATH(%r{hello/(?<name>[^/]+)}))
-		subject.request.captures.should == ['world']
-		subject.request.locals.should == { 'name' => 'world' }
-		subject.request.path_info.should == '/rest'
-	end
-	
-	it do
-		subject.send(:__match?, %r{hello/(?<name>[^/]+)})
-		subject.request.captures.should == ['world']
-		subject.request.locals.should == { 'name' => 'world' }
-		subject.request.path_info.should == '/rest'
-	end
-	
-	context do
-		subject do
-			Mojito.base_application Mojito::M::Path, Mojito::R::Content do
-				on PATH('hello/:name') do
-					on PATH('another/:name') do
-						write request.locals[:name]
-						halt!
-					end
-					write request.locals[:name]
-					halt!
-				end
-			end.mock_request
-		end
-		
-		it { subject.get('/hello/Fred').status.should == 200 }
-		it { subject.get('/hello/Fred').body.should == 'Fred' }
-		it { subject.get('/hello/Fred/another/Barney').status.should == 200 }
-		it { subject.get('/hello/Fred/another/Barney').body.should == 'Barney' }
-		
-	end
-	
-end
-
-describe Mojito::Matchers::VirtualHost do
-	
-	subject do
-		Mojito.application Mojito::Matchers::VirtualHost do
-			on HOST('localhost') do write 'localhost' ; halt! end
-			on HOST('test:8080') do write 'test' ; halt! end
-		end.mock_request
-	end
-	
-	it { subject.get('http://localhost:4444/').body.should == 'localhost' }
-	it { subject.get('http://localhost/').body.should == 'localhost' }
-	it { subject.get('http://localhost:80/').body.should == 'localhost' }
-	it { subject.get('http://test:8080/').body.should == 'test' }
-	it { subject.get('http://test/').status.should == 404 }
-	
-end

data/spec/mojito/rendering/content_spec.rb

@@ -0,0 +1,17 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Rendering::Content do
+	
+	subject do
+		Mojito.base_application Mojito::Rendering::Content do
+			on do write 'test content' ; halt! end
+		end.mock_request
+	end
+	
+	it { subject.get('/').body.should == 'test content' }
+	
+end

data/spec/mojito/rendering/delegation_spec.rb

@@ -0,0 +1,37 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Rendering::Delegation do
+	
+	subject do
+		sub_app = Mojito.base_application Mojito::R::Content, Mojito::R::Delegation do
+			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
+		end.mock_request
+	end
+	
+	it { subject.get('/').status.should == 200 }
+	it { subject.get('/').body.should == 'sub-application' }
+	
+	context do
+		
+		subject do
+			sub_app = Mojito.base_application Mojito::R::Content, Mojito::R::Delegation, 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
+				on PATH('hello/:name') do run! sub_app end
+			end.mock_request
+		end
+		
+		it { subject.get('/hello/world/rest').status.should == 200 }
+		it { subject.get('/hello/world/rest').body.should == '/rest world' }
+
+	end
+		
+end

data/spec/mojito/rendering/file_spec.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Rendering::File do
+	
+	subject do
+		Mojito.base_application Mojito::Rendering::File do
+			file! __FILE__
+		end.mock_request
+	end
+	
+	it { subject.get('/').status.should == 200 }
+	it { subject.get('/').headers.should include('Content-Type') }
+	it { subject.get('/').headers['Content-Type'].should == 'application/x-ruby' }
+	it { subject.get('/').headers.should include('Content-Length') }
+	it { subject.get('/').headers['Content-Length'].should == ::File.size(__FILE__).to_s }
+	it { subject.get('/').headers.should include('Last-Modified') }
+	it { subject.get('/').headers['Last-Modified'].should == ::File.mtime(__FILE__).rfc2822 }
+	it { subject.get('/').body.should == ::File.read(__FILE__) }
+	
+end

data/spec/mojito/rendering/status_codes_spec.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Rendering::StatusCodes do
+	
+	subject do
+		Mojito.base_application Mojito::Matchers::Path, Mojito::Rendering::StatusCodes do
+			on 'ok' do ok! end
+			on 'not_found' do not_found! end
+			on 'internal_server_error' do internal_server_error! end
+			on 'unavailable' do unavailable! end
+			on 'redirect' do redirect! '/test' end
+		end.mock_request
+	end
+	
+	it { subject.get('/ok').status.should == 200 }
+	it { subject.get('/not_found').status.should == 404 }
+	it { subject.get('/internal_server_error').status.should == 500 }
+	it { subject.get('/unavailable').status.should == 503 }
+	it { subject.get('/redirect').status.should == 302 }
+	it { subject.get('/redirect').headers['Location'].should == '/test' }
+	
+end

data/spec/mojito/rendering/templates_spec.rb

@@ -0,0 +1,37 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe Mojito::Rendering::Templates do
+	
+	context 'inline templates' do
+		subject do
+			Mojito.base_application Mojito::Rendering::Templates do
+				template :erb, 'before <%= var %> <%= yield %> after', :var => 'middle' do 'inside the block' end
+				halt!
+			end.mock_request
+		end
+		
+		it { subject.get('/').status.should == 200 }
+		it { subject.get('/').body.should == 'before middle inside the block after' }
+		
+	end
+	
+	context 'file templates' do
+		subject do
+			Mojito.base_application Mojito::Rendering::Templates do
+				template 'test.html.erb', :var => 'middle' do 'inside the block' end
+				halt!
+			end.mock_request
+		end
+		
+		it { subject.get('/').status.should == 200 }
+		it { subject.get('/').body.should == 'HTML file with a variable middle and a yield inside the block' }
+		it { subject.get('/').headers.should include('Content-Type') }
+		it { subject.get('/').headers['Content-Type'].should == 'text/html' }
+		
+	end
+
+end

data/spec/mojito/rendering_spec.rb

@@ -3,87 +3,3 @@ require 'simplecov' and SimpleCov.start do
 	add_filter "spec/"
 end
 require 'mojito'
-
-describe Mojito::Rendering::Content do
-	
-	subject do
-		Mojito.base_application Mojito::Rendering::Content do
-			on do write 'test content' ; halt! end
-		end.mock_request
-	end
-	
-	it { subject.get('/').body.should == 'test content' }
-	
-end
-
-describe Mojito::Rendering::StatusCodes do
-	
-	subject do
-		Mojito.base_application Mojito::Matchers::Path, Mojito::Rendering::StatusCodes do
-			on 'ok' do ok! end
-			on 'not_found' do not_found! end
-			on 'internal_server_error' do internal_server_error! end
-			on 'unavailable' do unavailable! end
-			on 'redirect' do redirect! '/test' end
-		end.mock_request
-	end
-	
-	it { subject.get('/ok').status.should == 200 }
-	it { subject.get('/not_found').status.should == 404 }
-	it { subject.get('/internal_server_error').status.should == 500 }
-	it { subject.get('/unavailable').status.should == 503 }
-	it { subject.get('/redirect').status.should == 302 }
-	it { subject.get('/redirect').headers['Location'].should == '/test' }
-	
-end
-
-describe Mojito::Rendering::Delegation do
-	
-	subject do
-		sub_app = Mojito.base_application Mojito::R::Content, Mojito::R::Delegation do
-			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
-		end.mock_request
-	end
-	
-	it { subject.get('/').status.should == 200 }
-	it { subject.get('/').body.should == 'sub-application' }
-	
-	context do
-		
-		subject do
-			sub_app = Mojito.base_application Mojito::R::Content, Mojito::R::Delegation, 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
-				on PATH('hello/:name') do run! sub_app end
-			end.mock_request
-		end
-		
-		it { subject.get('/hello/world/rest').status.should == 200 }
-		it { subject.get('/hello/world/rest').body.should == '/rest world' }
-
-	end
-		
-end
-
-describe Mojito::Rendering::File do
-	
-	subject do
-		Mojito.base_application Mojito::Rendering::File do
-			file! __FILE__
-		end.mock_request
-	end
-	
-	it { subject.get('/').status.should == 200 }
-	it { subject.get('/').headers.should include('Content-Type') }
-	it { subject.get('/').headers['Content-Type'].should == 'application/x-ruby' }
-	it { subject.get('/').headers.should include('Content-Length') }
-	it { subject.get('/').headers['Content-Length'].should == ::File.size(__FILE__).to_s }
-	it { subject.get('/').headers.should include('Last-Modified') }
-	it { subject.get('/').headers['Last-Modified'].should == ::File.mtime(__FILE__).rfc2822 }
-	it { subject.get('/').body.should == ::File.read(__FILE__) }
-	
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojito
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &20131580 !ruby/object:Gem::Requirement
+  requirement: &19113520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *20131580
+  version_requirements: *19113520
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &20130100 !ruby/object:Gem::Requirement
+  requirement: &19113040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.18'
   type: :runtime
   prerelease: false
-  version_requirements: *20130100
+  version_requirements: *19113040
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &20129340 !ruby/object:Gem::Requirement
+  requirement: &19112500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *20129340
+  version_requirements: *19112500
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &20128340 !ruby/object:Gem::Requirement
+  requirement: &19111980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,21 @@ dependencies:
         version: 0.9.15
   type: :runtime
   prerelease: false
-  version_requirements: *20128340
+  version_requirements: *19111980
+- !ruby/object:Gem::Dependency
+  name: where-am-i
+  requirement: &19111420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *19111420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20152720 !ruby/object:Gem::Requirement
+  requirement: &19110940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *20152720
+  version_requirements: *19110940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20151740 !ruby/object:Gem::Requirement
+  requirement: &19110400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *20151740
+  version_requirements: *19110400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20150340 !ruby/object:Gem::Requirement
+  requirement: &19109880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20150340
+  version_requirements: *19109880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20149300 !ruby/object:Gem::Requirement
+  requirement: &19208400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *20149300
+  version_requirements: *19208400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &20148580 !ruby/object:Gem::Requirement
+  requirement: &19207820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20148580
+  version_requirements: *19207820
 description: A simple yet powerful webframework largely inspired by Rum and Cuba
 email: dev@trense.info
 executables: []
@@ -126,8 +137,11 @@ files:
 - lib/mojito/helpers/exception_handling.rb
 - lib/mojito/helpers/shortcuts.rb
 - lib/mojito/matchers.rb
+- lib/mojito/matchers/environment.rb
 - lib/mojito/matchers/methods.rb
 - lib/mojito/matchers/path.rb
+- lib/mojito/matchers/session.rb
+- lib/mojito/matchers/url_scheme.rb
 - lib/mojito/matchers/virtual_host.rb
 - lib/mojito/rendering.rb
 - lib/mojito/rendering/content.rb
@@ -135,10 +149,21 @@ files:
 - lib/mojito/rendering/delegation.rb
 - lib/mojito/rendering/file.rb
 - lib/mojito/rendering/status_codes.rb
+- lib/mojito/rendering/templates.rb
 - lib/mojito/request_extensions.rb
 - lib/mojito/utils/status_codes.rb
 - spec/mojito/helpers_spec.rb
+- spec/mojito/matchers/methods_spec.rb
+- spec/mojito/matchers/path_spec.rb
+- spec/mojito/matchers/session_spec.rb
+- spec/mojito/matchers/url_scheme_spec.rb
+- spec/mojito/matchers/virtual_host_spec.rb
 - spec/mojito/matchers_spec.rb
+- spec/mojito/rendering/content_spec.rb
+- spec/mojito/rendering/delegation_spec.rb
+- spec/mojito/rendering/file_spec.rb
+- spec/mojito/rendering/status_codes_spec.rb
+- spec/mojito/rendering/templates_spec.rb
 - spec/mojito/rendering_spec.rb
 - spec/mojito/request_extensions_spec.rb
 - spec/mojito_spec.rb