mojito 0.2.4 → 0.2.5

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 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!
+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! See also https://github.com/mtrense/mojito-examples for more examples.
 
 h2. Installing
 
@@ -38,19 +38,17 @@ p. This starts a http-server on port 9292. Now try to call your handler with cur
 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 get messy very quick if your project becomes more complex, so please read on...
-
 h2. Controllers
 
-The method call @Mojito::Controllers.runtime_controller@ actually created a new controller class. Every controller inherits from @Mojito::Base@ which contains a minimal set of methods that all controllers must have in common. Controller classes are actually Rack-Applications, so they must provide a (class-)method @call(env)@. The common sequence of processing a request includes:
+Controllers are the common building blocks of Mojito Applications. For each successful request at least one controller is instantiated. The call to @controller :runtime@ actually defines the calling class as runtime controller and includes the corresponding module - Mojito::Controllers::Runtime in this case. For a specific class one can choose from many controller types, each of which is specialized to a specific use-case. 
+
+Controller classes are actually Rack-Applications, so they must provide a (class-)method @call(env)@. The common sequence of processing a request includes:
 
 * @call(env)@ is called from the surrounding application/the framework
-* a new instance of the controller-class is instantiated and filled with the given environment
+* a new instance of the controller-class is instantiated and configured with the given environment
 * a kind of dispatch method (@__dispatch@ for build-in controllers) is called to do the actual work
 
-This ensures that the controller instance which handles a specific request is used solely for that request, so that any instance variables created during request-processing stay request-local. At the same time this keeps application stacking and nesting as simple as @call@-ing the next application
-
-
+This ensures that the controller instance which handles a specific request is used solely for that request, so that any instance variables created during request-processing stay request-local. At the same time this keeps application stacking and nesting as simple as @call@-ing the next application.
 
 h2. Structure of a real-world application
 

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/mojito.rb

@@ -42,6 +42,8 @@ module Mojito
 		
 		def controller(name, options = {})
 			mod = Mojito::Controllers.const_get name.to_s.camel_case.to_sym
+			[*options[:rendering]].each {|r| rendering r }
+			[*options[:helpers]].each {|h| helper h }
 			include mod
 		end
 		
@@ -55,7 +57,7 @@ module Mojito
 			when :all
 				Mojito::Rendering
 			else
-				Mojito::Controllers.const_get name.to_s.camel_case.to_sym
+				Mojito::Rendering.const_get name.to_s.camel_case.to_sym
 			end
 			include mod
 		end

data/lib/mojito/base.rb

@@ -10,13 +10,14 @@ module Mojito
 			type.extend ClassMethods
 		end
 		
-		def initialize(request)
+		def initialize(request, options = {})
 			@__request = case request 
 			when Rack::Request
 				request.dup
 			when Hash, Mash
 				Rack::Request.new(request.dup)
 			end
+			@options = options
 			self.env['MOJITO/CONTEXT_PATH'] = self.env['SCRIPT_NAME']
 		end
 		

data/lib/mojito/controllers.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 
 module Mojito::Controllers
+	require 'mojito/controllers/entities'
 	require 'mojito/controllers/method'
 	require 'mojito/controllers/runtime'
 	require 'mojito/controllers/sinatra'
 	
 	
-	
 end

data/lib/mojito/controllers/entities.rb

@@ -0,0 +1,42 @@
+# encoding: UTF-8
+
+module Mojito::Controllers
+	
+	module Entities
+		
+		def self.included(type)
+			type.extend ClassMethods
+		end
+		
+		def __dispatch
+			
+			[404, { 'Content-Type' => 'application/octet-stream' }, []]
+		end
+		
+		module ClassMethods
+			
+			def types
+				@types ||= {}
+			end
+			
+			def type(t, &block)
+				tc = TypeConfiguration.new t
+				tc.instance_exec &block if block
+				types[t] = tc
+			end
+			
+		end
+		
+		class TypeConfiguration
+			
+			def initialize(type)
+				@type = type
+			end
+			
+			
+			
+		end
+		
+	end
+	
+end

data/lib/mojito/rendering.rb

@@ -6,6 +6,7 @@ module Mojito::Rendering
 	require 'mojito/rendering/content_types'
 	require 'mojito/rendering/delegation'
 	require 'mojito/rendering/file'
+	require 'mojito/rendering/markup'
 	require 'mojito/rendering/status_codes'
 	require 'mojito/rendering/templates'
 	
@@ -15,6 +16,7 @@ module Mojito::Rendering
 			include ContentTypes
 			include Delegation
 			include File
+			include Markup
 			include StatusCodes
 			include Templates
 		end

data/lib/mojito/rendering/markup.rb

@@ -0,0 +1,14 @@
+# encoding: UTF-8
+
+module Mojito::Rendering
+	
+	module Markup
+		require 'json_builder'
+		
+		def generate_json(&block)
+			JSONBuilder::Compiler.generate &block
+		end
+		
+	end
+	
+end

data/lib/mojito/rendering/status_codes.rb

@@ -4,24 +4,13 @@ module Mojito::Rendering
 	
 	module StatusCodes
 		
-		def ok!
-			response.status = 200
-			halt!
-		end
-		
-		def not_found!
-			response.status = 404
-			halt!
-		end
-		
-		def internal_server_error!
-			response.status = 500
-			halt!
-		end
-		
-		def unavailable!
-			response.status = 503
-			halt!
+		%W[ok not_found unauthorized internal_server_error service_unavailable].each do |status|
+			eval <<-EVAL
+			def #{status}!
+				response.status = #{Mojito::STATUS[status.to_sym].code}
+				halt!
+			end
+			EVAL
 		end
 		
 		def redirect(target, status = 302)

data/spec/mojito/rendering/status_codes_spec.rb

@@ -13,7 +13,7 @@ describe 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 'service_unavailable' do service_unavailable! end
 			on 'redirect' do redirect! '/test' end
 		end.mock_request
 	end
@@ -21,9 +21,7 @@ describe Mojito::Rendering::StatusCodes do
 	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('/service_unavailable').status.should == 503 }
 	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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mojito
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -75,6 +75,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.15
+- !ruby/object:Gem::Dependency
+  name: json_builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.7
 - !ruby/object:Gem::Dependency
   name: where-am-i
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +200,7 @@ files:
 - lib/mojito.rb
 - lib/mojito/base.rb
 - lib/mojito/controllers.rb
+- lib/mojito/controllers/entities.rb
 - lib/mojito/controllers/method.rb
 - lib/mojito/controllers/runtime.rb
 - lib/mojito/controllers/runtime/environment.rb
@@ -201,6 +218,7 @@ files:
 - lib/mojito/rendering/content_types.rb
 - lib/mojito/rendering/delegation.rb
 - lib/mojito/rendering/file.rb
+- lib/mojito/rendering/markup.rb
 - lib/mojito/rendering/status_codes.rb
 - lib/mojito/rendering/templates.rb
 - lib/mojito/request_extensions.rb