cascading-configuration-hash 1.4.0 → 1.4.1

data/lib/cascading-configuration-hash.rb

@@ -16,6 +16,8 @@ module CascadingConfiguration
     module AccessorDefinitionMethods
     end
     module Interface
+      module Instance
+      end
     end
     module ObjectInstance
     end
@@ -30,3 +32,4 @@ require_relative 'cascading-configuration-hash/CascadingConfiguration/_private_/
 require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash.rb'
 require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/AccessorDefinitionMethods.rb'
 require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/Interface.rb'
+require_relative 'cascading-configuration-hash/CascadingConfiguration/Hash/Interface/Instance.rb'

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

@@ -15,6 +15,8 @@ module CascadingConfiguration::Hash
     class_or_module.extend_also_extends( CascadingConfiguration::Variable::EigenclassConfigurationChain )
   end
 
+  include_cascades_extends( CascadingConfiguration::Hash::Interface::Instance )
+
   include_cascades_extends( CascadingConfiguration::Hash )
   
   prepend_module_include do |class_or_module|

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

@@ -98,7 +98,7 @@ module CascadingConfiguration::Hash::AccessorDefinitionMethods
   
   def define_instance_configuration_hash_setter( configuration_name )
     configuration_setter_name = ( configuration_name.to_s + '=' ).to_sym
-    accessor_local_instance_support.module_eval do 
+    accessor_instance_support.module_eval do 
 	    define_method( configuration_setter_name ) do |hash|
 	      # we want the hash to supplant existing config
 	      return composite_hash_for_cascading_configuration( configuration_name ).replace( hash )
@@ -106,11 +106,38 @@ module CascadingConfiguration::Hash::AccessorDefinitionMethods
     end
   end
 
-  ############################################
+  ###############################################
   #  define_instance_configuration_hash_getter  #
-  ############################################
+  ###############################################
   
   def define_instance_configuration_hash_getter( configuration_name )
+    configuration_getter_name = configuration_name
+    accessor_instance_support.module_eval do 
+	    define_method( configuration_getter_name ) do
+	      return composite_hash_for_cascading_configuration( 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
+    accessor_local_instance_support.module_eval do 
+	    define_method( configuration_setter_name ) do |hash|
+	      # we want the hash to supplant existing config
+	      return composite_hash_for_cascading_configuration( 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
     accessor_local_instance_support.module_eval do 
 	    define_method( configuration_getter_name ) do

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

@@ -68,22 +68,22 @@ module CascadingConfiguration::Hash::Interface
 
   end
 
-  ######################################
-  #  attr_instance_configuration_hash  #
-  ######################################
+  ####################################
+  #  attr_object_configuration_hash  #
+  ####################################
 
 	# defines configuration in present class or module context
 	# configuration does not cascade
-  def attr_instance_configuration_hash( *property_names, & compositing_block )
+  def attr_object_configuration_hash( *property_names, & compositing_block )
 
 		CascadingConfiguration::Variable.define_accessor_local_instance_support( self )
 
     property_names.each do |this_property_name|
 			accessor_module_support.set_compositing_proc( this_property_name, compositing_block ) if block_given?
       # define configuration setter
-      define_instance_configuration_hash_setter( this_property_name )
+      define_object_configuration_hash_setter( this_property_name )
       # define configuration getter
-      define_instance_configuration_hash_getter( this_property_name )
+      define_object_configuration_hash_getter( this_property_name )
     end
     
     return self

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

@@ -0,0 +1,26 @@
+
+module CascadingConfiguration::Hash::Interface::Instance
+
+	extend  CascadingConfiguration::InternalModuleStub
+
+  ######################################
+  #  attr_instance_configuration_hash  #
+  ######################################
+
+	# defines configuration in present class or module context
+	# configuration does not cascade
+  def attr_instance_configuration_hash( *property_names, & compositing_block )
+
+    property_names.each do |this_property_name|
+			accessor_module_support.set_compositing_proc( this_property_name, compositing_block ) if block_given?
+      # define configuration setter
+      define_instance_configuration_hash_setter( this_property_name )
+      # define configuration getter
+      define_instance_configuration_hash_getter( this_property_name )
+    end
+    
+    return self
+
+  end
+
+end

data/spec/CascadingConfiguration/Hash_spec.rb

@@ -383,7 +383,7 @@ describe CascadingConfiguration::Hash do
     end
 
     object_instance_one = CascadingConfiguration::Hash::ClassConfigurationMockClass.new
-    object_instance_one.respond_to?( :a_configuration ).should == false
+    object_instance_one.respond_to?( :configuration_setting ).should == false
     object_instance_one.instance_variables.empty?.should == true
     
     class CascadingConfiguration::Hash::ClassConfigurationMockClassSub1 < CascadingConfiguration::Hash::ClassConfigurationMockClass
@@ -397,7 +397,7 @@ describe CascadingConfiguration::Hash do
     end
 
     object_instance_two = CascadingConfiguration::Hash::ClassConfigurationMockClassSub1.new
-    object_instance_two.respond_to?( :a_configuration ).should == false
+    object_instance_two.respond_to?( :configuration_setting ).should == false
 
     # change ancestor setting
     CascadingConfiguration::Hash::ClassConfigurationMockClass.configuration_setting[ :a_yet_unused_configuration ] = :some_value
@@ -561,7 +561,7 @@ describe CascadingConfiguration::Hash do
     end
 
     object_instance_one = CascadingConfiguration::Hash::LocalConfigurationMockClass.new
-    object_instance_one.respond_to?( :a_configuration ).should == false
+    object_instance_one.respond_to?( :configuration_setting ).should == true
     object_instance_one.instance_variables.empty?.should == true
     
     class CascadingConfiguration::Hash::LocalConfigurationMockClassSub1 < CascadingConfiguration::Hash::LocalConfigurationMockClass
@@ -571,12 +571,11 @@ describe CascadingConfiguration::Hash do
     end
 
     object_instance_two = CascadingConfiguration::Hash::LocalConfigurationMockClassSub1.new
-    object_instance_two.respond_to?( :a_configuration ).should == false
+    object_instance_two.respond_to?( :configuration_setting ).should == true
     object_instance_two.instance_variables.empty?.should == true
 
   end
   
-  
   ######################################
   #  attr_instance_configuration_hash  #
   ######################################
@@ -598,12 +597,7 @@ describe CascadingConfiguration::Hash do
     module CascadingConfiguration::Hash::InstanceConfigurationMockModuleExtended
       extend CascadingConfiguration::Hash
       # => singleton gets attr_configuration and configurations
-      respond_to?( :attr_instance_configuration_hash ).should == true
-      attr_instance_configuration_hash :configuration_setting
-      respond_to?( :configuration_setting ).should == true
-      configuration_setting.should == {}
-      self.configuration_setting[ :a_configuration ] = :some_value
-      configuration_setting.should == { :a_configuration => :some_value }
+      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
@@ -641,6 +635,134 @@ describe CascadingConfiguration::Hash do
       # => singleton gets attr_configuration and configurations
       respond_to?( :attr_instance_configuration_hash ).should == true
       attr_instance_configuration_hash :configuration_setting
+      respond_to?( :configuration_setting ).should == false
+      instance_methods.include?( :configuration_setting ).should == true
+      instance_variables.empty?.should == true
+      # => including modules and classes get attr_configuration and configurations
+      module SubmoduleIncluding
+        include CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded
+        instance_methods.include?( :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
+      module SubmoduleExtending
+        extend CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded
+        # if we're extended then we want to use the eigenclass ancestor chain
+        # - the first ancestor will be the extending module
+        # - the rest of the ancestors will be the extending module's include chain
+        instance_methods.include?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
+        instance_variables.empty?.should == true
+      end
+      # => instances of including classes get configurations
+      class ClassIncluding
+        include CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded
+        instance_methods.include?( :configuration_setting ).should == true
+        respond_to?( :configuration_setting ).should == false
+        instance_variables.empty?.should == true
+      end
+      setting_class_including_instance = ClassIncluding.new
+      setting_class_including_instance.respond_to?( :configuration_setting ).should == true
+      setting_class_including_instance.instance_variables.empty?.should == true
+      class ClassExtending
+        extend CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded
+        instance_methods.include?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == true
+        instance_variables.empty?.should == true
+      end
+      setting_class_including_instance = ClassExtending.new
+      setting_class_including_instance.respond_to?( :configuration_setting ).should == false
+      setting_class_including_instance.instance_variables.empty?.should == true
+    end
+
+    class CascadingConfiguration::Hash::InstanceConfigurationMockClass
+      include CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded::SubmoduleIncluding
+      instance_methods.include?( :configuration_setting ).should == true
+      respond_to?( :configuration_setting ).should == false
+      instance_variables.empty?.should == true
+    end
+
+    object_instance_one = CascadingConfiguration::Hash::InstanceConfigurationMockClass.new
+    object_instance_one.respond_to?( :configuration_setting ).should == true
+    object_instance_one.instance_variables.empty?.should == true
+    
+    class CascadingConfiguration::Hash::InstanceConfigurationMockClassSub1 < CascadingConfiguration::Hash::InstanceConfigurationMockClass
+      instance_methods.include?( :configuration_setting ).should == true
+      respond_to?( :configuration_setting ).should == false
+      instance_variables.empty?.should == true
+    end
+
+    object_instance_two = CascadingConfiguration::Hash::InstanceConfigurationMockClassSub1.new
+    object_instance_two.respond_to?( :configuration_setting ).should == true
+    object_instance_two.instance_variables.empty?.should == true
+
+  end
+  
+  ####################################
+  #  attr_object_configuration_hash  #
+  ####################################
+  
+  it 'can define a local configuration hash, which will not cascade' do
+
+    # possibilities:
+    # * module extended with setting
+    # => singleton gets attr_configuration and configurations
+    # => including modules and classes get nothing
+    # => extending modules and classes get nothing
+    # => instances of including and extending classes get nothing
+    # * module included with setting
+    # => singleton gets attr_configuration and configurations
+    # => including modules and classes get attr_configuration and configurations
+    # => instances of including classes get configurations
+    # => extending modules and classes get attr_configuration and configurations
+    # => instances of extending classes get nothing
+    module CascadingConfiguration::Hash::ObjectConfigurationMockModuleExtended
+      extend CascadingConfiguration::Hash
+      # => singleton gets attr_configuration and configurations
+      respond_to?( :attr_object_configuration_hash ).should == true
+      attr_object_configuration_hash :configuration_setting
+      respond_to?( :configuration_setting ).should == true
+      configuration_setting.should == {}
+      self.configuration_setting[ :a_configuration ] = :some_value
+      configuration_setting.should == { :a_configuration => :some_value }
+      instance_methods.include?( :configuration_setting ).should == false
+      instance_variables.empty?.should == true
+      # => including modules and classes get nothing
+      module SubmoduleIncluding
+        include CascadingConfiguration::Hash::ObjectConfigurationMockModuleExtended
+        instance_methods.include?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == false
+        instance_variables.empty?.should == true
+      end
+      # => extending modules and classes get nothing
+      module SubmoduleExtending
+        extend CascadingConfiguration::Hash::ObjectConfigurationMockModuleExtended
+        instance_methods.include?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == false
+        instance_variables.empty?.should == true
+      end
+      # => instances of including and extending classes get nothing
+      class ClassIncluding
+        include CascadingConfiguration::Hash::ObjectConfigurationMockModuleExtended
+        instance_methods.include?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == false
+        instance_variables.empty?.should == true
+      end
+      class ClassExtending
+        extend CascadingConfiguration::Hash::ObjectConfigurationMockModuleExtended
+        instance_methods.include?( :configuration_setting ).should == false
+        respond_to?( :configuration_setting ).should == false
+        instance_variables.empty?.should == true
+      end
+    end
+
+    # * module included with setting
+    module CascadingConfiguration::Hash::ObjectConfigurationMockModuleIncluded
+      include CascadingConfiguration::Hash
+      # => singleton gets attr_configuration and configurations
+      respond_to?( :attr_object_configuration_hash ).should == true
+      attr_object_configuration_hash :configuration_setting
       respond_to?( :configuration_setting ).should == true
       configuration_setting.should == {}
       self.configuration_setting[ :a_configuration ] = :some_value
@@ -649,14 +771,14 @@ describe CascadingConfiguration::Hash do
       instance_variables.empty?.should == true
       # => including modules and classes get attr_configuration and configurations
       module SubmoduleIncluding
-        include CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded
+        include CascadingConfiguration::Hash::ObjectConfigurationMockModuleIncluded
         instance_methods.include?( :configuration_setting ).should == false
         respond_to?( :configuration_setting ).should == false
         instance_variables.empty?.should == true
       end
       # => extending modules and classes get attr_configuration and configurations
       module SubmoduleExtending
-        extend CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded
+        extend CascadingConfiguration::Hash::ObjectConfigurationMockModuleIncluded
         # if we're extended then we want to use the eigenclass ancestor chain
         # - the first ancestor will be the extending module
         # - the rest of the ancestors will be the extending module's include chain
@@ -666,7 +788,7 @@ describe CascadingConfiguration::Hash do
       end
       # => instances of including classes get configurations
       class ClassIncluding
-        include CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded
+        include CascadingConfiguration::Hash::ObjectConfigurationMockModuleIncluded
         instance_methods.include?( :configuration_setting ).should == false
         respond_to?( :configuration_setting ).should == false
         instance_variables.empty?.should == true
@@ -675,7 +797,7 @@ describe CascadingConfiguration::Hash do
       setting_class_including_instance.respond_to?( :configuration_setting ).should == false
       setting_class_including_instance.instance_variables.empty?.should == true
       class ClassExtending
-        extend CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded
+        extend CascadingConfiguration::Hash::ObjectConfigurationMockModuleIncluded
         instance_methods.include?( :configuration_setting ).should == false
         respond_to?( :configuration_setting ).should == false
         instance_variables.empty?.should == true
@@ -685,25 +807,25 @@ describe CascadingConfiguration::Hash do
       setting_class_including_instance.instance_variables.empty?.should == true
     end
 
-    class CascadingConfiguration::Hash::InstanceConfigurationMockClass
-      include CascadingConfiguration::Hash::InstanceConfigurationMockModuleIncluded::SubmoduleIncluding
+    class CascadingConfiguration::Hash::ObjectConfigurationMockClass
+      include CascadingConfiguration::Hash::ObjectConfigurationMockModuleIncluded::SubmoduleIncluding
       instance_methods.include?( :configuration_setting ).should == false
       respond_to?( :configuration_setting ).should == false
       instance_variables.empty?.should == true
     end
 
-    object_instance_one = CascadingConfiguration::Hash::InstanceConfigurationMockClass.new
-    object_instance_one.respond_to?( :a_configuration ).should == false
+    object_instance_one = CascadingConfiguration::Hash::ObjectConfigurationMockClass.new
+    object_instance_one.respond_to?( :configuration_setting ).should == false
     object_instance_one.instance_variables.empty?.should == true
     
-    class CascadingConfiguration::Hash::InstanceConfigurationMockClassSub1 < CascadingConfiguration::Hash::InstanceConfigurationMockClass
+    class CascadingConfiguration::Hash::ObjectConfigurationMockClassSub1 < CascadingConfiguration::Hash::ObjectConfigurationMockClass
       instance_methods.include?( :configuration_setting ).should == false
       respond_to?( :configuration_setting ).should == false
       instance_variables.empty?.should == true
     end
 
-    object_instance_two = CascadingConfiguration::Hash::InstanceConfigurationMockClassSub1.new
-    object_instance_two.respond_to?( :a_configuration ).should == false
+    object_instance_two = CascadingConfiguration::Hash::ObjectConfigurationMockClassSub1.new
+    object_instance_two.respond_to?( :configuration_setting ).should == false
     object_instance_two.instance_variables.empty?.should == true
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Asher
@@ -57,6 +57,7 @@ files:
 - lib/cascading-configuration-hash/CascadingConfiguration/CompositingHash/Instance.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/CompositingHash.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/Hash/AccessorDefinitionMethods.rb
+- lib/cascading-configuration-hash/CascadingConfiguration/Hash/Interface/Instance.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/Hash/Interface.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/Hash.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/LocalConfigurationHash.rb