cascading_configuration 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -38,3 +38,6 @@ Added :initialize_configuration to CascadingConfiguration::Core::Module; subclas
 Renamed project from cascading-configuration to cascading_configuration to match Rubygems guidelines for gem naming.
 Ensured configurations don't re-register parents that are higher in the ancestor chain than the ones already registered.
 
+## 7/15/2012
+
+Added support in extension modules for aliasing methods that will exist in object extended by extension module but does not exist yet in extension module.

data/lib/cascading_configuration/core/instance_controller.rb

@@ -80,14 +80,12 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
     @instance = instance.extend( self )
     
     if @instance.is_a?( ::Module )
-      @instance.const_set( constant, self )
+      initialize_constant_in_instance( constant )
       unless extending
         initialize_inheritance( @instance )
       end
     else
-      hex_id_string = '0x%x' % ( @instance.__id__ << 1 )
-      constant = 'ID_' << hex_id_string
-      self.class.const_set( constant, self )
+      initialize_constant_in_self
     end
 
     # We manage reference to self in singleton from here to avoid duplicative efforts.
@@ -111,6 +109,30 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
     @extension_modules = { }
         
   end
+
+  #################################
+  #  initialize_constant_in_self  #
+  #################################
+  
+  def initialize_constant_in_instance( constant )
+
+    @instance.const_set( constant, self )
+
+  end
+  
+  #################################
+  #  initialize_constant_in_self  #
+  #################################
+  
+  def initialize_constant_in_self
+    
+    hex_id_string = '0x%x' % ( @instance.__id__ << 1 )
+    constant = 'ID_' << hex_id_string
+    self.class.const_set( constant, self )
+    
+    return self
+    
+  end
   
   ####################################
   #  initialize_inheriting_instance  #
@@ -127,31 +149,82 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
     
     # subclass eigenclass inheritance is automatic; re-extending will only mess it up
     unless for_subclass
-      unless is_extending or @cascade_extends.empty?
-        # 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 )
+      initialize_inheriting_instance_includes_extends( parent_instance, instance, is_extending )
+    end
+    
+  end
+
+  #####################################################
+  #  initialize_inheriting_instance_includes_extends  #
+  #####################################################
+  
+  def initialize_inheriting_instance_includes_extends( parent_instance, instance, is_extending = false )
+
+    unless is_extending or @cascade_extends.empty?
+      initialize_inheriting_instance_extends( parent_instance, instance )
+    end
+    
+    unless @cascade_includes.empty?
+
+      if is_extending
+        initialize_inheriting_instance_includes_for_extend_crossover( parent_instance, instance )
+      else
+        initialize_inheriting_instance_includes( parent_instance, instance )
       end
-      unless @cascade_includes.empty?
-        if is_extending
-          @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
-          end
-        elsif instance.is_a?( ::Module )
-          cascade_includes = @cascade_includes
-          instance.module_eval do
-            # We collect cascade includes 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_includes  #
+  #############################################
+
+  def initialize_inheriting_instance_includes( 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 )
+
+    @cascade_includes.each do |this_include|
+      case instance
+        when ::Module
+          unless instance.ancestors.include?( this_include )
+            instance.extend( this_include )
           end
-        end
+        else
+          instance.extend( this_include )
       end
     end
     
@@ -162,7 +235,7 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
   ######################################################
   
   def initialize_encapsulation_for_inheriting_instance( encapsulation, parent_instance, instance )
-    
+
     encapsulation.register_child_for_parent( instance, parent_instance )
     
   end

data/lib/cascading_configuration/core/instance_controller/extension_module.rb

@@ -10,13 +10,25 @@ class ::CascadingConfiguration::Core::InstanceController::ExtensionModule < ::Mo
     @instance_controller = instance_controller
     @encapsulation = encapsulation
     @configuration_name = configuration_name
-    
+
+    @pending_aliases = { }
+            
     if block_given?
       module_eval( & definer_block )
     end
     
   end
 
+  ##############
+  #  extended  #
+  ##############
+  
+  def extended( configuration_instance )
+    
+    create_pending_aliases( configuration_instance )
+        
+  end
+
   #########################
   #  instance_controller  #
   #########################
@@ -34,5 +46,53 @@ class ::CascadingConfiguration::Core::InstanceController::ExtensionModule < ::Mo
   ########################
   
   attr_reader :configuration_name
-      
+
+  ############################
+  #  create_pending_aliases  #
+  ############################
+
+  def create_pending_aliases( configuration_instance )
+    
+    created_aliases = false
+    
+    unless @pending_aliases.empty?
+      pending_aliases = @pending_aliases
+      eigenclass = class << configuration_instance ; self ; end
+      eigenclass.instance_eval do
+        pending_aliases.delete_if do |this_alias_name, this_method_name|
+          should_delete = false
+          if method_defined?( this_method_name )
+            alias_method( this_alias_name, this_method_name )
+            should_delete = true
+          end
+          should_delete
+        end
+      end
+      created_aliases = true
+    end
+    
+    return created_aliases
+    
+  end
+  
+  ##################
+  #  alias_method  #
+  ##################
+  
+  def alias_method( alias_name, method_name )
+    
+    aliased_method = false
+    
+    # if we don't respond to method, store it away so that we can alias it at extend time
+    if method_defined?( method_name )
+      super
+      aliased_method = true
+    else
+      @pending_aliases[ alias_name ] = method_name
+    end
+    
+    return aliased_method
+    
+  end
+        
 end

data/lib/cascading_configuration/core/module.rb

@@ -5,7 +5,7 @@ class ::CascadingConfiguration::Core::Module < ::Module
   DefaultEncapsulation = ::CascadingConfiguration::Core::Encapsulation.new( DefaultEncapsulationName )
   
   include ::CascadingConfiguration::Core::EnableModuleSupport
-
+  
   ################
   #  initialize  #
   ################
@@ -22,7 +22,7 @@ class ::CascadingConfiguration::Core::Module < ::Module
     
     @ccm_name = ccm_name
     @ccm_aliases = ccm_aliases
-        
+    
     define_definition_methods( @ccm_name, *@ccm_aliases )
         
   end
@@ -44,7 +44,7 @@ class ::CascadingConfiguration::Core::Module < ::Module
   #################
   
   attr_reader :ccm_aliases
-  
+
   ###############################
   #  define_definition_methods  #
   ###############################

data/spec/cascading_configuration/core/instance_controller/extension_module_spec.rb

@@ -22,5 +22,32 @@ describe ::CascadingConfiguration::Core::InstanceController::ExtensionModule do
 
     end
   end
+  
+  ##################
+  #  alias_method  #
+  ##################
+  
+  it 'can pend method aliases' do
+    module ::CascadingConfiguration::Core::InstanceController::ExtensionModule::AliasMethodMock
+      
+      ForInstance = ::Module.new
+      InstanceController = ::CascadingConfiguration::Core::InstanceController.new( ForInstance )
+      Encapsulation = ::CascadingConfiguration::Core::Module::DefaultEncapsulation
+
+      Module_instance = ::CascadingConfiguration::Core::InstanceController::ExtensionModule.new( InstanceController, Encapsulation, :some_configuration )
+      
+      Module_instance.alias_method( :alias_name, :method_in_object_but_not_module )
+      
+      instance = ::Module.new do
+        def self.method_in_object_but_not_module
+        end
+      end
+      
+      instance.respond_to?( :alias_name ).should == false
+      instance.extend( Module_instance )
+      instance.respond_to?( :alias_name ).should == true
+      
+    end
+  end
 
 end

metadata

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