cascading-configuration-array 1.1.1 → 1.1.2

data/lib/cascading-configuration-array.rb

@@ -27,7 +27,6 @@ end
 require_relative 'cascading-configuration-array/CascadingConfiguration/CompositingArray.rb'
 require_relative 'cascading-configuration-array/CascadingConfiguration/_private_/CompositingArray.rb'
 require_relative 'cascading-configuration-array/CascadingConfiguration/CompositingArray/Instance.rb'
-require_relative 'cascading-configuration-array/CascadingConfiguration/CompositingArray/_private_/Instance.rb'
 require_relative 'cascading-configuration-array/CascadingConfiguration/LocalConfigurationArray.rb'
 require_relative 'cascading-configuration-array/CascadingConfiguration/_private_/LocalConfigurationArray.rb'
 require_relative 'cascading-configuration-array/CascadingConfiguration/Array.rb'

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

@@ -18,17 +18,17 @@ module CascadingConfiguration::CompositingArray::Instance
 
   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 )
-
     composite_array = nil
 
-    if instance_variable_defined?( composite_array_variable )
-      composite_array = instance_variable_get( composite_array_variable )
-    else
-      composite_array = ::CascadingConfiguration::CompositingArray.new( cascading_name, self )
-      instance_variable_set( composite_array_variable, composite_array )
-    end
+		klass = ( is_a?( Module ) ? self : self.class )
+		accessor_support_module = klass::AccessorSupportModule
+		self_instance = self
+		accessor_support_module.instance_eval do
+			unless composite_array = ( ( @composite_arrays ||= Hash.new )[ cascading_name ] ||= Hash.new )[ self_instance ]
+	      composite_array = ::CascadingConfiguration::CompositingArray.new( cascading_name, self_instance )
+				@composite_arrays[ cascading_name ][ self_instance ] = composite_array
+			end
+		end
 
     return composite_array
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Asher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 -04:00
+date: 2011-07-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,6 @@ files:
 - lib/cascading-configuration-array/CascadingConfiguration/Array/ClassInstance.rb
 - lib/cascading-configuration-array/CascadingConfiguration/Array/ModuleInstance.rb
 - lib/cascading-configuration-array/CascadingConfiguration/Array.rb
-- lib/cascading-configuration-array/CascadingConfiguration/CompositingArray/_private_/Instance.rb
 - lib/cascading-configuration-array/CascadingConfiguration/CompositingArray/Instance.rb
 - lib/cascading-configuration-array/CascadingConfiguration/CompositingArray.rb
 - lib/cascading-configuration-array/CascadingConfiguration/LocalConfigurationArray.rb

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

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