Merge improvements to the AbstractClass mixin from elsewhere.

lib/strelka/authprovider.rb

@@ -30,9 +30,9 @@
 class Strelka::AuthProvider
 	extend Loggability,
 	       Pluggability,
+	       Strelka::AbstractClass,
 	       Strelka::Delegation
 	include Strelka::Constants,
-	        Strelka::AbstractClass,
 	        Strelka::ResponseHelpers
 
 	# Loggability API -- set up logging under the 'strelka' log host

lib/strelka/httprequest/acceptparams.rb

@@ -50,9 +50,9 @@ class Strelka::HTTPRequest
 	# * Mahlon E. Smith <mahlon@martini.nu>
 	#
 	class AcceptParam
-		extend Loggability
-		include Comparable,
-		        Strelka::AbstractClass
+		extend Loggability,
+		       Strelka::AbstractClass
+		include Comparable
 
 
 		# Loggability API -- set up logging under the 'strelka' log host

lib/strelka/mixins.rb

@@ -2,6 +2,7 @@
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 
+
 require 'tempfile'
 
 require 'strelka' unless defined?( Strelka )
@@ -16,49 +17,47 @@ module Strelka
 	#
 	#   # AbstractClass
 	#   class MyBaseClass
-	#       include Strelka::AbstractClass
+	#       extend Strelka::AbstractClass
 	#
 	#       # Define a method that will raise a NotImplementedError if called
 	#       pure_virtual :api_method
 	#   end
 	#
 	module AbstractClass
 
-		### Methods to be added to including classes
-		module ClassMethods
-
-			### Define one or more "virtual" methods which will raise
-			### NotImplementedErrors when called via a concrete subclass.
-			def pure_virtual( *syms )
-				syms.each do |sym|
-					define_method( sym ) do |*args|
-						raise ::NotImplementedError,
-							"%p does not provide an implementation of #%s" % [ self.class, sym ],
-							caller(1)
-					end
-				end
-			end
-
-
-			### Turn subclasses' new methods back to public.
-			def inherited( subclass )
-				subclass.module_eval { public_class_method :new }
-				super
-			end
-
-		end # module ClassMethods
+		### Extension callback -- mark the extended object's .new as private
+		def self::extended( mod )
+			super
+			mod.class_eval { private_class_method :new }
+		end
 
 
-		### Inclusion callback
+		### Inclusion callback -- support backward-compatible inclusion.
 		def self::included( mod )
+			mod.extend( self )
 			super
-			if mod.respond_to?( :new )
-				mod.extend( ClassMethods )
-				mod.module_eval { private_class_method :new }
+		end
+
+
+		### Define one or more "virtual" methods which will raise
+		### NotImplementedErrors when called via a concrete subclass.
+		def pure_virtual( *syms )
+			syms.each do |sym|
+				define_method( sym ) do |*args|
+					raise ::NotImplementedError,
+					"%p does not provide an implementation of #%s" % [ self.class, sym ],
+					caller(1)
+				end
 			end
 		end
 
 
+		### Inheritance callback -- Turn subclasses' .new methods back to public.
+		def inherited( subclass )
+			subclass.module_eval { public_class_method :new }
+			super
+		end
+
 	end # module AbstractClass
 
 

lib/strelka/plugins.rb

@@ -228,7 +228,6 @@ def register_plugin( mod )
 
 					self.log.debug "  copying class instance variable %s (%p)" % [ ivar, copy ]
 
-					# Don't duplicate modules/classes or immediates
 					instance_variable_set( ivar, copy )
 					self.log.debug "  instance variable %p set to %p in %p" %
 						[ ivar, self.instance_variable_get(ivar), self ]
@@ -268,7 +267,7 @@ def install_plugins
 					next
 				end
 
-				self.log.info "  including %p." % [ mod ]
+				self.log.info "  including %p in %p." % [ mod, self ]
 				include( mod )
 			end
 

lib/strelka/router.rb

@@ -25,8 +25,8 @@
 # #add_route and #route_request methods.
 class Strelka::Router
 	extend Loggability,
-	       Pluggability
-	include Strelka::AbstractClass
+	       Pluggability,
+	       Strelka::AbstractClass
 
 	# Loggability API -- set up logging under the 'strelka' log host
 	log_to :strelka

lib/strelka/session.rb

@@ -45,8 +45,8 @@
 #
 class Strelka::Session
 	extend Loggability,
-	       Pluggability
-	include Strelka::AbstractClass
+	       Pluggability,
+	       Strelka::AbstractClass
 
 
 	# Loggability API -- set up logging under the 'strelka' log host

spec/strelka/mixins_spec.rb

@@ -19,8 +19,8 @@
 	describe Strelka::AbstractClass do
 
 		context "mixed into a class" do
-			it "will cause the including class to hide its ::new method" do
-				testclass = Class.new { include Strelka::AbstractClass }
+			it "will cause the extended class to hide its ::new method" do
+				testclass = Class.new { extend Strelka::AbstractClass }
 
 				expect {
 					testclass.new
@@ -34,7 +34,7 @@
 
 			before(:each) do
 				testclass = Class.new {
-					include Strelka::AbstractClass
+					extend Strelka::AbstractClass
 					pure_virtual :test_method
 				}
 				subclass = Class.new( testclass )