picombo 0.4.0 → 0.4.1

data/lib/classes/event.rb

@@ -8,7 +8,10 @@ module Picombo
 	# The event class is a powerful system where you can add, modify or remove Picombo functionality, and you can also create your own events to leverage easy plugablity features in your applicetion.
 	#
 	# === Examples
-	# It's very easy to use events to alter system behavior. This event addition will merge some parameters to every controller call:
+	# It's very easy to use events to alter system behavior.
+	# 
+	# ==== Using Procs
+	# You can add one-off proc objects to the event queue:
 	# 	Picombo::Event.add('system.post_router') do |data|
 	# 		data.merge!({:params => ['test', 'test', 'test']})
 	# 	end
@@ -16,9 +19,20 @@ module Picombo
 	#
 	# Because the system.post_router is called as Picombo::Event.run('system.post_router', uri) it passes the routed uri variable as data in the method above.
 	#
+	# ==== Using Strings
 	# You can also add class methods to events:
 	# 	Picombo::Event.add('system.shutdown', 'Picombo::Foobar.new.write_access_log')
 	# This might process some data and then write it to an event log on the system.shutdown event right before the output is sent to the browser
+	# 
+	# String event additions use eval(), so be careful!
+	# 
+	# ==== Using Arrays
+	# 
+	# You can also use arrays to pass things to the event queue:
+	# 
+	# 	Picombo::Event.add('system.display', [self, 'display'])
+	# 
+	# This will run the current class's "display" method on the system.display event
 
 	class Event
 		private
@@ -104,19 +118,6 @@ module Picombo
 					end
 				elsif callback.is_a?(String)
 					eval(callback)
-					#callback = callback.split('.')
-
-					#if callback.length > 1
-					#	namespace = Object
-					#	callback[0].split("::").each do |const|
-					#		namespace = namespace.const_get(const)
-					#	end
-
-					#	Picombo::Log.write('info', 'trying to run '+namespace.inspect+'.'+callback[1])
-					#	namespace.send(callback[1])
-					#else
-					#	Kernel.send(callback[0])
-					#end
 				elsif callback.is_a?(Proc)
 					callback.call(data)
 				end

data/lib/classes/router.rb

@@ -107,19 +107,18 @@ module Picombo
 			Picombo::Bench.instance.start('controller_execution')
 
 			Picombo::Event.run('system.pre_controller')
-			if controller_methods.include?(uri[:method].to_sym)
-				begin
-					if uri[:params].nil? or uri[:params].empty?
-						controller.send(uri[:method])
-					else
-						controller.send(uri[:method], *uri[:params])
-					end
-				rescue Picombo::E404 => e
-					puts '404 Error: '+e.message
-					return Picombo::Controllers::Error_404.new.run_error(@@req.path)
+			begin
+				if ! controller_methods.include?(uri[:method].to_sym) and ! controller_methods.include?(uri[:method].to_s)
+					raise Picombo::E404
 				end
-			else
-				puts uri[:controller]+' did not include '+uri[:method]+'!!'
+
+				if uri[:params].nil? or uri[:params].empty?
+					controller.send(uri[:method])
+				else
+					controller.send(uri[:method], *uri[:params])
+				end
+			rescue Picombo::E404 => e
+				puts '404 Error: '+e.message
 				return Picombo::Controllers::Error_404.new.run_error(@@req.path)
 			end
 			Picombo::Event.run('system.post_controller')
@@ -167,8 +166,7 @@ module Picombo
 			@@segments = @@current_uri.split('/')[1..-1]
 			@@rsegments = router_parts[1..-1]
 			routed_uri = @@current_uri
-puts '@@current_uri: '+@@current_uri.inspect
-puts 'routed_uri: '+routed_uri
+
 			# Try and find a direct match
 			if @@routes.key?(@@current_uri)
 				routed_uri = @@routes[@@current_uri][:val]
@@ -187,7 +185,7 @@ puts 'routed_uri: '+routed_uri
 					end
 				end
 			end
-puts '@@rsegments: '+@@rsegments.inspect
+
 			params = @@rsegments.slice(2, router_parts.length)
 
 			if ! params.nil?

data/lib/controllers/template.rb

@@ -23,16 +23,14 @@ module Picombo
 
 				@template = Picombo::Stache::const_get(@template.capitalize).new if @template.is_a?(String)
 
-				Picombo::Event.add('system.post_controller', [self, 'render']) if @auto_render
-			end
+				Picombo::Event.add('system.display') do |data|
+					if @auto_render
+						if Picombo::Core.cli
+							return @template.render
+						end
 
-			def render
-				if @auto_render
-					if Picombo::Core.cli
-						return @template.render
+						@template.output
 					end
-
-					@template.output
 				end
 			end
 		end

data/lib/core/core.rb

@@ -74,7 +74,7 @@ module Picombo
 	class Core
 		@@cli = false
 
-		VERSION = '0.4.0'
+		VERSION = '0.4.1'
 
 		# Determines if the request was made on the CLI or not
 		def self.cli

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Jeremy Bush
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 -05:00
+date: 2010-06-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,7 @@ dependencies:
         version: 0.10.0
   type: :runtime
   version_requirements: *id002
-description: Picombo is a lightweight Ruby 1.9 MVC web framework that enables you to create websites quickly.
+description: Picombo is a lightweight Ruby MVC web framework that enables you to create websites quickly.
 email: contractfrombelow@gmail.com
 executables: []