mojito 0.1.2 → 0.2.3

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

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

data/lib/mojito/controllers/sinatra.rb

@@ -0,0 +1,11 @@
+# encoding: UTF-8
+
+module Mojito::Controllers
+	
+	module Sinatra
+		
+		
+		
+	end
+	
+end

data/lib/mojito/helpers/exception_handling.rb

@@ -23,10 +23,10 @@ module Mojito
 			
 			def self.included(type)
 				type.instance_exec do
-					old_dispatch = instance_method(:dispatch)
-					define_method :dispatch do
+					old_call_with_handlers = method(:call_with_handlers)
+					define_method :call_with_handlers do
 						begin
-							old_dispatch.bind(self).call
+							old_call_with_handlers.bind(self).call
 						rescue Exception => e
 							__handle_error e
 						end
@@ -79,8 +79,6 @@ module Mojito
 			
 		end
 		
-		Mojito::PLUGINS[:exception_handling] = ExceptionHandling
-
 	end
 
 end

data/lib/mojito/helpers/shortcuts.rb

@@ -32,6 +32,4 @@ module Mojito::Helpers
 		
 	end
 	
-	Mojito::PLUGINS[:shortcuts] = Shortcuts
-	
 end

data/lib/mojito/rendering.rb

@@ -9,11 +9,15 @@ module Mojito::Rendering
 	require 'mojito/rendering/status_codes'
 	require 'mojito/rendering/templates'
 	
-	include Content
-	include ContentTypes
-	include Delegation
-	include File
-	include StatusCodes
-	include Templates
+	def self.included(type)
+		type.instance_exec do
+			include Content
+			include ContentTypes
+			include Delegation
+			include File
+			include StatusCodes
+			include Templates
+		end
+	end
 	
 end

data/lib/mojito/rendering/content.rb

@@ -19,6 +19,4 @@ module Mojito::Rendering
 		
 	end
 
-	Mojito::PLUGINS[:content] = Content
-	
 end

data/lib/mojito/rendering/content_types.rb

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

data/lib/mojito/rendering/delegation.rb

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

data/lib/mojito/rendering/file.rb

@@ -51,6 +51,4 @@ module Mojito::Rendering
 		
 	end
 	
-	Mojito::PLUGINS[:file] = File
-
 end

data/lib/mojito/rendering/status_codes.rb

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

data/lib/mojito/rendering/templates.rb

@@ -8,13 +8,13 @@ module Mojito::Rendering
 		require 'mime/types'
 		
 		def template(*args, &block)
-			locals = Hash === args.last ? args.pop : self.locals
+			locals = Hash === args.last ? args.pop : self.request.locals
 			template = if args.size == 2
 				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
+				if not response.include?('Content-Type') and %r{\.(?<extension>\w+)\.\w+$} =~ file.to_s
 					response['Content-Type'] = MIME::Types.type_for(extension)
 				end
 				Tilt[file.to_s].new file.to_s
@@ -24,6 +24,4 @@ module Mojito::Rendering
 		
 	end
 	
-	Mojito::PLUGINS[:templates] = Templates
-
 end

data/lib/mojito/request_extensions.rb

@@ -2,6 +2,10 @@
 
 class ::Rack::Request
 	
+	def dup
+		Rack::Request.new(@env.dup)
+	end
+	
 	def captures
 		@env['mojito/captures'] ||= []
 	end

data/lib/mojito/utils/rspec.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+
+require 'rspec/expectations'
+
+RSpec::Matchers.define :respond_with do |*args|
+	status = if Integer === args.first
+		args.shift 
+	else
+		nil
+	end
+	headers = if Hash === args.last
+		args.pop
+	else
+		{}
+	end
+	body = args.first
+	
+	match do |actual|
+		(status ? actual.status == status : true) and
+		(body ? actual.body == body : true) and
+		headers.all? do |name, value|
+			actual.headers[name] == value
+		end
+	end
+	
+end

data/spec/mojito/base_spec.rb

@@ -7,8 +7,8 @@ require 'mojito'
 describe Mojito::Base do
 	
 	subject do
-		Mojito.base_application :status_codes do
-			on Mojito::Matchers::PATH('test.:extension') do ok! end
+		Mojito::C.runtime_controller Mojito::R::StatusCodes do
+			on PATH('test.:extension') do ok! end
 		end.mock_request
 	end
 	
@@ -19,4 +19,20 @@ describe Mojito::Base do
 	it { subject.get('/test.rb').headers.should include('Content-Type') }
 	it { subject.get('/test.rb').headers['Content-Type'].should == 'application/x-ruby' }
 	
+	context do
+		
+		subject do
+			Class.new.tap do |c|
+				c.class_exec do
+					include Mojito::Base
+				end
+			end
+		end
+		
+		it { subject.should respond_to(:new).with(1).argument }
+		it { subject.should respond_to(:call).with(1).argument }
+		it { subject.should respond_to(:dispatch).with(1).argument }
+		
+	end
+		
 end

data/spec/mojito/controllers/method_spec.rb

@@ -0,0 +1,56 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+	add_filter "lib/mojito/utils/rspec.rb"
+end
+require 'mojito'
+require 'mojito/utils/rspec'
+
+describe Mojito::Controllers::Method do
+	
+	context do
+		subject { Mojito::Controllers::Method }
+		
+		it { subject.args_for(0, '').should == [[], ''] }
+		it { subject.args_for(0, 'Fred/Barney').should == [[], 'Fred/Barney'] }
+		it { subject.args_for(1, 'Fred').should == [['Fred'], ''] }
+		it { subject.args_for(1, 'Fred/Barney').should == [['Fred'], 'Barney'] }
+		it { subject.args_for(2, 'Fred/Barney/Wilma').should == [['Fred', 'Barney'], 'Wilma'] }
+		it { subject.args_for(-1, 'Fred/Barney/Wilma').should == [['Fred', 'Barney', 'Wilma'], ''] }
+		it { subject.args_for(-1, '').should == [[], ''] }
+		it { subject.args_for(-2, '').should == [nil, ''] }
+		it { subject.args_for(-4, 'Fred/Barney').should == [nil, 'Fred/Barney'] }
+		
+	end
+	
+	subject do
+		Mojito::Controllers.method_controller(Mojito::Rendering) do
+			def test_method
+				write 'Test method'
+			end
+			def hello(name)
+				write "Hello #{name}"
+			end
+			def hello_all(first_name, *names)
+				write "Hello #{[first_name, *names].join(', ')}"
+			end
+		end.mock_request
+	end
+	
+	it { subject.get('/test_method').should respond_with(200, 'Test method') }
+	it { subject.get('/test_method/another_parameter').should respond_with(200, 'Test method') }
+	
+	it { subject.get('/hello/Fred').should respond_with(200, 'Hello Fred') }
+	it { subject.get('/hello/Fred+Flintstone').should respond_with(200, 'Hello Fred Flintstone') }
+	it { subject.get('/hello/Fred/Barney').should respond_with(200, 'Hello Fred') }
+	
+	it { subject.get('/hello').should respond_with(404) }
+	
+	it { subject.get('/hello_all/Fred/Barney').should respond_with(200, 'Hello Fred, Barney') }
+	it { subject.get('/hello_all/Fred/Barney/Wilma').should respond_with(200, 'Hello Fred, Barney, Wilma') }
+
+	it { subject.get('/hello_all').should respond_with(404) }
+	
+	it { subject.get('/not_defined_method').should respond_with(404) }
+	
+end

data/spec/mojito/{matchers → controllers/runtime}/methods_spec.rb

@@ -1,13 +1,15 @@
 # encoding: UTF-8
 require 'simplecov' and SimpleCov.start do
 	add_filter "spec/"
+	add_filter "lib/mojito/utils/rspec.rb"
 end
 require 'mojito'
+require 'mojito/utils/rspec'
 
-describe Mojito::Matchers::Methods do
+describe Mojito::Controllers::Runtime::Methods do
 	
 	subject do
-		Mojito.application Mojito::Matchers::Methods do
+		Mojito::C.runtime_controller Mojito::R::Content, Mojito::Controllers::Runtime::Methods do
 			on GET() do write 'get' ; halt! end
 			on POST() do write 'post' ; halt! end
 			on HEAD() do write 'head' ; halt! end

data/spec/mojito/{matchers → controllers/runtime}/path_spec.rb

@@ -1,15 +1,17 @@
 # encoding: UTF-8
 require 'simplecov' and SimpleCov.start do
 	add_filter "spec/"
+	add_filter "lib/mojito/utils/rspec.rb"
 end
 require 'mojito'
+require 'mojito/utils/rspec'
 
-describe Mojito::Matchers::Path do
+describe Mojito::Controllers::Runtime::Path do
 	
-	subject { Mojito.application.new Rack::MockRequest.env_for('http://localhost/hello/world/rest') }
+	subject { Mojito::C.runtime_controller(Mojito::H::Shortcuts).new Rack::MockRequest.env_for('http://localhost/hello/world/rest') }
 	
 	it do
-		subject.send(:__match?, Mojito::M::PATH('hello'))
+		subject.send(:__match?, subject.PATH('hello'))
 		subject.captures.should be_empty
 		subject.locals.should be_empty
 		subject.path_info.should == '/world/rest'
@@ -23,7 +25,7 @@ describe Mojito::Matchers::Path do
 	end
 	
 	it do
-		subject.send(:__match?, Mojito::M::PATH('hello/:name'))
+		subject.send(:__match?, subject.PATH('hello/:name'))
 		subject.request.captures.should == ['world']
 		subject.request.locals.should == { 'name' => 'world' }
 		subject.request.path_info.should == '/rest'
@@ -37,7 +39,7 @@ describe Mojito::Matchers::Path do
 	end
 	
 	it do
-		subject.send(:__match?, Mojito::M::PATH(%r{hello/(?<name>[^/]+)}))
+		subject.send(:__match?, subject.PATH(%r{hello/(?<name>[^/]+)}))
 		subject.request.captures.should == ['world']
 		subject.request.locals.should == { 'name' => 'world' }
 		subject.request.path_info.should == '/rest'
@@ -52,7 +54,7 @@ describe Mojito::Matchers::Path do
 	
 	context do
 		subject do
-			Mojito.base_application Mojito::M::Path, Mojito::R::Content do
+			Mojito::C.runtime_controller Mojito::R::Content do
 				on PATH('hello/:name') do
 					on PATH('another/:name') do
 						write request.locals[:name]
@@ -64,10 +66,9 @@ describe Mojito::Matchers::Path do
 			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' }
+		it { subject.get('/hello/Fred').should respond_with(200, 'Fred') }
+		it { subject.get('/hello/Fred+Flintstone').should respond_with(200, 'Fred Flintstone') }
+		it { subject.get('/hello/Fred/another/Barney').should respond_with(200, 'Barney') }
 		
 	end
 	

data/spec/mojito/{matchers → controllers/runtime}/session_spec.rb

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

data/spec/mojito/controllers/runtime/url_scheme_spec.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+	add_filter "lib/mojito/utils/rspec.rb"
+end
+require 'mojito'
+require 'mojito/utils/rspec'
+
+describe Mojito::Controllers::Runtime::UrlScheme do
+	
+	subject do
+		Mojito::C.runtime_controller Mojito::Controllers::Runtime::UrlScheme, Mojito::R::Content 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/').should respond_with(200, 'insecure') }
+	it { subject.get('http://localhost:7777/').should respond_with(200, 'insecure') }
+	it { subject.get('https://localhost:80/').should respond_with(200, 'secure') }
+	it { subject.get('https://localhost/').should respond_with(200, 'secure') }
+	it { subject.get('otherprotocol://test/').should respond_with(404) }
+	
+end

data/spec/mojito/controllers/runtime/virtual_host_spec.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+require 'simplecov' and SimpleCov.start do
+	add_filter "spec/"
+	add_filter "lib/mojito/utils/rspec.rb"
+end
+require 'mojito'
+require 'mojito/utils/rspec'
+
+describe Mojito::Controllers::Runtime::VirtualHost do
+	
+	subject do
+		Mojito::C.runtime_controller Mojito::Controllers::Runtime::VirtualHost, Mojito::R::Content 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/').should respond_with(200, 'localhost') }
+	it { subject.get('http://localhost/').should respond_with(200, 'localhost') }
+	it { subject.get('http://localhost:80/').should respond_with(200, 'localhost') }
+	it { subject.get('http://test:8080/').should respond_with(200, 'test') }
+	it { subject.get('http://test/').should respond_with(404) }
+	
+end

data/spec/mojito/helpers_spec.rb

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

data/spec/mojito/rendering/content_spec.rb

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