mongrel2 0.21.0 → 0.22.1

data/lib/mongrel2/connection.rb

@@ -4,9 +4,9 @@ require 'socket'
 require 'zmq'
 require 'yajl'
 require 'digest/sha1'
+require 'loggability'
 
 require 'mongrel2' unless defined?( Mongrel2 )
-require 'mongrel2/mixins'
 
 
 # The Mongrel2 connection class. Connection objects serve as a front end for 
@@ -17,7 +17,10 @@ require 'mongrel2/mixins'
 # == References
 # * http://mongrel2.org/static/mongrel2-manual.html#x1-700005.3
 class Mongrel2::Connection
-	include Mongrel2::Loggable
+	extend Loggability
+
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
 
 
 	### Create a new Connection identified by +app_id+ (a UUID or other unique string) that

data/lib/mongrel2/control.rb

@@ -3,9 +3,9 @@
 require 'zmq'
 require 'yajl'
 require 'tnetstring'
+require 'loggability'
 
 require 'mongrel2' unless defined?( Mongrel2 )
-require 'mongrel2/mixins'
 
 
 # An interface to the Mongrel2 control port.
@@ -13,7 +13,11 @@ require 'mongrel2/mixins'
 # == References
 # (http://mongrel2.org/static/mongrel2-manual.html#x1-380003.8)
 class Mongrel2::Control
-	include Mongrel2::Loggable
+	extend Loggability
+
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
+
 
 	# The default zmq connection spec to use when talking to a mongrel2 server
 	DEFAULT_PORT = 'ipc://run/control'

data/lib/mongrel2/handler.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'zmq'
+require 'loggability'
 
 require 'mongrel2' unless defined?( Mongrel2 )
 require 'mongrel2/config'
@@ -81,16 +82,20 @@ require 'mongrel2/websocket'
 #     app.run
 #
 class Mongrel2::Handler
-	include Mongrel2::Loggable,
-	        Mongrel2::Constants
+	extend Loggability
+	include Mongrel2::Constants
+
+
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
 
 
 	### Create an instance of the handler using the config from the database with
 	### the given +appid+ and run it.
 	def self::run( appid )
-		Mongrel2.log.info "Running application %p" % [ appid ]
+		self.log.info "Running application %p" % [ appid ]
 		send_spec, recv_spec = self.connection_info_for( appid )
-		Mongrel2.log.info "  config specs: %s <-> %s" % [ send_spec, recv_spec ]
+		self.log.info "  config specs: %s <-> %s" % [ send_spec, recv_spec ]
 		new( appid, send_spec, recv_spec ).run
 	end
 
@@ -98,11 +103,11 @@ class Mongrel2::Handler
 	### Return the send_spec and recv_spec for the given +appid+ from the current configuration
 	### database. Returns +nil+ if no Handler is configured with +appid+ as its +sender_id+.
 	def self::connection_info_for( appid )
-		Mongrel2.log.debug "Looking up handler spec for appid %p" % [ appid ]
+		self.log.debug "Looking up handler spec for appid %p" % [ appid ]
 		hconfig = Mongrel2::Config::Handler.by_send_ident( appid ).first or
 			raise ArgumentError, "no handler with a send_ident of %p configured" % [ appid ]
 
-		Mongrel2.log.debug "  found: %s" % [ hconfig.values ]
+		self.log.debug "  found: %s" % [ hconfig.values ]
 		return hconfig.send_spec, hconfig.recv_spec
 	end
 

data/lib/mongrel2/httprequest.rb

@@ -1,19 +1,24 @@
 #!/usr/bin/ruby
 
+require 'ipaddr'
+require 'loggability'
+
 require 'mongrel2/request' unless defined?( Mongrel2::Request )
-require 'mongrel2/mixins'
 require 'mongrel2/httpresponse'
-require 'ipaddr'
 
 
 # The Mongrel2 HTTP Request class. Instances of this class represent an HTTP request from
 # a Mongrel2 server.
 class Mongrel2::HTTPRequest < Mongrel2::Request
-	include Mongrel2::Loggable
+	extend Loggability
+
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
 
 	# HTTP verbs from RFC2616
 	HANDLED_HTTP_METHODS = [ :OPTIONS, :GET, :HEAD, :POST, :PUT, :DELETE, :TRACE, :CONNECT ]
 
+	# Mongrel2::Request API -- register this class as handling the HTTP verbs
 	register_request_type( self, *HANDLED_HTTP_METHODS )
 
 

data/lib/mongrel2/httpresponse.rb

@@ -2,16 +2,19 @@
 #encoding: utf-8
 
 require 'time'
+require 'loggability'
 
 require 'mongrel2/response' unless defined?( Mongrel2::Response )
-require 'mongrel2/mixins'
 require 'mongrel2/constants'
 
 
 # The Mongrel2 HTTP Response class.
 class Mongrel2::HTTPResponse < Mongrel2::Response
-	include Mongrel2::Loggable,
-	        Mongrel2::Constants
+	extend Loggability
+	include Mongrel2::Constants
+
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
 
 	# The format for building valid HTTP responses
 	STATUS_LINE_FORMAT = "HTTP/1.1 %03d %s".freeze

data/lib/mongrel2/jsonrequest.rb

@@ -1,16 +1,20 @@
 #!/usr/bin/ruby
 
 require 'yajl'
+require 'loggability'
 
 require 'mongrel2/request' unless defined?( Mongrel2::Request )
-require 'mongrel2/mixins'
 
 
 # The Mongrel2 JSON Request class. Instances of this class represent a JSSocket request from
 # a Mongrel2 server.
 class Mongrel2::JSONRequest < Mongrel2::Request
-	include Mongrel2::Loggable
+	extend Loggability
 
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
+
+	# Mongrel2::Request API -- register this request type as handling 'JSON' requests
 	register_request_type( self, :JSON )
 
 

data/lib/mongrel2/request.rb

@@ -2,17 +2,19 @@
 
 require 'tnetstring'
 require 'yajl'
+require 'loggability'
 
 require 'mongrel2' unless defined?( Mongrel2 )
-require 'mongrel2/mixins'
 require 'mongrel2/table'
 
 
 # The Mongrel2 Request base class. Derivatives of this class represent a request from
 # a Mongrel2 server.
 class Mongrel2::Request
-	include Mongrel2::Loggable
+	extend Loggability
 
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
 
 	# METHOD header -> request class mapping
 	@request_types = Hash.new {|h,k| h[k] = Mongrel2::Request }
@@ -23,7 +25,7 @@ class Mongrel2::Request
 	### request object.
 	def self::parse( raw_request )
 		sender, conn_id, path, rest = raw_request.split( ' ', 4 )
-		Mongrel2.log.debug "Parsing request for %p from %s:%s (rest: %p)" %
+		self.log.debug "Parsing request for %p from %s:%s (rest: %p)" %
 			[ path, sender, conn_id, rest ]
 
 		# Extract the headers and the body, ignore the rest
@@ -32,7 +34,7 @@ class Mongrel2::Request
 
 		# Headers will be a JSON String when not using the TNetString protocol
 		if headers.is_a?( String )
-			Mongrel2.log.debug "  parsing old-style headers"
+			self.log.debug "  parsing old-style headers"
 			headers = Yajl::Parser.parse( headers )
 		end
 
@@ -40,7 +42,7 @@ class Mongrel2::Request
 		headers['METHOD'] =~ /^(\w+)$/ or
 			raise Mongrel2::UnhandledMethodError, headers['METHOD']
 		req_method = $1.untaint.to_sym
-		Mongrel2.log.debug "Request method is: %p" % [ req_method ]
+		self.log.debug "Request method is: %p" % [ req_method ]
 		concrete_class = self.subclass_for_method( req_method )
 
 		return concrete_class.new( sender, conn_id, path, headers, body, raw_request )
@@ -72,15 +74,15 @@ class Mongrel2::Request
 	### If you wish one of your subclasses to be used instead of Mongrel2::Request
 	### for the default request class, register it with a METHOD of :__default.
 	def self::register_request_type( subclass, *req_methods )
-		Mongrel2.log.debug "Registering %p for %p requests" % [ subclass, req_methods ]
+		self.log.debug "Registering %p for %p requests" % [ subclass, req_methods ]
 		req_methods.each do |methname|
 			if methname == :__default
 				# Clear cached lookups
-				Mongrel2.log.info "Registering %p as the default request type." % [ subclass ]
+				self.log.info "Registering %p as the default request type." % [ subclass ]
 				Mongrel2::Request.request_types.delete_if {|_, klass| klass == Mongrel2::Request }
 				Mongrel2::Request.request_types.default_proc = lambda {|h,k| h[k] = subclass }
 			else
-				Mongrel2.log.info "Registering %p for the %p method." % [ subclass, methname ]
+				self.log.info "Registering %p for the %p method." % [ subclass, methname ]
 				Mongrel2::Request.request_types[ methname.to_sym ] = subclass
 			end
 		end

data/lib/mongrel2/response.rb

@@ -2,14 +2,17 @@
 
 require 'tnetstring'
 require 'yajl'
+require 'loggability'
 
 require 'mongrel2' unless defined?( Mongrel2 )
-require 'mongrel2/mixins'
 
 
 # The Mongrel2 Response base class.
 class Mongrel2::Response
-	include Mongrel2::Loggable
+	extend Loggability
+
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
 
 	# The default number of bytes of the response body to send to the mongrel2
 	# server at a time.
@@ -18,7 +21,7 @@ class Mongrel2::Response
 
 	### Create a response to the specified +request+ and return it.
 	def self::from_request( request )
-		Mongrel2.log.debug "Creating a %p to request %p" % [ self, request ]
+		self.log.debug "Creating a %p to request %p" % [ self, request ]
 		response = new( request.sender_id, request.conn_id )
 		response.request = request
 

data/lib/mongrel2/table.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/ruby
 
 require 'forwardable'
+require 'loggability'
 
 require 'mongrel2' unless defined?( Mongrel2 )
-require 'mongrel2/mixins'
 
 
 # The Mongrel2 Table class. Instances of this class provide a case-insensitive hash-like
@@ -14,15 +14,18 @@ require 'mongrel2/mixins'
 #   headers['user-agent']  # => 'PornBrowser 1.1.5'
 #   headers[:user_agent]   # => 'PornBrowser 1.1.5'
 #   headers.user_agent     # => 'PornBrowser 1.1.5'
-# 
+#
 # == Author/s
-# 
+#
 # * Michael Granger <ged@FaerieMUD.org>
 # * Mahlon E. Smith <mahlon@martini.nu>
 #
 class Mongrel2::Table
-	extend Forwardable
-	include Mongrel2::Loggable
+	extend Forwardable,
+	       Loggability
+
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
 
 	# Methods that understand case-insensitive keys
 	KEYED_METHODS = [ :"[]", :"[]=", :delete, :fetch, :has_key?, :include?, :member?, :store ]

data/lib/mongrel2/testing.rb

@@ -2,6 +2,7 @@
 
 require 'uri'
 require 'pathname'
+require 'loggability'
 require 'mongrel2'
 require 'mongrel2/request'
 
@@ -19,6 +20,10 @@ module Mongrel2
 
 	### A factory for generating Mongrel2::Request objects for testing.
 	class RequestFactory
+		extend Loggability
+
+		# Loggability API -- set up logging under the 'mongrel2' log host
+		log_to :mongrel2
 
 		# Default testing UUID (sender_id)
 		DEFAULT_TEST_UUID = 'BD17D85C-4730-4BF2-999D-9D2B2E0FCCF9'
@@ -217,8 +222,12 @@ module Mongrel2
 
 	### A factory for generating WebSocket request objects for testing.
 	class WebSocketFrameFactory < Mongrel2::RequestFactory
+		extend Loggability
 		include Mongrel2::Constants
 
+		# Loggability API -- set up logging under the 'mongrel2' log host
+		log_to :mongrel2
+
 		# The default host
 		DEFAULT_TESTING_HOST  = 'localhost'
 		DEFAULT_TESTING_PORT  = '8113'
@@ -371,7 +380,7 @@ module Mongrel2
 			flag_symbols.flatten!
 			flag_symbols.compact!
 
-			Mongrel2.log.debug "Making a flags header for symbols: %p" % [ flag_symbols ]
+			self.log.debug "Making a flags header for symbols: %p" % [ flag_symbols ]
 
 			return flag_symbols.inject( 0x00 ) do |flags, flag|
 				case flag

data/lib/mongrel2/websocket.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
 require 'mongrel2/request' unless defined?( Mongrel2::Request )
-require 'mongrel2/mixins'
 require 'mongrel2/constants'
 
 
@@ -211,7 +210,7 @@ module Mongrel2::WebSocket
 
 		### Create a response frame from the given request +frame+.
 		def self::from_request( frame )
-			Mongrel2.log.debug "Creating a %p response to request %p" % [ self, frame ]
+			self.log.debug "Creating a %p response to request %p" % [ self, frame ]
 			response = new( frame.sender_id, frame.conn_id, frame.path )
 			response.request_frame = frame
 

data/lib/mongrel2/xmlrequest.rb

@@ -1,16 +1,20 @@
 #!/usr/bin/ruby
 
 require 'nokogiri'
+require 'loggability'
 
 require 'mongrel2/request' unless defined?( Mongrel2::Request )
-require 'mongrel2/mixins'
 
 
 # The Mongrel2 XML Request class. Instances of this class represent a request for an XML route from
 # a Mongrel2 server.
 class Mongrel2::XMLRequest < Mongrel2::Request
-	include Mongrel2::Loggable
+	extend Loggability
 
+	# Loggability API -- set up logging under the 'mongrel2' log host
+	log_to :mongrel2
+
+	# Mongrel2::Request API -- register this class as handling 'XML' requests
 	register_request_type( self, :XML )
 
 

data/spec/lib/helpers.rb

@@ -50,33 +50,6 @@ require 'spec/lib/matchers'
 module Mongrel2::SpecHelpers
 	include Mongrel2::TestConstants
 
-	class ArrayLogger
-		### Create a new ArrayLogger that will append content to +array+.
-		def initialize( array )
-			@array = array
-		end
-
-		### Write the specified +message+ to the array.
-		def write( message )
-			@array << message
-		end
-
-		### No-op -- this is here just so Logger doesn't complain
-		def close; end
-
-	end # class ArrayLogger
-
-
-	unless defined?( LEVEL )
-		LEVEL = {
-			:debug => Logger::DEBUG,
-			:info  => Logger::INFO,
-			:warn  => Logger::WARN,
-			:error => Logger::ERROR,
-			:fatal => Logger::FATAL,
-		  }
-	end
-
 	###############
 	module_function
 	###############
@@ -89,29 +62,24 @@ module Mongrel2::SpecHelpers
 
 	### Reset the logging subsystem to its default state.
 	def reset_logging
-		Mongrel2.reset_logger
+		Loggability.formatter = nil
+		Loggability.output_to( $stderr )
+		Loggability.level = :fatal
 	end
 
 
 	### Alter the output of the default log formatter to be pretty in SpecMate output
-	def setup_logging( level=Logger::FATAL )
-
-		# Turn symbol-style level config into Logger's expected Fixnum level
-		if Mongrel2::Logging::LOG_LEVELS.key?( level.to_s )
-			level = Mongrel2::Logging::LOG_LEVELS[ level.to_s ]
-		end
-
-		logger = Logger.new( $stderr )
-		Mongrel2.logger = logger
-		Mongrel2.logger.level = level
+	def setup_logging( level=:fatal )
 
 		# Only do this when executing from a spec in TextMate
 		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			Thread.current['logger-output'] = []
-			logdevice = ArrayLogger.new( Thread.current['logger-output'] )
-			Mongrel2.logger = Logger.new( logdevice )
-			# Mongrel2.logger.level = level
-			Mongrel2.logger.formatter = Mongrel2::Logging::HtmlFormatter.new( logger )
+			logarray = []
+			Thread.current['logger-output'] = logarray
+			Loggability.output_to( logarray )
+			Loggability.format_as( :html )
+			Loggability.level = :debug
+		else
+			Loggability.level = level
 		end
 	end