mojito 0.0.1 → 0.1.0

data/README.textile

@@ -1,8 +1,8 @@
-h1. mojito - Next level ruby webframework
+h1. mojito - Next level Ruby webframework
 
 p. Mojito is a lean and simple webframework. 
 
-p. As the name implies mojito derives from cuba (https://github.com/soveran/cuba). Many thanks to Michel and the cuba sources for giving me some major insights on web-application-simplicity!
+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!
 
 h2. Installing
 
@@ -10,7 +10,7 @@ bc. $ gem install mojito
 
 h2. Your first application
 
-p. The easiest way to start with mojito is to use a plain config.ru script to develop and configure your application. 
+p. The easiest way to start with mojito is to use a plain @config.ru@ script to develop and configure your application. 
 
 bc.. $ cat config.ru
 require 'mojito'
@@ -23,9 +23,9 @@ FirstApp = Mojito.application do
 	end
 end
 
-run FirstApp
+run FirstApp.to_app
 
-p. This installs a handler for GET requests to a path of /hello/ followed by a name (actually this notation catches all but a slash '/'). You can start this application by running @rackup@ from the same directory:
+p. This installs a handler for GET requests to a path of /hello/ followed by a name (actually this notation catches everything but a slash '/'). You can start this application by running @rackup@ from the same directory:
 
 bc. $ rackup
 
@@ -34,7 +34,50 @@ p. This starts a http-server on port 9292. Now try to call your handler through
 bc. $ curl http://localhost:9292/hello/Fred
 Hello Fred! How are you?
 
-p. Please be aware that although this way is easy to start with it tends to messy very quick if your project becomes more complex, so please read on...
+p. Please be aware that although this way is easy to start with it tends to get messy very quick if your project becomes more complex, so please read on...
+
+h2. Structure of a real-world application
+
+p. The above call to @Mojito.application@ actually created a class and included most of Mojitos foundation methods, so that you could start writing your application code without wondering what features you want to include in your application. As a tribute to simplicity (one of the most important I think), another helper method @Mojito.base_application@ can be used to create a blank application class, which only includes modules that are strictly necessary. Instead of using those methods you can also write out all of the generated classes code (here @Mojito@ is included, which in turn includes @Mojito::Base@, the basic module which is used by @Mojito.base_application@):
+
+bc.. class FirstApp
+	include Mojito
+	routes do
+		on GET(), PATH('/hello/:name') do |name|
+			...
+		end
+	end
+end
+
+p. which is not only perfectly legal but also favoured, when you need any special behaviour on your application class.
+
+p. Although you can actually use any structure you want (including a single-file application), some of them are more useful than others. My preferred way of developing Mojito applications is to reuse most of the concepts found in product development with rubygems and git.
+
+h2. Behind the scenes
+
+p. Understanding how Mojito dispatches requests and selects handlers, which in turn use common functionality to create the response is vital to an efficient use of Mojito as web application framework. First of all Mojito applications (classes which include @Mojito::Base@ or @Mojito@) are simply Ruby classes, which are instantiated with the Rack-environment hash for each request. This is automatically triggered by a rack-enabled webserver through the call of @run ApplicationClass@, which tells rack to call @call(env)@ on that class. The Mojito implementation will then instantiate the Application (the instance is called a _controller_ from now on) and call @dispatch@ on that controller. The dispatch method then executes any block given to the @routes@-method in the class definition. As in Cuba the routes-definition is executed once for each request.
+
+h3. Matching
+
+p. A matcher is simply a Proc, instantiated with matcher-specific configuration, which returns whether or not a given request matches its criteria. The request-method matcher for example is implemented as follows:
+
+bc.. 	def METHOD(method)
+	proc { request.request_method == method.to_s.upcase }
+end
+
+p. This method configures a Proc to return true when the requests method matches the given parameter. The returned Proc is evaluated in the context of the current controller. This is also where the @request@ method comes from. Like @request@, a matcher can access any method from the controller, within which it is executed. The naming convention is to name all matchers uppercase.
+
+h3. Rendering
+
+h3. Helpers
+
+h2. Deployment/Hosting
+
+p. tbd
+
+h2. Writing extensions
+
+p. tbd
 
 h2. Contributing to mojito
  

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/lib/mojito.rb

@@ -1,10 +1,12 @@
 # encoding: UTF-8
 require 'rack'
-require 'slick/logging'
+require 'extlib'
 
 module Mojito
-	require 'mojito/utils/status_codes'
+	require 'mojito/request_extensions'
 	require 'mojito/helpers'
+	require 'mojito/base'
+	require 'mojito/utils/status_codes'
 	require 'mojito/rendering'
 	require 'mojito/matchers'
 	
@@ -26,7 +28,6 @@ module Mojito
 				include Mojito::Base
 				helpers.reverse.each do |helper|
 					include helper
-					extend helper::ClassMethods if helper.const_defined? :ClassMethods
 				end
 			end
 			cl.routes &block if block
@@ -39,112 +40,12 @@ module Mojito
 				include Mojito
 				helpers.reverse.each do |helper|
 					include helper
-					extend helper::ClassMethods if helper.const_defined? :ClassMethods
 				end
 			end
 			cl.routes &block if block
 		end
 	end
 	
-	module Base
-	
-		def self.included(type)
-			type.extend ClassMethods
-		end
-		
-		def initialize(env)
-			@__env = env
-		end
-		
-		def env
-			@__env
-		end
-		
-		def request
-			@__request ||= Rack::Request.new(env)
-		end
-		
-		def response
-			@__response ||= Rack::Response.new
-		end
-		
-		def captures
-			@__captures ||= []
-		end
-		
-		def locals
-			@__locals ||= {}
-		end
-		
-		def script_name
-			env['SCRIPT_NAME']
-		end
-		
-		def path_info
-			env['PATH_INFO']
-		end
-		
-		def halt!(resp = response)
-			throw :halt, case resp
-			when Rack::Response
-				resp.finish
-			when Array
-				resp
-			when Symbol, Integer
-				response.status = STATUS[resp].code
-				response.finish
-			else
-				[500, { 'Content-Type' => 'application/octet-stream' }, []]
-			end
-		end
-		
-		def dispatch
-			instance_exec &self.class.routes if self.class.routes
-			Rack::Response.new [], 404, 'Content-Type' => 'application/octet-stream'
-		end
-		
-		def on(*matchers, &block)
-			env_backup = env.dup
-			param_size = captures.length
-			return unless matchers.all? {|m| __match?(m) }
-			params = captures[param_size..-1][0..block.arity].collect {|p| Rack::Utils.unescape(p) }
-			instance_exec *params, &block
-		ensure
-			@__env = env_backup
-		end
-		
-		def __match?(matcher)
-			case matcher
-			when String, Regexp
-				instance_exec &Matchers::PATH(matcher)
-			when Proc
-				instance_exec &matcher
-			else
-				matcher
-			end
-		end
-		
-		module ClassMethods
-			
-			def call(env)
-				catch :halt do
-					new(env).dispatch
-				end
-			end
-			
-			def routes(&block)
-				@__routing = block if block
-				@__routing
-			end
-			
-			def mock_request
-				Rack::MockRequest.new self
-			end
-			
-		end
-
-	end
-	
-	ALL_HELPERS = [Mojito::Matchers, Mojito::Rendering, Mojito::Helpers::ExceptionHandling, Mojito::Base]
+	ALL_HELPERS = [Mojito::Matchers, Mojito::Rendering, Mojito::Helpers::ExceptionHandling, Mojito::Helpers::Shortcuts, Mojito::Base]
 
 end

data/lib/mojito/base.rb

@@ -0,0 +1,100 @@
+# encoding: UTF-8
+
+module Mojito
+	
+	module Base
+		
+		def self.included(type)
+			type.extend ClassMethods
+		end
+		
+		def initialize(env)
+			@__env = env
+		end
+		
+		def env
+			@__env
+		end
+		
+		def request
+			@__request ||= Rack::Request.new(env)
+		end
+		
+		def response
+			@__response ||= Rack::Response.new
+		end
+		
+		def halt!(resp = response)
+			throw :halt, case resp
+			when Rack::Response
+				resp.finish
+			when Array
+				resp
+			when Symbol, Integer
+				response.status = STATUS[resp].code
+				response.finish
+			else
+				[500, { 'Content-Type' => 'text/plain', 'Content-Length' => '0' }, []]
+			end
+		end
+		
+		##
+		# 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'
+		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
+		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 &Matchers::PATH(matcher)
+			when Proc
+				instance_exec &matcher
+			else
+				matcher
+			end
+		end
+		private :__match?
+		
+		module ClassMethods
+			
+			def call(env)
+				catch :halt do
+					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
+			
+		end
+		
+	end
+	
+end

data/lib/mojito/helpers.rb

@@ -3,5 +3,6 @@
 module Mojito::Helpers
 	
 	require 'mojito/helpers/exception_handling'
+	require 'mojito/helpers/shortcuts'
 	
 end

data/lib/mojito/helpers/exception_handling.rb

@@ -22,7 +22,6 @@ module Mojito
 		module ExceptionHandling
 			
 			def self.included(type)
-				type.extend ClassMethods
 				type.instance_exec do
 					old_dispatch = instance_method(:dispatch)
 					define_method :dispatch do
@@ -33,6 +32,7 @@ module Mojito
 						end
 					end
 				end
+				type.extend ClassMethods
 			end
 			
 			def raise(exception)

data/lib/mojito/helpers/shortcuts.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+
+module Mojito::Helpers::Shortcuts
+	
+	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

data/lib/mojito/matchers/path.rb

@@ -6,11 +6,11 @@ module Mojito::Matchers
 		
 		def PATH(pattern)
 			consume_path = proc do |pattern|
-				if match = 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
-					locals.update match.names.inject({}) {|hash, name| hash[name.to_sym] = match[name] ; hash }
-					captures.push *match.captures
+					request.locals.update match.names.inject({}) {|hash, name| hash[name.to_sym] = match[name] ; hash }
+					request.captures.push *match.captures
 					true
 				else
 					false

data/lib/mojito/rendering.rb

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

data/lib/mojito/rendering/delegation.rb

@@ -4,8 +4,8 @@ module Mojito::Rendering
 	
 	module Delegation
 		
-		def run(app)
-			halt! app
+		def run!(app)
+			halt! app.call(env)
 		end
 		
 	end

data/lib/mojito/rendering/file.rb

@@ -0,0 +1,53 @@
+# encoding: UTF-8
+
+module Mojito::Rendering
+	
+	module File
+		require 'pathname'
+		require 'mime/types'
+		require 'time'
+		
+		def file!(filename)
+			path = Pathname === filename ? filename : Pathname.new(filename.to_s)
+			restrict_path! path if respond_to? :restrict_path!
+			if path.readable? and path.file?
+				body = FileResponse.new path
+				halt! [response.status, response.headers.merge(body.compute_headers), body]
+			else
+				not_found!
+			end
+		end
+		
+		class FileResponse
+			
+			def initialize(pathname)
+				@pathname = pathname
+			end
+			
+			def each(&block)
+				@pathname.open do |f|
+					yield f.read
+				end
+			end
+			
+			def compute_headers
+				{ 'Content-Type' => mime_type.to_s, 'Content-Length' => size.to_s, 'Last-Modified' => @pathname.mtime.rfc2822 }
+			end
+			
+			def mime_type
+				MIME::Types.type_for(@pathname.to_s).first || MIME::Types['application/octet-stream'].first
+			end
+			
+			def size
+				@pathname.size
+			end
+			
+			def to_path
+				@pathname.to_s
+			end
+			
+		end
+		
+	end
+	
+end

data/lib/mojito/rendering/status_codes.rb

@@ -25,8 +25,7 @@ module Mojito::Rendering
 		end
 		
 		def redirect(target, status = 302)
-			response['Location'] = target
-			response.status = status
+			response.redirect(target, status)
 		end
 		
 		def redirect!(target, status = 302)

data/lib/mojito/request_extensions.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+
+class ::Rack::Request
+	
+	def captures
+		@env['mojito/captures'] ||= []
+	end
+	
+	def locals
+		@env['mojito/locals'] ||= Mash.new
+	end
+	
+	def script_name
+		@env['SCRIPT_NAME']
+	end
+	
+	def path_info
+		@env['PATH_INFO']
+	end
+	
+	get_method = instance_method(:GET)
+	define_method :GET do
+		get_method.bind(self).call.to_mash
+	end
+	
+	post_method = instance_method(:POST)
+	define_method :POST do
+		post_method.bind(self).call.to_mash
+	end
+
+end

data/spec/mojito/helpers_spec.rb

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

data/spec/mojito/matchers_spec.rb

@@ -1,4 +1,7 @@
 # encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
 require 'mojito'
 
 describe Mojito::Matchers::Methods do
@@ -43,30 +46,51 @@ describe Mojito::Matchers::Path do
 	
 	it do
 		subject.send(:__match?, Mojito::M::PATH('hello/:name'))
-		subject.captures.should == ['world']
-		subject.locals.should == { :name => 'world' }
-		subject.path_info.should == '/rest'
+		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.captures.should == ['world']
-		subject.locals.should == { :name => 'world' }
-		subject.path_info.should == '/rest'
+		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.captures.should == ['world']
-		subject.locals.should == { :name => 'world' }
-		subject.path_info.should == '/rest'
+		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.captures.should == ['world']
-		subject.locals.should == { :name => 'world' }
-		subject.path_info.should == '/rest'
+		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/rendering_spec.rb

@@ -1,4 +1,7 @@
 # encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
 require 'mojito'
 
 describe Mojito::Rendering::Content do
@@ -12,3 +15,75 @@ describe Mojito::Rendering::Content do
 	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

data/spec/mojito/request_extensions_spec.rb

@@ -0,0 +1,19 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+end
+require 'mojito'
+
+describe ::Rack::Request do
+	
+	subject do
+		Mojito.base_application Mojito::Rendering::Content do
+			write request.GET[:hello]
+			halt!
+		end.mock_request
+	end
+	
+	it { subject.get('/?hello=world').status.should == 200 }
+	it { subject.get('/?hello=world').body.should == 'world' }
+	
+end

data/spec/mojito_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojito
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &6514840 !ruby/object:Gem::Requirement
+  requirement: &20131580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *6514840
+  version_requirements: *20131580
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &6514180 !ruby/object:Gem::Requirement
+  requirement: &20130100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,32 @@ dependencies:
         version: '1.18'
   type: :runtime
   prerelease: false
-  version_requirements: *6514180
+  version_requirements: *20130100
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: &20129340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *20129340
+- !ruby/object:Gem::Dependency
+  name: extlib
+  requirement: &20128340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.15
+  type: :runtime
+  prerelease: false
+  version_requirements: *20128340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6513520 !ruby/object:Gem::Requirement
+  requirement: &20152720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +65,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *6513520
+  version_requirements: *20152720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7041900 !ruby/object:Gem::Requirement
+  requirement: &20151740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +76,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *7041900
+  version_requirements: *20151740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7040840 !ruby/object:Gem::Requirement
+  requirement: &20150340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *7040840
+  version_requirements: *20150340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &7039960 !ruby/object:Gem::Requirement
+  requirement: &20149300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +98,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *7039960
+  version_requirements: *20149300
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &7038500 !ruby/object:Gem::Requirement
+  requirement: &20148580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7038500
+  version_requirements: *20148580
 description: A simple yet powerful webframework largely inspired by Rum and Cuba
 email: dev@trense.info
 executables: []
@@ -99,8 +121,10 @@ files:
 - LICENSE.txt
 - VERSION
 - lib/mojito.rb
+- lib/mojito/base.rb
 - lib/mojito/helpers.rb
 - lib/mojito/helpers/exception_handling.rb
+- lib/mojito/helpers/shortcuts.rb
 - lib/mojito/matchers.rb
 - lib/mojito/matchers/methods.rb
 - lib/mojito/matchers/path.rb
@@ -109,10 +133,14 @@ files:
 - lib/mojito/rendering/content.rb
 - lib/mojito/rendering/content_types.rb
 - lib/mojito/rendering/delegation.rb
+- lib/mojito/rendering/file.rb
 - lib/mojito/rendering/status_codes.rb
+- lib/mojito/request_extensions.rb
 - lib/mojito/utils/status_codes.rb
+- spec/mojito/helpers_spec.rb
 - spec/mojito/matchers_spec.rb
 - spec/mojito/rendering_spec.rb
+- spec/mojito/request_extensions_spec.rb
 - spec/mojito_spec.rb
 - README.textile
 homepage: http://github.com/mtrense/mojito
@@ -127,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: