cascading-configuration-array 1.1.0 → 1.1.1

data/lib/cascading-configuration-array/CascadingConfiguration/Array/Accessors.rb

@@ -3,22 +3,6 @@ module CascadingConfiguration::Array::Accessors
 
 	extend  CascadingConfiguration::InternalModuleStub
 
-	###################
-	#  self.extended  #
-	###################
-	
-	def self.extended( class_or_module )
-		class_or_module.instance_eval do
-      # accessor support in module to permit method overriding with super
-			unless const_defined?( :AccessorSupportModule )
-				accessor_support_module = Module.new { extend  CascadingConfiguration::InternalModuleStub }
-				const_set( :AccessorSupportModule, accessor_support_module )
-				include class_or_module::AccessorSupportModule
-				extend  class_or_module::AccessorSupportModule
-			end
-		end
-	end
-
   ###################################
   #  define_cascading_array_setter  #
   ###################################

data/lib/cascading-configuration-array/CascadingConfiguration/Array/ModuleInstance.rb

@@ -2,22 +2,21 @@
 module CascadingConfiguration::Array::ModuleInstance
   
 	extend  CascadingConfiguration::InternalModuleStub
-
+	
   ##############
   #  included  #
   ##############
   
   def included( class_or_module )
 		super if method_defined?( :super )
+		# CascadingConfiguration::Array
     module_self = self
     class_or_module.instance_eval do
-      include CascadingConfiguration::Array
-      # when we extend a module (which has happened if we got here)
-      # then we need to make sure when the module we are extending is included
-      # * CascadingConfiguration is included
-      # * the module we extended is used to extend the class/module that included
+			# whichever module included CascadingConfiguration::Array
       extend  module_self
+      # cascade CascadingConfiguration::Array
+      include CascadingConfiguration::Array
     end
   end
   
-end
+end

data/lib/cascading-configuration-array/CascadingConfiguration/Array.rb

@@ -12,9 +12,9 @@ module CascadingConfiguration::Array
     class_or_module.instance_eval do
       include CascadingConfiguration::Variable
       extend  module_self
-      extend  CascadingConfiguration::Array::Accessors
-      extend  CascadingConfiguration::Array::ClassInstance
-      include CascadingConfiguration::CompositingArray::Instance
+      extend  module_self::Accessors
+      extend  module_self::ClassInstance
+			include CascadingConfiguration::CompositingArray::Instance
 			# module support
 			unless is_a?( Class )
         extend CascadingConfiguration::Array::ModuleInstance
@@ -22,12 +22,4 @@ module CascadingConfiguration::Array
     end
   end
 
-  #########################
-  #  ancestors_to_Object  #
-  #########################
-
-  def ancestors_to_Object
-    return ancestors_to_class_or_module_interpolating_module_branches( Object, CascadingConfiguration::Array::ModuleInstance )
-  end
-
 end

data/lib/cascading-configuration-array/CascadingConfiguration/CompositingArray/Instance.rb

@@ -1,25 +1,23 @@
 
 module CascadingConfiguration::CompositingArray::Instance
 
-	extend  CascadingConfiguration::InternalModuleStub
-
   ###################
   #  self.included  #
   ###################
 
   def self.included( class_or_module )
-    module_self = self
-    class_or_module.instance_eval do
-      extend module_self
-    end
-  end
-
+		module_self = self
+		class_or_module.instance_eval do
+			extend module_self
+		end
+	end
+	
   #################################################
   #  composite_array_for_cascading_configuration  #
   #################################################
 
   def composite_array_for_cascading_configuration( cascading_name )
-    
+
     # initialize composite array if necessary or acquire it from object
     composite_array_variable = composite_array_variable_name( cascading_name )
 

data/lib/cascading-configuration-array/CascadingConfiguration/CompositingArray/_private_/Instance.rb

@@ -4,13 +4,14 @@ module CascadingConfiguration::CompositingArray::Instance
   ###########################################################################################################
       private ###############################################################################################
   ###########################################################################################################
-  
+
   ###################################
   #  composite_array_variable_name  #
   ###################################
   
   def composite_array_variable_name( configuration_name )
-    return ( cascading_variable_name( configuration_name ).to_s + '__' + 'composite_array' ).to_sym
+		klass = ( is_a?( Module ) ? self : self.class )
+    return ( klass::AccessorSupportModule.cascading_variable_name( configuration_name ).to_s + '__' + 'compositing_array' ).to_sym
   end
-  
-end
+
+end

data/lib/cascading-configuration-array/CascadingConfiguration/CompositingArray.rb

@@ -9,7 +9,8 @@ class CascadingConfiguration::CompositingArray < Array
   
   def initialize( cascading_name, working_instance )
     @cascading_name     = cascading_name
-    @cascading_variable = working_instance.cascading_variable_name( @cascading_name )
+		working_class = ( working_instance.is_a?( Module ) ? working_instance : working_instance.class )
+    @cascading_variable = working_class::AccessorSupportModule.cascading_variable_name( @cascading_name )
     @working_instance   = working_instance
     # if first ancestor can have a composite array, register self with it in case it gets updated in the future
     if ( first_ancestor = @working_instance.first_ancestor ).respond_to?( :composite_array_for_cascading_configuration )

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Asher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 -04:00
+date: 2011-07-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency