cascading-configuration-array 1.4.1 → 1.5.0

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

@@ -0,0 +1,246 @@
+
+module CascadingConfiguration::Array::Interface::GettersSetters
+
+  ###################################
+  #  define_cascading_array_setter  #
+  ###################################
+  
+  def define_cascading_array_setter( configuration_name )
+
+    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 )
+
+    array_setter_proc = Proc.new do |array|
+
+      return CascadingConfiguration::Array.set_composite_array_for_cascading_configuration( self, 
+                                                                                            configuration_name, 
+                                                                                            array )
+      
+    end
+
+		module_configuration_support_module.module_eval do
+			define_method( configuration_setter_name, & array_setter_proc )
+		end
+
+		instance_configuration_support_module.module_eval do
+			define_method( configuration_setter_name, & array_setter_proc )
+		end if instance_configuration_support_module
+
+  end
+
+  ###################################
+  #  define_cascading_array_getter  #
+  ###################################
+  
+  def define_cascading_array_getter( configuration_name )
+
+    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 )
+
+    array_getter_proc = Proc.new do
+
+      return CascadingConfiguration::Array.composite_array_for_cascading_configuration( self, 
+                                                                                        configuration_name )
+      
+    end
+
+		module_configuration_support_module.module_eval do
+			define_method( configuration_getter_name, & array_getter_proc )
+		end
+
+		instance_configuration_support_module.module_eval do
+			define_method( configuration_getter_name, & array_getter_proc )
+		end if instance_configuration_support_module
+
+  end
+
+  #############################################
+  #  define_class_configuration_array_setter  #
+  #############################################
+  
+  def define_class_configuration_array_setter( configuration_name )
+
+    configuration_setter_name = ( configuration_name.to_s + '=' ).to_sym
+
+    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
+
+    module_configuration_support_module.module_eval do 
+	    define_method( configuration_setter_name ) do |array|
+
+        return CascadingConfiguration::Array.set_composite_array_for_cascading_configuration( self, 
+                                                                                              configuration_name, 
+                                                                                              array )
+	    end
+    end
+
+  end
+
+  #############################################
+  #  define_class_configuration_array_getter  #
+  #############################################
+  
+  def define_class_configuration_array_getter( configuration_name )
+
+    configuration_getter_name = configuration_name
+
+    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
+
+    module_configuration_support_module.module_eval do 
+	    define_method( configuration_getter_name ) do
+
+        return CascadingConfiguration::Array.composite_array_for_cascading_configuration( self, 
+                                                                                          configuration_name )
+
+	    end
+    end
+
+  end
+
+  #############################################
+  #  define_local_configuration_array_setter  #
+  #############################################
+  
+  def define_local_configuration_array_setter( configuration_name )
+    
+    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 )
+
+    local_setter_proc = Proc.new do |array|
+
+      return CascadingConfiguration::Array.set_composite_array_for_cascading_configuration( self, 
+                                                                                            configuration_name, 
+                                                                                            array )
+    
+    end
+
+    instance_configuration_support_module.module_eval do 
+	    define_method( configuration_setter_name, & local_setter_proc )
+    end if instance_configuration_support_module
+
+    local_instance_configuration_support_module.module_eval do 
+	    define_method( configuration_setter_name, & local_setter_proc )
+    end
+
+  end
+
+  #############################################
+  #  define_local_configuration_array_getter  #
+  #############################################
+  
+  def define_local_configuration_array_getter( configuration_name )
+    
+    configuration_getter_name = configuration_name
+
+    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
+
+    local_instance_configuration_support_module = CascadingConfiguration::Variable.local_instance_configuration_support_module( self )
+
+    local_getter_proc = Proc.new do
+
+      return CascadingConfiguration::Array.composite_array_for_cascading_configuration( self, 
+                                                                                        configuration_name )
+    
+    end
+
+    instance_configuration_support_module.module_eval do 
+	    define_method( configuration_getter_name, & local_getter_proc )
+    end if instance_configuration_support_module
+
+    local_instance_configuration_support_module.module_eval do 
+	    define_method( configuration_getter_name, & local_getter_proc )
+    end
+    
+  end
+
+  ################################################
+  #  define_instance_configuration_array_setter  #
+  ################################################
+  
+  def define_instance_configuration_array_setter( configuration_name )
+
+    configuration_setter_name = ( configuration_name.to_s + '=' ).to_sym
+
+    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
+
+    instance_configuration_support_module.module_eval do 
+	    define_method( configuration_setter_name ) do |array|
+
+        return CascadingConfiguration::Array.set_composite_array_for_cascading_configuration( self, 
+                                                                                              configuration_name, 
+                                                                                              array )
+	    end
+    end
+
+  end
+
+  ################################################
+  #  define_instance_configuration_array_getter  #
+  ################################################
+  
+  def define_instance_configuration_array_getter( configuration_name )
+    
+    configuration_getter_name = configuration_name
+
+    instance_configuration_support_module = CascadingConfiguration::Variable.instance_configuration_support_module( self )
+
+    instance_configuration_support_module.module_eval do 
+	    define_method( configuration_getter_name ) do
+
+        return CascadingConfiguration::Array.composite_array_for_cascading_configuration( self, 
+                                                                                          configuration_name )
+
+	    end
+    end
+
+  end
+  
+  ##############################################
+  #  define_object_configuration_array_setter  #
+  ##############################################
+  
+  def define_object_configuration_array_setter( configuration_name )
+    
+    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.module_eval do
+	    define_method( configuration_setter_name ) do |array|
+
+        return CascadingConfiguration::Array.set_composite_array_for_cascading_configuration( self, 
+                                                                                              configuration_name, 
+                                                                                              array )
+
+	    end
+    end
+
+  end
+
+  ##############################################
+  #  define_object_configuration_array_getter  #
+  ##############################################
+  
+  def define_object_configuration_array_getter( configuration_name )
+
+    configuration_getter_name = configuration_name
+
+    local_instance_configuration_support_module = CascadingConfiguration::Variable.local_instance_configuration_support_module( self )
+    
+    local_instance_configuration_support_module.module_eval do 
+	    define_method( configuration_getter_name ) do
+
+        return CascadingConfiguration::Array.composite_array_for_cascading_configuration( self, 
+                                                                                          configuration_name )
+
+	    end
+    end
+
+  end
+  
+end

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

@@ -0,0 +1,48 @@
+
+module CascadingConfiguration::Array::ModuleSupportMethods
+  
+  #################################################
+  #  composite_array_for_cascading_configuration  #
+  #################################################
+
+  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 )
+		else
+			composite_array = ::CascadingConfiguration::Array::CompositingArray.new( configuration_instance, configuration_name )
+		end
+
+    return composite_array
+    
+  end
+
+  #####################################################
+  #  set_composite_array_for_cascading_configuration  #
+  #####################################################
+
+  def set_composite_array_for_cascading_configuration( configuration_instance, configuration_name, array )
+  
+    composite_array = composite_array_for_cascading_configuration( configuration_instance, configuration_name )
+
+    # we want the array to supplant existing config
+    # clear the array (excludes everything explicitly)
+    composite_array.clear
+
+    # push array elements (removes anything excluded from exclude)
+    composite_array.push( *array )
+    
+    return composite_array
+  
+  end
+  
+end

data/lib/cascading-configuration-array.rb

@@ -1,35 +1,28 @@
 
-if $cascading_configuration_development
-	require_relative '../../variable/lib/cascading-configuration-variable.rb'
-else
-	require 'cascading-configuration-variable'
-end
+require 'cascading-configuration-variable'
+#require_relative '../../variable/lib/cascading-configuration-variable.rb'
 
 module CascadingConfiguration
-  class CompositingArray < Array
-    module Instance
-    end
-  end
-  class LocalConfigurationArray < Array
-  end
   module Array
-    module AccessorDefinitionMethods
+    class CompositingArray < ::Array
+      class LocalConfigurationArray < ::Array
+      end
+    end
+    module ModuleSupportMethods
     end
     module Interface
-      module Instance
+      module GettersSetters
       end
     end
-    module ObjectInstance
-    end
   end
 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/LocalConfigurationArray.rb'
-require_relative 'cascading-configuration-array/CascadingConfiguration/_private_/LocalConfigurationArray.rb'
-require_relative 'cascading-configuration-array/CascadingConfiguration/Array.rb'
-require_relative 'cascading-configuration-array/CascadingConfiguration/Array/AccessorDefinitionMethods.rb'
+require_relative 'cascading-configuration-array/_private_/CascadingConfiguration/Array/CompositingArray/LocalConfigurationArray.rb'
+require_relative 'cascading-configuration-array/_private_/CascadingConfiguration/Array/CompositingArray.rb'
+require_relative 'cascading-configuration-array/_private_/CascadingConfiguration/Array/Interface/GettersSetters.rb'
+require_relative 'cascading-configuration-array/_private_/CascadingConfiguration/Array/ModuleSupportMethods.rb'
+
 require_relative 'cascading-configuration-array/CascadingConfiguration/Array/Interface.rb'
-require_relative 'cascading-configuration-array/CascadingConfiguration/Array/Interface/Instance.rb'
+require_relative 'cascading-configuration-array/CascadingConfiguration/Array.rb'
+
+

data/spec/CascadingConfiguration/Array_spec.rb

@@ -420,7 +420,7 @@ describe CascadingConfiguration::Array do
       module SubmoduleIncluding
         include CascadingConfiguration::Array::LocalConfigurationMockModuleIncluded
         instance_methods.include?( :configuration_setting ).should == true
-        respond_to?( :configuration_setting ).should == true
+        respond_to?( :configuration_setting ).should == false
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get attr_configuration and configurations
@@ -437,7 +437,7 @@ describe CascadingConfiguration::Array do
       class ClassIncluding
         include CascadingConfiguration::Array::LocalConfigurationMockModuleIncluded
         instance_methods.include?( :configuration_setting ).should == true
-        respond_to?( :configuration_setting ).should == true
+        respond_to?( :configuration_setting ).should == false
         instance_variables.empty?.should == true
       end
       setting_class_including_instance = ClassIncluding.new
@@ -501,7 +501,6 @@ describe CascadingConfiguration::Array do
     module CascadingConfiguration::Array::InstanceConfigurationMockModuleExtended
       extend CascadingConfiguration::Array
       # => singleton gets attr_configuration and configurations
-      respond_to?( :attr_instance_configuration_array ).should == false
       instance_variables.empty?.should == true
       # => including modules and classes get nothing
       module SubmoduleIncluding

data/spec/{CascadingConfiguration → _private_/CascadingConfiguration/Array/CompositingArray}/LocalConfigurationArray_spec.rb

@@ -1,14 +1,14 @@
 
-require_relative '../../lib/cascading-configuration-array.rb'
+require_relative '../../../../../lib/cascading-configuration-array.rb'
 
-describe CascadingConfiguration::LocalConfigurationArray do
+describe CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray do
 
   #########
   #  []=  #
   #########
 
   it 'can add elements' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance[0] = :some_setting
     array_instance.should == [ :some_setting ]
     array_instance.exclude_array.include?( :some_setting ).should == false
@@ -22,7 +22,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   ########
   
   it 'can add elements' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance << :some_setting
     array_instance.should == [ :some_setting ]
     array_instance.exclude_array.include?( :some_setting ).should == false
@@ -36,7 +36,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   #######
 
   it 'can add elements' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance += [ :some_setting ]
     array_instance.should == [ :some_setting ]
     array_instance.exclude_array.include?( :some_setting ).should == false
@@ -50,7 +50,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   ##########
   
   it 'can add elements' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance.push( :some_setting )
     array_instance.should == [ :some_setting ]
     array_instance.exclude_array.include?( :some_setting ).should == false
@@ -64,7 +64,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   ############
   
   it 'can concat arrays' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance.concat( [ :some_setting ] )
     array_instance.should == [ :some_setting ]
     array_instance.exclude_array.include?( :some_setting ).should == false
@@ -78,7 +78,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   #######
   
   it 'can exclude elements' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance += [ :some_setting, :other_setting ]
     array_instance -= [ :other_setting ]
     array_instance.should == [ :some_setting ]
@@ -93,7 +93,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   ############
   
   it 'can exclude elements' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance += [ :some_setting, :other_setting ]
     array_instance.delete( :other_setting )
     array_instance.should == [ :some_setting ]
@@ -108,7 +108,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   #########
   
   it 'can pop the final element' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance += [ :other_setting, :some_setting ]
     array_instance.pop.should == :some_setting
     array_instance.should == [ :other_setting ]
@@ -120,7 +120,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   ###########
   
   it 'can shift the first element' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance += [ :other_setting, :some_setting ]
     array_instance.shift.should == :other_setting
     array_instance.should == [ :some_setting ]
@@ -132,7 +132,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   ############
   
   it 'can slice elements' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance += [ :other_setting, :some_setting ]
     array_instance.slice!( 0, 1 ).should == [ :other_setting ]
     array_instance.should == [ :some_setting ]
@@ -144,7 +144,7 @@ describe CascadingConfiguration::LocalConfigurationArray do
   ###########
 
   it 'can clear, causing present elements to be excluded' do
-    array_instance = CascadingConfiguration::LocalConfigurationArray.new
+    array_instance = CascadingConfiguration::Array::CompositingArray::LocalConfigurationArray.new
     array_instance += [ :some_setting, :other_setting ]
     array_instance.clear
     array_instance.should == []