persistence 0.0.2 → 0.0.4

data/lib/persistence.rb

@@ -29,7 +29,6 @@ module ::Persistence
   extend ::Persistence::Object::Flat::File::FilePersistence
   
   persist_files_by_path!
-  persist_file_paths_as_strings!
         
 end
 

data/lib/persistence/adapter/abstract.rb

@@ -1,7 +1,7 @@
 
 ###
 # @private
-###
+#
 # Singleton providing helper methods for writing adapters.
 #
 module ::Persistence::Adapter::Abstract

data/lib/persistence/adapter/abstract/enable_disable.rb

@@ -1,7 +1,7 @@
 
 ###
 # @private
-###
+#
 # Provides home directory and enable/disable methods to including adapter class instances.
 #
 module ::Persistence::Adapter::Abstract::EnableDisable

data/lib/persistence/adapter/abstract/primary_key/id_property_string.rb

@@ -1,7 +1,7 @@
 
 ###
 # @private
-###
+#
 # Provides primary key with the object's persistence_id and the attribute name, connected by
 #  self.class::Delimiter in including adapter class.
 #

data/lib/persistence/adapter/abstract/primary_key/simple.rb

@@ -1,7 +1,7 @@
 
 ###
 # @private
-###
+#
 # Provides primary key with attribute name to including adapter class.
 #
 module ::Persistence::Adapter::Abstract::PrimaryKey::Simple

data/lib/persistence/adapter/mock/bucket/index/index_interface.rb

@@ -136,7 +136,7 @@ module ::Persistence::Adapter::Mock::Bucket::Index::IndexInterface
     
     index_value_or_keys = @reverse_keys.delete( global_id )
 
-    if index_value_or_keys.is_a?( Array )
+    if index_value_or_keys.is_a?( ::Array )
 
       index_value_or_keys.each do |this_key|
         @keys.delete( this_key )

data/lib/persistence/cursor/atomic.rb

@@ -61,7 +61,7 @@ module ::Persistence::Cursor::Atomic
   #
   def first( count = 1 )
     first_values = super
-    if first_values.is_a?( Array )
+    if first_values.is_a?( ::Array )
       first_values.each do |this_value|
         this_value.attrs_atomic!
       end
@@ -97,7 +97,7 @@ module ::Persistence::Cursor::Atomic
   #  
   def next( count = 1 )
     next_values = super
-    if next_values.is_a?( Array )
+    if next_values.is_a?( ::Array )
       next_values.each do |this_value|
         this_value.attrs_atomic!
       end

data/lib/persistence/object.rb

@@ -17,5 +17,5 @@
 module ::Persistence::Object
   
   extend ::Persistence::Object::Autodetermine
-  
+
 end

data/lib/persistence/object/autodetermine.rb

@@ -1,10 +1,11 @@
 
 ###
 # @private
-###
+#
 # Module used internally to extend Persistence and Persistence::Object to automatically determine what type of object
 #   (of types: Complex, Flat, Hash, Array, File) module is being included in, and to include the appropriate
 #   corresponding module branch.
+#
 module ::Persistence::Object::Autodetermine
 
   ###################
@@ -13,9 +14,9 @@ module ::Persistence::Object::Autodetermine
   
   def self.extended( persistence_object_module )
 
-    persistence_object_module.extend ModuleCluster::Define::Block::ClassOrModuleOrInstance
+    persistence_object_module.extend( ::Module::Cluster )
     
-    persistence_object_module.class_or_module_include do |class_or_module|
+    persistence_object_module.cluster( :persistence ).after_include do |class_or_module|
 
       # two types of objects: complex and flat
       # * complex objects persist ivars
@@ -65,7 +66,7 @@ module ::Persistence::Object::Autodetermine
 
     end
 
-    persistence_object_module.class_or_module_or_instance_extend do
+    persistence_object_module.cluster( :persistence ).before_extend( :class, :module ) do
       raise 'Persistence does not expect to be used without class-level support.'
     end
     

data/lib/persistence/object/class_instance.rb

@@ -4,7 +4,7 @@
 #
 module ::Persistence::Object::ClassInstance
   
-  include ::Persistence::Object::ParsePersistenceArgs
+  include ::Persistence::Object::ParsePersistenceArgs::ClassInstance
 
   include ::CascadingConfiguration::Setting
   include ::CascadingConfiguration::Hash
@@ -220,7 +220,7 @@ module ::Persistence::Object::ClassInstance
 
     persistence_value = nil
 
-    index_instance, key, no_key = parse_args_for_index_value_no_value( args )
+    index_instance, key, no_key = parse_class_args_for_index_value_no_value( args )
 
     # if no key, open a cursor for a list
     if no_key
@@ -231,7 +231,7 @@ module ::Persistence::Object::ClassInstance
 
       global_id = index_instance ? index_instance.get_object_id( key ) : key
       
-      persistence_value = instance_persistence_port.get_object( global_id )
+      persistence_value = instance_persistence_bucket.get_object( global_id )
 
     end
     
@@ -273,7 +273,7 @@ module ::Persistence::Object::ClassInstance
   #
   def persisted?( *args )
     
-    index, key, no_key = parse_args_for_index_value_no_value( args, true )
+    index, key, no_key = parse_class_args_for_index_value_no_value( args, true )
     
     global_id = index ? index.get_object_id( key ) : key
     
@@ -319,7 +319,7 @@ module ::Persistence::Object::ClassInstance
     
     # FIX - future: archive if appropriate (distinct from delete/etc. see draft spec)
     
-    index, key, no_key = parse_args_for_index_value_no_value( args, true )
+    index, key, no_key = parse_class_args_for_index_value_no_value( args, true )
 
     global_id = index ? index.get_object_id( key ) : key
 
@@ -349,10 +349,14 @@ module ::Persistence::Object::ClassInstance
   def index( index_name, ensure_exists = false )
      
      index_instance = nil
-
+     
+     if index_name.nil?
+       raise ::ArgumentError, 'Index name required but received nil.'
+     end
+     
      unless index_instance = indexes[ index_name ]
        if ensure_exists
-         raise ::ArgumentError, 'No index found by name ' << index_name.to_s + '.'
+         raise ::ArgumentError, 'No index found by name ' << index_name.to_s + ' for ' << to_s + '.'
        end
      end
          
@@ -716,7 +720,7 @@ module ::Persistence::Object::ClassInstance
     
     cursor_instance = nil
     
-    index_instance, key, no_key = parse_args_for_index_value_no_value( args )
+    index_instance, key, no_key = parse_class_args_for_index_value_no_value( args )
     
     if index_instance
       

data/lib/persistence/object/complex.rb

@@ -6,12 +6,12 @@
 #
 module ::Persistence::Object::Complex
 
-  extend ModuleCluster::Define::ClusterCascades
+  extend ::Module::Cluster
   
   include ::Persistence::Object::ObjectInstance
-  include_or_extend_cascades_prepend_extends ::Persistence::Object::ClassInstance
-  
   include ::Persistence::Object::Complex::ObjectInstance
-  include_or_extend_cascades_prepend_extends ::Persistence::Object::Complex::ClassInstance
+  
+  cluster( :persistence ).before_include_or_extend.cascade.extend( ::Persistence::Object::ClassInstance,
+                                                                   ::Persistence::Object::Complex::ClassInstance )
 
 end

data/lib/persistence/object/complex/array.rb

@@ -1,14 +1,16 @@
 
 ###
-# Convenience module for extending array types (singletons and instances) with persistence capabilities.
+# Convenience module for extending array types (singletons and instances) 
+#   with persistence capabilities.
 #
 module ::Persistence::Object::Complex::Array
 
-  extend ModuleCluster::Define::ClusterCascades
+  extend ::Module::Cluster
   
   include ::Persistence::Object::Complex
-  
   include ::Persistence::Object::Complex::Array::ObjectInstance
-  include_or_extend_cascades_prepend_extends ::Persistence::Object::Complex::Array::ClassInstance
+
+  cascade = cluster( :persistence ).before_include_or_extend.cascade
+  cascade.extend( ::Persistence::Object::Complex::Array::ClassInstance )
 
 end

data/lib/persistence/object/complex/array/class_instance.rb

@@ -10,7 +10,7 @@ module ::Persistence::Object::Complex::Array::ClassInstance
   
   def persist( *args )
     
-    index, key, no_key = parse_args_for_index_value_no_value( args, true )
+    index, key, no_key = parse_class_args_for_index_value_no_value( args, true )
     
     if index
       global_id = index.get_object_id( key )

data/lib/persistence/object/complex/array/object_instance.rb

@@ -10,7 +10,7 @@ module ::Persistence::Object::Complex::Array::ObjectInstance
   
   def persist( *args )
     
-    index, key, no_key = parse_args_for_index_value_no_value( args, true )
+    index, key, no_key = parse_object_args_for_index_value_no_value( args, true )
     
     if index
       global_id = index.get_object_id( key )

data/lib/persistence/object/complex/attributes/attributes_array.rb

@@ -20,7 +20,7 @@ module ::Persistence::Object::Complex::Attributes::AttributesArray
   def has_attributes?( *attributes )
     
     has_attributes = false
-    
+
     attributes.each do |this_attribute|
       break unless has_attributes = include?( this_attribute )
     end

data/lib/persistence/object/complex/hash.rb

@@ -1,14 +1,16 @@
 
 ###
-# Convenience module for extending hash types (singletons and instances) with persistence capabilities.
+# Convenience module for extending hash types (singletons and instances) 
+#   with persistence capabilities.
 #
 module ::Persistence::Object::Complex::Hash
 
-  extend ModuleCluster::Define::ClusterCascades
+  extend ::Module::Cluster
   
   include ::Persistence::Object::Complex
-  
   include ::Persistence::Object::Complex::Hash::ObjectInstance
-  include_or_extend_cascades_prepend_extends ::Persistence::Object::Complex::Hash::ClassInstance
+
+  cascade = cluster( :persistence ).before_include_or_extend.cascade
+  cascade.extend( ::Persistence::Object::Complex::Hash::ClassInstance )
 
 end

data/lib/persistence/object/complex/hash/class_instance.rb

@@ -10,7 +10,7 @@ module ::Persistence::Object::Complex::Hash::ClassInstance
   
   def persist( *args )
     
-    index, key, no_key = parse_args_for_index_value_no_value( args, true )
+    index, key, no_key = parse_class_args_for_index_value_no_value( args, true )
     
     if index
       global_id = index.get_object_id( key )

data/lib/persistence/object/complex/hash/object_instance.rb

@@ -10,7 +10,7 @@ module ::Persistence::Object::Complex::Hash::ObjectInstance
   
   def persist( *args )
     
-    index, key, no_key = parse_args_for_index_value_no_value( args, true )
+    index, key, no_key = parse_object_args_for_index_value_no_value( args, true )
     
     if index
       global_id = index.get_object_id( key )

data/lib/persistence/object/complex/object_instance.rb

@@ -118,7 +118,7 @@ module ::Persistence::Object::Complex::ObjectInstance
   #
   def index_attributes
 
-    attribute_indexes.each do |this_attribute_name, this_attribute_index|
+    self.class.attribute_indexes.each do |this_attribute_name, this_attribute_index|
       this_attribute_index.index_object( self )
     end
     
@@ -132,7 +132,7 @@ module ::Persistence::Object::Complex::ObjectInstance
   
   def persist( *args )
 
-    index_instance, key, no_key = parse_args_for_index_value_no_value( args )
+    index_instance, key, no_key = parse_object_args_for_index_value_no_value( args )
 
     unless persistence_id
       if no_key
@@ -260,7 +260,7 @@ module ::Persistence::Object::Complex::ObjectInstance
       persistence_bucket.put_attribute!( self, attribute, value )
 
       if self.class.has_attribute_index?( attribute )
-         attribute_indexes[ attribute ].index_object( self )
+         self.class.attribute_indexes[ attribute ].index_object( self )
       end
       
     # otherwise get from object

data/lib/persistence/object/flat.rb

@@ -6,12 +6,13 @@
 #
 module ::Persistence::Object::Flat
   
-  extend ModuleCluster::Define::ClusterCascades
+  extend ::Module::Cluster
   
   include ::Persistence::Object::ObjectInstance
-  include_or_extend_cascades_prepend_extends ::Persistence::Object::ClassInstance
-  
   include ::Persistence::Object::Flat::ObjectInstance
-  include_or_extend_cascades_prepend_extends ::Persistence::Object::Flat::ClassInstance
-
+  
+  cascade = cluster( :persistence ).before_include_or_extend.cascade
+  cascade.extend( ::Persistence::Object::ClassInstance,
+                  ::Persistence::Object::Flat::ClassInstance )
+  
 end

data/lib/persistence/object/flat/class_instance.rb

@@ -12,7 +12,7 @@ module ::Persistence::Object::Flat::ClassInstance
 
     persistence_value = nil
 
-    index_instance, key, no_key = parse_args_for_index_value_no_value( args )
+    index_instance, key, no_key = parse_class_args_for_index_value_no_value( args )
 
     # if no key, open a cursor for a list
     if no_key
@@ -23,7 +23,7 @@ module ::Persistence::Object::Flat::ClassInstance
 
       global_id = index_instance ? index_instance.get_object_id( key ) : key
       
-      persistence_value = instance_persistence_port.get_flat_object( global_id )
+      persistence_value = instance_persistence_bucket.get_flat_object( global_id )
 
     end
     

data/lib/persistence/object/flat/file.rb

@@ -4,11 +4,12 @@
 #
 module ::Persistence::Object::Flat::File
 
-  extend ModuleCluster::Define::ClusterCascades
+  extend ::Module::Cluster
   
   include ::Persistence::Object::Flat
-  
   include ::Persistence::Object::Flat::File::ObjectInstance
-  include_or_extend_cascades_prepend_extends ::Persistence::Object::Flat::File::ClassInstance
+  
+  cascade = cluster( :persistence ).before_include_or_extend.cascade
+  cascade.extend( ::Persistence::Object::Flat::File::ClassInstance )
     
 end

data/lib/persistence/object/flat/file/class_instance.rb

@@ -12,14 +12,32 @@ module ::Persistence::Object::Flat::File::ClassInstance
   
   def persist( *args )
 
-    persistence_value = super
+    persistence_value = nil
 
-    if persists_file_paths_as_objects?  and 
-       persistence_value.is_a?( ::Persistence::Object::Flat::File::Path )
+    index_instance, key, no_key = parse_class_args_for_index_value_no_value( args )
 
-      persistence_value = File.open( persistence_value, 
-                                     persistence_value.mode || 'r' )
+    # if no key, open a cursor for a list
+    if no_key
 
+      persistence_value = ::Persistence::Cursor.new( instance_persistence_bucket, index_instance )
+
+    else
+
+      if global_id = index_instance ? index_instance.get_object_id( key ) : key
+      
+        persistence_value_hash = instance_persistence_bucket.get_object_hash( global_id )
+      
+        persistence_value = persistence_value_hash.first[ 1 ]
+      
+        if persistence_value.is_a?( ::Persistence::Object::Flat::File::Path ) and
+           ! persists_file_paths_as_strings?
+
+          persistence_value = open( persistence_value, persistence_value.mode || 'r' )
+
+        end
+
+      end
+      
     end
     
     return persistence_value
@@ -69,31 +87,6 @@ module ::Persistence::Object::Flat::File::ClassInstance
     
   end
 
-  #####################################
-  #  persists_file_paths_as_objects?  #
-  #####################################
-
-  ###
-  # Query whether File paths should be persisted as objects (rather than by strings).
-  #   Lookup chain is: File instance, File class, Persistence::Port::Bucket instance, Persistence::Port instance,
-  #   Persistence singleton.
-  #
-  # @return [true,false] Whether files should be persisted as objects rather than as strings.
-  #
-  def persists_file_paths_as_objects?
-    
-    persists_file_paths_as_objects = nil
-    
-    persists_file_paths_as_objects = super
-    
-    if persists_file_paths_as_objects.nil?
-      persists_file_paths_as_objects = instance_persistence_bucket.persists_file_paths_as_objects?
-    end
-    
-    return persists_file_paths_as_objects
-    
-  end
-
   #####################################
   #  persists_file_paths_as_strings?  #
   #####################################