active-fedora 3.1.6 → 3.2.0.pre1

data/spec/unit/relationship_graph_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe ActiveFedora::RelationshipGraph do
+  before do 
+    @graph = ActiveFedora::RelationshipGraph.new
+  end
+
+  
+  it "should add relationships" do
+    @n1 = ActiveFedora::Base.new
+    @n2 = ActiveFedora::Base.new
+    @graph.add(:has_part, @n1)
+    @graph.relationships[:has_part].should == [@n1]
+    @graph.add(:has_part, @n2)
+    @graph.relationships[:has_part].should == [@n1, @n2]
+    @graph.add(:has_part, @n2)
+    @graph.relationships[:has_part].should == [@n1, @n2]
+    @graph.dirty.should be_true
+  end
+
+  it "should create a rdf graph" do
+    graph = @graph.to_graph('info:fedora/foo:1')
+    graph.should be_kind_of RDF::Graph
+    graph.statements.to_a.should == []
+
+    @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
+    @graph.add(:has_part, @n1)
+    graph = @graph.to_graph('info:fedora/foo:1')
+    stmts = graph.statements.to_a
+    stmts.size.should == 1
+    stmt = stmts.first
+    stmt.subject.to_s.should == 'info:fedora/foo:1'
+    stmt.predicate.to_s.should == 'info:fedora/fedora-system:def/relations-external#hasPart'
+    stmt.object.to_s.should == 'info:fedora/foo:777'
+    
+  end
+
+  it "should have array accessor" do
+    @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
+    @graph.add(:has_part, @n1)
+    @graph[:has_part].should == [@n1]
+  end
+
+
+  describe "delete" do
+    it "should delete an object when an object is passed" do
+      @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
+      @graph.add(:has_part, @n1)
+      @graph[:has_part].should == [@n1]
+      @graph.delete(:has_part, @n1)
+      @graph[:has_part].should == []
+    end
+    it "should delete an pid when an object is passed" do
+      #a reloaded rels-ext is just a list of uris, not inflated.
+      @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
+      @graph.add(:has_part, 'info:fedora/foo:777')
+      @graph[:has_part].should == ['info:fedora/foo:777']
+      @graph.delete(:has_part, @n1)
+      @graph[:has_part].should == []
+    end
+    it "should delete an pid when a string is passed" do
+      #a reloaded rels-ext is just a list of uris, not inflated.
+      @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
+      @graph.add(:has_part, 'info:fedora/foo:777')
+      @graph[:has_part].should == ['info:fedora/foo:777']
+      @graph.delete(:has_part, 'info:fedora/foo:777')
+      @graph[:has_part].should == []
+    end
+    it "should delete an object when a pid is passed" do
+      #a reloaded rels-ext is just a list of uris, not inflated.
+      @n1 = ActiveFedora::Base.new(:pid=>'foo:777')
+      @graph.add(:has_part, @n1)
+      @graph[:has_part].should == [@n1]
+      @graph.delete(:has_part, 'info:fedora/foo:777')
+      @graph[:has_part].should == []
+    end
+  end
+  describe "build_statement" do
+    it "should raise an error when the target is a pid, not a uri" do
+      lambda { @graph.build_statement('info:fedora/spec:9', :is_part_of, 'spec:7') }.should raise_error ArgumentError
+    end
+    it "should run the happy path" do
+      stm = @graph.build_statement('info:fedora/spec:9', :is_part_of, 'info:fedora/spec:7')
+      stm.object.to_s.should == "info:fedora/spec:7"
+    end
+    it "should also be happy with non-info URIs" do
+      stm = @graph.build_statement('info:fedora/spec:9', :is_annotation_of, 'http://www.w3.org/standards/techs/rdf')
+      stm.object.to_s.should == "http://www.w3.org/standards/techs/rdf"
+    end
+    it "should also be happy with targets that are URI::Generics" do
+      stm = @graph.build_statement('info:fedora/spec:9', :is_annotation_of, URI.parse('http://www.w3.org/standards/techs/rdf'))
+      stm.object.to_s.should == "http://www.w3.org/standards/techs/rdf"
+    end
+  end
+end

data/spec/unit/relationship_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 require 'active_fedora'
+require 'active_fedora/relationship'
 require "rexml/document"
 require 'mocha'
 require 'uri'
@@ -24,6 +25,8 @@ describe ActiveFedora::Relationship do
   end
   /%
   before(:each) do
+    ActiveSupport::Deprecation.expects(:warn).with("ActiveFedora::Releationship is deprecated and will be removed in the next release").twice
+    
     @test_relationship = ActiveFedora::Relationship.new
     @test_literal = ActiveFedora::Relationship.new(:is_literal=>true)
   end
@@ -33,6 +36,7 @@ describe ActiveFedora::Relationship do
   end
   
   describe "#new" do
+    ActiveSupport::Deprecation.expects(:warn).with("ActiveFedora::Releationship is deprecated and will be removed in the next release").twice
     test_relationship = ActiveFedora::Relationship.new(:subject => "demo:5", :predicate => "isMemberOf", :object => "demo:10")
     
     test_relationship.subject.should == "info:fedora/demo:5"
@@ -84,8 +88,4 @@ describe ActiveFedora::Relationship do
     end
   end
   
-  describe "#to_hash" do
-    it "should return a hash of structure {subject => {predicate => [object]}}"
-  end
-  
 end

data/spec/unit/relationships_helper_spec.rb

@@ -10,6 +10,9 @@ class SpecNamedNode
   include ActiveFedora::RelationshipsHelper
   
   attr_accessor :pid
+  def internal_uri
+    'info:fedora/' + pid.to_s
+  end
 end
 
 describe ActiveFedora::RelationshipsHelper do
@@ -51,10 +54,9 @@ describe ActiveFedora::RelationshipsHelper do
     
     it 'should check if current object is the kind of model class supplied' do
       #has_model relationship does not get created until save called
-      r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_model,:object=>ActiveFedora::ContentModel.pid_from_ruby_class(SpecNamedNode)})
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new(r.object))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(ActiveFedora::ContentModel.pid_from_ruby_class(SpecNamedNode)))
       @test_object.expects(:relationships).returns(graph).at_least_once
       @test_object.conforms_to?(SpecNamedNode).should == true
     end
@@ -69,10 +71,9 @@ describe ActiveFedora::RelationshipsHelper do
       @test_object3 = SpecNamedNode.new
       @test_object3.pid = increment_pid
       #has_model relationship does not get created until save called so need to add the has model rel here, is fine since not testing save
-      r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_model,:object=>ActiveFedora::ContentModel.pid_from_ruby_class(SpecNamedNode)}) 
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new(r.object))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(ActiveFedora::ContentModel.pid_from_ruby_class(SpecNamedNode)))
       @test_object.expects(:relationships).returns(graph).at_least_once
       @test_object3.assert_conforms_to('object',@test_object,SpecNamedNode)
     end
@@ -107,20 +108,19 @@ describe ActiveFedora::RelationshipsHelper do
       @test_object2.pid = increment_pid
       @test_object3 = MockNamedRelationships3.new
       @test_object3.pid = increment_pid
-      r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_model,:object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockNamedRelationships3)}) 
+      model_pid = ActiveFedora::ContentModel.pid_from_ruby_class(MockNamedRelationships3)
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new(r.object))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(model_pid))
       @test_object2.expects(:relationships).returns(graph).at_least_once
       #should return expected named relationships
       @test_object2.relationships_by_name.should == {:self=>{"testing"=>[],"testing2"=>[]}}
-      r3 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_part,:object=>@test_object})
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new(r.object))
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_part),  RDF::URI.new(r3.object))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(model_pid))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new(@test_object.internal_uri))
       @test_object3.expects(:relationships).returns(graph).at_least_once
-      @test_object3.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[]}}
+      @test_object3.relationships_by_name.should == {:self=>{"testing"=>[@test_object.internal_uri],"testing2"=>[]}}
     end 
   end
 
@@ -206,21 +206,18 @@ describe ActiveFedora::RelationshipsHelper do
     it 'should return an array of object uri for a given relationship name' do
       @test_object2 = MockRelationshipNames.new
       @test_object2.pid = increment_pid
-      r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:has_model, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockRelationshipNames))
       @test_object3 = SpecNamedNode.new 
       @test_object3.pid = increment_pid
       @test_object4 = SpecNamedNode.new 
       @test_object4.pid = increment_pid
       #add relationships that mirror 'testing' and 'testing2'
-      r3 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:has_part, :object=>@test_object3)
-      r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:has_member, :object=>@test_object4)      
       graph = RDF::Graph.new
       subject = RDF::URI.new "info:fedora/test:sample_pid"
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new(r.object))
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_member),  RDF::URI.new(r4.object))
-      graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_part),  RDF::URI.new(r3.object))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new(ActiveFedora::ContentModel.pid_from_ruby_class(MockRelationshipNames)))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_member),  RDF::URI.new(@test_object4.internal_uri))
+      graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new(@test_object3.internal_uri))
       @test_object2.expects(:relationships).returns(graph).at_least_once
-     @test_object2.find_relationship_by_name("testing").should == [r3.object] 
+     @test_object2.find_relationship_by_name("testing").should == [@test_object3.internal_uri] 
     end
   end
 
@@ -503,9 +500,7 @@ describe ActiveFedora::RelationshipsHelper do
     #  named_predicate_exists_with_different_name?(subject,name,predicate)
     describe "named_relationships_desc" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: named_relationships_desc has been deprecated.  Please call relationships_desc instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationships_desc has been deprecated.  Please call relationships_desc instead.")
         @test_object.class.respond_to?(:relationships_desc)
         obj = mock()
         @test_object.class.expects(:relationships_desc)
@@ -515,9 +510,7 @@ describe ActiveFedora::RelationshipsHelper do
 
     describe "register_named_subject" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: register_named_subject has been deprecated.  Please call register_relationship_desc_subject instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: register_named_subject has been deprecated.  Please call register_relationship_desc_subject instead.")
         @test_object.class.respond_to?(:register_relationship_desc_subject)
         obj = mock()
         @test_object.class.expects(:register_relationship_desc_subject).with(:self)
@@ -527,9 +520,7 @@ describe ActiveFedora::RelationshipsHelper do
 
     describe "register_named_relationship" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: register_named_relationship has been deprecated.  Please call register_relationship_desc instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: register_named_relationship has been deprecated.  Please call register_relationship_desc instead.")
         @test_object.class.respond_to?(:register_relationship_desc)
         obj = mock()
         @test_object.class.expects(:register_relationship_desc).with(:self,"testing",:has_member,{})
@@ -539,9 +530,7 @@ describe ActiveFedora::RelationshipsHelper do
 
     describe "create_named_relationship_methods" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: create_named_relationship_methods has been deprecated.  Please call create_relationship_name_methods instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: create_named_relationship_methods has been deprecated.  Please call create_relationship_name_methods instead.")
         @test_object.class.respond_to?(:create_relationship_name_methods)
         obj = mock()
         @test_object.class.expects(:create_relationship_name_methods).with("testing")
@@ -551,9 +540,7 @@ describe ActiveFedora::RelationshipsHelper do
 
     describe "create_bidirectional_named_relationship_methods" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: create_bidirectional_named_relationship_methods has been deprecated.  Please call create_bidirectional_relationship_name_methods instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: create_bidirectional_named_relationship_methods has been deprecated.  Please call create_bidirectional_relationship_name_methods instead.")
         @test_object.class.respond_to?(:create_bidirectional_relationship_name_methods)
         obj = mock()
         @test_object.class.expects(:create_bidirectional_relationship_name_methods).with("testing","testing_outbound")
@@ -563,9 +550,7 @@ describe ActiveFedora::RelationshipsHelper do
 
     describe "outbound_named_relationship_query" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: outbound_named_relationship_query has been deprecated.  Please call outbound_relationship_query instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: outbound_named_relationship_query has been deprecated.  Please call outbound_relationship_query instead.")
         @test_object.class.respond_to?(:outbound_relationship_query)
         obj = mock()
         @test_object.class.expects(:outbound_relationship_query).with("testing",["testid"])
@@ -575,9 +560,7 @@ describe ActiveFedora::RelationshipsHelper do
 
     describe "inbound_named_relationship_query" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: inbound_named_relationship_query has been deprecated.  Please call inbound_relationship_query instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: inbound_named_relationship_query has been deprecated.  Please call inbound_relationship_query instead.")
         @test_object.class.respond_to?(:inbound_relationship_query)
         obj = mock()
         @test_object.class.expects(:inbound_relationship_query).with("testid","testing")
@@ -587,9 +570,7 @@ describe ActiveFedora::RelationshipsHelper do
 
     describe "bidirectional_named_relationship_query" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: bidirectional_named_relationship_query has been deprecated.  Please call bidirectional_relationship_query instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: bidirectional_named_relationship_query has been deprecated.  Please call bidirectional_relationship_query instead.")
         @test_object.class.respond_to?(:bidirectional_relationship_query)
         obj = mock()
         @test_object.class.expects(:bidirectional_relationship_query).with("testid","testing",["testid2"])
@@ -599,9 +580,7 @@ describe ActiveFedora::RelationshipsHelper do
 
     describe "named_predicate_exists_with_different_name?" do
       it 'should throw deprecation warning if old method name called and should call new method name' do
-        logger = mock()
-        logger.expects(:warn).with("Deprecation: named_predicate_exists_with_different_name? has been deprecated.  Please call predicate_exists_with_different_relationship_name? instead.")
-        @test_object.class.expects(:logger).returns(logger)
+        ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_predicate_exists_with_different_name? has been deprecated.  Please call predicate_exists_with_different_relationship_name? instead.")
         @test_object.class.respond_to?(:predicate_exists_with_different_relationship_name?)
         obj = mock()
         @test_object.class.expects(:predicate_exists_with_different_relationship_name?).with(:subject,"testing",:has_member)
@@ -636,9 +615,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationship" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationship has been deprecated.  Please call find_relationship_by_name instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationship has been deprecated.  Please call find_relationship_by_name instead.")
       @test_object.respond_to?(:find_relationship_by_name).should == true
       @test_object.expects(:find_relationship_by_name).with("testing")
       @test_object.named_relationship("testing")
@@ -647,9 +624,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "register_named_subject" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: register_named_subject has been deprecated.  Please call register_relationship_desc_subject instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: register_named_subject has been deprecated.  Please call register_relationship_desc_subject instead.")
       @test_object.respond_to?(:register_relationship_desc_subject).should == true
       @test_object.expects(:register_relationship_desc_subject).with(:self)
       @test_object.register_named_subject(:self)
@@ -658,9 +633,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "register_named_relationship" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: register_named_relationship has been deprecated.  Please call register_relationship_desc instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: register_named_relationship has been deprecated.  Please call register_relationship_desc instead.")
       @test_object.respond_to?(:register_relationship_desc).should == true
       @test_object.expects(:register_relationship_desc).with(:self,"testing",:has_member,{})
       @test_object.register_named_relationship(:self,"testing",:has_member,{})
@@ -669,9 +642,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationships" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationships has been deprecated.  Please call relationships_by_name instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationships has been deprecated.  Please call relationships_by_name instead.")
       @test_object.respond_to?(:relationships_by_name).should == true
       @test_object.expects(:relationships_by_name)
       @test_object.named_relationships
@@ -680,9 +651,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationships_from_class" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationships_from_class has been deprecated.  Please call relationships_by_name_from_class instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationships_from_class has been deprecated.  Please call relationships_by_name_from_class instead.")
       @test_object.respond_to?(:relationships_by_name_from_class).should == true
       @test_object.expects(:relationships_by_name_from_class)
       @test_object.named_relationships_from_class
@@ -691,9 +660,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_inbound_relationships" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_inbound_relationships has been deprecated.  Please call inbound_relationships_by_name instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_inbound_relationships has been deprecated.  Please call inbound_relationships_by_name instead.")
       @test_object.respond_to?(:inbound_relationships_by_name).should == true
       @test_object.expects(:inbound_relationships_by_name)
       @test_object.named_inbound_relationships
@@ -702,9 +669,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_outbound_relationships" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_outbound_relationships has been deprecated.  Please call outbound_relationships_by_name instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_outbound_relationships has been deprecated.  Please call outbound_relationships_by_name instead.")
       @test_object.respond_to?(:outbound_relationships_by_name).should == true
       @test_object.expects(:outbound_relationships_by_name)
       @test_object.named_outbound_relationships
@@ -713,9 +678,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "outbound_named_relationship_predicates" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: outbound_named_relationship_predicates has been deprecated.  Please call outbound_relationship_predicates instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: outbound_named_relationship_predicates has been deprecated.  Please call outbound_relationship_predicates instead.")
       @test_object.respond_to?(:outbound_relationship_predicates).should == true
       @test_object.expects(:outbound_relationship_predicates)
       @test_object.outbound_named_relationship_predicates
@@ -724,9 +687,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "inbound_named_relationship_predicates" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: inbound_named_relationship_predicates has been deprecated.  Please call inbound_relationship_predicates instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: inbound_named_relationship_predicates has been deprecated.  Please call inbound_relationship_predicates instead.")
       @test_object.respond_to?(:inbound_relationship_predicates).should == true
       @test_object.expects(:inbound_relationship_predicates)
       @test_object.inbound_named_relationship_predicates
@@ -735,9 +696,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationship_predicates" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationship_predicates has been deprecated.  Please call relationship_predicates instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationship_predicates has been deprecated.  Please call relationship_predicates instead.")
       @test_object.respond_to?(:relationship_predicates).should == true
       @test_object.expects(:relationship_predicates)
       @test_object.named_relationship_predicates
@@ -746,9 +705,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationship_predicates_from_class" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationship_predicates_from_class has been deprecated.  Please call relationship_predicates_from_class instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationship_predicates_from_class has been deprecated.  Please call relationship_predicates_from_class instead.")
       @test_object.respond_to?(:relationship_predicates_from_class).should == true
       @test_object.expects(:relationship_predicates_from_class)
       @test_object.named_relationship_predicates_from_class
@@ -757,9 +714,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "is_named_relationship?" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: is_named_relationship? has been deprecated.  Please call is_relationship_name? instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: is_named_relationship? has been deprecated.  Please call is_relationship_name? instead.")
       @test_object.respond_to?(:is_relationship_name?).should == true
       @test_object.expects(:is_relationship_name?)
       @test_object.is_named_relationship?("testing",true)
@@ -768,9 +723,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationships_desc" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationships_desc has been deprecated.  Please call relationships_desc instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationships_desc has been deprecated.  Please call relationships_desc instead.")
       @test_object.respond_to?(:relationships_desc)
       @test_object.expects(:relationships_desc)
       @test_object.named_relationships_desc
@@ -779,9 +732,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationships_desc_from_class" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationships_desc_from_class has been deprecated.  Please call relationships_desc_from_class instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationships_desc_from_class has been deprecated.  Please call relationships_desc_from_class instead.")
       @test_object.respond_to?(:relationships_desc_from_class)
       @test_object.expects(:relationships_desc_from_class)
       @test_object.named_relationships_desc_from_class
@@ -790,9 +741,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationship_type" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationship_type has been deprecated.  Please call relationship_model_type instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationship_type has been deprecated.  Please call relationship_model_type instead.")
       @test_object.respond_to?(:relationship_model_type)
       @test_object.expects(:relationship_model_type).with("testing")
       @test_object.named_relationship_type("testing")
@@ -801,9 +750,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "add_named_relationship" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: add_named_relationship has been deprecated.  Please call add_relationship_by_name instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: add_named_relationship has been deprecated.  Please call add_relationship_by_name instead.")
       @test_object.respond_to?(:add_relationship_by_name)
       obj = mock()
       @test_object.expects(:add_relationship_by_name).with("testing",obj)
@@ -813,9 +760,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "remove_named_relationship" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: remove_named_relationship has been deprecated.  Please call remove_relationship_by_name instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: remove_named_relationship has been deprecated.  Please call remove_relationship_by_name instead.")
       @test_object.respond_to?(:remove_relationship_by_name)
       obj = mock()
       @test_object.expects(:remove_relationship_by_name).with("testing",obj)
@@ -825,9 +770,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "assert_kind_of_model" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: assert_kind_of_model has been deprecated.  Please call assert_conforms_to instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: assert_kind_of_model has been deprecated.  Please call assert_conforms_to instead.")
       @test_object.respond_to?(:assert_conforms_to)
       obj = mock()
       @test_object.expects(:assert_conforms_to).with("testing",obj,ActiveFedora::Base)
@@ -837,9 +780,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "kind_of_model?" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: kind_of_model? has been deprecated.  Please call conforms_to? instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: kind_of_model? has been deprecated.  Please call conforms_to? instead.")
       @test_object.respond_to?(:conforms_to?)
       obj = mock()
       @test_object.expects(:conforms_to?).with(ActiveFedora::Base)
@@ -849,9 +790,7 @@ describe ActiveFedora::RelationshipsHelper do
 
   describe "named_relationship_query" do
     it 'should throw deprecation warning if old method name called and should call new method name' do
-      logger = mock()
-      logger.expects(:warn).with("Deprecation: named_relationship_query has been deprecated.  Please call relationship_query instead.")
-      @test_object.expects(:logger).returns(logger)
+      ActiveSupport::Deprecation.expects(:warn).with("Deprecation: named_relationship_query has been deprecated.  Please call relationship_query instead.")
       @test_object.respond_to?(:relationship_query)
       obj = mock()
       @test_object.expects(:relationship_query).with("testing")