persistence 0.0.2 → 0.0.4

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

@@ -0,0 +1,124 @@
+
+###
+# @private
+#
+# Object-specific implementation for parsing persistence args.
+#
+# Internal helper for parsing args of the format: method, method( global_id ), method( index_name, value ),
+#   method( index_instance, value ), method( index_name => value ), method( index_instance => value ).
+#
+module ::Persistence::Object::ParsePersistenceArgs::ObjectInstance
+  
+  include ::Persistence::Object::ParsePersistenceArgs
+
+  ################################################
+  #  parse_object_args_for_index_value_no_value  #
+  ################################################
+  
+  ###
+  # Parse *args for index, key_value, no_value.
+  #
+  # @param args [Array] An array of args of the format: method, method( global_id ), method( index_name, value ),
+  #   method( index_instance, value ), method( index_name => value ), method( index_instance => value ).
+  #
+  # @param require_value [true,false] Whether key value must be provided; will throw exception if true and
+  #   key value is not provided.
+  #
+  # @return [Array] Array containing index instance, key value, whether key value was provided.
+  #
+  def parse_object_args_for_index_value_no_value( args, require_value = false )
+    
+    # * nil
+    #   - Cursor to primary bucket
+    # * :index
+    #   - Cursor to index
+    # * :index => persistence_key
+    #   - Object(s) for indexed key value
+    
+    index = nil
+    key_value = nil
+    no_value = nil
+    case args.count
+
+      when 0
+
+        no_value = true
+        if require_value
+          raise ::Persistence::Exception::KeyValueRequired, 
+                'Key value required.'
+        end
+
+      when 1
+
+        index_or_id = args[ 0 ]
+
+        case index_or_id
+
+          when ::Symbol, ::String
+
+            index = self.class.index( index_or_id, true )
+            no_value = true
+
+          when ::Hash
+
+            key_value = index_or_id.values[ 0 ]
+            index_name = index_or_id.keys[ 0 ]
+
+            case index_name
+
+              when ::Symbol, ::String
+
+                index = self.class.index( index_name, true )
+
+            end
+
+            no_value = false
+          
+          else
+
+            if index_or_id.respond_to?( :index_object )
+
+              index = index_or_id
+              no_value = true
+            
+            else
+
+              # persistence_id - anything other than Symbol, String, Hash
+              key_value = args[ 0 ]
+              no_value = false
+
+            end
+          
+        end
+        
+      when 2
+
+        index_or_name = args[ 0 ]
+
+        
+        if index_or_name.respond_to?( :index_object )
+          index = index_or_name
+        elsif index_or_name
+          index = self.class.index( index_or_name, true )
+        end
+        
+        key_value = args[ 1 ]
+
+        no_value = false
+
+      else
+
+        raise 'Unexpected arguments ' << args.inspect + '.'
+
+    end
+    
+    # if we have a file we need to persist it like we would a sub-object
+    if key_value.is_a?( ::File )
+      key_value = process_file_key( key_value )
+    end
+    
+    return index, key_value, no_value
+    
+  end
+  
+end

data/lib/persistence/port/bucket/bucket_interface.rb

@@ -536,24 +536,6 @@ module ::Persistence::Port::Bucket::BucketInterface
     
   end
 
-  #####################################
-  #  persists_file_paths_as_objects?  #
-  #####################################
-
-  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 = parent_port.persists_file_paths_as_objects?
-    end
-    
-    return persists_file_paths_as_objects
-    
-  end
-
   #####################################
   #  persists_file_paths_as_strings?  #
   #####################################

data/lib/persistence/port/port_interface.rb

@@ -22,7 +22,7 @@ module ::Persistence::Port::PortInterface
     
     @buckets = { }
     
-    @instances = ::UniqueArray.new
+    @instances = ::Array::Unique.new
     
     @name    = port_name
     @adapter = adapter_instance
@@ -378,24 +378,6 @@ module ::Persistence::Port::PortInterface
     
   end
 
-  #####################################
-  #  persists_file_paths_as_objects?  #
-  #####################################
-
-  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 = ::Persistence.persists_file_paths_as_objects?
-    end
-    
-    return persists_file_paths_as_objects
-    
-  end
-
   #####################################
   #  persists_file_paths_as_strings?  #
   #####################################

data/lib/requires.rb

@@ -1,7 +1,8 @@
-require 'module-cluster'
 
-require 'cascading-configuration'
-#require_relative '../../ruby/cascading-configuration/lib/cascading-configuration.rb'
+begin ; require 'development' ; rescue ::LoadError ; end
+
+require 'module/cluster'
+require 'cascading_configuration'
  
 basepath = 'persistence'
 
@@ -35,6 +36,8 @@ files.concat [
 files.concat [
 
   'object/parse_persistence_args',
+  'object/parse_persistence_args/class_instance',
+  'object/parse_persistence_args/object_instance',
 
   'object/index',
   
@@ -47,9 +50,6 @@ files.concat [
 
   'object/flat/file/file_persistence',
   
-  'object/flat/file/contents',
-  'object/flat/file/path',
-  
   'object/flat/file/class_instance',
   'object/flat/file/object_instance',
   
@@ -84,8 +84,11 @@ files.concat [
   'object/flat',
   'object/flat/file',
 
+  'object/flat/file/contents',
+  'object/flat/file/path',
+  
   'object/autodetermine',
-  'object',
+  'object'
 
 ]
 
@@ -146,5 +149,3 @@ files.concat [
 files.each do |this_file|
   require_relative( File.join( basepath, this_file ) + '.rb' )
 end
-
-require_relative( basepath + '.rb' )

data/spec/persistence/object/complex/attributes_spec.rb

@@ -1199,13 +1199,6 @@ describe ::Persistence::Object::Complex::Attributes do
       atomic_attribute?( :some_other_reader ).should == false
       atomic_attribute?( :some_other_writer ).should == false
 
-      atomic_attribute?( :some_accessor ).should == true
-      atomic_attribute?( :some_reader ).should == true
-      atomic_attribute?( :some_writer ).should == true
-      atomic_attribute?( :some_other_accessor ).should == false
-      atomic_attribute?( :some_other_reader ).should == false
-      atomic_attribute?( :some_other_writer ).should == false
-
     end
   end
 
@@ -1229,13 +1222,6 @@ describe ::Persistence::Object::Complex::Attributes do
       atomic_attribute_accessor?( :some_other_reader ).should == false
       atomic_attribute_accessor?( :some_other_writer ).should == false
 
-      atomic_attribute_accessor?( :some_accessor ).should == true
-      atomic_attribute_accessor?( :some_reader ).should == false
-      atomic_attribute_accessor?( :some_writer ).should == false
-      atomic_attribute_accessor?( :some_other_accessor ).should == false
-      atomic_attribute_accessor?( :some_other_reader ).should == false
-      atomic_attribute_accessor?( :some_other_writer ).should == false
-
     end
   end
 
@@ -1259,13 +1245,6 @@ describe ::Persistence::Object::Complex::Attributes do
       atomic_attribute_reader?( :some_other_reader ).should == false
       atomic_attribute_reader?( :some_other_writer ).should == false
 
-      atomic_attribute_reader?( :some_accessor ).should == true
-      atomic_attribute_reader?( :some_reader ).should == true
-      atomic_attribute_reader?( :some_writer ).should == false
-      atomic_attribute_reader?( :some_other_accessor ).should == false
-      atomic_attribute_reader?( :some_other_reader ).should == false
-      atomic_attribute_reader?( :some_other_writer ).should == false
-
     end
   end
 
@@ -1289,13 +1268,6 @@ describe ::Persistence::Object::Complex::Attributes do
       atomic_attribute_writer?( :some_other_reader ).should == false
       atomic_attribute_writer?( :some_other_writer ).should == false
 
-      atomic_attribute_writer?( :some_accessor ).should == true
-      atomic_attribute_writer?( :some_reader ).should == false
-      atomic_attribute_writer?( :some_writer ).should == true
-      atomic_attribute_writer?( :some_other_accessor ).should == false
-      atomic_attribute_writer?( :some_other_reader ).should == false
-      atomic_attribute_writer?( :some_other_writer ).should == false
-
     end
   end
 
@@ -1311,13 +1283,7 @@ describe ::Persistence::Object::Complex::Attributes do
       atomic_attributes[ :some_writer ] = :writer
     end
     ::Persistence::Object::Complex::Attributes::AtomicAttributeStatus.new.instance_eval do
-
-      atomic_attribute_status( :some_accessor ).should == :accessor
-      atomic_attribute_status( :some_reader ).should == :reader
-      atomic_attribute_status( :some_writer ).should == :writer
-      atomic_attribute_status( :some_other_accessor ).should == nil
-      atomic_attribute_status( :some_other_reader ).should == nil
-      atomic_attribute_status( :some_other_writer ).should == nil
+$blah = true
 
       atomic_attribute_status( :some_accessor ).should == :accessor
       atomic_attribute_status( :some_reader ).should == :reader
@@ -1349,13 +1315,6 @@ describe ::Persistence::Object::Complex::Attributes do
       non_atomic_attribute?( :some_other_reader ).should == false
       non_atomic_attribute?( :some_other_writer ).should == false
 
-      non_atomic_attribute?( :some_accessor ).should == true
-      non_atomic_attribute?( :some_reader ).should == true
-      non_atomic_attribute?( :some_writer ).should == true
-      non_atomic_attribute?( :some_other_accessor ).should == false
-      non_atomic_attribute?( :some_other_reader ).should == false
-      non_atomic_attribute?( :some_other_writer ).should == false
-
     end
   end
 
@@ -1379,13 +1338,6 @@ describe ::Persistence::Object::Complex::Attributes do
       non_atomic_attribute_accessor?( :some_other_reader ).should == false
       non_atomic_attribute_accessor?( :some_other_writer ).should == false
 
-      non_atomic_attribute_accessor?( :some_accessor ).should == true
-      non_atomic_attribute_accessor?( :some_reader ).should == false
-      non_atomic_attribute_accessor?( :some_writer ).should == false
-      non_atomic_attribute_accessor?( :some_other_accessor ).should == false
-      non_atomic_attribute_accessor?( :some_other_reader ).should == false
-      non_atomic_attribute_accessor?( :some_other_writer ).should == false
-
     end
   end
 
@@ -1409,13 +1361,6 @@ describe ::Persistence::Object::Complex::Attributes do
       non_atomic_attribute_reader?( :some_other_reader ).should == false
       non_atomic_attribute_reader?( :some_other_writer ).should == false
 
-      non_atomic_attribute_reader?( :some_accessor ).should == true
-      non_atomic_attribute_reader?( :some_reader ).should == true
-      non_atomic_attribute_reader?( :some_writer ).should == false
-      non_atomic_attribute_reader?( :some_other_accessor ).should == false
-      non_atomic_attribute_reader?( :some_other_reader ).should == false
-      non_atomic_attribute_reader?( :some_other_writer ).should == false
-
     end
   end
 
@@ -1439,13 +1384,6 @@ describe ::Persistence::Object::Complex::Attributes do
       non_atomic_attribute_writer?( :some_other_reader ).should == false
       non_atomic_attribute_writer?( :some_other_writer ).should == false
 
-      non_atomic_attribute_writer?( :some_accessor ).should == true
-      non_atomic_attribute_writer?( :some_reader ).should == false
-      non_atomic_attribute_writer?( :some_writer ).should == true
-      non_atomic_attribute_writer?( :some_other_accessor ).should == false
-      non_atomic_attribute_writer?( :some_other_reader ).should == false
-      non_atomic_attribute_writer?( :some_other_writer ).should == false
-
     end
   end
 
@@ -1469,13 +1407,6 @@ describe ::Persistence::Object::Complex::Attributes do
       non_atomic_attribute_status( :some_other_reader ).should == nil
       non_atomic_attribute_status( :some_other_writer ).should == nil
 
-      non_atomic_attribute_status( :some_accessor ).should == :accessor
-      non_atomic_attribute_status( :some_reader ).should == :reader
-      non_atomic_attribute_status( :some_writer ).should == :writer
-      non_atomic_attribute_status( :some_other_accessor ).should == nil
-      non_atomic_attribute_status( :some_other_reader ).should == nil
-      non_atomic_attribute_status( :some_other_writer ).should == nil
-
     end
   end
 
@@ -1502,20 +1433,6 @@ describe ::Persistence::Object::Complex::Attributes do
       persistent_attribute?( :some_non_atomic_other_reader ).should == false
       persistent_attribute?( :some_non_atomic_other_writer ).should == false
 
-      persistent_attribute?( :some_non_atomic_accessor ).should == true
-      persistent_attribute?( :some_non_atomic_reader ).should == true
-      persistent_attribute?( :some_non_atomic_writer ).should == true
-      persistent_attribute?( :some_non_atomic_other_accessor ).should == false
-      persistent_attribute?( :some_non_atomic_other_reader ).should == false
-      persistent_attribute?( :some_non_atomic_other_writer ).should == false
-
-      persistent_attribute?( :some_atomic_accessor ).should == true
-      persistent_attribute?( :some_atomic_reader ).should == true
-      persistent_attribute?( :some_atomic_writer ).should == true
-      persistent_attribute?( :some_atomic_other_accessor ).should == false
-      persistent_attribute?( :some_atomic_other_reader ).should == false
-      persistent_attribute?( :some_atomic_other_writer ).should == false
-                                   
       persistent_attribute?( :some_atomic_accessor ).should == true
       persistent_attribute?( :some_atomic_reader ).should == true
       persistent_attribute?( :some_atomic_writer ).should == true
@@ -1549,20 +1466,6 @@ describe ::Persistence::Object::Complex::Attributes do
       persistent_attribute_accessor?( :some_non_atomic_other_reader ).should == false
       persistent_attribute_accessor?( :some_non_atomic_other_writer ).should == false
 
-      persistent_attribute_accessor?( :some_non_atomic_accessor ).should == true
-      persistent_attribute_accessor?( :some_non_atomic_reader ).should == false
-      persistent_attribute_accessor?( :some_non_atomic_writer ).should == false
-      persistent_attribute_accessor?( :some_non_atomic_other_accessor ).should == false
-      persistent_attribute_accessor?( :some_non_atomic_other_reader ).should == false
-      persistent_attribute_accessor?( :some_non_atomic_other_writer ).should == false
-
-      persistent_attribute_accessor?( :some_atomic_accessor ).should == true
-      persistent_attribute_accessor?( :some_atomic_reader ).should == false
-      persistent_attribute_accessor?( :some_atomic_writer ).should == false
-      persistent_attribute_accessor?( :some_atomic_other_accessor ).should == false
-      persistent_attribute_accessor?( :some_atomic_other_reader ).should == false
-      persistent_attribute_accessor?( :some_atomic_other_writer ).should == false
-
       persistent_attribute_accessor?( :some_atomic_accessor ).should == true
       persistent_attribute_accessor?( :some_atomic_reader ).should == false
       persistent_attribute_accessor?( :some_atomic_writer ).should == false
@@ -1596,20 +1499,6 @@ describe ::Persistence::Object::Complex::Attributes do
       persistent_attribute_reader?( :some_non_atomic_other_reader ).should == false
       persistent_attribute_reader?( :some_non_atomic_other_writer ).should == false
 
-      persistent_attribute_reader?( :some_non_atomic_accessor ).should == true
-      persistent_attribute_reader?( :some_non_atomic_reader ).should == true
-      persistent_attribute_reader?( :some_non_atomic_writer ).should == false
-      persistent_attribute_reader?( :some_non_atomic_other_accessor ).should == false
-      persistent_attribute_reader?( :some_non_atomic_other_reader ).should == false
-      persistent_attribute_reader?( :some_non_atomic_other_writer ).should == false
-
-      persistent_attribute_reader?( :some_atomic_accessor ).should == true
-      persistent_attribute_reader?( :some_atomic_reader ).should == true
-      persistent_attribute_reader?( :some_atomic_writer ).should == false
-      persistent_attribute_reader?( :some_atomic_other_accessor ).should == false
-      persistent_attribute_reader?( :some_atomic_other_reader ).should == false
-      persistent_attribute_reader?( :some_atomic_other_writer ).should == false
-
       persistent_attribute_reader?( :some_atomic_accessor ).should == true
       persistent_attribute_reader?( :some_atomic_reader ).should == true
       persistent_attribute_reader?( :some_atomic_writer ).should == false
@@ -1643,20 +1532,6 @@ describe ::Persistence::Object::Complex::Attributes do
       persistent_attribute_writer?( :some_non_atomic_other_reader ).should == false
       persistent_attribute_writer?( :some_non_atomic_other_writer ).should == false
 
-      persistent_attribute_writer?( :some_non_atomic_accessor ).should == true
-      persistent_attribute_writer?( :some_non_atomic_reader ).should == false
-      persistent_attribute_writer?( :some_non_atomic_writer ).should == true
-      persistent_attribute_writer?( :some_non_atomic_other_accessor ).should == false
-      persistent_attribute_writer?( :some_non_atomic_other_reader ).should == false
-      persistent_attribute_writer?( :some_non_atomic_other_writer ).should == false
-
-      persistent_attribute_writer?( :some_atomic_accessor ).should == true
-      persistent_attribute_writer?( :some_atomic_reader ).should == false
-      persistent_attribute_writer?( :some_atomic_writer ).should == true
-      persistent_attribute_writer?( :some_atomic_other_accessor ).should == false
-      persistent_attribute_writer?( :some_atomic_other_reader ).should == false
-      persistent_attribute_writer?( :some_atomic_other_writer ).should == false
-
       persistent_attribute_writer?( :some_atomic_accessor ).should == true
       persistent_attribute_writer?( :some_atomic_reader ).should == false
       persistent_attribute_writer?( :some_atomic_writer ).should == true
@@ -1690,20 +1565,6 @@ describe ::Persistence::Object::Complex::Attributes do
       persistent_attribute_status( :some_non_atomic_other_reader ).should == nil
       persistent_attribute_status( :some_non_atomic_other_writer ).should == nil
 
-      persistent_attribute_status( :some_non_atomic_accessor ).should == :accessor
-      persistent_attribute_status( :some_non_atomic_reader ).should == :reader
-      persistent_attribute_status( :some_non_atomic_writer ).should == :writer
-      persistent_attribute_status( :some_non_atomic_other_accessor ).should == nil
-      persistent_attribute_status( :some_non_atomic_other_reader ).should == nil
-      persistent_attribute_status( :some_non_atomic_other_writer ).should == nil
-
-      persistent_attribute_status( :some_atomic_accessor ).should == :accessor
-      persistent_attribute_status( :some_atomic_reader ).should == :reader
-      persistent_attribute_status( :some_atomic_writer ).should == :writer
-      persistent_attribute_status( :some_atomic_other_accessor ).should == nil
-      persistent_attribute_status( :some_atomic_other_reader ).should == nil
-      persistent_attribute_status( :some_atomic_other_writer ).should == nil
-
       persistent_attribute_status( :some_atomic_accessor ).should == :accessor
       persistent_attribute_status( :some_atomic_reader ).should == :reader
       persistent_attribute_status( :some_atomic_writer ).should == :writer