cascading-configuration-hash 1.4.1 → 1.5.0

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

@@ -0,0 +1,233 @@
+
+module CascadingConfiguration::Hash::Interface::GettersSetters
+
+  ##################################
+  #  define_cascading_hash_setter  #
+  ##################################
+  
+  def define_cascading_hash_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 |hash|
+
+      return CascadingConfiguration::Hash.composite_hash_for_cascading_configuration( self, configuration_name ).replace( hash )
+      
+    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_hash_getter  #
+  ##################################
+  
+  def define_cascading_hash_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::Hash.composite_hash_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_hash_setter  #
+  ############################################
+  
+  def define_class_configuration_hash_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 |hash|
+
+        return CascadingConfiguration::Hash.composite_hash_for_cascading_configuration( self, configuration_name ).replace( hash )
+
+	    end
+    end
+
+  end
+
+  ############################################
+  #  define_class_configuration_hash_getter  #
+  ############################################
+  
+  def define_class_configuration_hash_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::Hash.composite_hash_for_cascading_configuration( self, configuration_name )
+
+	    end
+    end
+
+  end
+
+  ############################################
+  #  define_local_configuration_hash_setter  #
+  ############################################
+  
+  def define_local_configuration_hash_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 |hash|
+
+      return CascadingConfiguration::Hash.composite_hash_for_cascading_configuration( self, configuration_name ).replace( hash )
+    
+    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_hash_getter  #
+  ############################################
+  
+  def define_local_configuration_hash_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::Hash.composite_hash_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_hash_setter  #
+  ###############################################
+  
+  def define_instance_configuration_hash_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 |hash|
+
+        return CascadingConfiguration::Hash.composite_hash_for_cascading_configuration( self, configuration_name ).replace( hash )
+
+	    end
+    end
+
+  end
+
+  ###############################################
+  #  define_instance_configuration_hash_getter  #
+  ###############################################
+  
+  def define_instance_configuration_hash_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::Hash.composite_hash_for_cascading_configuration( self, configuration_name )
+
+	    end
+    end
+
+  end
+
+  #############################################
+  #  define_object_configuration_hash_setter  #
+  #############################################
+  
+  def define_object_configuration_hash_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 |hash|
+
+        return CascadingConfiguration::Hash.composite_hash_for_cascading_configuration( self, configuration_name ).replace( hash )
+
+	    end
+    end
+
+  end
+
+  #############################################
+  #  define_object_configuration_hash_getter  #
+  #############################################
+  
+  def define_object_configuration_hash_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::Hash.composite_hash_for_cascading_configuration( self, configuration_name )
+
+	    end
+    end
+
+  end
+
+end

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

@@ -0,0 +1,29 @@
+
+module CascadingConfiguration::Hash::ModuleSupportMethods
+
+  ################################################
+  #  composite_hash_for_cascading_configuration  #
+  ################################################
+
+  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 )
+		else
+			composite_hash = ::CascadingConfiguration::Hash::CompositingHash.new( configuration_instance, configuration_name )
+		end
+
+    return composite_hash
+
+  end
+
+end

data/lib/cascading-configuration-hash.rb

@@ -1,35 +1,24 @@
 
-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 CompositingHash < Hash
-    module Instance
-    end
-  end
-  class LocalConfigurationHash < Hash
-  end
   module Hash
-    module AccessorDefinitionMethods
+    class CompositingHash < ::Hash
+      class LocalConfigurationHash < ::Hash
+      end
     end
     module Interface
-      module Instance
+      module GettersSetters
       end
     end
-    module ObjectInstance
-    end
   end
 end
 
-require_relative 'cascading-configuration-hash/CascadingConfiguration/CompositingHash.rb'
-require_relative 'cascading-configuration-hash/CascadingConfiguration/_private_/CompositingHash.rb'
-require_relative 'cascading-configuration-hash/CascadingConfiguration/CompositingHash/Instance.rb'
-require_relative 'cascading-configuration-hash/CascadingConfiguration/LocalConfigurationHash.rb'
-require_relative 'cascading-configuration-hash/CascadingConfiguration/_private_/LocalConfigurationHash.rb'
-require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash.rb'
-require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/AccessorDefinitionMethods.rb'
+require_relative 'cascading-configuration-hash/_private_/CascadingConfiguration/Hash/CompositingHash/LocalConfigurationHash.rb'
+require_relative 'cascading-configuration-hash/_private_/CascadingConfiguration/Hash/CompositingHash.rb'
+require_relative 'cascading-configuration-hash/_private_/CascadingConfiguration/Hash/Interface/GettersSetters.rb'
+require_relative 'cascading-configuration-hash/_private_/CascadingConfiguration/Hash/ModuleSupportMethods.rb'
+
 require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/Interface.rb'
-require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/Interface/Instance.rb'
+require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash.rb'

data/spec/CascadingConfiguration/Hash_spec.rb

@@ -519,7 +519,7 @@ describe CascadingConfiguration::Hash do
       module SubmoduleIncluding
         include CascadingConfiguration::Hash::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
@@ -536,7 +536,7 @@ describe CascadingConfiguration::Hash do
       class ClassIncluding
         include CascadingConfiguration::Hash::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
@@ -597,7 +597,6 @@ describe CascadingConfiguration::Hash do
     module CascadingConfiguration::Hash::InstanceConfigurationMockModuleExtended
       extend CascadingConfiguration::Hash
       # => singleton gets attr_configuration and configurations
-      respond_to?( :attr_instance_configuration_hash ).should == false
       instance_methods.include?( :configuration_setting ).should == false
       instance_variables.empty?.should == true
       # => including modules and classes get nothing

data/spec/{CascadingConfiguration → _private_/CascadingConfiguration/Hash/CompositingHash}/LocalConfigurationHash_spec.rb

@@ -1,14 +1,14 @@
 
-require_relative '../../lib/cascading-configuration-hash.rb'
+require_relative '../../../../../lib/cascading-configuration-hash.rb'
 
-describe CascadingConfiguration::LocalConfigurationHash do
+describe CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash do
 
   #########
   #  []=  #
   #########
 
   it 'can add elements' do
-    hash_instance = ::CascadingConfiguration::LocalConfigurationHash.new
+    hash_instance = ::CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash.new
     hash_instance[ :some_setting ] = :some_value
     hash_instance.should == { :some_setting => :some_value }
     hash_instance.exclude_array.include?( :some_setting ).should == false
@@ -23,7 +23,7 @@ describe CascadingConfiguration::LocalConfigurationHash do
   ###########
   
   it 'can add elements' do
-    hash_instance = ::CascadingConfiguration::LocalConfigurationHash.new
+    hash_instance = ::CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash.new
     hash_instance.store( :some_setting, :some_value )
     hash_instance.should == { :some_setting => :some_value }
     hash_instance.exclude_array.include?( :some_setting ).should == false
@@ -38,7 +38,7 @@ describe CascadingConfiguration::LocalConfigurationHash do
   ############
   
   it 'can exclude elements' do
-    hash_instance = ::CascadingConfiguration::LocalConfigurationHash.new
+    hash_instance = ::CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash.new
     hash_instance[ :some_setting ] = :some_value
     hash_instance.delete( :some_setting ).should == :some_value
     hash_instance.should == {}
@@ -50,7 +50,7 @@ describe CascadingConfiguration::LocalConfigurationHash do
   ############
   
   it 'can merge from another hash' do
-    hash_instance = ::CascadingConfiguration::LocalConfigurationHash.new
+    hash_instance = ::CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash.new
     hash_instance.merge!( { :some_setting => :some_value } )
     hash_instance.should == { :some_setting => :some_value }
   end
@@ -60,7 +60,7 @@ describe CascadingConfiguration::LocalConfigurationHash do
   #############
   
   it 'can replace existing elements with others' do
-    hash_instance = ::CascadingConfiguration::LocalConfigurationHash.new
+    hash_instance = ::CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash.new
     hash_instance.merge!( { :some_setting => :some_value } )
     hash_instance.should == { :some_setting => :some_value }
     hash_instance.replace( { :other_setting => :some_value } )
@@ -74,7 +74,7 @@ describe CascadingConfiguration::LocalConfigurationHash do
   ###########
   
   it 'can shift the first element' do
-    hash_instance = ::CascadingConfiguration::LocalConfigurationHash.new
+    hash_instance = ::CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash.new
     hash_instance.merge!( { :some_setting => :some_value } )
     hash_instance.shift.should == [ :some_setting, :some_value ]
     hash_instance.should == {}
@@ -85,7 +85,7 @@ describe CascadingConfiguration::LocalConfigurationHash do
   ###########
 
   it 'can clear, causing present elements to be excluded' do
-    hash_instance = ::CascadingConfiguration::LocalConfigurationHash.new
+    hash_instance = ::CascadingConfiguration::Hash::CompositingHash::LocalConfigurationHash.new
     hash_instance.merge!( { :some_setting => :some_value } )
     hash_instance.clear
     hash_instance.should == {}