mongrel2 0.21.0 → 0.22.1

data/spec/mongrel2/handler_spec.rb

@@ -138,7 +138,6 @@ describe Mongrel2::Handler do
 		response.status.should == 204
 	end
 
-
 	it "ignores JSON messages by default" do
 		req = make_json_request()
 		@request_sock.should_receive( :recv ).and_return( req )
@@ -151,7 +150,6 @@ describe Mongrel2::Handler do
 		response.should be_nil()
 	end
 
-
 	it "dispatches JSON message to the #handle_json method" do
 		json_handler = Class.new( OneShotHandler ) do
 			def handle_json( request )
@@ -170,7 +168,6 @@ describe Mongrel2::Handler do
 		response.should be_a( Mongrel2::Response )
 	end
 
-
 	it "ignores XML messages by default" do
 		req = make_xml_request()
 		@request_sock.should_receive( :recv ).and_return( req )
@@ -183,7 +180,6 @@ describe Mongrel2::Handler do
 		response.should be_nil()
 	end
 
-
 	it "dispatches XML message to the #handle_xml method" do
 		xml_handler = Class.new( OneShotHandler ) do
 			def handle_xml( request )
@@ -202,7 +198,6 @@ describe Mongrel2::Handler do
 		response.should be_a( Mongrel2::Response )
 	end
 
-
 	it "continues when a ZMQ::Error is received but the connection remains open" do
 		req = make_request()
 

data/spec/mongrel2_spec.rb

@@ -13,7 +13,7 @@ require 'rspec'
 
 require 'spec/lib/helpers'
 
-require 'logger'
+require 'loggability'
 require 'mongrel2'
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.1
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -157,7 +157,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -165,7 +165,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: loggability
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
   requirement: !ruby/object:Gem::Requirement
@@ -189,7 +205,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -197,7 +213,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -346,8 +362,6 @@ files:
 - lib/mongrel2/httprequest.rb
 - lib/mongrel2/httpresponse.rb
 - lib/mongrel2/jsonrequest.rb
-- lib/mongrel2/logging.rb
-- lib/mongrel2/mixins.rb
 - lib/mongrel2/request.rb
 - lib/mongrel2/response.rb
 - lib/mongrel2/table.rb
@@ -375,8 +389,6 @@ files:
 - spec/mongrel2/handler_spec.rb
 - spec/mongrel2/httprequest_spec.rb
 - spec/mongrel2/httpresponse_spec.rb
-- spec/mongrel2/logging_spec.rb
-- spec/mongrel2/mixins_spec.rb
 - spec/mongrel2/request_spec.rb
 - spec/mongrel2/response_spec.rb
 - spec/mongrel2/table_spec.rb
@@ -407,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongrel2
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby-Mongrel2 is a complete Ruby (1.9-only) connector for Mongrel2[http://mongrel2.org/]

data/lib/mongrel2/logging.rb

@@ -1,241 +0,0 @@
-#!/usr/bin/ruby
-
-require 'logger'
-require 'date'
-
-require 'mongrel2' unless defined?( Mongrel2 )
-require 'mongrel2/mixins'
-
-
-# A mixin that adds a logging subsystem to the extended object.
-module Mongrel2::Logging
-
-	### Logging
-	# Log levels
-	LOG_LEVELS = {
-		'debug' => Logger::DEBUG,
-		'info'  => Logger::INFO,
-		'warn'  => Logger::WARN,
-		'error' => Logger::ERROR,
-		'fatal' => Logger::FATAL,
-	}.freeze
-	LOG_LEVEL_NAMES = LOG_LEVELS.invert.freeze
-
-
-	### Inclusion hook
-	def self::extended( mod )
-		super
-
-		class << mod
-			# the log formatter that will be used when the logging subsystem is reset
-			attr_accessor :default_log_formatter
-
-			# the logger that will be used when the logging subsystem is reset
-			attr_accessor :default_logger
-
-			# the logger that's currently in effect
-			attr_accessor :logger
-			alias_method :log, :logger
-			alias_method :log=, :logger=
-		end
-
-		mod.default_logger = mod.logger = Logger.new( $stderr )
-		mod.default_logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
-		mod.default_log_formatter = Mongrel2::Logging::Formatter.new( mod.default_logger )
-	end
-
-
-	### Reset the global logger object to the default
-	def reset_logger
-		self.logger = self.default_logger
-		self.logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
-		self.logger.formatter = self.default_log_formatter
-	end
-
-
-	### Returns +true+ if the global logger has not been set to something other than
-	### the default one.
-	def using_default_logger?
-		return self.logger == self.default_logger
-	end
-
-
-	# A alternate formatter for Logger instances.
-	class Formatter < Logger::Formatter
-
-		# The format to output unless debugging is turned on
-		DEFAULT_FORMAT = "[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"
-
-		# The format to output if debugging is turned on
-		DEFAULT_DEBUG_FORMAT = "[%1$s.%2$06d %3$d/%4$s] %5$5s {%6$s} -- %7$s\n"
-
-
-		### Initialize the formatter with a reference to the logger so it can check for log level.
-		def initialize( logger, format=DEFAULT_FORMAT, debug=DEFAULT_DEBUG_FORMAT ) # :notnew:
-			@logger       = logger
-			@format       = format
-			@debug_format = debug
-
-			super()
-		end
-
-		######
-		public
-		######
-
-		# The Logger object associated with the formatter
-		attr_accessor :logger
-
-		# The logging format string
-		attr_accessor :format
-
-		# The logging format string that's used when outputting in debug mode
-		attr_accessor :debug_format
-
-
-		### Log using either the DEBUG_FORMAT if the associated logger is at ::DEBUG level or
-		### using FORMAT if it's anything less verbose.
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity,                                                     # %5$s
-				progname,                                                     # %6$s
-				msg                                                           # %7$s
-			]
-
-			if @logger.level == Logger::DEBUG
-				return self.debug_format % args
-			else
-				return self.format % args
-			end
-		end
-	end # class LogFormatter
-
-
-	# A ANSI-colorized formatter for Logger instances.
-	class ColorFormatter < Logger::Formatter
-		extend Mongrel2::ANSIColorUtilities
-
-		# Color settings
-		LEVEL_FORMATS = {
-			:debug => colorize( :bold, :black ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s {%6$s} -- %7$s\n"},
-			:info  => colorize( :normal ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:warn  => colorize( :bold, :yellow ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:error => colorize( :red ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-			:fatal => colorize( :bold, :red ) {"[%1$s.%2$06d %3$d/%4$s] %5$5s -- %7$s\n"},
-		}
-
-
-		### Initialize the formatter with a reference to the logger so it can check for log level.
-		def initialize( logger, settings={} ) # :notnew:
-			settings = LEVEL_FORMATS.merge( settings )
-
-			@logger   = logger
-			@settings = settings
-
-			super()
-		end
-
-		######
-		public
-		######
-
-		# The Logger object associated with the formatter
-		attr_accessor :logger
-
-		# The formats, by level
-		attr_accessor :settings
-
-
-		### Log using the format associated with the severity
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity,                                                     # %5$s
-				progname,                                                     # %6$s
-				msg                                                           # %7$s
-			]
-
-			return self.settings[ severity.downcase.to_sym ] % args
-		end
-	end # class LogFormatter
-
-
-	# An alternate formatter for Logger instances that outputs +div+ HTML
-	# fragments.
-	class HtmlFormatter < Logger::Formatter
-
-		# The default HTML fragment that'll be used as the template for each log message.
-		HTML_LOG_FORMAT = %q{
-		<div class="log-message %5$s">
-			<span class="log-time">%1$s.%2$06d</span>
-			[
-				<span class="log-pid">%3$d</span>
-				/
-				<span class="log-tid">%4$s</span>
-			]
-			<span class="log-level">%5$s</span>
-			:
-			<span class="log-name">%6$s</span>
-			<span class="log-message-text">%7$s</span>
-		</div>
-		}
-
-		### Override the logging formats with ones that generate HTML fragments
-		def initialize( logger, format=HTML_LOG_FORMAT ) # :notnew:
-			@logger = logger
-			@format = format
-			super()
-		end
-
-
-		######
-		public
-		######
-
-		# The HTML fragment that will be used as a format() string for the log
-		attr_accessor :format
-
-
-		### Return a log message composed out of the arguments formatted using the
-		### formatter's format string
-		def call( severity, time, progname, msg )
-			args = [
-				time.strftime( '%Y-%m-%d %H:%M:%S' ),                         # %1$s
-				time.usec,                                                    # %2$d
-				Process.pid,                                                  # %3$d
-				Thread.current == Thread.main ? 'main' : Thread.object_id,    # %4$s
-				severity.downcase,                                            # %5$s
-				progname,                                                     # %6$s
-				html_escape( msg ).gsub(/\n/, '<br />')                       # %7$s
-			]
-
-			return self.format % args
-		end
-
-
-		#######
-		private
-		#######
-
-		### Return a copy of the specified +string+ with HTML special characters escaped as
-		### HTML entities.
-		def html_escape( string )
-			return string.
-				gsub( /&/, '&amp;' ).
-				gsub( /</, '&lt;' ).
-				gsub( />/, '&gt;' )
-		end
-
-	end # class HtmlLogFormatter
-
-end # module Mongrel2
-
-# vim: set nosta noet ts=4 sw=4:
-

data/lib/mongrel2/mixins.rb

@@ -1,143 +0,0 @@
-#!/usr/bin/ruby
-
-require 'logger'
-
-require 'mongrel2' unless defined?( Mongrel2 )
-require 'mongrel2/constants'
-
-
-module Mongrel2
-
-	# Add logging to a Mongrel2 class. Including classes get #log and #log_debug methods.
-	module Loggable
-
-		# A logging proxy class that wraps calls to the logger into calls that include
-		# the name of the calling class.
-		class ClassNameProxy
-
-			### Create a new proxy for the given +klass+.
-			def initialize( klass, force_debug=false )
-				@classname   = klass.name
-				@force_debug = force_debug
-			end
-
-			### Delegate debug messages to the global logger with the appropriate class name.
-			def debug( msg=nil, &block )
-				Mongrel2.logger.add( Logger::DEBUG, msg, @classname, &block )
-			end
-
-			### Delegate info messages to the global logger with the appropriate class name.
-			def info( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Mongrel2.logger.add( Logger::INFO, msg, @classname, &block )
-			end
-
-			### Delegate warn messages to the global logger with the appropriate class name.
-			def warn( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Mongrel2.logger.add( Logger::WARN, msg, @classname, &block )
-			end
-
-			### Delegate error messages to the global logger with the appropriate class name.
-			def error( msg=nil, &block )
-				return self.debug( msg, &block ) if @force_debug
-				Mongrel2.logger.add( Logger::ERROR, msg, @classname, &block )
-			end
-
-			### Delegate fatal messages to the global logger with the appropriate class name.
-			def fatal( msg=nil, &block )
-				Mongrel2.logger.add( Logger::FATAL, msg, @classname, &block )
-			end
-
-		end # ClassNameProxy
-
-		#########
-		protected
-		#########
-
-		### Copy constructor -- clear the original's log proxy.
-		def initialize_copy( original )
-			@log_proxy = @log_debug_proxy = nil
-			super
-		end
-
-		### Return the proxied logger.
-		def log
-			@log_proxy ||= ClassNameProxy.new( self.class )
-		end
-
-		### Return a proxied "debug" logger that ignores other level specification.
-		def log_debug
-			@log_debug_proxy ||= ClassNameProxy.new( self.class, true )
-		end
-
-	end # module Loggable
-
-	# A collection of ANSI color utility functions
-	module ANSIColorUtilities
-
-		# Set some ANSI escape code constants (Shamelessly stolen from Perl's
-		# Term::ANSIColor by Russ Allbery <rra@stanford.edu> and Zenin <zenin@best.com>
-		ANSI_ATTRIBUTES = {
-			'clear'      => 0,
-			'reset'      => 0,
-			'bold'       => 1,
-			'dark'       => 2,
-			'underline'  => 4,
-			'underscore' => 4,
-			'blink'      => 5,
-			'reverse'    => 7,
-			'concealed'  => 8,
-
-			'black'      => 30,   'on_black'   => 40,
-			'red'        => 31,   'on_red'     => 41,
-			'green'      => 32,   'on_green'   => 42,
-			'yellow'     => 33,   'on_yellow'  => 43,
-			'blue'       => 34,   'on_blue'    => 44,
-			'magenta'    => 35,   'on_magenta' => 45,
-			'cyan'       => 36,   'on_cyan'    => 46,
-			'white'      => 37,   'on_white'   => 47
-		}
-
-		###############
-		module_function
-		###############
-
-		### Create a string that contains the ANSI codes specified and return it
-		def ansi_code( *attributes )
-			attributes.flatten!
-			attributes.collect! {|at| at.to_s }
-			return '' unless /(?:vt10[03]|xterm(?:-color)?|linux|screen)/i =~ ENV['TERM']
-			attributes = ANSI_ATTRIBUTES.values_at( *attributes ).compact.join(';')
-
-			if attributes.empty?
-				return ''
-			else
-				return "\e[%sm" % attributes
-			end
-		end
-
-
-		### Colorize the given +string+ with the specified +attributes+ and return it, handling 
-		### line-endings, color reset, etc.
-		def colorize( *args )
-			string = ''
-
-			if block_given?
-				string = yield
-			else
-				string = args.shift
-			end
-
-			ending = string[/(\s)$/] || ''
-			string = string.rstrip
-
-			return ansi_code( args.flatten ) + string + ansi_code( 'reset' ) + ending
-		end
-
-	end # module ANSIColorUtilities
-
-end # module Mongrel2
-
-# vim: set nosta noet ts=4 sw=4:
-