cascading-configuration-hash 1.3.2 → 1.3.3

data/lib/cascading-configuration-hash.rb

@@ -1,6 +1,4 @@
 
-require 'module-cluster'
-
 if $cascading_configuration_development
 	require_relative '../../variable/lib/cascading-configuration-variable.rb'
 else
@@ -21,8 +19,6 @@ module CascadingConfiguration
     end
     module ObjectInstance
     end
-    module ModuleInclusionExtensionSupport
-    end
   end
 end
 
@@ -34,4 +30,3 @@ require_relative 'cascading-configuration-hash/CascadingConfiguration/_private_/
 require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash.rb'
 require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/AccessorDefinitionMethods.rb'
 require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/Interface.rb'
-require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/ModuleInclusionExtensionSupport.rb'

data/lib/cascading-configuration-hash/CascadingConfiguration/Hash.rb

@@ -6,15 +6,21 @@ module CascadingConfiguration::Hash
 	extend  CascadingConfiguration::InternalModuleStub
 
   include CascadingConfiguration::Variable
+
   include CascadingConfiguration::CompositingHash::Instance
+  include CascadingConfiguration::Hash::Interface
+  include CascadingConfiguration::Hash::AccessorDefinitionMethods
 
-  include_cascades_extends( CascadingConfiguration::Hash,
-                            CascadingConfiguration::Hash::Interface,
-                            CascadingConfiguration::Hash::AccessorDefinitionMethods )
-  
-  include_cascades_extends_to_module( CascadingConfiguration::Hash::ModuleInclusionExtensionSupport )
+  prepend_module_include do |class_or_module|
+    class_or_module.extend_also_extends( CascadingConfiguration::Variable::EigenclassConfigurationChain )
+  end
 
-  extend_cascades_extends( CascadingConfiguration::Hash::Interface,
-                           CascadingConfiguration::Hash::AccessorDefinitionMethods )
+  include_cascades_extends( CascadingConfiguration::Hash )
+  
+  prepend_module_include do |class_or_module|
+    class_or_module.include_or_extend_cascades_prepending_extends do
+		  accessor_module_support
+	  end
+  end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Asher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 -04:00
+date: 2011-08-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,6 @@ files:
 - lib/cascading-configuration-hash/CascadingConfiguration/CompositingHash.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/Hash/AccessorDefinitionMethods.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/Hash/Interface.rb
-- lib/cascading-configuration-hash/CascadingConfiguration/Hash/ModuleInclusionExtensionSupport.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/Hash.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/LocalConfigurationHash.rb
 - lib/cascading-configuration-hash.rb

data/lib/cascading-configuration-hash/CascadingConfiguration/Hash/ModuleInclusionExtensionSupport.rb

@@ -1,38 +0,0 @@
-
-module CascadingConfiguration::Hash::ModuleInclusionExtensionSupport
-  
-	extend CascadingConfiguration::InternalModuleStub
-	
-  #####################
-  #  append_features  #
-  #####################
-  
-  def append_features( class_or_module )
-		# the module that is including/extending CascadingConfiguration::Hash
-    module_self = self
-    class_or_module.instance_eval do
-			# extend accessors defined for modules (and classes, which are modules)
-			extend module_self.accessor_module_support
-    end
-		super
-  end
-
-  ###################
-  #  extend_object  #
-  ###################
-  
-  def extend_object( class_or_module )
-		# CascadingConfiguration::Hash
-		module_self = self
-    class_or_module.instance_eval do
-			# extend accessors defined for modules (and classes, which are modules)
-			extend module_self.accessor_module_support
-    end
-		super
-    class_or_module.instance_eval do
-			# tell ancestor_configuration_chain to search the eigenclass chain as well
-			extend CascadingConfiguration::Variable::EigenclassConfigurationChain
-    end
-  end
-  
-end