cascading_configuration 1.0.3 → 1.0.4

data/lib/cascading_configuration/core/enable_module_support.rb

@@ -13,7 +13,6 @@ module ::CascadingConfiguration::Core::EnableModuleSupport
     unless instance_controller = ::CascadingConfiguration::Core::InstanceController.instance_controller( instance )
       instance_controller = ::CascadingConfiguration::Core::InstanceController.new( instance, 
                                                                                     @default_encapsulation,
-                                                                                    :Controller,
                                                                                     true )
     end
 

data/lib/cascading_configuration/core/instance_controller.rb

@@ -1,8 +1,6 @@
 
 class ::CascadingConfiguration::Core::InstanceController < ::Module
   
-  include ::ParallelAncestry::Inheritance
-  
   @instance_controller = { }
 
   #####################################
@@ -12,7 +10,6 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
   def self.create_instance_controller( instance,
                                        default_encapsulation_or_name = ::CascadingConfiguration::Core::
                                                                          Module::DefaultEncapsulation, 
-                                       constant = :Controller,
                                        extending = false )
     
     instance_controller = nil
@@ -71,19 +68,12 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
   
   def initialize( instance, 
                   default_encapsulation_or_name = ::CascadingConfiguration::Core::Module::DefaultEncapsulation, 
-                  constant = :Controller,
                   extending = false )
 
-    # Call to super is necessary for ParallelAncestry support.
-    super()
-    
-    @instance = instance.extend( self )
+    @instance = instance.extend( ::Module::Cluster )
     
     if @instance.is_a?( ::Module )
-      initialize_constant_in_instance( constant )
-      unless extending
-        initialize_inheritance( @instance )
-      end
+      initialize_constant_in_instance
     else
       initialize_constant_in_self
     end
@@ -101,22 +91,22 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
     # We also support arbitrary additional encapsulations.
     @encapsulations = { }
     
-    @cascade_includes = ::Array::Unique.new( self )
-    @cascade_extends = ::Array::Unique.new( self )
-    
     @support_modules = { }
     
     @extension_modules = { }
+    
+    # create a cascading block to register configurations for parent at include/extend
+    initialize_inheritance_for_instance( @instance, extending )
         
   end
-
+  
   #################################
   #  initialize_constant_in_self  #
   #################################
   
-  def initialize_constant_in_instance( constant )
+  def initialize_constant_in_instance
 
-    @instance.const_set( constant, self )
+    @instance.const_set( :Controller, self )
 
   end
   
@@ -133,103 +123,62 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
     return self
     
   end
-  
-  ####################################
-  #  initialize_inheriting_instance  #
-  ####################################
-
-  def initialize_inheriting_instance( parent_instance, instance, for_subclass = false, is_extending = false )
 
-    super
+  #########################################
+  #  initialize_inheritance_for_instance  #
+  #########################################
+  
+  def initialize_inheritance_for_instance( instance, extending = false )
 
-    initialize_encapsulation_for_inheriting_instance( @default_encapsulation, parent_instance, instance )
-    @encapsulations.each do |this_encapsulation_name, this_encapsulation|
-      initialize_encapsulations_for_inheriting_instance( this_encapsulation, parent_instance, instance )
-    end
-    
-    # subclass eigenclass inheritance is automatic; re-extending will only mess it up
-    unless for_subclass
-      initialize_inheriting_instance_includes_extends( parent_instance, instance, is_extending )
-    end
-    
-  end
+    unless instance.is_a?( ::Module::Cluster ) and instance.has_cluster?( :cascading_configuration_inheritance )
+      
+      instance.extend( ::Module::Cluster )
+      
+      reference_to_self = self
+      
+      case instance
+      
+        when ::Class
+        
+          instance.cluster( :cascading_configuration_inheritance ).subclass do |inheriting_instance|
+            reference_to_self.initialize_inheriting_instance( self, inheriting_instance )
+          end
+      
+        when ::Module
+        
+          unless extending
 
-  #####################################################
-  #  initialize_inheriting_instance_includes_extends  #
-  #####################################################
-  
-  def initialize_inheriting_instance_includes_extends( parent_instance, instance, is_extending = false )
+            instance.cluster( :cascading_configuration_inheritance ).after_include do |inheriting_instance|
+              reference_to_self.initialize_inheriting_instance( self, inheriting_instance )
+              reference_to_self.initialize_inheritance_for_instance( inheriting_instance )
+            end
 
-    unless is_extending or @cascade_extends.empty?
-      initialize_inheriting_instance_extends( parent_instance, instance )
-    end
-    
-    unless @cascade_includes.empty?
+            instance.cluster( :cascading_configuration_inheritance ).after_extend do |inheriting_instance|
+              reference_to_self.initialize_inheriting_instance( self, inheriting_instance )
+            end
 
-      if is_extending
-        initialize_inheriting_instance_includes_for_extend_crossover( parent_instance, instance )
-      else
-        initialize_inheriting_instance_includes( parent_instance, instance )
+          end
+          
       end
 
     end
     
   end
+  
+  ####################################
+  #  initialize_inheriting_instance  #
+  ####################################
 
-  #############################################
-  #  initialize_inheriting_instance_includes  #
-  #############################################
-
-  def initialize_inheriting_instance_includes( parent_instance, instance )
+  def initialize_inheriting_instance( parent_instance, instance )
     
-    cascade_includes = @cascade_includes
-    
-    instance.module_eval do
-      # We collect cascade extends in accumulating order (oldest => youngest), 
-      # which means we need to reverse prior to including/extending 
-      # (we need youngest => oldest).
-      include( *cascade_includes.reverse )
-    end
-    
-  end
-
-  ############################################
-  #  initialize_inheriting_instance_extends  #
-  ############################################
-
-  def initialize_inheriting_instance_extends( parent_instance, instance )
-  
-    # We collect cascade extends in accumulating order (oldest => youngest), 
-    # which means we need to reverse prior to including/extending 
-    # (we need youngest => oldest).
-    instance.extend( *@cascade_extends.reverse )
-  
-  end
-  
-  ##################################################################
-  #  initialize_inheriting_instance_includes_for_extend_crossover  #
-  ##################################################################
-  
-  ###
-  # Normally we have module => module cascading where instance methods remain instance methods,
-  #   and singleton methods remain singleton methods. When a module extends another, however,
-  #   instance methods become singleton methods.
-  #
-  def initialize_inheriting_instance_includes_for_extend_crossover( parent_instance, instance )
+    initialize_encapsulation_for_inheriting_instance( @default_encapsulation, parent_instance, instance )
 
-    @cascade_includes.each do |this_include|
-      case instance
-        when ::Module
-          unless instance.ancestors.include?( this_include )
-            instance.extend( this_include )
-          end
-        else
-          instance.extend( this_include )
-      end
+    @encapsulations.each do |this_encapsulation_name, this_encapsulation|
+      initialize_encapsulations_for_inheriting_instance( this_encapsulation, parent_instance, instance )
     end
     
   end
-  
+
   ######################################################
   #  initialize_encapsulation_for_inheriting_instance  #
   ######################################################
@@ -252,18 +201,6 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
   
   attr_reader :instance
   
-  ######################
-  #  cascade_includes  #
-  ######################
-
-  attr_reader :cascade_includes
-
-  #####################
-  #  cascade_extends  #
-  #####################
-
-  attr_reader :cascade_extends
-
   ###########################
   #  add_extension_modules  #
   ###########################
@@ -383,11 +320,11 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
       # Cascades
     
       if should_cascade_includes
-        @cascade_includes.push( support_module_instance ) 
+        @instance.cluster( :cascading_configuration ).after_include.cascade.include( support_module_instance )
       end
     
       if should_cascade_extends
-        @cascade_extends.push( support_module_instance )      
+        @instance.cluster( :cascading_configuration ).after_include.cascade.extend( support_module_instance )
       end
     
       # Includes/Extends
@@ -687,7 +624,8 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
   
   def alias_local_instance_method( alias_name, 
                                    name, 
-                                   encapsulation_or_name = ::CascadingConfiguration::Core::Module::DefaultEncapsulation )
+                                   encapsulation_or_name = ::CascadingConfiguration::Core::
+                                                             Module::DefaultEncapsulation )
 
     aliased_method = false
     

data/spec/cascading_configuration/array/sorted/unique_spec.rb

@@ -37,7 +37,7 @@ describe CascadingConfiguration::Array::Sorted::Unique do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::Sorted::Unique::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -51,7 +51,7 @@ describe CascadingConfiguration::Array::Sorted::Unique do
       class ClassIncluding
         include CascadingConfiguration::Array::Sorted::Unique::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending
@@ -215,7 +215,7 @@ describe CascadingConfiguration::Array::Sorted::Unique do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::Sorted::Unique::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -229,7 +229,7 @@ describe CascadingConfiguration::Array::Sorted::Unique do
       class ClassIncluding
         include CascadingConfiguration::Array::Sorted::Unique::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending

data/spec/cascading_configuration/array/sorted_spec.rb

@@ -37,7 +37,7 @@ describe CascadingConfiguration::Array::Sorted do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::Sorted::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -51,7 +51,7 @@ describe CascadingConfiguration::Array::Sorted do
       class ClassIncluding
         include CascadingConfiguration::Array::Sorted::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending
@@ -215,7 +215,7 @@ describe CascadingConfiguration::Array::Sorted do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::Sorted::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -229,7 +229,7 @@ describe CascadingConfiguration::Array::Sorted do
       class ClassIncluding
         include CascadingConfiguration::Array::Sorted::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending

data/spec/cascading_configuration/array/unique_spec.rb

@@ -37,7 +37,7 @@ describe CascadingConfiguration::Array::Unique do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::Unique::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -51,7 +51,7 @@ describe CascadingConfiguration::Array::Unique do
       class ClassIncluding
         include CascadingConfiguration::Array::Unique::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending
@@ -219,7 +219,7 @@ describe CascadingConfiguration::Array::Unique do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::Unique::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -233,7 +233,7 @@ describe CascadingConfiguration::Array::Unique do
       class ClassIncluding
         include CascadingConfiguration::Array::Unique::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending

data/spec/cascading_configuration/array_spec.rb

@@ -37,7 +37,7 @@ describe CascadingConfiguration::Array do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -51,7 +51,7 @@ describe CascadingConfiguration::Array do
       class ClassIncluding
         include CascadingConfiguration::Array::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending
@@ -215,7 +215,7 @@ describe CascadingConfiguration::Array do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -229,7 +229,7 @@ describe CascadingConfiguration::Array do
       class ClassIncluding
         include CascadingConfiguration::Array::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending

data/spec/cascading_configuration/core/instance_controller_spec.rb

@@ -136,32 +136,24 @@ describe ::CascadingConfiguration::Core::InstanceController do
       InstanceController.support( :include ).should == ModuleInstance_Include
       ForInstance.ancestors.include?( ModuleInstance_Include ).should == true
       ForInstance.is_a?( ModuleInstance_Include ).should == false
-      InstanceController.cascade_includes.include?( ModuleInstance_Include ).should == false
-      InstanceController.cascade_extends.include?( ModuleInstance_Include ).should == false
       
       # should_extend
       ModuleInstance_Extend = InstanceController.create_support( :extend, Encapsulation, false, nil, true, false, false )
       InstanceController.support( :extend ).should == ModuleInstance_Extend
       ForInstance.ancestors.include?( ModuleInstance_Extend ).should == false
       ForInstance.is_a?( ModuleInstance_Extend ).should == true
-      InstanceController.cascade_includes.include?( ModuleInstance_Extend ).should == false
-      InstanceController.cascade_extends.include?( ModuleInstance_Extend ).should == false
       
       # should_cascade_includes
       ModuleInstance_CascadeIncludes = InstanceController.create_support( :cascade_includes, Encapsulation, false, nil, false, true, false )
       InstanceController.support( :cascade_includes ).should == ModuleInstance_CascadeIncludes
       ForInstance.ancestors.include?( ModuleInstance_CascadeIncludes ).should == false
       ForInstance.is_a?( ModuleInstance_CascadeIncludes ).should == false
-      InstanceController.cascade_includes.include?( ModuleInstance_CascadeIncludes ).should == true
-      InstanceController.cascade_extends.include?( ModuleInstance_CascadeIncludes ).should == false
       
       # should_cascade_extends
       ModuleInstance_CascadeExtends = InstanceController.create_support( :cascade_extends, Encapsulation, nil, false, false, false, true )
       InstanceController.support( :cascade_extends ).should == ModuleInstance_CascadeExtends
       ForInstance.ancestors.include?( ModuleInstance_CascadeExtends ).should == false
       ForInstance.is_a?( ModuleInstance_CascadeExtends ).should == false
-      InstanceController.cascade_includes.include?( ModuleInstance_CascadeExtends ).should == false
-      InstanceController.cascade_extends.include?( ModuleInstance_CascadeExtends ).should == true
       
       AnotherModule_IncludeA = ::Module.new
       AnotherModule_IncludeA.instance_eval do
@@ -197,7 +189,6 @@ describe ::CascadingConfiguration::Core::InstanceController do
         extend ForInstance
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == false
-        eigenclass.ancestors.include?( ModuleInstance_CascadeIncludes ).should == true
       end
       AnotherModule_ExtendB = ::Module.new
       AnotherModule_ExtendB.instance_eval do

data/spec/cascading_configuration/hash_spec.rb

@@ -37,7 +37,7 @@ describe CascadingConfiguration::Hash do
       module SubmoduleIncluding
         include CascadingConfiguration::Hash::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -51,7 +51,7 @@ describe CascadingConfiguration::Hash do
       class ClassIncluding
         include CascadingConfiguration::Hash::ConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending
@@ -273,7 +273,7 @@ describe CascadingConfiguration::Hash do
       module SubmoduleIncluding
         include CascadingConfiguration::Hash::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -287,7 +287,7 @@ describe CascadingConfiguration::Hash do
       class ClassIncluding
         include CascadingConfiguration::Hash::ClassConfigurationMockModuleExtended
         method_defined?( :configuration_setting ).should == false
-        respond_to?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending

data/spec/cascading_configuration/setting_spec.rb

@@ -32,7 +32,7 @@ describe CascadingConfiguration::Setting do
       module SubmoduleIncluding
         include CascadingConfiguration::Setting::ConfigurationMockExtended
         method_defined?( :some_configuration ).should == false
-        respond_to?( :some_configuration ).should == false
+        respond_to?( :some_configuration ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -46,7 +46,7 @@ describe CascadingConfiguration::Setting do
       class ClassIncluding
         include CascadingConfiguration::Setting::ConfigurationMockExtended
         method_defined?( :some_configuration ).should == false
-        respond_to?( :some_configuration ).should == false
+        respond_to?( :some_configuration ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending
@@ -194,7 +194,7 @@ describe CascadingConfiguration::Setting do
       module SubmoduleIncluding
         include CascadingConfiguration::Setting::ClassConfigurationMockExtended
         method_defined?( :some_configuration ).should == false
-        respond_to?( :some_configuration ).should == false
+        respond_to?( :some_configuration ).should == true
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get nothing
@@ -208,7 +208,7 @@ describe CascadingConfiguration::Setting do
       class ClassIncluding
         include CascadingConfiguration::Setting::ClassConfigurationMockExtended
         method_defined?( :some_configuration ).should == false
-        respond_to?( :some_configuration ).should == false
+        respond_to?( :some_configuration ).should == true
         instance_variables.empty?.should == true
       end
       class ClassExtending

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cascading_configuration
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: module-cluster