cascading-configuration-setting 1.1.1 → 1.1.3

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

@@ -3,6 +3,8 @@ module CascadingConfiguration::Setting
 
 	extend  CascadingConfiguration::InternalModuleStub
 
+  include CascadingConfiguration::Variable
+
   ###################
   #  self.included  #
   ###################
@@ -10,15 +12,11 @@ module CascadingConfiguration::Setting
   def self.included( class_or_module )
 		module_self = self
     class_or_module.instance_eval do
-      include CascadingConfiguration::Variable
       extend  module_self
-      include module_self::ObjectInstance
       extend  module_self::ClassInstance
       extend  module_self::Accessors
 			# module support
-      unless is_a?( Class )
-        extend CascadingConfiguration::Setting::ModuleInstance
-      end
+      extend CascadingConfiguration::Setting::ModuleInstance unless is_a?( Class )
     end
   end
 

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

@@ -12,11 +12,25 @@ module CascadingConfiguration::Setting::ModuleInstance
 		# CascadingConfiguration::Setting
     module_self = self
     class_or_module.instance_eval do
-			# whichever module included CascadingConfiguration::Setting
+			# whichever module included CascadingConfiguration::Setting, which is now being included
       extend  module_self
       # cascade CascadingConfiguration::Setting
       include CascadingConfiguration::Setting
     end
   end
+
+  ##############
+  #  extended  #
+  ##############
+
+	def extended( class_or_module )
+		super if method_defined?( :super )
+		# CascadingConfiguration::Setting
+    module_self = self
+    class_or_module.instance_eval do
+      # cascade CascadingConfiguration::Setting
+      include CascadingConfiguration::Setting
+    end
+	end
   
 end

data/spec/CascadingConfiguration/Setting_spec.rb

@@ -39,5 +39,20 @@ describe CascadingConfiguration::Setting do
       some_other_configuration.should == :a_third_setting_value
     end
   end
-    
+
+  # test two
+  
+  module CascadingConfiguration::Setting::MockModuleExtended
+    include CascadingConfiguration::Setting
+    attr_configuration :some_other_configuration
+    self.some_other_configuration = :our_setting_value
+    some_other_configuration.should == :our_setting_value
+  end
+  
+  class CascadingConfiguration::Setting::MockClassExtended
+    extend CascadingConfiguration::Setting::MockModuleExtended
+    self.some_other_configuration = :our_setting_value
+    some_other_configuration.should == :our_setting_value
+  end
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Asher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 -04:00
+date: 2011-07-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency