mojito 0.1.2 → 0.2.3

data/spec/mojito/rendering/delegation_spec.rb

@@ -1,38 +1,38 @@
 # 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::Delegation do
 	
 	subject do
-		sub_app = Mojito.base_application Mojito::R::Content, Mojito::M::Path do
+		sub_app = Mojito::C.runtime_controller Mojito::H::Shortcuts, Mojito::R::Content 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
+		Mojito::C.runtime_controller Mojito::R::Content, Mojito::R::Delegation do
 			on 'to/sub/app' do run! sub_app end
 		end.mock_request
 	end
 	
-	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' }
+	it { subject.get('/to/sub/app').should respond_with(200, 'sub-application') }
+	it { subject.get('/to/sub/app/this/is/the/sub-application').should respond_with(200, '/to/sub/app') }
 	
 	context do
 		
 		subject do
-			sub_app = Mojito.base_application Mojito::R::Content, Mojito::H::Shortcuts do
+			sub_app = Mojito::C.runtime_controller 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
+			Mojito::C.runtime_controller 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' }
+		it { subject.get('/hello/world/rest').should respond_with(200, '/rest world') }
 
 	end
 		

data/spec/mojito/rendering/file_spec.rb

@@ -1,24 +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::Rendering::File do
 	
 	subject do
-		Mojito.base_application Mojito::Rendering::File do
+		Mojito::C.runtime_controller Mojito::R::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__) }
+	it do
+		subject.get('/').should respond_with(200, ::File.read(__FILE__),
+			'Content-Type' => 'application/x-ruby', 
+			'Content-Length' => ::File.size(__FILE__).to_s, 
+			'Last-Modified' => ::File.mtime(__FILE__).rfc2822)
+	end
 	
 end

data/spec/mojito/rendering/status_codes_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::Rendering::StatusCodes do
 	
 	subject do
-		Mojito.base_application Mojito::Matchers::Path, Mojito::Rendering::StatusCodes do
+		Mojito::C.runtime_controller Mojito::R::StatusCodes do
 			on 'ok' do ok! end
 			on 'not_found' do not_found! end
 			on 'internal_server_error' do internal_server_error! end
@@ -20,7 +22,8 @@ describe Mojito::Rendering::StatusCodes do
 	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' }
+	it { subject.get('/redirect').should respond_with(302, 'Location' => '/test') }
+#	it { subject.get('/redirect').status.should == 302 }
+#	it { subject.get('/redirect').headers['Location'].should == '/test' }
 	
 end

data/spec/mojito/rendering/templates_spec.rb

@@ -1,37 +1,47 @@
 # 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::Templates do
 	
 	context 'inline templates' do
 		subject do
-			Mojito.base_application Mojito::Rendering::Templates do
+			Mojito::C.runtime_controller 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' }
+		it { subject.get('/').should respond_with(200, 'before middle inside the block after') }
 		
 	end
 	
 	context 'file templates' do
 		subject do
-			Mojito.base_application Mojito::Rendering::Templates do
+			Mojito::C.runtime_controller Mojito::R::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' }
+		it { subject.get('/').should respond_with(200, 'HTML file with a variable middle and a yield inside the block', 'Content-Type' => 'text/html') }
 		
+		context 'text template' do
+			subject do
+				Mojito::C.runtime_controller Mojito::R::Templates do
+					template 'test.txt.erb', :var => 'middle' do 'inside the block' end
+					halt!
+				end.mock_request
+			end
+			
+			it { subject.get('/').should respond_with(200, 'Text file with a variable middle and a yield inside the block', 'Content-Type' => 'text/plain') }
+			
+		end
+			
 	end
 
 end

data/spec/mojito/rendering_spec.rb

@@ -1,5 +1,7 @@
 # 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/request_extensions_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 ::Rack::Request do
 	
 	subject do
-		Mojito.base_application Mojito::Rendering::Content do
+		Mojito::C.runtime_controller Mojito::Rendering::Content do
 			write request.GET[:hello]
 			halt!
 		end.mock_request

data/spec/mojito_spec.rb

@@ -1,19 +1,21 @@
 # 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 do
   
 	context do
-		subject { Mojito.application {} }
+		subject { Mojito::C.runtime_controller {} }
 		it { subject.ancestors.should include(Mojito::Base) }
 		it { subject.should respond_to(:call) }
 	end
 	
 	context do
-		subject { Mojito.application(Mojito::Matchers::Path).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 { subject.env.should_not be_nil }
 		it { subject.request.should be_kind_of(Rack::Request) }
 		it { subject.captures.should be_empty }
@@ -28,7 +30,7 @@ describe Mojito do
 	
 	context do
 		subject do
-			Mojito.application do
+			Mojito::C.runtime_controller do
 				
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojito
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &15854720 !ruby/object:Gem::Requirement
+  requirement: &22721340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *15854720
+  version_requirements: *22721340
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &15854100 !ruby/object:Gem::Requirement
+  requirement: &22737160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.18'
   type: :runtime
   prerelease: false
-  version_requirements: *15854100
+  version_requirements: *22737160
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &15853440 !ruby/object:Gem::Requirement
+  requirement: &22736600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *15853440
+  version_requirements: *22736600
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: &15852680 !ruby/object:Gem::Requirement
+  requirement: &22736120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.15
   type: :runtime
   prerelease: false
-  version_requirements: *15852680
+  version_requirements: *22736120
 - !ruby/object:Gem::Dependency
   name: where-am-i
-  requirement: &15851760 !ruby/object:Gem::Requirement
+  requirement: &22735620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15851760
+  version_requirements: *22735620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15850760 !ruby/object:Gem::Requirement
+  requirement: &22735140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *15850760
+  version_requirements: *22735140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15850180 !ruby/object:Gem::Requirement
+  requirement: &22734640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *15850180
+  version_requirements: *22734640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15849540 !ruby/object:Gem::Requirement
+  requirement: &22733920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15849540
+  version_requirements: *22733920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15848960 !ruby/object:Gem::Requirement
+  requirement: &22732500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *15848960
+  version_requirements: *22732500
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15848300 !ruby/object:Gem::Requirement
+  requirement: &22731980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15848300
+  version_requirements: *22731980
 description: A simple yet powerful webframework largely inspired by Rum and Cuba
 email: dev@trense.info
 executables: []
@@ -133,16 +133,19 @@ files:
 - VERSION
 - lib/mojito.rb
 - lib/mojito/base.rb
+- lib/mojito/controllers.rb
+- lib/mojito/controllers/method.rb
+- lib/mojito/controllers/runtime.rb
+- lib/mojito/controllers/runtime/environment.rb
+- lib/mojito/controllers/runtime/methods.rb
+- lib/mojito/controllers/runtime/path.rb
+- lib/mojito/controllers/runtime/session.rb
+- lib/mojito/controllers/runtime/url_scheme.rb
+- lib/mojito/controllers/runtime/virtual_host.rb
+- lib/mojito/controllers/sinatra.rb
 - lib/mojito/helpers.rb
 - 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
 - lib/mojito/rendering/content_types.rb
@@ -151,15 +154,16 @@ files:
 - lib/mojito/rendering/status_codes.rb
 - lib/mojito/rendering/templates.rb
 - lib/mojito/request_extensions.rb
+- lib/mojito/utils/rspec.rb
 - lib/mojito/utils/status_codes.rb
 - spec/mojito/base_spec.rb
+- spec/mojito/controllers/method_spec.rb
+- spec/mojito/controllers/runtime/methods_spec.rb
+- spec/mojito/controllers/runtime/path_spec.rb
+- spec/mojito/controllers/runtime/session_spec.rb
+- spec/mojito/controllers/runtime/url_scheme_spec.rb
+- spec/mojito/controllers/runtime/virtual_host_spec.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

data/lib/mojito/matchers.rb

@@ -1,23 +0,0 @@
-# encoding: UTF-8
-
-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/spec/mojito/matchers/url_scheme_spec.rb

@@ -1,22 +0,0 @@
-# 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