active-fedora 3.1.6 → 3.2.0.pre1

data/lib/active_fedora/service_definitions.rb

@@ -0,0 +1,89 @@
+module ActiveFedora
+module ServiceDefinitions
+  def self.included(mod)
+    # check that it's an AF base
+    if mod.ancestors.include? ActiveFedora::Base
+      mod.extend(ClassMethods)
+      model_uri = mod.to_class_uri
+    # load ContentModel, pull Sdef pointers
+      begin
+        cmodel = ActiveFedora::ContentModel.load_instance(mod.to_class_uri)
+        sdef_pids = cmodel.ids_for_outbound(:has_service).collect { |uri|
+          uri.split('/')[-1]
+        }
+      rescue
+        sdef_pids = []
+      end
+      unless sdef_pids.include? "fedora-system:3"
+        sdef_pids << "fedora-system:3"
+      end
+      sdef_pids.each { |sdef_pid| mod.has_service_definition sdef_pid }
+    end
+  end
+  def self.sdef_config
+    @@methods ||= begin
+      if defined? Rails
+        config_path = Rails.root.join('config','service_mappings.yml')
+      else
+        config_path = 'config/service_mappings.yml'
+      end
+      YAML::load(File.open(config_path))[:service_mapping]
+    end
+    @@methods
+  end
+  def self.lookup_method(sdef_uri, method_name)
+    sdef_pid = sdef_uri.split('/')[-1]
+    begin
+      sdef = sdef_config[sdef_pid]
+      return nil unless sdef
+      result = nil
+      sdef.each { |key, value| result = key if method_name == value }
+    rescue
+      return nil
+    end
+    return result
+  end
+
+  module ClassMethods
+    def sdef_pids
+      @sdef_pids ||= []
+    end
+    def has_service_definition sdef_uri
+      sdef_pid = sdef_uri.split('/')[-1]
+      unless sdef_pids.include? sdef_pid
+        self.add_sdef_methods! sdef_pid
+        sdef_pids << sdef_pid
+      end
+    end
+    # iterate over SDef pointers, identify symbols in yaml map
+    # inject methods by symbol key
+    def add_sdef_methods! sdef_pid
+      unless sdef_pid == "fedora-system:3"
+        content = ActiveFedora::RubydoraConnection.instance.connection.datastream_dissemination(:pid=>sdef_pid, :dsid=>"METHODMAP")
+        method_map = Nokogiri::XML.parse(content)
+        methods = method_map.xpath('//fmm:Method').collect { |method|
+          method["operationName"]
+        }
+      else
+        methods = ["viewObjectProfile","viewMethodIndex","viewItemIndex","viewDublinCore"]
+      end
+      methods.each { |method|
+        add_method!(sdef_pid, method)
+      }
+    end
+    def add_method!(sdef_pid, method_name)
+      # find method_key
+      method_key = ServiceDefinitions.lookup_method(sdef_pid, method_name)
+      if method_key and not method_defined? method_key
+        define_method(method_key) { |*args, &block|
+            opts = args[0] || {}
+            opts = opts.merge({:pid => pid, :sdef => sdef_pid, :method => method_name })
+            repo = ActiveFedora::RubydoraConnection.instance.connection
+          # dispatch to the dissemination method on restAPI client
+            repo.dissemination opts, &block
+        }
+      end
+    end
+  end
+end
+end

data/lib/active_fedora/unsaved_digital_object.rb

@@ -0,0 +1,40 @@
+module ActiveFedora
+  # Helps Rubydora create datastreams of the type defined by the ActiveFedora::Base#datastream_class_for_name
+  class UnsavedDigitalObject 
+    attr_accessor :original_class, :datastreams, :label, :namespace
+    
+    def initialize(original_class, namespace)
+      self.original_class = original_class
+      self.namespace = namespace
+      self.datastreams = {}
+    end
+
+    def pid
+      '__DO_NOT_USE__'
+    end
+
+    def new?
+      true
+    end
+
+    ### Change this into a real digital object
+    def save
+      obj = DigitalObject.find(self.original_class, assign_pid)
+      self.datastreams.each do |k, v|
+        v.digital_object = obj
+        obj.datastreams[k] = v
+      end
+      obj
+    end
+
+    def assign_pid
+        args = {}
+        args[:namespace] = self.namespace if self.namespace
+        RubydoraConnection.instance.nextid args
+    end
+
+
+
+  end
+end
+

data/lib/active_fedora/version.rb

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

data/spec/integration/base_spec.rb

@@ -11,11 +11,6 @@ class MockAFBaseRelationship < ActiveFedora::Base
   has_relationship "testing3", :is_member_of_collection
 end
 
-class MockAFBaseDatastream < ActiveFedora::Base
-  has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
-  has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
-end
-
 class MockAFBaseFromSolr < ActiveFedora::Base
   has_relationship "testing", :has_part, :type=>MockAFBaseFromSolr
   has_relationship "testing2", :has_member, :type=>MockAFBaseFromSolr
@@ -39,7 +34,7 @@ end
 describe "Datastreams synched together" do
   before do
     class DSTest < ActiveFedora::Base
-      def configure_defined_datastreams
+      def load_datastreams
         super
         unless self.datastreams.keys.include? 'test_ds'
          add_file_datastream("XXX",:dsid=>'test_ds', :mimeType=>'text/html')
@@ -101,12 +96,6 @@ describe ActiveFedora::Base do
       @test_object.pid.should_not be_nil
     end
 
-    it "passing namespace to constructor with no pid should generate a pid with the supplied namespace" do
-      @test_object2 = ActiveFedora::Base.new({:namespace=>"randomNamespace"})
-      #@test_object2.pid.match('changeme:\d+').to_a.first.should == @test_object2.pid
-      # will be nil if match failed, otherwise will equal pid
-      @test_object2.pid.match('randomNamespace:\d+').to_a.first.should == @test_object2.pid
-    end
   end
   
   describe ".save" do
@@ -118,6 +107,13 @@ describe ActiveFedora::Base do
       @test_object2.delete
     end
     
+    it "passing namespace to constructor with no pid should generate a pid with the supplied namespace" do
+      @test_object2 = ActiveFedora::Base.new({:namespace=>"randomNamespace"})
+      # will be nil if match failed, otherwise will equal pid
+      @test_object2.save
+      @test_object2.pid.match('randomNamespace:\d+').to_a.first.should == @test_object2.pid
+    end
+
     it "should set the CMA hasModel relationship in the Rels-EXT" do 
       @test_object2.save
       rexml = REXML::Document.new(@test_object2.datastreams["RELS-EXT"].content)
@@ -125,9 +121,9 @@ describe ActiveFedora::Base do
       rexml.root.elements["rdf:Description/ns0:hasModel"].attributes["rdf:resource"].should == 'info:fedora/afmodel:ActiveFedora_Base'
     end
     it "should merge attributes from fedora into attributes hash" do
+      @test_object2.save
       inner_object = @test_object2.inner_object
       inner_object.pid.should == @test_object2.pid
-      @test_object2.save
       inner_object.should respond_to(:state)
       inner_object.should respond_to(:lastModifiedDate)
       inner_object.should respond_to(:ownerId)
@@ -231,12 +227,9 @@ describe ActiveFedora::Base do
 
   describe '.add_relationship' do
     it "should update the RELS-EXT datastream and relationships should end up in Fedora when the object is saved" do
-      test_relationships = [ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_member_of, :object => "info:fedora/demo:5"), 
-                                ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_member_of, :object => "info:fedora/demo:10"),
-                                ActiveFedora::Relationship.new(:subject => :self, :predicate => :conforms_to, :object => "info:fedora/afmodel:OralHistory")]
-      test_relationships.each do |rel|
-        @test_object.add_relationship(rel.predicate, rel.object)
-      end
+      @test_object.add_relationship(:is_member_of, "info:fedora/demo:5")
+      @test_object.add_relationship(:is_member_of, "info:fedora/demo:10")
+      @test_object.add_relationship(:conforms_to, "info:fedora/afmodel:OralHistory")
       @test_object.save
       rexml = REXML::Document.new(@test_object.datastreams["RELS-EXT"].content)
       # Purpose: confirm that the isMemberOf entries exist and have real RDF in them
@@ -321,9 +314,11 @@ describe ActiveFedora::Base do
   describe "delete" do
     
     it "should delete the object from Fedora and Solr" do
+      @test_object.save
       ActiveFedora::Base.find_by_solr(@test_object.pid).hits.first["id"].should == @test_object.pid
+      pid = @test_object.pid # store so we can access it after deletion
       @test_object.delete
-      ActiveFedora::Base.find_by_solr(@test_object.pid).hits.should be_empty
+      ActiveFedora::Base.find_by_solr(pid).hits.should be_empty
     end
 
     describe '#delete' do
@@ -347,24 +342,19 @@ describe ActiveFedora::Base do
         @test_object5.add_relationship_by_name("testing2",@test_object3)
         @test_object2.save
         @test_object5.save
-        r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-        r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-        r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-        r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-        model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
         #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"=>[r5.object], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object], "testing_bidirectional_outbound"=>[]}}
-        @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r2.object], "testing_inbound2"=>[r5.object]}, :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"=>[r2.object]}, :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"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
+        @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.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"=>[r5.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+        @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"=>[r3.object], "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"=>[]}}
     end
   end
     
@@ -373,6 +363,7 @@ describe ActiveFedora::Base do
   describe '#remove_relationship' do
     it 'should remove a relationship from an object after a save' do
       @test_object2 = ActiveFedora::Base.new
+      @test_object2.save
       @test_object.add_relationship(:has_part,@test_object2)
       @test_object.save
       @pid = @test_object.pid
@@ -382,16 +373,11 @@ describe ActiveFedora::Base do
         puts "#{e.message}\n#{e.backtrace}"
         raise e
       end
-      #use dummy relationships just to get correct formatting for expected objects
-      r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-      model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(ActiveFedora::Base))
-#      @test_object.relationships.should == {:self=>{:has_model=>[model_rel.object], :has_part=>[r.object]}}
-      stmt = @test_object.build_statement(@test_object.internal_uri, :has_part, r.object)
-      @test_object.relationships.has_statement?(stmt).should be_true
+      @test_object.object_relations[:has_part].should include @test_object2.internal_uri
       @test_object.remove_relationship(:has_part,@test_object2)
       @test_object.save
       @test_object = ActiveFedora::Base.load_instance(@pid)
-      @test_object.relationships.has_statement?(stmt).should be_false
+      @test_object.object_relations[:has_part].should be_nil
     end
   end
 
@@ -414,64 +400,38 @@ describe ActiveFedora::Base do
       @test_object5.testing_bidirectional_append(@test_object4)
       @test_object2.save
       @test_object5.save
-      r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-      r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-      r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-      r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-      model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
+      model_rel = ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship)
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      stmt = @test_object2.build_statement(@test_object2.internal_uri, :has_model, model_rel.object)
-      @test_object2.relationships.has_statement?(stmt).should be_true
-      stmt = @test_object2.build_statement(@test_object2.internal_uri, :has_part, r3.object)
-      @test_object2.relationships.has_statement?(stmt).should be_true
-      stmt = @test_object2.build_statement(@test_object2.internal_uri, :has_member, r4.object)
-      @test_object2.relationships.has_statement?(stmt).should be_true
-      stmt = @test_object2.build_statement(@test_object2.internal_uri, :is_member_of_collection, r5.object)
-      @test_object2.relationships.has_statement?(stmt).should be_true
-      @test_object2.inbound_relationships.should == {:has_part=>[r5.object]}
-      stmt = @test_object3.build_statement(@test_object3.internal_uri, :has_model, model_rel.object)
-      @test_object3.relationships.has_statement?(stmt).should be_true
-      @test_object3.inbound_relationships.should == {:has_part=>[r2.object],
-                                                               :has_member=>[r5.object]}
-      stmt = @test_object4.build_statement(@test_object4.internal_uri, :has_model, model_rel.object)
-      @test_object4.relationships.has_statement?(stmt).should be_true
-      @test_object4.inbound_relationships.should == {:has_member=>[r2.object],:has_collection_member=>[r5.object]}
+      @test_object2.object_relations[:has_model].should include model_rel
+      @test_object2.object_relations[:has_part].should include @test_object3
+
+      @test_object2.object_relations[:has_member].should include @test_object4 
+      @test_object2.object_relations[:is_member_of_collection].should include @test_object5
+      @test_object2.inbound_relationships.should == {:has_part=>[@test_object5.internal_uri]}
+
+      @test_object3.object_relations[:has_model].should include model_rel
+      @test_object3.inbound_relationships.should == {:has_part=>[@test_object2.internal_uri],
+                                                               :has_member=>[@test_object5.internal_uri]}
+      @test_object4.object_relations[:has_model].should include model_rel
+      @test_object4.inbound_relationships.should == {:has_member=>[@test_object2.internal_uri],:has_collection_member=>[@test_object5.internal_uri]}
 
-      stmt = @test_object5.build_statement(@test_object5.internal_uri, :has_model, model_rel.object)
-      @test_object5.relationships.has_statement?(stmt).should be_true
-      stmt = @test_object5.build_statement(@test_object5.internal_uri, :has_part, r2.object)
-      @test_object5.relationships.has_statement?(stmt).should be_true
-      stmt = @test_object5.build_statement(@test_object5.internal_uri, :has_member, r3.object)
-      @test_object5.relationships.has_statement?(stmt).should be_true
-      stmt = @test_object5.build_statement(@test_object5.internal_uri, :has_collection_member, r4.object)
-      @test_object5.relationships.has_statement?(stmt).should be_true
-      @test_object5.inbound_relationships.should == {:is_member_of_collection=>[r2.object]}
-      # @test_object2.outbound_relationships.should == {:has_model=>[model_rel.object],
-      #                                                       :has_part=>[r3.object],
-      #                                                       :has_member=>[r4.object],
-      #                                                       :is_member_of_collection=>[r5.object]}
-      # @test_object3.outbound_relationships.should == {:has_model=>[model_rel.object]}
-      # @test_object4.outbound_relationships.should == {:has_model=>[model_rel.object]}
-      # @test_object5.outbound_relationships.should == {:has_model=>[model_rel.object],
-      #                                                       :has_part=>[r2.object],
-      #                                                       :has_member=>[r3.object],
-      #                                                       :has_collection_member=>[r4.object]}
+      @test_object5.object_relations[:has_model].should include model_rel
+      @test_object5.object_relations[:has_part].should include @test_object2
+      @test_object5.object_relations[:has_member].should include @test_object3 
+      @test_object5.object_relations[:has_collection_member].should include @test_object4 
+      @test_object5.inbound_relationships.should == {:is_member_of_collection=>[@test_object2.internal_uri]}
     end
   end
   
   describe '#inbound_relationships' do
     it 'should return a hash of inbound relationships' 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 named relationship 'testing'
       @test_object2.testing_append(@test_object3)
@@ -481,15 +441,10 @@ describe ActiveFedora::Base do
       #@test_object5.testing_bidirectional_append(@test_object4)
       @test_object2.save
       @test_object5.save
-      r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-      r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-      r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-      r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-      model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.inbound_relationships.should == {:has_part=>[r5.object]}
-      @test_object3.inbound_relationships.should == {:has_part=>[r2.object],:has_member=>[r5.object]}
-      @test_object4.inbound_relationships.should == {:has_member=>[r2.object]}
+      @test_object2.inbound_relationships.should == {:has_part=>[@test_object5.internal_uri]}
+      @test_object3.inbound_relationships.should == {:has_part=>[@test_object2.internal_uri],:has_member=>[@test_object5.internal_uri]}
+      @test_object4.inbound_relationships.should == {:has_member=>[@test_object2.internal_uri]}
       @test_object5.inbound_relationships.should == {}
     end
   end
@@ -497,16 +452,12 @@ describe ActiveFedora::Base do
   describe '#inbound_relationships_by_name' do
     it 'should return a hash of inbound relationship names to array of objects' 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 named relationship 'testing'
       @test_object2.testing_append(@test_object3)
@@ -515,17 +466,12 @@ describe ActiveFedora::Base do
       @test_object5.testing2_append(@test_object3)
       @test_object2.save
       @test_object5.save
-      r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-      r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-      r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-      r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-      model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.inbound_relationships_by_name.should == {"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+      @test_object2.inbound_relationships_by_name.should == {"testing_inbound"=>[@test_object5.internal_uri],"testing_inbound2"=>[],
                                                            "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
-      @test_object3.inbound_relationships_by_name.should == {"testing_inbound"=>[r2.object],"testing_inbound2"=>[r5.object],
+      @test_object3.inbound_relationships_by_name.should == {"testing_inbound"=>[@test_object2.internal_uri],"testing_inbound2"=>[@test_object5.internal_uri],
                                                            "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
-      @test_object4.inbound_relationships_by_name.should == {"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
+      @test_object4.inbound_relationships_by_name.should == {"testing_inbound"=>[],"testing_inbound2"=>[@test_object2.internal_uri],
                                                            "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
       @test_object5.inbound_relationships_by_name.should == {"testing_inbound"=>[],"testing_inbound2"=>[],
                                                            "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
@@ -535,16 +481,12 @@ describe ActiveFedora::Base do
   describe '#relationships_by_name' do
     it '' 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 named relationship 'testing'
       @test_object2.testing_append(@test_object3)
@@ -553,21 +495,16 @@ describe ActiveFedora::Base do
       @test_object5.testing2_append(@test_object3)
       @test_object2.save
       @test_object5.save
-      r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-      r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-      r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-      r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-      model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #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"=>[r5.object], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object], "testing_bidirectional_outbound"=>[]}}
-      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r2.object], "testing_inbound2"=>[r5.object]}, :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"=>[r2.object]}, :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"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
+      @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"=>[]}}
       #all inbound should now be empty if no parameter supplied to relationships
-      @test_object2.relationships_by_name.should == {:self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object], "testing_bidirectional_outbound"=>[]}}
+      @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"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "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
   
@@ -592,16 +529,11 @@ describe ActiveFedora::Base do
       @test_object5.add_relationship_by_name("testing2",@test_object3)
       @test_object2.save
       @test_object5.save
-      r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-      r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-      r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-      r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-      model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #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"=>[r5.object], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object], "testing_bidirectional_outbound"=>[]}}
-      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r2.object], "testing_inbound2"=>[r5.object]}, :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"=>[r2.object]}, :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"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
+      @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"=>[]}}
     end
   end
   
@@ -626,28 +558,24 @@ describe ActiveFedora::Base do
       @test_object5.add_relationship_by_name("testing2",@test_object3)
       @test_object2.save
       @test_object5.save
-      r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-      r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-      r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-      r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-      model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.relationships_by_name(false).should == {:self=>{"testing"=>[r3.object],
-                                                            "testing2"=>[r4.object],
+      @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"=>[r3.object]},
-                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+                                                            "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"=>[r2.object], "testing_inbound2"=>[r5.object]}, :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"=>[r2.object]}, :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"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
-      @test_object2.remove_relationship_by_name("testing",@test_object3)
+      @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.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"=>[r5.object], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r5.object]}, :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"=>[r2.object]}, :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"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
+      @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_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"=>[]}}
     end
   end
 
@@ -668,153 +596,26 @@ describe ActiveFedora::Base do
       @test_object5.add_relationship_by_name("testing2",@test_object3)
       @test_object2.save
       @test_object5.save
-      r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-      r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-      r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-      r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-      model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
-      @test_object2.find_relationship_by_name("testing").should == [r3.object]
-      @test_object2.find_relationship_by_name("testing2").should == [r4.object]
-      @test_object2.find_relationship_by_name("testing_inbound").should == [r5.object]
+      @test_object2.find_relationship_by_name("testing").should == [@test_object3.internal_uri]
+      @test_object2.find_relationship_by_name("testing2").should == [@test_object4.internal_uri]
+      @test_object2.find_relationship_by_name("testing_inbound").should == [@test_object5.internal_uri]
       @test_object2.find_relationship_by_name("testing_inbound2").should == []
       @test_object3.find_relationship_by_name("testing").should == []
       @test_object3.find_relationship_by_name("testing2").should == []
-      @test_object3.find_relationship_by_name("testing_inbound").should == [r2.object]
-      @test_object3.find_relationship_by_name("testing_inbound2").should == [r5.object]
+      @test_object3.find_relationship_by_name("testing_inbound").should == [@test_object2.internal_uri]
+      @test_object3.find_relationship_by_name("testing_inbound2").should == [@test_object5.internal_uri]
       @test_object4.find_relationship_by_name("testing").should == []
       @test_object4.find_relationship_by_name("testing2").should == []
       @test_object4.find_relationship_by_name("testing_inbound").should == []
-      @test_object4.find_relationship_by_name("testing_inbound2").should == [r2.object]
-      @test_object5.find_relationship_by_name("testing").should == [r2.object]
-      @test_object5.find_relationship_by_name("testing2").should == [r3.object]
+      @test_object4.find_relationship_by_name("testing_inbound2").should == [@test_object2.internal_uri]
+      @test_object5.find_relationship_by_name("testing").should == [@test_object2.internal_uri]
+      @test_object5.find_relationship_by_name("testing2").should == [@test_object3.internal_uri]
       @test_object5.find_relationship_by_name("testing_inbound").should == []
       @test_object5.find_relationship_by_name("testing_inbound2").should == []
       
     end
   end
   
-  #
-  # Named datastream specs
-  #
-  describe '#add_named_datastream' do
-    it 'should add a datastream with the given name to the object in fedora' do
-      @test_object2 = MockAFBaseDatastream.new
-#      @test_object2.new_object = true
-      f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
-      f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
-      f2.stubs(:original_filename).returns("dino.jpg")
-      f.stubs(:content_type).returns("image/jpeg")
-      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})
-      @test_object2.add_named_datastream("high",{:content_type=>"image/jpeg",:blob=>f2})
-      ds = @test_object2.thumbnail.first
-      ds2 = @test_object2.high.first
-      @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
-      @test_object2.named_datastreams.keys.size.should == 2
-      @test_object2.named_datastreams.keys.include?("thumbnail").should == true
-      @test_object2.named_datastreams.keys.include?("high").should == true
-      @test_object2.named_datastreams["thumbnail"].size.should == 1
-      @test_object2.named_datastreams["high"].size.should == 1
-      t2_thumb1 = @test_object2.named_datastreams["thumbnail"].first
-      t2_thumb1.dsid.should == ds.dsid
-      t2_thumb1.mimeType.should == ds.mimeType
-      t2_thumb1.pid.should == ds.pid
-      t2_thumb1.dsLabel.should == ds.dsLabel
-      t2_thumb1.controlGroup.should == ds.controlGroup
-      t2_high1 = @test_object2.named_datastreams["high"].first
-      t2_high1.dsid.should == ds2.dsid
-      t2_high1.mimeType.should == ds2.mimeType
-      t2_high1.pid.should == ds2.pid
-      t2_high1.dsLabel.should == ds2.dsLabel
-      t2_high1.controlGroup.should == ds2.controlGroup
-    end
-  end
-  
-  describe '#add_named_file_datastream' do
-    it 'should add a file datastream with the given name to the object in fedora' do
-      @test_object2 = MockAFBaseDatastream.new
-#      @test_object2.new_object = true
-      f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
-      f.stubs(:content_type).returns("image/jpeg")
-      @test_object2.add_named_file_datastream("thumbnail",f)
-      ds = @test_object2.thumbnail.first
-      @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
-      @test_object2.named_datastreams["thumbnail"].size.should == 1
-      t2_thumb1 = @test_object2.named_datastreams["thumbnail"].first
-      t2_thumb1.dsid.should == "THUMB1"
-      t2_thumb1.mimeType.should == "image/jpeg"
-      t2_thumb1.pid.should == @test_object2.pid
-      t2_thumb1.dsLabel.should == "minivan.jpg"
-      t2_thumb1.controlGroup.should == "M"
-
-# .attributes.should == {"label"=>ds.label,"dsid"=>ds.dsid,
-#                                                                                  "mimeType"=>ds.attributes[:mimeType],
-#                                                                                  :controlGroup=>ds.attributes[:controlGroup],
-#                                                                                  :pid=>ds.pid, :dsID=>ds.dsid, :dsLabel=>ds.attributes[:dsLabel]}
-    end
-  end
-  
-  describe '#update_named_datastream' do
-    it 'should update a named datastream to have a new file' do
-      @test_object2 = MockAFBaseDatastream.new
-      f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
-      minivan = f.read
-      f.rewind
-      f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
-      dino = f2.read
-      f2.rewind
-      f.stubs(:content_type).returns("image/jpeg")
-      f.stubs(:original_filename).returns("minivan.jpg")
-      f2.stubs(:content_type).returns("image/jpeg")
-      f2.stubs(:original_filename).returns("dino.jpg")
-      #check raise exception if dsid not supplied
-      @test_object2.add_named_datastream("thumbnail",{:file=>f})
-      @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
-      
-      @test_object2.thumbnail.size.should == 1
-      @test_object2.thumbnail_ids == ["THUMB1"]
-      ds = @test_object2.thumbnail.first
-      ds.dsid.should == "THUMB1"
-      ds.mimeType.should == "image/jpeg"
-      ds.pid.should == @test_object2.pid
-      ds.dsLabel.should == "minivan.jpg"
-      ds.controlGroup.should == "M"
-
-      ds.content.should == minivan 
-      @test_object2.update_named_datastream("thumbnail",{:file=>f2,:dsid=>"THUMB1"})
-      @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
-      @test_object2.thumbnail.size.should == 1
-      @test_object2.thumbnail_ids == ["THUMB1"]
-      ds2 = @test_object2.thumbnail.first
-      ds2.dsid.should == "THUMB1"
-      ds2.mimeType.should == "image/jpeg"
-      ds2.pid.should == @test_object2.pid
-      ds2.dsLabel.should == "dino.jpg"
-      ds2.controlGroup.should == "M"
-      (ds2.content == dino).should be_true
-    end
-  end
-  
-  describe '#named_datastreams_ids' do
-    it 'should return a hash of datastream name to an array of dsids' do
-      @test_object2 = MockAFBaseDatastream.new
-#      @test_object2.new_object = true
-      f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
-      f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
-      f2.stubs(:original_filename).returns("dino.jpg")
-      f.stubs(:content_type).returns("image/jpeg")
-      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})
-      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f2})
-      @test_object2.save
-      @test_object2 = MockAFBaseDatastream.load_instance(@test_object2.pid)
-      @test_object2.named_datastreams_ids.should == {"high"=>[], "thumbnail"=>["THUMB1", "THUMB2"]}
-    end
-  end
-
-  
 #   describe '#load_instance_from_solr' do
 #     it 'should populate an instance of an ActiveFedora::Base object using solr instead of Fedora' do
 #       
@@ -856,11 +657,7 @@ describe ActiveFedora::Base do
 #       @test_object5.testing2_append(@test_object3)
 #       @test_object2.save
 #       @test_object5.save
-#       r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
-#       r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object3)
-#       r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
-#       r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
-#       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseFromSolr))
+#       model_rel = ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseFromSolr)
 #       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
 #       test_from_solr_object2 = MockAFBaseFromSolr.load_instance_from_solr(@test_object2.pid)
 #       test_from_solr_object3 = MockAFBaseFromSolr.load_instance_from_solr(@test_object3.pid)
@@ -884,37 +681,37 @@ describe ActiveFedora::Base do
 #       Time.parse(test_from_solr_object5.modified_date).should == Time.parse(@test_object5.modified_date)
 # 
 #       # need to test outbound and inbound relationships
-#       test_from_solr_object2.relationships(false).should == {:self=>{:has_model=>[model_rel.object],
-#                                                             :has_part=>[r3.object],
-#                                                             :has_member=>[r4.object]},
-#                                                     :inbound=>{:has_part=>[r5.object]}}
-#       test_from_solr_object2.relationships_by_name(false).should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object],
-#         "collection_members"=>[],"part_of"=>[],"parts_outbound"=>[r3.object]},
-#         :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],"parts_inbound"=>[]}}
-#       test_from_solr_object3.relationships(false).should == {:self=>{:has_model=>[model_rel.object]},
-#                                                    :inbound=>{:has_part=>[r2.object],
-#                                                                :has_member=>[r5.object]}}
+#       test_from_solr_object2.relationships(false).should == {:self=>{:has_model=>[model_rel],
+#                                                             :has_part=>[@test_object3],
+#                                                             :has_member=>[@test_object4]},
+#                                                     :inbound=>{:has_part=>[@test_object5]}}
+#       test_from_solr_object2.relationships_by_name(false).should == {:self=>{"testing"=>[@test_object3],"testing2"=>[@test_object4],
+#         "collection_members"=>[],"part_of"=>[],"parts_outbound"=>[@test_object3]},
+#         :inbound=>{"testing_inbound"=>[@test_object5],"testing_inbound2"=>[],"parts_inbound"=>[]}}
+#       test_from_solr_object3.relationships(false).should == {:self=>{:has_model=>[model_rel]},
+#                                                    :inbound=>{:has_part=>[@test_object2],
+#                                                                :has_member=>[@test_object5]}}
 #       test_from_solr_object3.relationships_by_name(false).should == {:self=>{"testing"=>[],"testing2"=>[], "collection_members"=>[],"part_of"=>[],"parts_outbound"=>[]},
-#                                                                    :inbound=>{"testing_inbound"=>[r2.object],"testing_inbound2"=>[r5.object], "parts_inbound"=>[]}}                                                                  
-#       test_from_solr_object4.relationships(false).should == {:self=>{:has_model=>[model_rel.object]},
-#                                                     :inbound=>{:has_member=>[r2.object]}}
-#       test_from_solr_object4.relationships_by_name(false).should == {:inbound=>{"parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r2.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}                       
-#       test_from_solr_object5.relationships(false).should == {:self=>{:has_model=>[model_rel.object],
-#                                                             :has_part=>[r2.object],
-#                                                             :has_member=>[r3.object]},
+#                                                                    :inbound=>{"testing_inbound"=>[@test_object2],"testing_inbound2"=>[@test_object5], "parts_inbound"=>[]}}                                                                  
+#       test_from_solr_object4.relationships(false).should == {:self=>{:has_model=>[model_rel]},
+#                                                     :inbound=>{:has_member=>[@test_object2]}}
+#       test_from_solr_object4.relationships_by_name(false).should == {:inbound=>{"parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[@test_object2]}, :self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}                       
+#       test_from_solr_object5.relationships(false).should == {:self=>{:has_model=>[model_rel],
+#                                                             :has_part=>[@test_object2],
+#                                                             :has_member=>[@test_object3]},
 #                                                     :inbound=>{}}
-#       test_from_solr_object5.relationships_by_name(false).should == {:inbound=>{"parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r3.object], "collection_members"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object]}}
+#       test_from_solr_object5.relationships_by_name(false).should == {:inbound=>{"parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[@test_object3], "collection_members"=>[], "part_of"=>[], "testing"=>[@test_object2], "parts_outbound"=>[@test_object2]}}
 #       #all inbound should now be empty if no parameter supplied to relationships
-#       test_from_solr_object2.relationships.should == {:self=>{:has_part=>[r3.object],:has_member=>[r4.object],:has_model=>[model_rel.object]}}
-#       test_from_solr_object2.relationships_by_name.should == {:self=>{"testing2"=>[r4.object], "collection_members"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object]}}
-#       test_from_solr_object3.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
+#       test_from_solr_object2.relationships.should == {:self=>{:has_part=>[@test_object3],:has_member=>[@test_object4],:has_model=>[model_rel]}}
+#       test_from_solr_object2.relationships_by_name.should == {:self=>{"testing2"=>[@test_object4], "collection_members"=>[], "part_of"=>[], "testing"=>[@test_object3], "parts_outbound"=>[@test_object3]}}
+#       test_from_solr_object3.relationships.should == {:self=>{:has_model=>[model_rel]}}
 #       test_from_solr_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}
-#       test_from_solr_object4.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
+#       test_from_solr_object4.relationships.should == {:self=>{:has_model=>[model_rel]}}
 #       test_from_solr_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}} 
-#       test_from_solr_object5.relationships.should == {:self=>{:has_model=>[model_rel.object],
-#                                                              :has_part=>[r2.object],
-#                                                              :has_member=>[r3.object]}}
-#       test_from_solr_object5.relationships_by_name.should == {:self=>{"testing2"=>[r3.object], "collection_members"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object]}}
+#       test_from_solr_object5.relationships.should == {:self=>{:has_model=>[model_rel],
+#                                                              :has_part=>[@test_object2],
+#                                                              :has_member=>[@test_object3]}}
+#       test_from_solr_object5.relationships_by_name.should == {:self=>{"testing2"=>[@test_object3], "collection_members"=>[], "part_of"=>[], "testing"=>[@test_object2], "parts_outbound"=>[@test_object2]}}
 #       # need to check metadata
 #       test_from_solr_object2.fields[:language][:values].should == ["Italian"]
 #       test_from_solr_object2.fields[:creator][:values].should == ["Linguist, A."]