cascading-configuration-array 1.5.1 → 1.6.0

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

@@ -51,7 +51,7 @@ module CascadingConfiguration::Array::Interface
 	# configuration does not cascade
   def attr_local_configuration_array( *configuration_names )
 
-		CascadingConfiguration::Variable.initialize_local_instance_configuration_module( self )
+		::CascadingConfiguration::Variable::ConfigurationSupport.create_local_instance_configuration_support_module( self )
 
     configuration_names.each do |this_configuration_name|
       # define configuration setter
@@ -72,7 +72,7 @@ module CascadingConfiguration::Array::Interface
 	# configuration does not cascade
   def attr_object_configuration_array( *configuration_names )
 
-		CascadingConfiguration::Variable.initialize_local_instance_configuration_module( self )
+		::CascadingConfiguration::Variable::ConfigurationSupport.create_local_instance_configuration_support_module( self )
 
     configuration_names.each do |this_configuration_name|
       # define configuration setter

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

@@ -12,7 +12,7 @@ class CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray <
   ################
 
   def initialize()
-    @exclude_array = ::Array.new
+    @exclude_array = [ ]
   end
 
   #########

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

@@ -1,5 +1,5 @@
 
-class CascadingConfiguration::Array::CompositingArray < Array
+class CascadingConfiguration::Array::CompositingArray < ::Array
 
   attr_accessor  :local_cascading_array
 
@@ -9,34 +9,23 @@ class CascadingConfiguration::Array::CompositingArray < Array
   
   def initialize( configuration_instance, configuration_name )
     
-    for_instance = false
-    
     @configuration_instance = configuration_instance
     
-    module_configuration_module = ::CascadingConfiguration::Variable.module_configuration_support_module( configuration_instance )
-    if ! module_configuration_module and ! configuration_instance.is_a?( Module )
-      module_configuration_module = ::CascadingConfiguration::Variable.module_configuration_support_module( configuration_instance.class )
-      for_instance = true 
-    end
-    
     @configuration_name = configuration_name
     
     # store self for sub composites
-    module_configuration_module.set_configuration_variable( configuration_name, self, for_instance )
+    ::CascadingConfiguration::Variable::ConfigurationSupport.set_configuration_variable( configuration_instance, configuration_name, self )
     
     # if first ancestor can have a composite array, register self with it in case it gets updated in the future
-    super_configuration_module = nil
-    if for_instance
-      super_configuration_module = module_configuration_module
-    else
-      super_configuration_module = module_configuration_module.super_configuration_module( configuration_name )
-    end
-
-    if super_configuration_module                                                                            and 
-       @super_composite_array = super_configuration_module.get_configuration_variable( configuration_name ) and 
-       @super_composite_array.respond_to?( :register_sub_composite_array )
+    if ancestor = ::CascadingConfiguration::Variable::ConfigurationSupport.ancestor( configuration_instance, configuration_name )
 
-      @super_composite_array.register_sub_composite_array( self )
+      @super_composite_array = ::CascadingConfiguration::Variable::ConfigurationSupport.get_configuration_variable( ancestor, 
+                                                                                                                    configuration_name )
+      if @super_composite_array.respond_to?( :register_sub_composite_array )
+        @super_composite_array.register_sub_composite_array( self )
+      else
+        @super_composite_array = nil
+      end
 
     end
     
@@ -44,7 +33,7 @@ class CascadingConfiguration::Array::CompositingArray < Array
     @local_cascading_array = ::CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     
     # we may later have our own child composites that register with us
-    @sub_composite_arrays = ::Array.new
+    @sub_composite_arrays = [ ]
     
     # initialize self status for parent and local
     update_self_as_cascading_composite

data/lib/cascading-configuration-array/_private_/CascadingConfiguration/Array/Interface/GettersSetters.rb

@@ -9,8 +9,8 @@ module CascadingConfiguration::Array::Interface::GettersSetters
 
     configuration_setter_name = ( configuration_name.to_s + '=' ).to_sym
 
-    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
-    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
+    configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.configuration_support_module( self )
+    instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.instance_configuration_support_module( self )
 
     array_setter_proc = Proc.new do |array|
 
@@ -20,7 +20,7 @@ module CascadingConfiguration::Array::Interface::GettersSetters
       
     end
 
-		module_configuration_support_module.module_eval do
+		configuration_support_module.module_eval do
 			define_method( configuration_setter_name, & array_setter_proc )
 		end
 
@@ -38,8 +38,8 @@ module CascadingConfiguration::Array::Interface::GettersSetters
 
     configuration_getter_name = configuration_name
 
-    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
-    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
+    configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.configuration_support_module( self )
+    instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.instance_configuration_support_module( self )
 
     array_getter_proc = Proc.new do
 
@@ -48,7 +48,7 @@ module CascadingConfiguration::Array::Interface::GettersSetters
       
     end
 
-		module_configuration_support_module.module_eval do
+		configuration_support_module.module_eval do
 			define_method( configuration_getter_name, & array_getter_proc )
 		end
 
@@ -66,9 +66,9 @@ module CascadingConfiguration::Array::Interface::GettersSetters
 
     configuration_setter_name = ( configuration_name.to_s + '=' ).to_sym
 
-    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
+    configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.configuration_support_module( self )
 
-    module_configuration_support_module.module_eval do 
+    configuration_support_module.module_eval do 
 	    define_method( configuration_setter_name ) do |array|
 
         return CascadingConfiguration::Array.set_composite_array_for_cascading_configuration( self, 
@@ -87,9 +87,9 @@ module CascadingConfiguration::Array::Interface::GettersSetters
 
     configuration_getter_name = configuration_name
 
-    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
+    configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.configuration_support_module( self )
 
-    module_configuration_support_module.module_eval do 
+    configuration_support_module.module_eval do 
 	    define_method( configuration_getter_name ) do
 
         return CascadingConfiguration::Array.composite_array_for_cascading_configuration( self, 
@@ -108,8 +108,8 @@ module CascadingConfiguration::Array::Interface::GettersSetters
     
     configuration_setter_name = ( configuration_name.to_s + '=' ).to_sym
 
-    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
-    local_instance_configuration_support_module = CascadingConfiguration::Variable.local_instance_configuration_support_module( self )
+    instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.instance_configuration_support_module( self )
+    local_instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.local_instance_configuration_support_module( self )
 
     local_setter_proc = Proc.new do |array|
 
@@ -137,9 +137,9 @@ module CascadingConfiguration::Array::Interface::GettersSetters
     
     configuration_getter_name = configuration_name
 
-    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
+    instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.instance_configuration_support_module( self )
 
-    local_instance_configuration_support_module = CascadingConfiguration::Variable.local_instance_configuration_support_module( self )
+    local_instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.local_instance_configuration_support_module( self )
 
     local_getter_proc = Proc.new do
 
@@ -166,7 +166,7 @@ module CascadingConfiguration::Array::Interface::GettersSetters
 
     configuration_setter_name = ( configuration_name.to_s + '=' ).to_sym
 
-    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
+    instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.instance_configuration_support_module( self )
 
     instance_configuration_support_module.module_eval do 
 	    define_method( configuration_setter_name ) do |array|
@@ -187,7 +187,7 @@ module CascadingConfiguration::Array::Interface::GettersSetters
     
     configuration_getter_name = configuration_name
 
-    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
+    instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.instance_configuration_support_module( self )
 
     instance_configuration_support_module.module_eval do 
 	    define_method( configuration_getter_name ) do
@@ -208,7 +208,7 @@ module CascadingConfiguration::Array::Interface::GettersSetters
     
     configuration_setter_name = ( configuration_name.to_s + '=' ).to_sym
 
-    local_instance_configuration_support_module = CascadingConfiguration::Variable.local_instance_configuration_support_module( self )
+    local_instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.local_instance_configuration_support_module( self )
 
     local_instance_configuration_support_module.module_eval do
 	    define_method( configuration_setter_name ) do |array|
@@ -230,7 +230,7 @@ module CascadingConfiguration::Array::Interface::GettersSetters
 
     configuration_getter_name = configuration_name
 
-    local_instance_configuration_support_module = CascadingConfiguration::Variable.local_instance_configuration_support_module( self )
+    local_instance_configuration_support_module = ::CascadingConfiguration::Variable::ConfigurationSupport.local_instance_configuration_support_module( self )
     
     local_instance_configuration_support_module.module_eval do 
 	    define_method( configuration_getter_name ) do

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

@@ -8,16 +8,9 @@ module CascadingConfiguration::Array::ModuleSupportMethods
   def composite_array_for_cascading_configuration( configuration_instance, configuration_name )
 
     composite_array = nil
-    for_instance = false
 
-    this_object_module_support = CascadingConfiguration::Variable.module_configuration_support_module( configuration_instance )
-    if ! this_object_module_support and ! configuration_instance.is_a?( Module )
-      this_object_module_support = CascadingConfiguration::Variable.module_configuration_support_module( configuration_instance.class )
-      for_instance = true 
-    end
-    
-		if this_object_module_support.has_configuration_variable?( configuration_name, for_instance )
-			composite_array = this_object_module_support.get_configuration_variable( configuration_name, for_instance )
+		if ::CascadingConfiguration::Variable::ConfigurationSupport.has_configuration_variable?( configuration_instance, configuration_name )
+			composite_array = ::CascadingConfiguration::Variable::ConfigurationSupport.get_configuration_variable( configuration_instance, configuration_name )
 		else
 			composite_array = ::CascadingConfiguration::Array::CompositingArray.new( configuration_instance, configuration_name )
 		end

data/spec/_private_/CascadingConfiguration/Array/CompositingArray_spec.rb

@@ -15,6 +15,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock01A
       include CascadingConfiguration::Array::CompositingArray::CCAMock01
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock01B
       include CascadingConfiguration::Array::CompositingArray::CIMock01A
@@ -65,6 +67,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock02A
       include CascadingConfiguration::Array::CompositingArray::CCAMock02
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock02B
       include CascadingConfiguration::Array::CompositingArray::CIMock02A
@@ -115,6 +119,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock03A
       include CascadingConfiguration::Array::CompositingArray::CCAMock03
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock03B
       include CascadingConfiguration::Array::CompositingArray::CIMock03A
@@ -165,6 +171,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock04A
       include CascadingConfiguration::Array::CompositingArray::CCAMock04
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock04B
       include CascadingConfiguration::Array::CompositingArray::CIMock04A
@@ -215,6 +223,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock05A
       include CascadingConfiguration::Array::CompositingArray::CCAMock05
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock05B
       include CascadingConfiguration::Array::CompositingArray::CIMock05A
@@ -265,6 +275,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock06A
       include CascadingConfiguration::Array::CompositingArray::CCAMock06
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock06B
       include CascadingConfiguration::Array::CompositingArray::CIMock06A
@@ -317,6 +329,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock07A
       include CascadingConfiguration::Array::CompositingArray::CCAMock07
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock07B
       include CascadingConfiguration::Array::CompositingArray::CIMock07A
@@ -369,6 +383,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock08A
       include CascadingConfiguration::Array::CompositingArray::CCAMock08
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock08B
       include CascadingConfiguration::Array::CompositingArray::CIMock08A
@@ -421,6 +437,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock09A
       include CascadingConfiguration::Array::CompositingArray::CCAMock09
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock09B
       include CascadingConfiguration::Array::CompositingArray::CIMock09A
@@ -473,6 +491,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock10A
       include CascadingConfiguration::Array::CompositingArray::CCAMock10
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock10B
       include CascadingConfiguration::Array::CompositingArray::CIMock10A
@@ -526,6 +546,8 @@ describe CascadingConfiguration::Array::CompositingArray do
     
     module CascadingConfiguration::Array::CompositingArray::CIMock11A
       include CascadingConfiguration::Array::CompositingArray::CCAMock11
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Array::CompositingArray::CIMock11B
       include CascadingConfiguration::Array::CompositingArray::CIMock11A

metadata

@@ -2,7 +2,7 @@
 name: cascading-configuration-array
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors: 
 - Asher
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-02-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: module-cluster