active-fedora 3.2.0.pre1 → 3.2.0.pre2

data/lib/active_fedora/samples/special_thing.rb

@@ -39,9 +39,9 @@ class SpecialThing < ActiveFedora::Base
   #
   
   # This is an example of how you can add a custom relationship to a model
-  # This will allow you to call .derivations on instances of the model to get a list of all of the _outbound_ "hasDerivation" relationships in the RELS-EXT datastream
-  has_relationship "derivations", :has_derivation
+  # This will allow you to call .derivation on instances of the model to get the _outbound_ "hasDerivation" relationship in the RELS-EXT datastream
+  belongs_to :derivation, :property=>:has_derivation
 
   # This will allow you to call .inspirations on instances of the model to get a list of all of the objects that assert "hasDerivation" relationships pointing at this object
-  has_relationship "inspirations", :has_derivation, :inbound => true  
-end
+  has_many :inspirations, :property=>:has_derivation
+end

data/lib/active_fedora/semantic_node.rb

@@ -4,6 +4,7 @@ module ActiveFedora
     extend ActiveSupport::Concern
     included do
       class_attribute  :class_relationships, :internal_uri
+      class_attribute  :class_relationships_desc
       self.class_relationships = {}
     end
     attr_accessor :relationships_loaded, :load_from_solr, :subject
@@ -32,6 +33,34 @@ module ActiveFedora
       rels_ext.dirty = true
     end
 
+    # Checks that this object is matches the model class passed in.
+    # It requires two steps to pass to return true
+    #   1. It has a hasModel relationship of the same model
+    #   2. kind_of? returns true for the model passed in
+    # This method can most often be used to detect if an object from Fedora that was created
+    # with a different model was then used to populate this object.
+    # @param [Class] the model class name to check if an object conforms_to that model
+    # @return [Boolean] true if this object conforms to the given model name
+    def conforms_to?(model_class)
+      if self.kind_of?(model_class)
+        #check has model and class match
+        mod = relationships.first(:predicate=>Predicates.find_graph_predicate(:has_model))
+        if mod
+          expected = ActiveFedora::ContentModel.pid_from_ruby_class(self.class)
+          if mod.object.to_s == expected
+            return true
+          else
+            raise "has_model relationship check failed for model #{model_class} raising exception, expected: '#{expected}' actual: '#{mod.object.to_s}'"
+          end
+        else
+          raise "has_model relationship does not exist for model #{model_class} check raising exception"
+        end
+      else
+        raise "kind_of? check failed for model #{model_class}, actual #{self.class} raising exception"
+      end
+      return false
+    end
+
     # Create an RDF statement
     # @param uri a string represending the subject
     # @param predicate a predicate symbol
@@ -120,40 +149,6 @@ module ActiveFedora
       return unless content.present?
       RelsExtDatastream.from_xml content, rels_ext
     end
-    
-    def relationships_from_class
-      rels = {}
-      self.class.relationships.each_pair do |subj, pred|
-        rels[subj] = {}
-        pred.each_key do |pred_key|
-          rels[subj][pred_key] = []
-        end
-      end
-      return rels
-    end
-    
-    def load_inbound_relationship(name, predicate, opts={})
-      opts = {:rows=>25}.merge(opts)
-      query = self.class.inbound_relationship_query(self.pid,"#{name}")
-      return [] if query.empty?
-      solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
-      if opts[:response_format] == :solr
-        return solr_result
-      else
-        if opts[:response_format] == :id_array
-          id_array = []
-          solr_result.hits.each do |hit|
-            id_array << hit[SOLR_DOCUMENT_ID]
-          end
-          return id_array
-        elsif opts[:response_format] == :load_from_solr || self.load_from_solr
-          return ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
-        else
-          return ActiveFedora::SolrService.reify_solr_results(solr_result)
-        end
-      end
-    end
-
 
     def ids_for_outbound(predicate)
       (object_relations[predicate] || []).map do |o|
@@ -162,220 +157,86 @@ module ActiveFedora
       end
     end
 
-    def load_bidirectional(name, inbound_method_name, outbound_method_name, opts) 
-        opts = {:rows=>25}.merge(opts)
-        if opts[:response_format] == :solr || opts[:response_format] == :load_from_solr
-          predicate = outbound_relationship_predicates["#{name}_outbound"]
-          outbound_id_array = ids_for_outbound(predicate)
-          query = self.class.bidirectional_relationship_query(self.pid,"#{name}",outbound_id_array)
-          solr_result = SolrService.instance.conn.query(query, :rows=>opts[:rows])
-          
-          if opts[:response_format] == :solr
-            return solr_result
-          elsif opts[:response_format] == :load_from_solr || self.load_from_solr
-            return ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
-          else
-            return ActiveFedora::SolrService.reify_solr_results(solr_result)
-          end
-        else
-          ary = send(inbound_method_name,opts) + send(outbound_method_name, opts)
-          return ary.uniq
-        end
+    # Return hash that persists relationship metadata defined by has_relationship calls
+    # @return [Hash] Hash of relationship subject (:self or :inbound) mapped to nested hashs of each relationship name mapped to another hash relationship options 
+    # @example For the following relationship
+    #
+    #  has_relationship "audio_records", :has_part, :type=>AudioRecord
+    #  
+    #  Results in the following returned by relationships_desc
+    #  {:self=>{"audio_records"=>{:type=>AudioRecord, :singular=>nil, :predicate=>:has_part, :inbound=>false}}}
+    def relationships_desc
+      @relationships_desc ||= self.class.relationships_desc
     end
 
-    def load_outbound_relationship(name, predicate, opts={})
-      id_array = ids_for_outbound(predicate)
-      if opts[:response_format] == :id_array  && !self.class.relationship_has_solr_filter_query?(:self,"#{name}")
-        return id_array
-      else
-        query = self.class.outbound_relationship_query(name,id_array)
-        solr_result = SolrService.instance.conn.query(query)
-        if opts[:response_format] == :solr
-          return solr_result
-        elsif opts[:response_format] == :id_array
-          id_array = []
-          solr_result.hits.each do |hit|
-            id_array << hit[SOLR_DOCUMENT_ID]
-          end
-          return id_array
-        elsif opts[:response_format] == :load_from_solr || self.load_from_solr
-          return ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
-        else
-          return ActiveFedora::SolrService.reify_solr_results(solr_result)
+    # Return hash of relationship names and predicate pairs (inbound and outbound).
+    # It retrieves this information via the relationships_desc hash in the class.
+    # @return [Hash] A hash of relationship names (inbound and outbound) mapped to predicates used
+    def relationship_predicates
+      return @relationship_predicates if @relationship_predicates
+      @relationship_predicates = {}
+      relationships_desc.each_pair do |subj, names|
+        @relationship_predicates[subj] = {}
+        names.each_pair do |name, args|
+          @relationship_predicates[subj][name] = args[:predicate]
         end
       end
+      @relationship_predicates
     end
-    
-    module ClassMethods
-      # Allows for a relationship to be treated like any other attribute of a model class. You define
-      # relationships in your model class using this method.  You then have access to several
-      # helper methods to list, append, and remove objects from the list of relationships. 
-      # ====Examples to define two relationships 
-      #  class AudioRecord < ActiveFedora::Base
-      #
-      #   has_relationship "oral_history", :has_part, :inbound=>true, :type=>OralHistory
-      #   # returns all similar audio
-      #   has_relationship "similar_audio", :has_part, :type=>AudioRecord
-      #   #returns only similar audio with format wav
-      #   has_relationship "similar_audio_wav", :has_part, :solr_fq=>"format_t:wav"
-      #
-      # The first two parameters are required:
-      #   name: relationship name
-      #   predicate: predicate for the relationship
-      #   opts:
-      #     possible parameters  
-      #       :inbound => if true loads an external relationship via Solr (defaults to false)
-      #       :type => The type of model to use when instantiated an object from the pid in this relationship (defaults to ActiveFedora::Base)
-      #       :solr_fq => Define a solr query here if you want to filter out some objects in your relationship (must be a properly formatted solr query)
-      #
-      # If inbound is true it expects the relationship to be defined by another object's RELS-EXT
-      # and to load that relationship from Solr.  Otherwise, if inbound is true the relationship is stored in
-      # this object's RELS-EXT datastream
-      #
-      # Word of caution - The same predicate may not be used twice for two inbound or two outbound relationships.  However, it may be used twice if one is inbound
-      # and one is outbound as shown in the example above.  A full list of possible predicates are defined by predicate_mappings
-      #
-      # For the oral_history relationship in the example above the following helper methods are created:
-      #  oral_history: returns array of OralHistory objects that have this AudioRecord with predicate :has_part 
-      #  oral_history_ids: Return array of pids for OralHistory objects that have this AudioRecord with predicate :has_part
-      #  oral_history_query: Return solr query that can be used to retrieve related objects as solr documents
-      # 
-      # For the outbound relationship "similar_audio" there are two additional methods to append and remove objects from that relationship
-      # since it is managed internally:
-      #  similar_audio: Return array of AudioRecord objects that have been added to similar_audio relationship
-      #  similar_audio_ids:  Return array of AudioRecord object pids that have been added to similar_audio relationship
-      #  similar_audio_query: Return solr query that can be used to retrieve related objects as solr documents
-      #  similar_audio_append: Add an AudioRecord object to the similar_audio relationship
-      #  similar_audio_remove: Remove an AudioRecord from the similar_audio relationship
-      def has_relationship(name, predicate, opts = {})
-        opts = {:singular => nil, :inbound => false}.merge(opts)
-        if opts[:inbound] == true
-          #raise "Duplicate use of predicate for inbound relationship name not allowed" if predicate_exists_with_different_relationship_name?(:inbound,name,predicate)
-          register_relationship_desc(:inbound, name, predicate, opts)
-          register_predicate(:inbound, predicate)
-          create_inbound_relationship_finders(name, predicate, opts)
-        else
-          #raise "Duplicate use of predicate for named outbound relationship \"#{predicate.inspect}\" not allowed" if named_predicate_exists_with_different_name?(:self,name,predicate)
-          register_relationship_desc(:self, name, predicate, opts)
-          register_predicate(:self, predicate)
-          create_relationship_name_methods(name)
-          create_outbound_relationship_finders(name, predicate, opts)
-        end
-      end
-      
-      # Generates relationship finders for predicates that point in both directions
-      #
-      # @param [String] name of the relationship method(s) to create
-      # @param [Symbol] outbound_predicate Predicate used in outbound relationships
-      # @param [Symbol] inbound_predicate Predicate used in inbound relationships
-      # @param [Hash] opts
-      #
-      # Example:
-      #  has_bidirectional_relationship("parts", :has_part, :is_part_of)
-      #
-      # will create three instance methods: parts_outbound, and parts_inbound and parts
-      # the inbound and outbound methods are the same that would result from calling 
-      # create_inbound_relationship_finders and create_outbound_relationship_finders
-      # The third method combines the results of both and handles generating appropriate 
-      # solr queries where necessary.
-      def has_bidirectional_relationship(name, outbound_predicate, inbound_predicate, opts={})
-        create_bidirectional_relationship_finders(name, outbound_predicate, inbound_predicate, opts)
-      end
-      
-    
-      # relationships are tracked as a hash of structure 
-      # @example
-      #   ds.relationships # => {:self=>{:has_model=>["afmodel:SimpleThing"],:has_part=>["demo:20"]},:inbound=>{:is_part_of=>["demo:6"]} 
-      def relationships
-        @class_relationships ||= Hash[:self => {}]
-      end
-    
-    
-      def register_subject(subject)
-        if !relationships.has_key?(subject) 
-            relationships[subject] = {} 
-        end
-      end
-    
-      def register_predicate(subject, predicate)
-        register_subject(subject)
-        if !relationships[subject].has_key?(predicate) 
-          relationships[subject][predicate] = []
-        end
-      end
 
+    # Return hash of outbound relationship names and predicate pairs
+    # @return [Hash] A hash of outbound relationship names mapped to predicates used
+    def outbound_relationship_predicates
+      relationship_predicates.has_key?(:self) ? relationship_predicates[:self] : {}
+    end
 
-      def create_inbound_relationship_finders(name, predicate, opts = {})
-        class_eval <<-END, __FILE__, __LINE__
-        def #{name}(opts={})
-          load_inbound_relationship('#{name}', '#{predicate}', opts)
-        end
-        def #{name}_ids
-          #{name}(:response_format => :id_array)
-        end
-        def #{name}_from_solr
-          #{name}(:response_format => :load_from_solr)
-        end
-        def #{name}_query
-          relationship_query("#{name}")
-        end
-        END
-      end
-    
-      def create_outbound_relationship_finders(name, predicate, opts = {})
-        class_eval <<-END, __FILE__, __LINE__
-        def #{name}(opts={})
-          load_outbound_relationship(#{name.inspect}, #{predicate.inspect}, opts)
-        end
-        def #{name}_ids
-          #{name}(:response_format => :id_array)
-        end
-        def #{name}_from_solr
-          #{name}(:response_format => :load_from_solr)
-        end
-        def #{name}_query
-          relationship_query("#{name}")
-        end
-        END
-      end
-      
+    # Return hash of inbound relationship names and predicate pairs
+    # @return [Hash] A hash of inbound relationship names mapped to predicates used
+    def inbound_relationship_predicates
+      relationship_predicates.has_key?(:inbound) ? relationship_predicates[:inbound] : {}
+    end
 
 
-      # Generates relationship finders for predicates that point in both directions
-      # and registers predicate relationships for each direction.
+    module ClassMethods
+      # Return hash that persists relationship metadata defined by has_relationship calls.  If you implement a child class of ActiveFedora::Base it will inherit
+      # the relationship descriptions defined there by merging in the class
+      # instance variable values.  It will also do this for any level of 
+      # ancestors.
+      # @return [Hash] Hash of relationship subject (:self or :inbound) mapped to nested hashs of each relationship name mapped to another hash relationship options
+      # @example
+      #  For the following relationship
       #
-      # @param [String] name Name of the relationship method(s) to create
-      # @param [Symbol] outbound_predicate Predicate used in outbound relationships
-      # @param [Symbol] inbound_predicate Predicate used in inbound relationships
-      # @param [Hash] opts (optional)
-      def create_bidirectional_relationship_finders(name, outbound_predicate, inbound_predicate, opts={})
-        inbound_method_name = name.to_s+"_inbound"
-        outbound_method_name = name.to_s+"_outbound"
-        has_relationship(outbound_method_name, outbound_predicate, opts)
-        has_relationship(inbound_method_name, inbound_predicate, opts.merge!(:inbound=>true))
-
-        #create methods that mirror the outbound append and remove with our bidirectional name, assume just add and remove locally        
-        create_bidirectional_relationship_name_methods(name,outbound_method_name)
-
-        class_eval <<-END, __FILE__, __LINE__
-        def #{name}(opts={})
-          load_bidirectional("#{name}", :#{inbound_method_name}, :#{outbound_method_name}, opts)
-        end
-        def #{name}_ids
-          #{name}(:response_format => :id_array)
-        end
-        def #{name}_from_solr
-          #{name}(:response_format => :load_from_solr)
-        end
-        def #{name}_query
-          relationship_query("#{name}")
+      #  has_relationship "audio_records", :has_part, :type=>AudioRecord
+      #  
+      #  Results in the following returned by relationships_desc
+      #  {:self=>{"audio_records"=>{:type=>AudioRecord, :singular=>nil, :predicate=>:has_part, :inbound=>false}}}
+      def relationships_desc
+        #get any relationship descriptions from superclasses
+        if @class_relationships_desc.nil?
+          @class_relationships_desc ||= Hash[:self => {}]
+
+          #get super classes
+          super_klasses = []
+          #insert in reverse order so the child overwrites anything in parent
+          super_klass = self.superclass
+          while !super_klass.nil?
+            super_klasses.insert(0,super_klass)
+            super_klass = super_klass.superclass
+          end
+        
+          super_klasses.each do |super_klass|
+            if super_klass.respond_to?(:relationships_desc)
+              super_rels = super_klass.relationships_desc
+              super_rels.each_pair do |subject,rels|
+                @class_relationships_desc[subject] = {} unless @class_relationships_desc.has_key?(subject)
+                @class_relationships_desc[subject].merge!(rels)
+              end
+            end
+          end
         end
-        END
+        @class_relationships_desc
       end
-
-      
+    
     end
   end
-
-
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.2.0.pre1"
+    VERSION = "3.2.0.pre2"
 end

data/spec/integration/base_file_management_spec.rb

@@ -13,6 +13,7 @@ describe ActiveFedora::Base do
   end
   
   it "should persist and re-load collection members" do
+    ActiveSupport::Deprecation.stubs(:warn)
     container_copy = ActiveFedora::Base.load_instance(@test_container.pid)
     container_copy.collection_members(:response_format=>:id_array).should == ["foo:2"]
   end

data/spec/integration/base_spec.rb

@@ -1,35 +1,5 @@
 require 'spec_helper'
 
-class MockAFBaseRelationship < ActiveFedora::Base
-  has_relationship "testing", :has_part, :type=>MockAFBaseRelationship
-  has_relationship "testing2", :has_member, :type=>MockAFBaseRelationship
-  has_relationship "testing_inbound", :has_part, :type=>MockAFBaseRelationship, :inbound=>true
-  has_relationship "testing_inbound2", :has_member, :type=>MockAFBaseRelationship, :inbound=>true
-  has_bidirectional_relationship "testing_bidirectional", :has_collection_member, :is_member_of_collection
-  #next 2 used to test objects on opposite end of bidirectional relationship
-  has_relationship "testing_inbound3", :has_collection_member, :inbound=>true
-  has_relationship "testing3", :is_member_of_collection
-end
-
-class MockAFBaseFromSolr < ActiveFedora::Base
-  has_relationship "testing", :has_part, :type=>MockAFBaseFromSolr
-  has_relationship "testing2", :has_member, :type=>MockAFBaseFromSolr
-  has_relationship "testing_inbound", :has_part, :type=>MockAFBaseFromSolr, :inbound=>true
-  has_relationship "testing_inbound2", :has_member, :type=>MockAFBaseFromSolr, :inbound=>true
-  
-  has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
-    m.field "holding_id", :string
-  end
-  
-  has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
-    m.field "created", :date, :xml_node => "created"
-    m.field "language", :string, :xml_node => "language"
-    m.field "creator", :string, :xml_node => "creator"
-    # Created remaining fields
-    m.field "geography", :string, :xml_node => "geography"
-    m.field "title", :string, :xml_node => "title"
-  end
-end
 
 describe "Datastreams synched together" do
   before do
@@ -57,6 +27,40 @@ end
 
 
 describe ActiveFedora::Base do
+  before :all do
+    ActiveSupport::Deprecation.stubs(:warn).with("Deprecation: Relationships will not be included by default in the next version.   To use has_relationship add 'include ActiveFedora::Relationships' to your model")
+    class MockAFBaseRelationship < ActiveFedora::Base
+      include ActiveFedora::FileManagement
+      has_relationship "testing", :has_part, :type=>MockAFBaseRelationship
+      has_relationship "testing2", :has_member, :type=>MockAFBaseRelationship
+      has_relationship "testing_inbound", :has_part, :type=>MockAFBaseRelationship, :inbound=>true
+      has_relationship "testing_inbound2", :has_member, :type=>MockAFBaseRelationship, :inbound=>true
+      has_bidirectional_relationship "testing_bidirectional", :has_collection_member, :is_member_of_collection
+      #next 2 used to test objects on opposite end of bidirectional relationship
+      has_relationship "testing_inbound3", :has_collection_member, :inbound=>true
+      has_relationship "testing3", :is_member_of_collection
+    end
+
+    class MockAFBaseFromSolr < ActiveFedora::Base
+      has_relationship "testing", :has_part, :type=>MockAFBaseFromSolr
+      has_relationship "testing2", :has_member, :type=>MockAFBaseFromSolr
+      has_relationship "testing_inbound", :has_part, :type=>MockAFBaseFromSolr, :inbound=>true
+      has_relationship "testing_inbound2", :has_member, :type=>MockAFBaseFromSolr, :inbound=>true
+      
+      has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
+        m.field "holding_id", :string
+      end
+      
+      has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
+        m.field "created", :date, :xml_node => "created"
+        m.field "language", :string, :xml_node => "language"
+        m.field "creator", :string, :xml_node => "creator"
+        # Created remaining fields
+        m.field "geography", :string, :xml_node => "geography"
+        m.field "title", :string, :xml_node => "title"
+      end
+    end
+  end
   
   before(:all) do
     ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
@@ -324,37 +328,40 @@ describe ActiveFedora::Base do
     describe '#delete' do
       it 'if inbound relationships exist should remove relationships from those inbound targets as well when deleting this object' do
         @test_object2 = MockAFBaseRelationship.new
-#        @test_object2.new_object = true
         @test_object2.save
         @test_object3 = MockAFBaseRelationship.new
-#        @test_object3.new_object = true
         @test_object3.save
         @test_object4 = MockAFBaseRelationship.new
-#        @test_object4.new_object = true
         @test_object4.save
         @test_object5 = MockAFBaseRelationship.new
-#        @test_object5.new_object = true
         @test_object5.save
         #append to relationship by 'testing'
         @test_object2.add_relationship_by_name("testing",@test_object3)
         @test_object2.add_relationship_by_name("testing2",@test_object4)
         @test_object5.add_relationship_by_name("testing",@test_object2)
-        @test_object5.add_relationship_by_name("testing2",@test_object3)
+        #@test_object5.add_relationship_by_name("testing2",@test_object3)
         @test_object2.save
         @test_object5.save
-        #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-        @test_object2.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[@test_object5.internal_uri], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object4.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object3.internal_uri], "parts_outbound"=>[@test_object3.internal_uri], "testing_bidirectional_outbound"=>[]}}
-        @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[@test_object2.internal_uri], "testing_inbound2"=>[@test_object5.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-        @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[@test_object2.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-        @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object2.internal_uri], "parts_outbound"=>[@test_object2.internal_uri], "testing_bidirectional_outbound"=>[]}}
+        #check that the inbound relationships on test_object3 and test_object4 were eliminated
+        #testing goes to :has_part and testing2 goes to :has_member
+        @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
+        @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object3.internal_uri]
+        @test_object2.relationships_by_name(false)[:self]["testing"].should == [@test_object3.internal_uri]
+
+        @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object2.internal_uri]
+        @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
+
+        @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
+
         @test_object2.delete
         #need to reload since removed from rels_ext in memory
         @test_object5 = MockAFBaseRelationship.load_instance(@test_object5.pid)
       
         #check any test_object2 inbound rels gone from source
-        @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[@test_object5.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-        @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-        @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+        @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == []
+
+        @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == []
+        @test_object5.relationships_by_name(false)[:self]["testing"].should == []
     end
   end
     
@@ -496,15 +503,38 @@ describe ActiveFedora::Base do
       @test_object2.save
       @test_object5.save
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[@test_object5.internal_uri], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object4.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object3.internal_uri], "parts_outbound"=>[@test_object3.internal_uri], "testing_bidirectional_outbound"=>[]}}
-      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[@test_object2.internal_uri], "testing_inbound2"=>[@test_object5.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[@test_object2.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object2.internal_uri], "parts_outbound"=>[@test_object2.internal_uri], "testing_bidirectional_outbound"=>[]}}
+      @test_object2.relationships_by_name(false)[:self]["testing"].should == [@test_object3.internal_uri]
+      @test_object2.relationships_by_name(false)[:self]["testing2"].should == [@test_object4.internal_uri]
+      @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object3.internal_uri]
+      @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
+
+      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object2.internal_uri]
+      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object5.internal_uri]
+
+      @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
+
+      @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
+      @test_object5.relationships_by_name(false)[:self]["testing2"].should == [@test_object3.internal_uri]
+      @test_object5.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object2.internal_uri]
+
       #all inbound should now be empty if no parameter supplied to relationships
-      @test_object2.relationships_by_name.should == {:self=>{"testing2"=>[@test_object4.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object3.internal_uri], "parts_outbound"=>[@test_object3.internal_uri], "testing_bidirectional_outbound"=>[]}}
-      @test_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object5.relationships_by_name.should == {:self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object2.internal_uri], "parts_outbound"=>[@test_object2.internal_uri], "testing_bidirectional_outbound"=>[]}}
+      @test_object2.relationships_by_name[:self]["testing"].should == [@test_object3.internal_uri]
+      @test_object2.relationships_by_name[:self]["testing2"].should == [@test_object4.internal_uri]
+      @test_object2.relationships_by_name[:self]["parts_outbound"].should == [@test_object3.internal_uri]
+      @test_object2.relationships_by_name.should_not have_key :inbound
+
+      @test_object3.relationships_by_name.should_not have_key :inbound
+      @test_object4.relationships_by_name.should_not have_key :inbound
+
+
+      @test_object5.relationships_by_name[:self]["testing"].should == [@test_object2.internal_uri]
+      @test_object5.relationships_by_name[:self]["testing2"].should == [@test_object3.internal_uri]
+      @test_object5.relationships_by_name[:self]["parts_outbound"].should == [@test_object2.internal_uri]
+      @test_object5.relationships_by_name.should_not have_key :inbound
+      # @test_object2.relationships_by_name.should == {:self=>{"testing2"=>[@test_object4.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object3.internal_uri], "parts_outbound"=>[@test_object3.internal_uri], "testing_bidirectional_outbound"=>[]}}
+      # @test_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      # @test_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      # @test_object5.relationships_by_name.should == {:self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object2.internal_uri], "parts_outbound"=>[@test_object2.internal_uri], "testing_bidirectional_outbound"=>[]}}
     end
   end
   
@@ -530,10 +560,19 @@ describe ActiveFedora::Base do
       @test_object2.save
       @test_object5.save
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[@test_object5.internal_uri], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object4.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object3.internal_uri], "parts_outbound"=>[@test_object3.internal_uri], "testing_bidirectional_outbound"=>[]}}
-      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[@test_object2.internal_uri], "testing_inbound2"=>[@test_object5.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[@test_object2.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object2.internal_uri], "parts_outbound"=>[@test_object2.internal_uri], "testing_bidirectional_outbound"=>[]}}
+      @test_object2.relationships_by_name(false)[:self]["testing"].should == [@test_object3.internal_uri]
+      @test_object2.relationships_by_name(false)[:self]["testing2"].should == [@test_object4.internal_uri]
+      @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object3.internal_uri]
+      @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
+
+      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object2.internal_uri]
+      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object5.internal_uri]
+
+      @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
+
+      @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
+      @test_object5.relationships_by_name(false)[:self]["testing2"].should == [@test_object3.internal_uri]
+      @test_object5.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object2.internal_uri]
     end
   end
   
@@ -559,23 +598,30 @@ describe ActiveFedora::Base do
       @test_object2.save
       @test_object5.save
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.relationships_by_name(false).should == {:self=>{"testing"=>[@test_object3.internal_uri],
-                                                            "testing2"=>[@test_object4.internal_uri],
-                                                            "testing_bidirectional_outbound"=>[],"testing3"=>[], 
-                                                            "collection_members"=>[], "part_of"=>[], "parts_outbound"=>[@test_object3.internal_uri]},
-                                                    :inbound=>{"testing_inbound"=>[@test_object5.internal_uri],"testing_inbound2"=>[],
-          "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound"=>[]}}
-      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[@test_object2.internal_uri], "testing_inbound2"=>[@test_object5.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[@test_object2.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object2.internal_uri], "parts_outbound"=>[@test_object2.internal_uri], "testing_bidirectional_outbound"=>[]}}
+      @test_object2.relationships_by_name(false)[:self]["testing"].should == [@test_object3.internal_uri]
+      @test_object2.relationships_by_name(false)[:self]["testing2"].should == [@test_object4.internal_uri]
+      @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object3.internal_uri]
+      @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
+
+      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object2.internal_uri]
+      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object5.internal_uri]
+
+      @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
+
+      @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
+      @test_object5.relationships_by_name(false)[:self]["testing2"].should == [@test_object3.internal_uri]
+      @test_object5.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object2.internal_uri]
+
       @test_object2.remove_relationship_by_name("testing",@test_object3.internal_uri)
       @test_object2.save
       #check now removed for both outbound and inbound
-      @test_object2.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[@test_object5.internal_uri], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object4.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object2.relationships_by_name(false)[:self]["testing"].should == []
+      @test_object2.relationships_by_name(false)[:self]["testing2"].should == [@test_object4.internal_uri]
+      @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == []
+      @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
 
-      @test_object3.inbound_relationships[:has_part].should be_nil
-      
-      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[@test_object5.internal_uri]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == []
+      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object5.internal_uri]
     end
   end