extended_include 0.0.2 → 0.0.3

data/HISTORY.txt

@@ -1,3 +1,8 @@
+2014-05-19 Version 0.0.3
+
+	Documentation clarification. Fix double-reverse for included class
+	methods. Don't depend on multiple include or extend order at all.
+
 2014-04-18 Version 0.0.2
 
 	Code clean-up (Module#include_class_methods no longer calls

data/extended_include.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name	= "extended_include"
-  s.version	= "0.0.2"
-  s.date	= "2014-04-18"
+  s.version	= "0.0.3"
+  s.date	= "2014-05-19"
   s.authors	= ["Brian Katzung"]
   s.email	= ["briank@kappacs.com"]
   s.homepage	= "http://rubygems.org/gems/extended_include"

data/lib/extended_include.rb

@@ -10,29 +10,26 @@
 # The Extended_Include module is a back-end support module. See the Module
 # module extensions for the user interface.
 #
-# Version 0.0.2, 2014-04-18
+# Version 0.0.3, 2014-05-19
 #
 # @author Brian Katzung (briank@kappacs.com), Kappa Computer Solutions, LLC
 # @license Public Domain
 
 module Extended_Include
 
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 
     # The extended_include list, by module
     @include_list = {}
 
-    # The class methods list, by module
+    # The class-methods-module list, by module
     @class_methods = {}
 
-    # Include additional modules.
+    # Backend for {Module#extended_include}.
     def self.add_includes (base, *modules)
 	(@include_list[base] ||= []).concat modules
 	base.class_exec do
-	    # Note that we reverse here to counter ::include's
-	    # last-to-first behavior in order to achieve first-to-last
-	    # behavior.
-	    include *modules.reverse
+	    modules.each { |mod| include mod }
 	    extend Extended_Include
 	end
     end
@@ -40,10 +37,10 @@ module Extended_Include
     # Return a module's class method list.
     def self.class_methods_for (base)
 	(@class_methods[base] ||= []).uniq!
-	@class_methods[base].reverse
+	@class_methods[base]
     end
 
-    # Include a module's class methods when included.
+    # Backend for {Module#include_class_methods}.
     def self.include_class_methods (base, *modules, &block)
 	(@class_methods[base] ||= []).concat modules
 	@class_methods[base].push Module.new(&block) if block
@@ -56,21 +53,22 @@ module Extended_Include
 	@include_list[base]
     end
 
-    # The #included method extended to other modules' ::included method.
+    # This method is automatically invoked whenever a module that uses
+    # #extended_include or #include_class_methods is included in another
+    # module.
     def included (base)
+	# self is the included module; base is the including module
 	Extended_Include.includes_for(self).each do |mod|
 	    mod.included base if mod.respond_to?(:included) &&
 	      (!base.respond_to?(:superclass) ||
 	      !base.superclass.include?(mod))
 	end
 
-	# Note that we reverse here to counter ::extend's
-	# last-to-first behavior in order to achieve first-to-last
-	# behavior.
 	sources = Extended_Include.class_methods_for self
-	base.class_exec { extend *sources.reverse } unless sources.empty?
+	base.class_exec { sources.each { |mod| extend mod } } unless
+	  sources.empty?
 
-	super base rescue nil
+	super base rescue nil	# chain any other #included methods
     end
 
 end

data/test/00ei.rb

@@ -0,0 +1,33 @@
+require 'minitest/autorun'
+require 'extended_include'
+
+module M1
+    module ClassMethods
+	def cm; $log << 'M1 cm'; super rescue nil; end
+    end
+    include_class_methods
+end
+
+module M2
+    extended_include M1;
+    module MyClassMethods
+	def cm; $log << 'M2 MCM cm'; super rescue nil; end
+    end
+    include_class_methods(MyClassMethods) do
+	def cm; $log << 'M2 anon cm'; super rescue nil; end
+    end
+end
+
+module M3; extended_include M2; end
+
+class TestExtInc_00 < MiniTest::Unit::TestCase
+
+    def test1
+	$log = []
+	M3.cm
+	assert_equal [ 'M2 anon cm', 'M2 MCM cm', 'M1 cm' ], $log
+    end
+
+end
+
+# END

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Brian Katzung
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-18 00:00:00 -05:00
+date: 2014-05-19 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - extended_include.gemspec
 - .yardopts
 - HISTORY.txt
+- test/00ei.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/extended_include
 licenses: 
@@ -64,5 +65,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Include both class and instance methods on module include
-test_files: []
-
+test_files: 
+- test/00ei.rb