cascading-configuration-hash 1.5.1 → 1.6.0

data/lib/cascading-configuration-hash/CascadingConfiguration/Hash/Interface.rb

@@ -14,13 +14,9 @@ module CascadingConfiguration::Hash::Interface
     
     configuration_names.each do |this_configuration_name|
       if block_given?
-        module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
-    	  for_instance = false
-    	  if ! is_a?( Module ) and ! module_configuration_support_module
-    	    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self.class )
-    	    for_instance = true
-			  end
-			  module_configuration_support_module.set_compositing_proc( this_configuration_name, compositing_block, for_instance )
+			  ::CascadingConfiguration::Variable::ConfigurationSupport.set_compositing_proc( self, 
+			                                                                                 this_configuration_name,
+			                                                                                 compositing_block )
       end
       # define configuration setter
       define_cascading_hash_setter( this_configuration_name )
@@ -42,13 +38,9 @@ module CascadingConfiguration::Hash::Interface
     
     configuration_names.each do |this_configuration_name|
       if block_given?
-        module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
-    	  for_instance = false
-    	  if ! is_a?( Module ) and ! module_configuration_support_module
-    	    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self.class )
-    	    for_instance = true
-			  end
-			  module_configuration_support_module.set_compositing_proc( this_configuration_name, compositing_block, for_instance )
+			  ::CascadingConfiguration::Variable::ConfigurationSupport.set_compositing_proc( self, 
+			                                                                                 this_configuration_name,
+			                                                                                 compositing_block )
       end
       # define configuration setter
       define_class_configuration_hash_setter( this_configuration_name )
@@ -69,17 +61,13 @@ module CascadingConfiguration::Hash::Interface
 	# configuration does not cascade
   def attr_local_configuration_hash( *configuration_names, & compositing_block )
 
-		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|
       if block_given?
-        module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
-    	  for_instance = false
-    	  if ! is_a?( Module ) and ! module_configuration_support_module
-    	    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self.class )
-    	    for_instance = true
-			  end
-			  module_configuration_support_module.set_compositing_proc( this_configuration_name, compositing_block, for_instance )
+			  ::CascadingConfiguration::Variable::ConfigurationSupport.set_compositing_proc( self, 
+			                                                                                 this_configuration_name,
+			                                                                                 compositing_block )
       end
       # define configuration setter
       define_local_configuration_hash_setter( this_configuration_name )
@@ -99,17 +87,13 @@ module CascadingConfiguration::Hash::Interface
 	# configuration does not cascade
   def attr_object_configuration_hash( *configuration_names, & compositing_block )
 
-		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|
       if block_given?
-        module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
-    	  for_instance = false
-    	  if ! is_a?( Module ) and ! module_configuration_support_module
-    	    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self.class )
-    	    for_instance = true
-			  end
-			  module_configuration_support_module.set_compositing_proc( this_configuration_name, compositing_block, for_instance )
+			  ::CascadingConfiguration::Variable::ConfigurationSupport.set_compositing_proc( self, 
+			                                                                                 this_configuration_name,
+			                                                                                 compositing_block )
       end
       # define configuration setter
       define_object_configuration_hash_setter( this_configuration_name )
@@ -131,13 +115,9 @@ module CascadingConfiguration::Hash::Interface
 
     configuration_names.each do |this_configuration_name|
       if block_given?
-        module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self )
-    	  for_instance = false
-    	  if ! is_a?( Module ) and ! module_configuration_support_module
-    	    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( self.class )
-    	    for_instance = true
-			  end
-			  module_configuration_support_module.set_compositing_proc( this_configuration_name, compositing_block, for_instance )
+			  ::CascadingConfiguration::Variable::ConfigurationSupport.set_compositing_proc( self, 
+			                                                                                 this_configuration_name,
+			                                                                                 compositing_block )
       end
       # define configuration setter
       define_instance_configuration_hash_setter( this_configuration_name )

data/lib/cascading-configuration-hash/_private_/CascadingConfiguration/Hash/CompositingHash.rb

@@ -1,5 +1,5 @@
 
-class CascadingConfiguration::Hash::CompositingHash < Hash
+class CascadingConfiguration::Hash::CompositingHash < ::Hash
 
   attr_accessor  :local_cascading_hash
 
@@ -9,34 +9,24 @@ class CascadingConfiguration::Hash::CompositingHash < Hash
   
   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 hash, 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_hash = super_configuration_module.get_configuration_variable( configuration_name ) and 
-       @super_composite_hash.respond_to?( :register_sub_composite_hash )
+    if ancestor = ::CascadingConfiguration::Variable::ConfigurationSupport.ancestor( configuration_instance, configuration_name )
+
+      @super_composite_hash = ::CascadingConfiguration::Variable::ConfigurationSupport.get_configuration_variable( ancestor, 
+                                                                                                                   configuration_name )
 
-      @super_composite_hash.register_sub_composite_hash( self )
+      if @super_composite_hash.respond_to?( :register_sub_composite_hash )
+        @super_composite_hash.register_sub_composite_hash( self )
+      else
+        @super_composite_hash = nil
+      end
 
     end
 
@@ -44,7 +34,7 @@ class CascadingConfiguration::Hash::CompositingHash < Hash
     @local_cascading_hash = ::CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash.new
     
     # we may later have our own child composites that register with us
-    @sub_composite_hashes = ::Array.new
+    @sub_composite_hashes = [ ]
     
     # initialize self status for parent and local
     update_self_as_cascading_composite
@@ -198,19 +188,11 @@ class CascadingConfiguration::Hash::CompositingHash < Hash
 
 	def update_composite_self_for_parent_hash( parent_hash, second_hash )
 	  
-	  module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( @configuration_instance )
-	  for_instance = false
-	  
-	  if ! module_configuration_support_module and ! is_a?( Module )
-	    module_configuration_support_module = CascadingConfiguration::Variable.module_configuration_support_module( @configuration_instance.class )
-	    for_instance = true
-    end
-    
-		if compositing_proc = module_configuration_support_module.get_compositing_proc( @configuration_name, for_instance )
+		if compositing_proc = ::CascadingConfiguration::Variable::ConfigurationSupport.get_compositing_proc_searching_upward( @configuration_instance, @configuration_name )
 			# if we have a compositing proc defined, use its result to replace
-			parent_hash_copy = Hash.new
+			parent_hash_copy = { }
 			parent_hash_copy.merge!( parent_hash ) if parent_hash
-			second_hash_copy = Hash.new
+			second_hash_copy = { }
 			second_hash_copy.merge!( second_hash ) if second_hash
 			composite_result = compositing_proc.call( parent_hash_copy, second_hash_copy )
 			super_replace( composite_result )

data/lib/cascading-configuration-hash/_private_/CascadingConfiguration/Hash/CompositingHash/LocalConfigurationHash.rb

@@ -8,7 +8,7 @@ class CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash < Ha
   ################
 
   def initialize()
-    @exclude_array = ::Array.new
+    @exclude_array = [ ]
   end
   
   #########
@@ -89,7 +89,7 @@ class CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash < Ha
   ##########################
 
   def add_to_exclude_array( *elements )
-    @exclude_array ||= ::Array.new
+    @exclude_array ||= [ ]
     @exclude_array += elements
     @exclude_array.sort!.uniq!
   end
@@ -103,7 +103,7 @@ class CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash < Ha
       @exclude_array -= elements
       @exclude_array.sort!.uniq!
     else
-      @exclude_array ||= ::Array.new
+      @exclude_array ||= [ ]
     end
   end
   

data/lib/cascading-configuration-hash/_private_/CascadingConfiguration/Hash/Interface/GettersSetters.rb

@@ -9,8 +9,8 @@ module CascadingConfiguration::Hash::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 |hash|
 
@@ -18,7 +18,7 @@ module CascadingConfiguration::Hash::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
 
@@ -36,8 +36,8 @@ module CascadingConfiguration::Hash::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
 
@@ -45,7 +45,7 @@ module CascadingConfiguration::Hash::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
 
@@ -63,9 +63,9 @@ module CascadingConfiguration::Hash::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 |hash|
 
         return CascadingConfiguration::Hash.composite_hash_for_cascading_configuration( self, configuration_name ).replace( hash )
@@ -83,9 +83,9 @@ module CascadingConfiguration::Hash::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::Hash.composite_hash_for_cascading_configuration( self, configuration_name )
@@ -103,8 +103,8 @@ module CascadingConfiguration::Hash::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 |hash|
 
@@ -130,9 +130,9 @@ module CascadingConfiguration::Hash::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
 
@@ -158,7 +158,7 @@ module CascadingConfiguration::Hash::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 |hash|
@@ -178,7 +178,7 @@ module CascadingConfiguration::Hash::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
@@ -198,7 +198,7 @@ module CascadingConfiguration::Hash::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 |hash|
@@ -218,7 +218,7 @@ module CascadingConfiguration::Hash::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-hash/_private_/CascadingConfiguration/Hash/ModuleSupportMethods.rb

@@ -8,16 +8,9 @@ module CascadingConfiguration::Hash::ModuleSupportMethods
   def composite_hash_for_cascading_configuration( configuration_instance, configuration_name )
 
     composite_hash = 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_hash = this_object_module_support.get_configuration_variable( configuration_name, for_instance )
+
+		if ::CascadingConfiguration::Variable::ConfigurationSupport.has_configuration_variable?( configuration_instance, configuration_name )
+			composite_hash = ::CascadingConfiguration::Variable::ConfigurationSupport.get_configuration_variable( configuration_instance, configuration_name )
 		else
 			composite_hash = ::CascadingConfiguration::Hash::CompositingHash.new( configuration_instance, configuration_name )
 		end

data/spec/_private_/CascadingConfiguration/Hash/CompositingHash_spec.rb

@@ -15,6 +15,8 @@ describe CascadingConfiguration::Hash::CompositingHash do
     
     module CascadingConfiguration::Hash::CompositingHash::CIMock01A
       include CascadingConfiguration::Hash::CompositingHash::CCHMock01
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Hash::CompositingHash::CIMock01B
       include CascadingConfiguration::Hash::CompositingHash::CIMock01A
@@ -62,6 +64,8 @@ describe CascadingConfiguration::Hash::CompositingHash do
     
     module CascadingConfiguration::Hash::CompositingHash::CIMock02A
       include CascadingConfiguration::Hash::CompositingHash::CCHMock02
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Hash::CompositingHash::CIMock02B
       include CascadingConfiguration::Hash::CompositingHash::CIMock02A
@@ -109,6 +113,8 @@ describe CascadingConfiguration::Hash::CompositingHash do
     
     module CascadingConfiguration::Hash::CompositingHash::CIMock03A
       include CascadingConfiguration::Hash::CompositingHash::CCHMock03
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Hash::CompositingHash::CIMock03B
       include CascadingConfiguration::Hash::CompositingHash::CIMock03A
@@ -161,6 +167,8 @@ describe CascadingConfiguration::Hash::CompositingHash do
     
     module CascadingConfiguration::Hash::CompositingHash::CIMock04A
       include CascadingConfiguration::Hash::CompositingHash::CCHMock04
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Hash::CompositingHash::CIMock04B
       include CascadingConfiguration::Hash::CompositingHash::CIMock04A
@@ -208,6 +216,8 @@ describe CascadingConfiguration::Hash::CompositingHash do
     
     module CascadingConfiguration::Hash::CompositingHash::CIMock05A
       include CascadingConfiguration::Hash::CompositingHash::CCHMock05
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Hash::CompositingHash::CIMock05B
       include CascadingConfiguration::Hash::CompositingHash::CIMock05A
@@ -250,6 +260,8 @@ describe CascadingConfiguration::Hash::CompositingHash do
     
     module CascadingConfiguration::Hash::CompositingHash::CIMock06A
       include CascadingConfiguration::Hash::CompositingHash::CCHMock06
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Hash::CompositingHash::CIMock06B
       include CascadingConfiguration::Hash::CompositingHash::CIMock06A
@@ -302,6 +314,8 @@ describe CascadingConfiguration::Hash::CompositingHash do
     
     module CascadingConfiguration::Hash::CompositingHash::CIMock07A
       include CascadingConfiguration::Hash::CompositingHash::CCHMock07
+      def self.some_configuration
+      end
     end
     module CascadingConfiguration::Hash::CompositingHash::CIMock07B
       include CascadingConfiguration::Hash::CompositingHash::CIMock07A

metadata

@@ -2,7 +2,7 @@
 name: cascading-configuration-hash
 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