cascading_configuration 1.0.0 → 1.0.1

data/README.md

@@ -108,7 +108,7 @@ Whether Hashes or Arrays, the idea is the same. We call the Compositing Objects.
 2. The compositing object is initialized (separately) for its immediate parent object.
 3. Whenever an update occurs, the compositing object updates its registered child object with the update.
 
-This way the lower objects are kept in sync with parent elements. Overriding hooked methods (provided by HookedArray from the hooked-array gem) provides a great deal of flexible functionality, permitting elements to be transformed as they are passed down the ancestor hierarchy.
+This way the lower objects are kept in sync with parent elements. Overriding hooked methods (provided by Array::Hooked from the array-hooked gem) provides a great deal of flexible functionality, permitting elements to be transformed as they are passed down the ancestor hierarchy.
 
 Right now there are 5 types of Compositing Objects:
 

data/lib/cascading_configuration/array/sorted/unique.rb

@@ -97,7 +97,7 @@ module ::CascadingConfiguration::Array::Sorted::Unique
 
   sorted_unique_array_module = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::
                                  CompositingObjects.new( :sorted_unique_array, 
-                                                         ::CompositingArray::Sorted::Unique, 
+                                                         ::Array::Sorted::Unique::Compositing, 
                                                          :default, 
                                                          :unique_sorted_array,
                                                          :configuration_sorted_unique_array,

data/lib/cascading_configuration/array/sorted.rb

@@ -97,7 +97,7 @@ module ::CascadingConfiguration::Array::Sorted
 
   sorted_array_module = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::
                           CompositingObjects.new( :sorted_array, 
-                                                  ::CompositingArray::Sorted, 
+                                                  ::Array::Sorted::Compositing, 
                                                   :default, 
                                                   :configuration_sorted_array )
   

data/lib/cascading_configuration/array/unique.rb

@@ -97,7 +97,7 @@ module ::CascadingConfiguration::Array::Unique
 
   unique_array_module = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::
                           CompositingObjects.new( :unique_array, 
-                                                  ::CompositingArray::Unique, 
+                                                  ::Array::Unique::Compositing, 
                                                   :default, 
                                                   :configuration_unique_array )
   

data/lib/cascading_configuration/array.rb

@@ -96,7 +96,7 @@ module ::CascadingConfiguration::Array
   #
 
   array_module = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::
-                   CompositingObjects.new( :array, ::CompositingArray, :default, :configuration_array )
+                   CompositingObjects.new( :array, ::Array::Compositing, :default, :configuration_array )
   
   ::CascadingConfiguration::Core.enable( self, array_module )
 

data/lib/cascading_configuration/core/encapsulation.rb

@@ -149,7 +149,7 @@ class ::CascadingConfiguration::Core::Encapsulation < ::Module
   def register_child_for_parent( child, parent )
 
     super
-    
+
     # Modules already have configurations and if parent already has configurations 
     unless parent.is_a?( ::Module ) or has_parents?( parent )
       register_child_for_parent( parent, parent.class )

data/lib/cascading_configuration/core/instance_controller/support_module.rb

@@ -21,8 +21,8 @@ class ::CascadingConfiguration::Core::InstanceController::SupportModule < ::Modu
     @encapsulation = encapsulation
     @module_type_name = module_type_name
 
-    @included = ::UniqueArray.new( self )
-    @extended = ::UniqueArray.new( self )
+    @included = ::Array::Unique.new( self )
+    @extended = ::Array::Unique.new( self )
 
     # include modules like ourselves above us
     existing_super_modules = super_modules

data/lib/cascading_configuration/core/instance_controller.rb

@@ -103,8 +103,8 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
     # We also support arbitrary additional encapsulations.
     @encapsulations = { }
     
-    @cascade_includes = ::UniqueArray.new( self )
-    @cascade_extends = ::UniqueArray.new( self )
+    @cascade_includes = ::Array::Unique.new( self )
+    @cascade_extends = ::Array::Unique.new( self )
     
     @support_modules = { }
     
@@ -119,7 +119,7 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
   def initialize_inheriting_instance( parent_instance, instance, for_subclass = false, is_extending = false )
 
     super
-    
+
     initialize_encapsulation_for_inheriting_instance( @default_encapsulation, parent_instance, instance )
     @encapsulations.each do |this_encapsulation_name, this_encapsulation|
       initialize_encapsulations_for_inheriting_instance( this_encapsulation, parent_instance, instance )
@@ -135,8 +135,13 @@ class ::CascadingConfiguration::Core::InstanceController < ::Module
       unless @cascade_includes.empty?
         if is_extending
           @cascade_includes.each do |this_include|
-            unless instance.ancestors.include?( this_include )
-              include.extend( this_include )
+            case instance
+              when ::Module
+                unless instance.ancestors.include?( this_include )
+                  instance.extend( this_include )
+                end
+              else
+                instance.extend( this_include )
             end
           end
         elsif instance.is_a?( ::Module )

data/lib/cascading_configuration/core.rb

@@ -14,9 +14,10 @@ module ::CascadingConfiguration::Core
     # Enable module instance so that when included it creates instance support
     instance.extend( ::CascadingConfiguration::Core::EnableInstanceSupport )
 
-    instance.extend( ::ModuleCluster )
+    instance.extend( ::Module::Cluster )
 
-    instance.include_or_extend_also_extends( instance::ClassInstance )
+    instance.cluster( :cascading_configuration ).after_include.extend( instance::ClassInstance )
+    instance.cluster( :cascading_configuration ).after_extend.extend( instance::ClassInstance )
     
   end
   

data/lib/cascading_configuration/hash.rb

@@ -96,7 +96,7 @@ module ::CascadingConfiguration::Hash
   #
 
   hash_module = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::
-                  CompositingObjects.new( :hash, ::CompositingHash, :default, :configuration_hash )
+                  CompositingObjects.new( :hash, ::Hash::Compositing, :default, :configuration_hash )
   
   ::CascadingConfiguration::Core.enable( self, hash_module )
 

data/lib/cascading_configuration.rb

@@ -1,4 +1,6 @@
 
+begin ; require 'development' ; rescue ::LoadError ; end
+
 # namespaces that have to be declared ahead of time for proper load order
 require_relative './namespaces'
 

data/lib/requires.rb

@@ -1,10 +1,10 @@
-require 'to_camel_case'
-require 'accessor-utilities'
-require 'parallel-ancestry'
-require 'compositing-hash'
-require 'compositing-array-sorted-unique'
+begin ; require 'development' ; rescue ::LoadError ; end
 
-#require_relative '../../compositing_objects/compositing-hash/lib/compositing-hash.rb'
+require 'to_camel_case'
+require 'accessor_utilities'
+require 'parallel_ancestry'
+require 'hash'
+require 'array'
 
 basepath = 'cascading_configuration'
 

data/spec/cascading_configuration/core/instance_controller_spec.rb

@@ -132,79 +132,87 @@ describe ::CascadingConfiguration::Core::InstanceController do
       InstanceController = ::CascadingConfiguration::Core::InstanceController.new( ForInstance )
 
       # should_include
-      ModuleInstance_Include = InstanceController.create_support( :some_type1, Encapsulation, nil, true, false, false, false )
-      InstanceController.support( :some_type1 ).should == ModuleInstance_Include
+      ModuleInstance_Include = InstanceController.create_support( :include, Encapsulation, nil, true, false, false, false )
+      InstanceController.support( :include ).should == ModuleInstance_Include
       ForInstance.ancestors.include?( ModuleInstance_Include ).should == true
       ForInstance.is_a?( ModuleInstance_Include ).should == false
       InstanceController.cascade_includes.include?( ModuleInstance_Include ).should == false
       InstanceController.cascade_extends.include?( ModuleInstance_Include ).should == false
       
       # should_extend
-      ModuleInstance_Extend = InstanceController.create_support( :some_type2, Encapsulation, false, nil, true, false, false )
-      InstanceController.support( :some_type2 ).should == ModuleInstance_Extend
+      ModuleInstance_Extend = InstanceController.create_support( :extend, Encapsulation, false, nil, true, false, false )
+      InstanceController.support( :extend ).should == ModuleInstance_Extend
       ForInstance.ancestors.include?( ModuleInstance_Extend ).should == false
       ForInstance.is_a?( ModuleInstance_Extend ).should == true
       InstanceController.cascade_includes.include?( ModuleInstance_Extend ).should == false
       InstanceController.cascade_extends.include?( ModuleInstance_Extend ).should == false
       
       # should_cascade_includes
-      ModuleInstance_CascadeIncludes = InstanceController.create_support( :some_type3, Encapsulation, false, nil, false, true, false )
-      InstanceController.support( :some_type3 ).should == ModuleInstance_CascadeIncludes
+      ModuleInstance_CascadeIncludes = InstanceController.create_support( :cascade_includes, Encapsulation, false, nil, false, true, false )
+      InstanceController.support( :cascade_includes ).should == ModuleInstance_CascadeIncludes
       ForInstance.ancestors.include?( ModuleInstance_CascadeIncludes ).should == false
       ForInstance.is_a?( ModuleInstance_CascadeIncludes ).should == false
       InstanceController.cascade_includes.include?( ModuleInstance_CascadeIncludes ).should == true
       InstanceController.cascade_extends.include?( ModuleInstance_CascadeIncludes ).should == false
       
       # should_cascade_extends
-      ModuleInstance_CascadeExtends = InstanceController.create_support( :some_type4, Encapsulation, nil, false, false, false, true )
-      InstanceController.support( :some_type4 ).should == ModuleInstance_CascadeExtends
+      ModuleInstance_CascadeExtends = InstanceController.create_support( :cascade_extends, Encapsulation, nil, false, false, false, true )
+      InstanceController.support( :cascade_extends ).should == ModuleInstance_CascadeExtends
       ForInstance.ancestors.include?( ModuleInstance_CascadeExtends ).should == false
       ForInstance.is_a?( ModuleInstance_CascadeExtends ).should == false
       InstanceController.cascade_includes.include?( ModuleInstance_CascadeExtends ).should == false
       InstanceController.cascade_extends.include?( ModuleInstance_CascadeExtends ).should == true
       
-      AnotherModule_IncludeA = ::Module.new do
+      AnotherModule_IncludeA = ::Module.new
+      AnotherModule_IncludeA.instance_eval do
         include ForInstance
         ancestors.include?( ModuleInstance_CascadeIncludes ).should == true
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == true
       end
-      AnotherModule_IncludeB = ::Module.new do
+      AnotherModule_IncludeB = ::Module.new
+      AnotherModule_IncludeB.instance_eval do
         include AnotherModule_IncludeA
         ancestors.include?( ModuleInstance_CascadeIncludes ).should == true
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == true
       end
-      AnotherModule_IncludeC = ::Module.new do
+      AnotherModule_IncludeC = ::Module.new
+      AnotherModule_IncludeC.instance_eval do
         include AnotherModule_IncludeB
         ancestors.include?( ModuleInstance_CascadeIncludes ).should == true
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == true
       end
-      AnotherModule_ClassInclude = ::Class.new do
+      AnotherModule_ClassInclude = ::Class.new
+      AnotherModule_ClassInclude.instance_eval do
         include AnotherModule_IncludeC
         ancestors.include?( ModuleInstance_CascadeIncludes ).should == true
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == true
       end
 
-      AnotherModule_ExtendA = ::Module.new do
+      AnotherModule_ExtendA = ::Module.new
+      AnotherModule_ExtendA.instance_eval do
         extend ForInstance
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == false
         eigenclass.ancestors.include?( ModuleInstance_CascadeIncludes ).should == true
       end
-      AnotherModule_ExtendB = ::Module.new do
+      AnotherModule_ExtendB = ::Module.new
+      AnotherModule_ExtendB.instance_eval do
         extend AnotherModule_ExtendA
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == false
       end
-      AnotherModule_ExtendC = ::Module.new do
+      AnotherModule_ExtendC = ::Module.new
+      AnotherModule_ExtendC.instance_eval do
         extend AnotherModule_ExtendB
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == false
       end
-      AnotherModule_ClassExtend = ::Class.new do
+      AnotherModule_ClassExtend = ::Class.new
+      AnotherModule_ClassExtend.instance_eval do
         extend AnotherModule_ExtendC
         eigenclass = class << self ; self ; end
         eigenclass.ancestors.include?( ModuleInstance_CascadeExtends ).should == false

data/spec/cascading_configuration/core/module/extended_configurations/compositing_objects_spec.rb

@@ -10,14 +10,14 @@ describe ::CascadingConfiguration::Core::Module::ExtendedConfigurations::Composi
   
   it 'can initialize with a compositing object class' do
     module ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects::InitializeMock
-      ClassInstance = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects.new( :setting, ::CompositingArray, :default, '' )
+      ClassInstance = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects.new( :setting, ::Array::Compositing, :default, '' )
       CCM = ::Module.new do
         ::CascadingConfiguration::Core.enable( self, ClassInstance )
       end
       CCM::ClassInstance.default_encapsulation.should == ::CascadingConfiguration::Core::Module::DefaultEncapsulation
       CCM::ClassInstance.ccm_name.should == :setting
       CCM::ClassInstance.ccm_aliases.should == [ '' ]
-      CCM::ClassInstance.compositing_object_class.should == ::CompositingArray
+      CCM::ClassInstance.compositing_object_class.should == ::Array::Compositing
     end
   end
   
@@ -29,7 +29,7 @@ describe ::CascadingConfiguration::Core::Module::ExtendedConfigurations::Composi
   it 'ensures objects are initialized for each level in hiearchy' do
     module ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects::CreateConfigurationMock
 
-      ClassInstance = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects.new( :setting, ::CompositingArray, :default, '' )
+      ClassInstance = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects.new( :setting, ::Array::Compositing, :default, '' )
       CCM = ::Module.new do
         ::CascadingConfiguration::Core.enable( self, ClassInstance )
       end
@@ -41,42 +41,42 @@ describe ::CascadingConfiguration::Core::Module::ExtendedConfigurations::Composi
         include CCM
         attr_setting :some_configuration
       end
-      Encapsulation.get_configuration( Module1, :some_configuration ).is_a?( ::CompositingArray ).should == true
+      Encapsulation.get_configuration( Module1, :some_configuration ).is_a?( ::Array::Compositing ).should == true
     
       # module 2
       Module2 = ::Module.new do
         include Module1
       end
-      Encapsulation.get_configuration( Module2, :some_configuration ).is_a?( ::CompositingArray ).should == true
+      Encapsulation.get_configuration( Module2, :some_configuration ).is_a?( ::Array::Compositing ).should == true
     
       # module 3
       Module3 = ::Module.new do
         include Module2
       end
-      Encapsulation.get_configuration( Module3, :some_configuration ).is_a?( ::CompositingArray ).should == true
+      Encapsulation.get_configuration( Module3, :some_configuration ).is_a?( ::Array::Compositing ).should == true
     
       # class 1
       Class1 = ::Class.new do
         include Module3
       end
-      Encapsulation.get_configuration( Class1, :some_configuration ).is_a?( ::CompositingArray ).should == true
+      Encapsulation.get_configuration( Class1, :some_configuration ).is_a?( ::Array::Compositing ).should == true
     
       # subclass 1
       Class2 = ::Class.new( Class1 )
-      Encapsulation.get_configuration( Class2, :some_configuration ).is_a?( ::CompositingArray ).should == true
+      Encapsulation.get_configuration( Class2, :some_configuration ).is_a?( ::Array::Compositing ).should == true
     
       # instance
       Instance = Class2.new
       Encapsulation.get_configuration( Instance, :some_configuration ).nil?.should == true
-      Instance.some_configuration.is_a?( ::CompositingArray ).should == true
+      Instance.some_configuration.is_a?( ::Array::Compositing ).should == true
 
       RandomInstance = ::Object.new
       Encapsulation.register_child_for_parent( RandomInstance, Instance )
-      Encapsulation.get_configuration( RandomInstance, :some_configuration ).is_a?( ::CompositingArray ).should == true
+      Encapsulation.get_configuration( RandomInstance, :some_configuration ).is_a?( ::Array::Compositing ).should == true
 
       RandomInstance2 = ::Object.new
       Encapsulation.register_child_for_parent( RandomInstance2, RandomInstance )
-      Encapsulation.get_configuration( RandomInstance2, :some_configuration ).is_a?( ::CompositingArray ).should == true
+      Encapsulation.get_configuration( RandomInstance2, :some_configuration ).is_a?( ::Array::Compositing ).should == true
       
     end
     
@@ -92,7 +92,7 @@ describe ::CascadingConfiguration::Core::Module::ExtendedConfigurations::Composi
   it 'can set and get values' do
     module ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects::SetterGetterMock
       
-      ClassInstance = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects.new( :setting, ::CompositingArray, :default, '' )
+      ClassInstance = ::CascadingConfiguration::Core::Module::ExtendedConfigurations::CompositingObjects.new( :setting, ::Array::Compositing, :default, '' )
       CCM = ::Module.new do
         ::CascadingConfiguration::Core.enable( self, ClassInstance )
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cascading_configuration
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: module-cluster
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: accessor-utilities
+  name: accessor_utilities
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel-ancestry
+  name: parallel_ancestry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: compositing-hash
+  name: hash
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: compositing-array-sorted-unique
+  name: array
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -167,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: