cascading-configuration-array-unique 2.0.4 → 2.1.0

data/README.md

@@ -203,7 +203,7 @@ end
 
   (The MIT License)
 
-  Copyright (c) 2011 Asher
+  Copyright (c) Asher
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the

data/README.rdoc

@@ -36,7 +36,7 @@ See README.md
 
   (The MIT License)
 
-  Copyright (c) 2011 Asher
+  Copyright (c) Asher
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the

data/lib/cascading-configuration-array-unique.rb

@@ -1,25 +1,17 @@
 
+require 'compositing-array-unique'
+
 if $__cascading_configuration__spec__development
-  require_relative '../../settings-array/lib/cascading-configuration-array.rb'
+  require_relative '../../variable/lib/cascading-configuration-variable.rb'
 else
-  require 'cascading-configuration-array'
+  require 'cascading-configuration-variable'
 end
 
 module ::CascadingConfiguration
   module Array
     module Unique
-      class CompositingArray < ::CascadingConfiguration::Array::CompositingArray
-      end
-      module ModuleSupportMethods
-      end
-      module Interface
-      end
     end
   end
 end
 
-require_relative 'cascading-configuration-array-unique/_private_/CascadingConfiguration/Array/Unique/CompositingArray.rb'
-require_relative 'cascading-configuration-array-unique/_private_/CascadingConfiguration/Array/Unique/ModuleSupportMethods.rb'
-
-require_relative 'cascading-configuration-array-unique/CascadingConfiguration/Array/Unique/Interface.rb'
 require_relative 'cascading-configuration-array-unique/CascadingConfiguration/Array/Unique.rb'

data/lib/cascading-configuration-array-unique/CascadingConfiguration/Array/Unique.rb

@@ -2,11 +2,53 @@
 module ::CascadingConfiguration::Array::Unique
   
   # Configuration modules for storage of settings arrays
-  include ::CascadingConfiguration::Variable
+  include ::CascadingConfiguration::Inheritance
+
+  ##############################################
+  #  attr_configuration_unique_array           #
+  #  attr_module_configuration_unique_array    #
+  #  attr_local_configuration_unique_array     #
+  #  attr_object_configuration_unique_array    #
+  #  attr_instance_configuration_unique_array  #
+  ##############################################
+
+  def attr_configuration_unique_array( *configuration_names, & define_block ) ;; end
+  def attr_module_configuration_unique_array( *configuration_names, & define_block ) ;; end
+  def attr_class_configuration_unique_array( *configuration_names, & define_block ) ;; end
+  def attr_local_configuration_unique_array( *configuration_names, & define_block ) ;; end
+  def attr_object_configuration_unique_array( *configuration_names, & define_block ) ;; end
+  def attr_instance_configuration_unique_array( *configuration_names, & define_block ) ;; end
+
+  ccua = self
+  cca = ::CascadingConfiguration::Array
+  ccv = ::CascadingConfiguration::Variable
+  ccm = ::CascadingConfiguration::Methods
+
+  setter_proc = ::Proc.new do |instance, configuration_name, value|
+    
+    return instance.__send__( configuration_name ).replace( value )
   
-  # Interface to declare configuration settings arrays
-  include ::CascadingConfiguration::Array::Unique::Interface
+  end
+  
+  getter_proc = ::Proc.new do |instance, configuration_name|
+
+    composite_unique_array = nil
+
+    if ccv.has_configuration_variable?( instance, configuration_name )
+      composite_unique_array = ccv.get_configuration_variable( instance, configuration_name )
+    else
+      parent_composite_array = nil
+      if ancestor = ::CascadingConfiguration::Variable.ancestor( instance, configuration_name )
+        parent_composite_array = ancestor.__send__( configuration_name )
+      end
+      composite_unique_array = ::CompositingArray::Unique.new( parent_composite_array )
+      ccv.set_configuration_variable( instance, configuration_name, composite_unique_array )
+    end
+
+    return composite_unique_array
+    
+  end
 
-  extend ::CascadingConfiguration::Array::Unique::ModuleSupportMethods
+  ccm.declare_compositing_configuration_object( self, :unique_array, setter_proc, getter_proc )
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cascading-configuration-array-unique
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cascading-configuration-variable
-  requirement: &70254022097220 !ruby/object:Gem::Requirement
+  requirement: &70261379169140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254022097220
+  version_requirements: *70261379169140
 - !ruby/object:Gem::Dependency
   name: cascading-configuration-array
-  requirement: &70254022096360 !ruby/object:Gem::Requirement
+  requirement: &70261379165120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,19 +32,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254022096360
+  version_requirements: *70261379165120
 description: Provides :attr_configuration_array.
 email: asher@ridiculouspower.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/cascading-configuration-array-unique/_private_/CascadingConfiguration/Array/Unique/CompositingArray.rb
-- lib/cascading-configuration-array-unique/_private_/CascadingConfiguration/Array/Unique/ModuleSupportMethods.rb
-- lib/cascading-configuration-array-unique/CascadingConfiguration/Array/Unique/Interface.rb
 - lib/cascading-configuration-array-unique/CascadingConfiguration/Array/Unique.rb
 - lib/cascading-configuration-array-unique.rb
-- spec/_private_/CascadingConfiguration/Array/CompositingArray_spec.rb
 - spec/CascadingConfiguration/Array/Unique_spec.rb
 - README.md
 - README.rdoc
@@ -68,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cascading-configuration-array-unique
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Support package for cascading-configuration.

data/lib/cascading-configuration-array-unique/CascadingConfiguration/Array/Unique/Interface.rb

@@ -1,111 +0,0 @@
-
-module ::CascadingConfiguration::Array::Unique::Interface
-
-  ######################
-  #  self.setter_proc  #
-  ######################
-
-  def self.setter_proc( configuration_name )
-
-    return Proc.new do |array|
-
-      return ::CascadingConfiguration::Array::Unique.set_composite_unique_array( self, 
-                                                                                 configuration_name, 
-                                                                                 array )
-    
-    end
-
-  end
-
-  ######################
-  #  self.getter_proc  #
-  ######################
-
-  def self.getter_proc( configuration_name )
-
-    return Proc.new do
-
-      return ::CascadingConfiguration::Array::Unique.composite_unique_array( self, 
-                                                                             configuration_name )
-    
-    end
-
-  end
-  
-  #####################################
-  #  attr_configuration_unique_array  #
-  #####################################
-
-  # defines configuration in class or module
-  # configuration cascades downward to instance including all classes or modules in-between
-  def attr_configuration_unique_array( *configuration_names )
-
-    return ::CascadingConfiguration::Variable.
-             define_cascading_configuration( self, 
-                                             ::CascadingConfiguration::Array::Unique::Interface, 
-                                             *configuration_names )
-
-  end
-
-  ############################################
-  #  attr_module_configuration_unique_array  #
-  ############################################
-
-  # defines configuration in class or module
-  # configuration cascades downward to last class or module
-  def attr_module_configuration_unique_array( *configuration_names )
-
-    return ::CascadingConfiguration::Variable.
-             define_module_configuration( self, 
-                                          ::CascadingConfiguration::Array::Unique::Interface, 
-                                          *configuration_names )
-
-  end
-  alias_method :attr_class_configuration_unique_array, :attr_module_configuration_unique_array
-
-  ###########################################
-  #  attr_local_configuration_unique_array  #
-  ###########################################
-
-  # defines configuration in present class or module context
-  # configuration does not cascade
-  def attr_local_configuration_unique_array( *configuration_names )
-
-    return ::CascadingConfiguration::Variable.
-             define_local_configuration( self, 
-                                         ::CascadingConfiguration::Array::Unique::Interface, 
-                                         *configuration_names )
-
-  end
-
-  ############################################
-  #  attr_object_configuration_unique_array  #
-  ############################################
-
-  # defines configuration in present instance
-  # configuration does not cascade
-  def attr_object_configuration_unique_array( *configuration_names )
-
-    return ::CascadingConfiguration::Variable.
-             define_object_configuration( self, 
-                                          ::CascadingConfiguration::Array::Unique::Interface, 
-                                          *configuration_names )
-
-  end
-
-  ##############################################
-  #  attr_instance_configuration_unique_array  #
-  ##############################################
-
-  # defines configuration in present class or module context
-  # configuration does not cascade
-  def attr_instance_configuration_unique_array( *configuration_names )
-
-    return ::CascadingConfiguration::Variable.
-             define_instance_configuration( self, 
-                                            ::CascadingConfiguration::Array::Unique::Interface, 
-                                            *configuration_names )
-
-  end
-
-end

data/lib/cascading-configuration-array-unique/_private_/CascadingConfiguration/Array/Unique/CompositingArray.rb

@@ -1,166 +0,0 @@
-
-class ::CascadingConfiguration::Array::Unique::CompositingArray < 
-      ::CascadingConfiguration::Array::CompositingArray
-
-  ################
-  #  initialize  #
-  ################
-  
-  def initialize( configuration_instance, configuration_name )
-
-    @unique_keys = { }
-    
-    super
-    
-  end
-
-  #####################################  Self Management  ##########################################
-
-  #########
-  #  []=  #
-  #########
-
-  def []=( index, object )
-
-    # we only set if we don't already have the object being inserted
-    # for this reason we return nil if no insert occurred
-
-    return_value = nil
-
-    # make sure that set is unique
-    unless @unique_keys.has_key?( object )
-
-      @unique_keys[ object ] = true
-
-      return_value = super
-
-    end
-    
-    return return_value
-    
-  end
-  
-  ############
-  #  insert  #
-  ############
-  
-  def insert( index, *objects )
-
-    # we only insert if we don't already have the object being inserted
-    # for this reason we return nil if no insert occurred
-
-    # if we have less elements in self than the index we are inserting at
-    # we need to make sure the nils inserted cascade
-    if index > count
-      if @unique_keys.has_key?( nil )
-        index -= ( index - count + 1 )
-      else
-        objects.unshift( nil )
-        index -= ( index - count )
-      end
-    end
-    
-    # get rid of objects already inserted
-    indexes_to_delete = [ ]
-    objects.each_with_index do |this_object, index|
-      if @unique_keys.has_key?( this_object )
-        indexes_to_delete.push( index )
-      else
-        @unique_keys[ this_object ] = true
-      end
-    end
-    indexes_to_delete.sort.reverse.each do |this_index|
-      objects.delete_at( this_index )
-    end
-
-    return nil if objects.empty?
-
-    return super
-    
-  end
-  
-  ##############
-  #  collect!  #
-  #  map!      #
-  ##############
-
-  def collect!
-    
-    return to_enum unless block_given?
-    
-    delete_indexes = [ ]
-    self.each_with_index do |this_object, index|
-      replacement_object = yield( this_object )
-      if @unique_keys.has_key?( replacement_object ) and replacement_object != this_object
-        delete_indexes.push( index )
-      else
-        self[ index ] = replacement_object
-      end
-    end
-    
-    delete_indexes.sort.reverse.each do |this_index|
-      delete_at( this_index )
-    end
-    
-    return self
-    
-  end
-  alias_method :map!, :collect!
-
-  ##################################################################################################
-      private ######################################################################################
-  ##################################################################################################
-
-  #############################
-  #  non_cascading_delete_at  #
-  #############################
-
-  def non_cascading_delete_at( index )
-    
-    object = super
-    
-    @unique_keys.delete( object )
-    
-    return object
-    
-  end
-
-  #########################  Self-as-Sub Management for Parent Updates  ############################
-	
-  ########################################
-  #  update_as_sub_array_for_parent_set  #
-  ########################################
-  
-  def update_as_sub_array_for_parent_set( index, object )
-    
-    super unless @unique_keys.has_key?( object )
-    
-  end
-
-  ###########################################
-  #  update_as_sub_array_for_parent_insert  #
-  ###########################################
-
-  def update_as_sub_array_for_parent_insert( index, *objects )
-    
-    # new parent indexes have been inserted at index in parent
-    
-    # get rid of objects already inserted
-    indexes_to_delete = [ ]
-    objects.each_with_index do |this_object, index|
-      if @unique_keys.has_key?( this_object )
-        indexes_to_delete.push( index )
-      else
-        @unique_keys[ this_object ] = true
-      end
-    end
-    indexes_to_delete.sort.reverse.each do |this_index|
-      objects.delete_at( this_index )
-    end
-    return false if objects.empty?
-
-    super
-
-  end
-  
-end