cascading-configuration-hash 1.1.1 → 1.1.2

data/lib/cascading-configuration-hash.rb

@@ -27,7 +27,6 @@ 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/CompositingHash/_private_/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'

data/lib/cascading-configuration-hash/CascadingConfiguration/CompositingHash/Instance.rb

@@ -18,18 +18,20 @@ module CascadingConfiguration::CompositingHash::Instance
   #  composite_hash_for_cascading_configuration  #
   ################################################
 
-  def composite_hash_for_cascading_configuration( configuration_name )
+  def composite_hash_for_cascading_configuration( cascading_name )
     
-    # initialize composite hash if necessary or acquire it from object
-    composite_hash_variable = composite_hash_variable_name( configuration_name )
     composite_hash = nil
-    if instance_variable_defined?( composite_hash_variable )
-      composite_hash = instance_variable_get( composite_hash_variable )
-    else
-      composite_hash = ::CascadingConfiguration::CompositingHash.new( configuration_name, self )
-      instance_variable_set( composite_hash_variable, composite_hash )
-    end
-    
+
+		klass = ( is_a?( Module ) ? self : self.class )
+		accessor_support_module = klass::AccessorSupportModule
+		self_instance = self
+		accessor_support_module.instance_eval do
+			unless composite_hash = ( ( @composite_hashes ||= Hash.new )[ cascading_name ] ||= Hash.new )[ self_instance ]
+	      composite_hash = ::CascadingConfiguration::CompositingHash.new( cascading_name, self_instance )
+				@composite_hashes[ cascading_name ][ self_instance ] = composite_hash
+			end
+		end
+
     return composite_hash
     
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 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-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,6 @@ extra_rdoc_files: []
 files: 
 - lib/cascading-configuration-hash/CascadingConfiguration/_private_/CompositingHash.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/_private_/LocalConfigurationHash.rb
-- lib/cascading-configuration-hash/CascadingConfiguration/CompositingHash/_private_/Instance.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/CompositingHash/Instance.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/CompositingHash.rb
 - lib/cascading-configuration-hash/CascadingConfiguration/Hash/Accessors.rb
@@ -52,8 +51,8 @@ files:
 - lib/cascading-configuration-hash.rb
 - spec/CascadingConfiguration/CascadingCompositeHash_spec.rb
 - spec/CascadingConfiguration/ConfigurationHash_spec.rb
-- spec/CascadingConfiguration/ConfigurationSettingsHash/Accessors_spec.rb
-- spec/CascadingConfiguration/ConfigurationSettingsHash_spec.rb
+- spec/CascadingConfiguration/Hash/Accessors_spec.rb
+- spec/CascadingConfiguration/Hash_spec.rb
 - README.md
 - README.rdoc
 has_rdoc: true

data/lib/cascading-configuration-hash/CascadingConfiguration/CompositingHash/_private_/Instance.rb

@@ -1,17 +0,0 @@
-
-module CascadingConfiguration::CompositingHash::Instance
-
-  ###########################################################################################################
-      private ###############################################################################################
-  ###########################################################################################################
-
-  ##################################
-  #  composite_hash_variable_name  #
-  ##################################
-  
-  def composite_hash_variable_name( configuration_name )
-		klass = ( is_a?( Module ) ? self : self.class )
-    return ( klass::AccessorSupportModule.cascading_variable_name( configuration_name ).to_s + '__' + 'composite_hash' ).to_sym
-  end
-
-end