array-unique 1.1.0 → 1.1.1

data/lib/array/namespaces.rb

@@ -1,7 +1,3 @@
 
 class ::Array::Unique < ::Array::Hooked
 end
-
-class ::UniqueArray < ::Array::Unique
-end
-

data/lib/array/requires.rb

@@ -10,5 +10,3 @@ files = [
 files.each do |this_file|
   require_relative( File.join( basepath, this_file ) + '.rb' )
 end
-
-require_relative( basepath + '.rb' )

data/lib/array/unique.rb

@@ -1,5 +1,6 @@
 
 require 'array/hooked'
+#require_relative '../../../array-hooked/lib/array-hooked.rb'
 
 # namespaces that have to be declared ahead of time for proper load order
 require_relative './namespaces'
@@ -9,6 +10,6 @@ require_relative './requires.rb'
 
 class ::Array::Unique < ::Array::Hooked
   
-  include ::Array::Unique::Interface
+  include ::Array::Unique::ArrayInterface
     
 end

data/lib/array/unique/array_interface.rb

@@ -1,5 +1,5 @@
 
-module ::Array::Unique::Interface
+module ::Array::Unique::ArrayInterface
 
   include ::Array::Hooked::ArrayInterface
 
@@ -9,7 +9,7 @@ module ::Array::Unique::Interface
   #  initialize  #
   ################
   
-  def initialize( *args )
+  def initialize( configuration_instance = nil, *args )
 
     @unique_keys = { }
     
@@ -32,64 +32,48 @@ module ::Array::Unique::Interface
 
     # make sure that set is unique
     unless @unique_keys.has_key?( object )
+      
+      if index > count
+        index = count
+        unless object.nil? or @unique_keys.has_key?( nil )
+          index += 1
+        end
+      end
+      return_value = super
 
       @unique_keys[ object ] = true
 
-      return_value = super
-
     end
     
     return return_value
     
   end
   
-  ############
-  #  insert  #
-  ############
+  ################################################
+  #  perform_single_object_insert_between_hooks  #
+  ################################################
   
-  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
+  def perform_single_object_insert_between_hooks( index, object )
 
-    # 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
+    if @unique_keys.has_key?( object )
+      index = nil
+    else
+      @unique_keys[ object ] = true
+      index = super
     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
+    return index
     
   end
-
-  ##################################
-  #  perform_delete_between_hooks  #
-  ##################################
   
-  def perform_delete_between_hooks( index )
-    
+  #####################################
+  #  perform_delete_at_between_hooks  #
+  #####################################
+  
+  def perform_delete_at_between_hooks( index )
+
     @unique_keys.delete( self[ index ] )
-    
+
     return super
     
   end

data/spec/array/unique_spec.rb

@@ -543,7 +543,7 @@ describe ::Array::Unique do
 
   it 'has a hook that is called before setting a value; return value is used in place of object' do
     
-    class ::Array::Unique::SubMockPreSet < ::Array::Hooked
+    class ::Array::Unique::SubMockPreSet < ::Array::Unique
       
       def pre_set_hook( index, object, is_insert = false )
         return :some_other_value
@@ -565,7 +565,7 @@ describe ::Array::Unique do
 
   it 'has a hook that is called after setting a value' do
 
-    class ::Array::Unique::SubMockPostSet < ::Array::Hooked
+    class ::Array::Unique::SubMockPostSet < ::Array::Unique
       
       def post_set_hook( index, object, is_insert = false )
         return :some_other_value
@@ -587,7 +587,7 @@ describe ::Array::Unique do
 
   it 'has a hook that is called before getting a value; if return value is false, get does not occur' do
     
-    class ::Array::Unique::SubMockPreGet < ::Array::Hooked
+    class ::Array::Unique::SubMockPreGet < ::Array::Unique
       
       def pre_get_hook( index )
         return false
@@ -610,7 +610,7 @@ describe ::Array::Unique do
 
   it 'has a hook that is called after getting a value' do
 
-    class ::Array::Unique::SubMockPostGet < ::Array::Hooked
+    class ::Array::Unique::SubMockPostGet < ::Array::Unique
       
       def post_get_hook( index, object )
         return :some_other_value
@@ -633,7 +633,7 @@ describe ::Array::Unique do
 
   it 'has a hook that is called before deleting an index; if return value is false, delete does not occur' do
     
-    class ::Array::Unique::SubMockPreDelete < ::Array::Hooked
+    class ::Array::Unique::SubMockPreDelete < ::Array::Unique
       
       def pre_delete_hook( index )
         return false
@@ -656,7 +656,7 @@ describe ::Array::Unique do
 
   it 'has a hook that is called after deleting an index' do
     
-    class ::Array::Unique::SubMockPostDelete < ::Array::Hooked
+    class ::Array::Unique::SubMockPostDelete < ::Array::Unique
       
       def post_delete_hook( index, object )
         return :some_other_value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: array-unique
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array-hooked