muding 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+*** 0.1.1 / 2006-07-25
+
++ 2 bug fixes
+	+fixed some issues with Controller::Base
+	+removed redirect_to method due to it's non-functioning
+
 *** 0.1.0 / 2006-07-23
 
 + 3 major enhancements

data/lib/acts/expireable.rb

@@ -24,7 +24,7 @@ module Acts #:nodoc:
 									#	s.destroy
 									#end
 
-									puts Time.now.to_s
+									#puts Time.now.to_s
 
 									self.find(:all, :conditions => ["spawn_at <= ? and expires_at >= ?", Time.now, Time.now]).each do |expireable|
 										expireable.spawn

data/lib/commands/server.rb

@@ -2,7 +2,6 @@
 
 log = Log4r::Logger.new 'main'
 log.outputters = Log4r::Outputter.stdout
-
 begin
 	server = TCPServer.new('localhost', 4000)
 	threads = []

data/lib/controller.rb

@@ -1,8 +1,13 @@
 module Controller
 	Log = Log4r::Logger.new 'controller'
 	Log.outputters = Log4r::Outputter.stdout
+	
+	class NoCommandException < Exception;end
+
+
 
 	class Base
+		alias :route :class
 		attr_accessor :input, :body, :rendered
 		attr_accessor :new_route, :default_command, :prompt
 
@@ -12,6 +17,7 @@ module Controller
 		#next command controller, or default command. 
 		#
 		#   route_to :route =>StartController, :command=>:begin, :prompt=>">"
+		#
 		#   This will make the user's next input goto the StartController
 		#   with the command "begin". After rendering the command 
 		#   it will output ">" to the user.
@@ -28,59 +34,82 @@ module Controller
 			
 			self.new_route = config[:controller]
 			self.default_command = config[:command]
+			
 			self.prompt = config[:prompt] if config[:prompt] != ""
 			self.prompt = render_template(before_view_file) if config[:view] == :default && @@before_view[config[:command]]
 		end
 
 		#TODO: Implement this.
-		#Should jump to next controller method right away, instead of waiting for new input.
-		#r(302,'','Location'=>URL(*a))
-		#by right away I mean after the command finishes running.
-		def redirect_to(options={})	
-			config = {:route => self.class, :command => nil, :prompt => "", :view => :default}
-			config.update options if options.is_a?(Hash)
-
-		end
-
+		#Should jump to next controller method right after this one finishes
+		#def redirect_to(options={})	
+		#	config = {:route => self.class, :command => nil, :prompt => "", :view => :default}
+		#	config.update options if options.is_a?(Hash)
+		#end
+
+		#render sets the text that will be sent back as a response to this command
+		#you can only render once per controller. This is in place to avoid magical
+		#renderings from happening out of the developers control.
+		#
+		#render called with no options yields the view file rendered if one exists.
+		#  
+		#  render    #=> renders /mud/views/controller/view.rhtml
+		#
+		#  render :text => "send this to them" #=> send this to them
 		def render(options = {})
 			raise "Double Render Error" if self.rendered
-
 			self.rendered = true
 			return if options[:nothing]
 			if options[:text]
 				@body = options[:text] 
 				return
 			end
-			@body = render_template(view_file)
-
-			@body += self.prompt if self.prompt
+			@body = render_template(view_file(@method))
 		end
-
+		
 		def initialize(command, s = {}) #:nodoc:
 			@method = command.downcase
 			@session = s
 		end
 
-		def route
-			return self.class
+		#service is the main method that controlls the flow through the controller.
+		#first it runs the method,
+		#then it renders the view if something hasn't already been rendered
+		#then it tacks the prompt onto the end of the command.
+		def service(*a)
+			if respond_to? @method
+				if self.method(@method).arity >= 1
+					send(@method, *a) 
+				else
+					send(@method)
+				end
+			end
+			if !self.rendered
+				render
+			end
+			
+			@body += self.prompt if self.prompt
+			
+			session[:handle].puts(@body)
+
+			self
 		end
-		
-		def view_file
-			command_file = @method + ".rhtml"
+
+		def view_file(method)
+			command_file = method + ".rhtml"
 			load_and_read_file(command_file)
 		end
 
 		def before_view_file
-			command_file = @@before_view[default_command].to_s + ".rhtml" 
-			load_and_read_file(command_file)
+			view_file @@before_view[default_command].to_s
 		end
 
+		#this method uses view_dir...
 		def load_and_read_file(file_name)
 			file = File.open(File.join(view_dir, file_name))
 			file.read
-			rescue Errno::ENOENT
-				puts $!
-				return "Could not find the proper view for this command" 
+		rescue Errno::ENOENT
+				#if we haven't at least rendered something, we are going to through a nocommand exception here..
+				raise Controller::NoCommandException
 		end
 
 		def view_dir
@@ -91,14 +120,6 @@ module Controller
 			ERB.new(vf, nil, '-').result(binding)
 		end
 
-		def service(*a)
-			send(@method, *a) if respond_to? @method
-			if !self.rendered
-				render
-			end
-			self
-		end
-
 		def session()
 			return @session
 		end
@@ -113,8 +134,8 @@ module Controller
 	end
 	
 	class NotFound < Base
-		def get(p)
-			render :text=>"#{p} Could not be found."
+		def get
+			render :text=>"There is no command for that."
 		end 
 	end
 
@@ -124,9 +145,7 @@ module Controller
 		end 
 	end
 
-        #Load all the controllers.
-        load "./mud/controllers/mud.rb"
-        Dir["./mud/controllers/*_controller.rb"].sort.each { |ext| load ext.to_s }
+	#Load all the controllers.
+	load "./mud/controllers/mud.rb"
+	Dir["./mud/controllers/*_controller.rb"].sort.each { |ext| load ext.to_s }
 end
-
-

data/lib/handle.rb

@@ -25,18 +25,31 @@ class Handle
 		response = Muding.run("begin", self)
 
 		while true
-			peer.puts response.body
-			self.route = response.new_route if response.new_route
-
-			self.default_command = nil
-			self.default_command = response.default_command if response.default_command
-			response = Muding.run(peer.gets, self)
+			update_route(response) if response
+			response = Muding.run(peer.gets, self) #blocks on peer.gets
 		end
+
 	rescue Errno::EPIPE
 		Log.info "Connection " + self.object_id.to_s + " Severed"
 	end
 
+	def update_route(response)
+		self.route = response.new_route if response.new_route
+		self.default_command = nil
+		self.default_command = response.default_command if response.default_command
+	end
+
 	def message(message_string)
 		peer.puts message_string
 	end
+	
+	def puts(string)
+		peer.puts(string)
+	rescue Error
+	end
+
+	def shutdown()
+		read_and_write = 2
+		peer.shutdown(read_and_write)
+	end
 end

data/lib/muding.rb

@@ -30,13 +30,19 @@ module Muding
 				args = input
 			end
 
+			if command == nil
+				raise Controller::NoCommandException
+			end
+
 			return route.new(command, session).service(*args)
 
+		rescue Controller::NoCommandException
+			return Controller::NotFound.new("get",session).service()
 		rescue Errno::EPIPE
 			raise
 		rescue Exception => x
 			Log.warn x
-			return Controllers::ServerError.new("get",session).service()
+			return Controller::ServerError.new("get",session).service()
 		end
 		def reload_controller_code
 			load "./mud/controllers/mud.rb"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: muding
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-07-23 00:00:00 -05:00
+  version: 0.1.1
+date: 2006-07-25 00:00:00 -05:00
 summary: an application framework for building multi-user environments.
 require_paths: 
 - lib