cascading-configuration-hash 1.1.2 → 1.1.3

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

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

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

@@ -18,5 +18,19 @@ module CascadingConfiguration::Hash::ModuleInstance
       include CascadingConfiguration::Hash
     end
   end
+
+  ##############
+  #  extended  #
+  ##############
+  
+  def extended( class_or_module )
+		super if method_defined?( :super )
+		# CascadingConfiguration::Hash
+    module_self = self
+    class_or_module.instance_eval do
+      # cascade CascadingConfiguration::Hash
+      include CascadingConfiguration::Hash
+    end
+  end
   
 end

data/spec/CascadingConfiguration/Hash_spec.rb

@@ -123,6 +123,21 @@ describe CascadingConfiguration::Hash do
       self.some_hash.replace( { :one => 1, :two => 2 } )
       self.some_hash.should == { :one => 0, :two => 0 }
     end
+
+    # test two
+    
+    module CascadingConfiguration::Hash::MockModuleExtended
+      include CascadingConfiguration::Hash
+      attr_configuration_hash :configuration_setting
+      configuration_setting.should == {}
+      configuration_setting[ :a_configuration ] = :some_value
+      configuration_setting.should == { :a_configuration => :some_value }
+    end
+
+    class CascadingConfiguration::Hash::MockClassExtended
+      extend CascadingConfiguration::Hash::MockModuleExtended
+      configuration_setting.should == { :a_configuration => :some_value }
+    end
     
   end
   

metadata

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