cascading-configuration-setting 1.1.0 → 1.1.1

data/lib/cascading-configuration-setting/CascadingConfiguration/Setting.rb

@@ -12,9 +12,9 @@ module CascadingConfiguration::Setting
     class_or_module.instance_eval do
       include CascadingConfiguration::Variable
       extend  module_self
-      include CascadingConfiguration::Setting::ObjectInstance
-      extend  CascadingConfiguration::Setting::ClassInstance
-      extend  CascadingConfiguration::Setting::Accessors
+      include module_self::ObjectInstance
+      extend  module_self::ClassInstance
+      extend  module_self::Accessors
 			# module support
       unless is_a?( Class )
         extend CascadingConfiguration::Setting::ModuleInstance
@@ -22,14 +22,6 @@ module CascadingConfiguration::Setting
     end
   end
 
-  #########################
-  #  ancestors_to_Object  #
-  #########################
-
-  def ancestors_to_Object
-    return ancestors_to_class_or_module_interpolating_module_branches( Object, CascadingConfiguration::Setting::ModuleInstance )
-  end
-
   ########################################
   #  get_configuration_searching_upward  #
   ########################################
@@ -38,7 +30,8 @@ module CascadingConfiguration::Setting
 
     configuration = nil
 
-    configuration_variable = cascading_variable_name( configuration_name )
+		klass = ( is_a?( Module ) ? self : self.class )
+    configuration_variable = klass::AccessorSupportModule.cascading_variable_name( configuration_name )
 
     ancestors_to_Object.each do |this_ancestor|
       if this_ancestor.instance_variable_defined?( configuration_variable )

data/lib/cascading-configuration-setting/CascadingConfiguration/Setting/Accessors.rb

@@ -3,32 +3,17 @@ module CascadingConfiguration::Setting::Accessors
 	
 	extend  CascadingConfiguration::InternalModuleStub
 	
-	###################
-	#  self.extended  #
-	###################
-	
-	def self.extended( class_or_module )
-		class_or_module.instance_eval do
-      # accessor support in module to permit method overriding with super
-			unless const_defined?( :AccessorSupportModule )
-				accessor_support_module = Module.new { extend  CascadingConfiguration::InternalModuleStub }
-				const_set( :AccessorSupportModule, accessor_support_module )
-				include class_or_module::AccessorSupportModule
-				extend  class_or_module::AccessorSupportModule
-			end
-		end
-	end
-	
   #############################
   #  define_cascading_setter  #
   #############################
   
   def define_cascading_setter( configuration_name )
     configuration_setter_name = ( configuration_name.to_s + '=' ).to_s
-    self::AccessorSupportModule.module_eval do 
+		accessor_support_module = self::AccessorSupportModule
+    accessor_support_module.module_eval do 
 			define_method( configuration_setter_name ) do |value|
 	      # configuration setter returns setting variable (variable from self), which is now the ID of value
-	      return instance_variable_set( cascading_variable_name( configuration_name ), value )
+	      return instance_variable_set( accessor_support_module.cascading_variable_name( configuration_name ), value )
 	    end
 		end
   end

data/lib/cascading-configuration-setting/CascadingConfiguration/Setting/ModuleInstance.rb

@@ -2,22 +2,21 @@
 module CascadingConfiguration::Setting::ModuleInstance
   
 	extend  CascadingConfiguration::InternalModuleStub
-
+	
   ##############
   #  included  #
   ##############
   
   def included( class_or_module )
 		super if method_defined?( :super )
+		# CascadingConfiguration::Setting
     module_self = self
     class_or_module.instance_eval do
-      include CascadingConfiguration::Setting
-      # when we extend a module (which has happened if we got here)
-      # then we need to make sure when the module we are extending is included
-      # * CascadingConfiguration is included
-      # * the module we extended is used to extend the class/module that included
+			# whichever module included CascadingConfiguration::Setting
       extend  module_self
+      # cascade CascadingConfiguration::Setting
+      include CascadingConfiguration::Setting
     end
   end
   
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Asher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-14 00:00:00 -04:00
+date: 2011-07-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,8 +44,8 @@ files:
 - lib/cascading-configuration-setting/CascadingConfiguration/Setting/ModuleInstance.rb
 - lib/cascading-configuration-setting/CascadingConfiguration/Setting.rb
 - lib/cascading-configuration-setting.rb
-- spec/CascadingConfiguration/ConfigurationSetting/Accessors_spec.rb
-- spec/CascadingConfiguration/ConfigurationSetting_spec.rb
+- spec/CascadingConfiguration/Setting/Accessors_spec.rb
+- spec/CascadingConfiguration/Setting_spec.rb
 - README.md
 - README.rdoc
 has_rdoc: true