active-fedora 3.1.0.pre2 → 3.1.0.pre3

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre2"
+    VERSION = "3.1.0.pre3"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -18,17 +18,6 @@ APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../")
 require 'jettywrapper'
 
 $: << 'lib'
-# def jetty_params 
-#   project_root = File.expand_path("#{File.dirname(__FILE__)}/../../")
-#   {
-#       :quiet => false,
-#       :jetty_home => File.join(project_root,'jetty'),
-#       :jetty_port => 8983,
-#       :solr_home => File.expand_path(File.join(project_root,'jetty','solr')),
-#       :fedora_home => File.expand_path(File.join(project_root,'jetty','fedora','default')),
-#       :startup_wait=>30
-#     }
-# end
 
 desc "Run active-fedora rspec tests"
 task :spec do
@@ -44,7 +33,6 @@ task :hudson do
   jetty_params = Jettywrapper.load_config
   jetty_params[:startup_wait]= 20
   error = Jettywrapper.wrap(jetty_params) do
-    #ENV["FEDORA_HOME"]=File.expand_path(File.join(File.dirname(__FILE__),'..','..','jetty','fedora','default'))
     Rake::Task["active_fedora:load_fixtures"].invoke
     Rake::Task["active_fedora:rspec"].invoke
   end

data/spec/integration/base_spec.rb

@@ -97,7 +97,7 @@ describe ActiveFedora::Base do
       @test_object2.save
       rexml = REXML::Document.new(@test_object2.datastreams["RELS-EXT"].content)
       # Purpose: confirm that the isMemberOf entries exist and have real RDF in them
-      rexml.root.elements["rdf:Description/hasModel"].attributes["rdf:resource"].should == 'info:fedora/afmodel:ActiveFedora_Base'
+      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
       inner_object = @test_object2.inner_object
@@ -215,8 +215,9 @@ describe ActiveFedora::Base do
       @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
-      rexml.root.elements["rdf:Description/isMemberOf[@rdf:resource='info:fedora/demo:5']"].attributes["xmlns"].should == 'info:fedora/fedora-system:def/relations-external#'
-      rexml.root.elements["rdf:Description/isMemberOf[@rdf:resource='info:fedora/demo:10']"].attributes["xmlns"].should == 'info:fedora/fedora-system:def/relations-external#'
+      rexml.root.attributes["xmlns:ns1"].should == 'info:fedora/fedora-system:def/relations-external#'
+      rexml.root.elements["rdf:Description/ns1:isMemberOf[@rdf:resource='info:fedora/demo:5']"].should_not be_nil
+      rexml.root.elements["rdf:Description/ns1:isMemberOf[@rdf:resource='info:fedora/demo:10']"].should_not be_nil
     end
   end
 
@@ -359,28 +360,25 @@ describe ActiveFedora::Base do
       #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]}}
+#      @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.remove_relationship(:has_part,@test_object2)
       @test_object.save
       @test_object = ActiveFedora::Base.load_instance(@pid)
-      @test_object.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
+      @test_object.relationships.has_statement?(stmt).should be_false
     end
   end
 
   describe '#relationships' do
     it 'should return internal relationships with no parameters and include inbound if false passed in' 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)
@@ -397,32 +395,42 @@ describe ActiveFedora::Base do
       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(false).should == {:self=>{:has_model=>[model_rel.object],
-                                                            :has_part=>[r3.object],
-                                                            :has_member=>[r4.object],
-                                                            :is_member_of_collection=>[r5.object]},
-                                                    :inbound=>{:has_part=>[r5.object]}}
-      @test_object3.relationships(false).should == {:self=>{:has_model=>[model_rel.object]},
-                                                    :inbound=>{:has_part=>[r2.object],
-                                                               :has_member=>[r5.object]}}
-      @test_object4.relationships(false).should == {:self=>{:has_model=>[model_rel.object]},
-                                                    :inbound=>{:has_member=>[r2.object],:has_collection_member=>[r5.object]}}
-      @test_object5.relationships(false).should == {:self=>{:has_model=>[model_rel.object],
-                                                            :has_part=>[r2.object],
-                                                            :has_member=>[r3.object],
-                                                            :has_collection_member=>[r4.object]},
-                                                    :inbound=>{:is_member_of_collection=>[r2.object]}}
-      #all inbound should now be empty if no parameter supplied to relationships
-      @test_object2.relationships.should == {:self=>{:has_model=>[model_rel.object],
-                                                            :has_part=>[r3.object],
-                                                            :has_member=>[r4.object],
-                                                            :is_member_of_collection=>[r5.object]}}
-      @test_object3.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
-      @test_object4.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
-      @test_object5.relationships.should == {:self=>{:has_model=>[model_rel.object],
-                                                            :has_part=>[r2.object],
-                                                            :has_member=>[r3.object],
-                                                            :has_collection_member=>[r4.object]}}
+      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]}
+
+      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]}
     end
   end
   
@@ -621,16 +629,12 @@ describe ActiveFedora::Base do
   describe '#find_relationship_by_name' do
     it 'should find relationships based on name passed in for inbound or outbound' 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.add_relationship_by_name("testing",@test_object3)

data/spec/integration/rels_ext_datastream_spec.rb

@@ -30,6 +30,7 @@ describe ActiveFedora::RelsExtDatastream do
   before(:each) do
     @test_object = ActiveFedora::Base.new
     @test_datastream = ActiveFedora::RelsExtDatastream.new(@test_object.inner_object, 'RELS-EXT')
+    @test_datastream.model = @test_object
     @test_object.save
     @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")]
@@ -64,9 +65,9 @@ describe ActiveFedora::RelsExtDatastream do
     it "should generate new rdf/xml as the datastream content" do
       @test_object.add_datastream(@test_datastream)
       @test_relationships.each do |rel|
-        @test_datastream.add_relationship(rel)
+        @test_object.add_relationship(rel.predicate, rel.object)
       end
-      rexml1 = REXML::Document.new(@test_datastream.to_rels_ext(@test_object.pid))
+      rexml1 = REXML::Document.new(@test_datastream.to_rels_ext())
       @test_datastream.serialize!
       rexml2 = REXML::Document.new(@test_object.datastreams["RELS-EXT"].content)
       rexml1.root.elements["rdf:Description"].inspect.should eql(rexml2.root.elements["rdf:Description"].inspect)
@@ -81,9 +82,10 @@ describe ActiveFedora::RelsExtDatastream do
     end
     @test_object.save
     # make sure that _something_ was actually added to the object's relationships hash
-    @test_object.relationships[:self].should have_key(:is_member_of)
+    @test_object.ids_for_outbound(:is_member_of).size.should == 1
     o = ActiveFedora::Base.load_instance(@test_object.pid)
-    ActiveFedora::Base.load_instance(@test_object.pid).relationships.should == @test_object.relationships
+    new_rels = ActiveFedora::Base.load_instance(@test_object.pid).relationships
+    new_rels.should == @test_object.relationships
   end
 
   describe '#from_solr' do
@@ -132,15 +134,34 @@ describe ActiveFedora::RelsExtDatastream do
       test_from_solr_object5 = MockAFRelsSolr.new
       test_from_solr_object5.rels_ext.from_solr(solr_doc)
       
-      test_from_solr_object2.relationships.should == {:self=>{:has_part=>[r3.object],:has_member=>[r4.object],:has_model=>[model_rel.object]}}
+      stmt = test_from_solr_object2.build_statement(test_from_solr_object2.internal_uri, :has_part, r3.object)
+      test_from_solr_object2.relationships.has_statement?(stmt).should be_true
+      stmt = test_from_solr_object2.build_statement(test_from_solr_object2.internal_uri, :has_member, r4.object)
+      test_from_solr_object2.relationships.has_statement?(stmt).should be_true
+      stmt = test_from_solr_object2.build_statement(test_from_solr_object2.internal_uri, :has_model, model_rel.object)
+      test_from_solr_object2.relationships.has_statement?(stmt).should be_true
+
+#      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=>{"testing"=>[r3.object],"testing2"=>[r4.object], "collection_members"=>[], "part_of"=>[], "parts_outbound"=>[r3.object]}}
-      test_from_solr_object3.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
+      #test_from_solr_object3.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
+      stmt = test_from_solr_object3.build_statement(test_from_solr_object3.internal_uri, :has_model, model_rel.object)
+      test_from_solr_object3.relationships.has_statement?(stmt).should be_true
       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.object]}}
+      stmt = test_from_solr_object4.build_statement(test_from_solr_object4.internal_uri, :has_model, model_rel.object)
+      test_from_solr_object4.relationships.has_statement?(stmt).should be_true
       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]}}
+
+      stmt = test_from_solr_object5.build_statement(test_from_solr_object5.internal_uri, :has_model, model_rel.object)
+      test_from_solr_object5.relationships.has_statement?(stmt).should be_true
+      stmt = test_from_solr_object5.build_statement(test_from_solr_object5.internal_uri, :has_part, r2.object)
+      test_from_solr_object5.relationships.has_statement?(stmt).should be_true
+      stmt = test_from_solr_object5.build_statement(test_from_solr_object5.internal_uri, :has_member, r3.object)
+      test_from_solr_object5.relationships.has_statement?(stmt).should be_true
+
+      # 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]}} 
     end
   end

data/spec/integration/semantic_node_spec.rb

@@ -9,6 +9,11 @@ describe ActiveFedora::SemanticNode do
       include ActiveFedora::RelationshipsHelper
       include ActiveFedora::SemanticNode
       has_relationship "collection_members", :has_collection_member
+      attr_accessor :rels_ext
+      def initialize
+        self.rels_ext = ActiveFedora::RelsExtDatastream.new(nil, nil)
+        rels_ext.model = self
+      end
     end
     @node = SpecNode.new
     class SNSpecModel < ActiveFedora::Base
@@ -18,11 +23,11 @@ describe ActiveFedora::SemanticNode do
     end
     class SpecNodeSolrFilterQuery < ActiveFedora::Base
       has_relationship("parts", :is_part_of, :inbound => true)
-      has_relationship("special_parts", :is_part_of, :inbound => true, :solr_fq=>"has_model_s:info\\:fedora/SpecialPart")
+      has_relationship("special_parts", :is_part_of, :inbound => true, :solr_fq=>"has_model_s:info\\:fedora/afmodel\\:SpecialPart")
       has_relationship("containers", :is_member_of)
-      has_relationship("special_containers", :is_member_of, :solr_fq=>"has_model_s:info\\:fedora/SpecialContainer")
+      has_relationship("special_containers", :is_member_of, :solr_fq=>"has_model_s:info\\:fedora/afmodel\\:SpecialContainer")
       has_bidirectional_relationship("bi_containers", :is_member_of, :has_member)
-      has_bidirectional_relationship("bi_special_containers", :is_member_of, :has_member, :solr_fq=>"has_model_s:info\\:fedora/SpecialContainer")
+      has_bidirectional_relationship("bi_special_containers", :is_member_of, :has_member, :solr_fq=>"has_model_s:info\\:fedora/afmodel\\:SpecialContainer")
     end
 
     @test_object = SNSpecModel.new
@@ -53,16 +58,18 @@ describe ActiveFedora::SemanticNode do
     @container4.add_relationship(:has_member,@test_object)
     @container4.save
 
+    class SpecialContainer; end;
+    class SpecialPart; end;
     @special_container = ActiveFedora::Base.new()
-    @special_container.add_relationship(:has_model,"SpecialContainer")
+    @special_container.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialContainer))
     @special_container.save
 
     @special_container3 = ActiveFedora::Base.new()
-    @special_container3.add_relationship(:has_model,"SpecialContainer")
+    @special_container3.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialContainer))
     @special_container3.save
 
     @special_container4 = ActiveFedora::Base.new()
-    @special_container4.add_relationship(:has_model,"SpecialContainer")
+    @special_container4.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialContainer))
     @special_container4.save
 
     #even though adding container3 and 3 special containers, it should only include the special containers when returning via relationship name finder methods
@@ -75,8 +82,8 @@ describe ActiveFedora::SemanticNode do
     @test_object_query.save
 
     @special_container2 = ActiveFedora::Base.new()
-    @special_container2.add_relationship(:has_model,"SpecialContainer")
-    @special_container2.add_relationship(:has_member,@test_object_query.pid)
+    @special_container2.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialContainer))
+    @special_container2.add_relationship(:has_member, 'info:fedora/'+@test_object_query.pid)
     @special_container2.save
 
     @part3 = ActiveFedora::Base.new()
@@ -84,7 +91,7 @@ describe ActiveFedora::SemanticNode do
     @part3.save
 
     @special_part = ActiveFedora::Base.new()
-    @special_part.add_relationship(:has_model,"SpecialPart")
+    @special_part.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecialPart))
     @special_part.add_relationship(:is_part_of, @test_object_query)
     @special_part.save
    
@@ -144,7 +151,8 @@ describe ActiveFedora::SemanticNode do
       spec_node = SpecNode.new
       spec_node.collection_members.should == []
       rel = ActiveFedora::Relationship.new(:subject => :self, :predicate => :has_collection_member, :object => @test_object.pid)  
-      spec_node.add_relationship(rel)
+      
+      spec_node.add_relationship(rel.predicate, rel.object)
       collection_members = spec_node.collection_members
       collection_members.length.should == 1
       collection_members.first.pid.should == @test_object.pid
@@ -255,13 +263,13 @@ describe ActiveFedora::SemanticNode do
     end
 
     it "should return a solr query for an inbound relationship" do
-      @test_object_query.special_parts_query.should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialPart"
+      @test_object_query.special_parts_query.should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/afmodel\\:SpecialPart"
     end
   end
 
   describe "inbound relationship query" do
     it "should return a properly formatted query for a relationship that has a solr filter query defined" do
-      SpecNodeSolrFilterQuery.inbound_relationship_query(@test_object_query.pid,"special_parts").should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialPart"
+      SpecNodeSolrFilterQuery.inbound_relationship_query(@test_object_query.pid,"special_parts").should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/afmodel\\:SpecialPart"
     end
 
     it "should return a properly formatted query for a relationship that does not have a solr filter query defined" do
@@ -274,7 +282,7 @@ describe ActiveFedora::SemanticNode do
       expected_string = ""
       @test_object_query.containers_ids.each_with_index do |id,index|
         expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
       end
       SpecNodeSolrFilterQuery.outbound_relationship_query("special_containers",@test_object_query.containers_ids).should == expected_string
     end
@@ -294,10 +302,10 @@ describe ActiveFedora::SemanticNode do
       expected_string = ""
       @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
         expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
       end
       expected_string << " OR "
-      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialContainer)"
+      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
       SpecNodeSolrFilterQuery.bidirectional_relationship_query(@test_object_query.pid,"bi_special_containers",@test_object_query.bi_containers_outbound_ids).should == expected_string
     end
 
@@ -371,7 +379,7 @@ describe ActiveFedora::SemanticNode do
       expected_string = ""
       @test_object_query.containers_ids.each_with_index do |id,index|
         expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
       end
       @test_object_query.special_containers_query.should == expected_string
     end 
@@ -407,23 +415,19 @@ describe ActiveFedora::SemanticNode do
     end
 
     it "should return an array of all Base objects with relationship if not using solr_fq" do
-      ids = @test_object_query.bi_containers_ids
-      ids.size.should == 5
-      ids.include?(@container3.pid).should == true
-      ids.include?(@special_container.pid).should == true
-      ids.include?(@special_container2.pid).should == true
-      ids.include?(@special_container3.pid).should == true
-      ids.include?(@special_container4.pid).should == true
+      @test_object_query.bi_containers_ids.should include @container3.pid, @special_container.pid, @special_container2.pid, @special_container3.pid, @special_container4.pid
+
+      @test_object_query.bi_containers_ids.size.should == 5
     end
 
     it "should return a solr query for a bidirectional relationship" do
       expected_string = ""
       @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
         expected_string << " OR " if index > 0
-        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
       end
       expected_string << " OR "
-      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialContainer)"
+      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/afmodel\\:SpecialContainer)"
       @test_object_query.bi_special_containers_query.should == expected_string
     end
   end
@@ -436,20 +440,25 @@ describe ActiveFedora::SemanticNode do
       has_relationship "testing", :has_part
       has_relationship "testing2", :has_member
       has_relationship "testing_inbound", :has_part, :inbound=>true
+      attr_accessor :rels_ext
+      def initialize
+        self.rels_ext = ActiveFedora::RelsExtDatastream.new(nil, nil)
+        rels_ext.model = self
+      end
     end
 
     it 'should automatically update the relationships_by_name if relationships has changed (no refresh of relationships_by_name hash unless relationships hash has changed' do
       @test_object2 = MockSemNamedRelationships.new
       r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_model,:object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockSemNamedRelationships)}) 
-      @test_object2.add_relationship(r)
+      @test_object2.add_relationship(r.predicate, r.object)
       #should return expected named relationships
-      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[],"testing2"=>[]},:inbound=>{"testing_inbound"=>[]}}
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[],"testing2"=>[]}}
       r3 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_part,:object=>@test_object})
-      @test_object2.add_relationship(r3)
-      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[]},:inbound=>{"testing_inbound"=>[]}}
+      @test_object2.add_relationship(r3.predicate, r3.object)
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[]}}
       r4 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_member,:object=>"3"})
-      @test_object2.add_relationship(r4)
-      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object]},:inbound=>{"testing_inbound"=>[]}}
+      @test_object2.add_relationship(r4.predicate, r4.object)
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object]}}
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,13 +1,15 @@
-ENV["RAILS_ENV"] ||= 'test'
+ENV["environment"] ||= 'test'
 require 'active-fedora'
 require 'spec'
 
+logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
+
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 $VERBOSE=nil
 
 # This loads the Fedora and Solr config info from /config/fedora.yml
 # You can load it from a different location by passing a file path as an argument.
-ActiveFedora.init(File.join(File.dirname(__FILE__), "..", "config", "fedora.yml"))
+ActiveFedora.init(:fedora_config_path=>File.join(File.dirname(__FILE__), "..", "config", "fedora.yml"))
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha

data/spec/unit/active_fedora_spec.rb

@@ -1,5 +1,4 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
-require 'equivalent-xml'
 
 # For testing Module-level methods like ActiveFedora.init
 
@@ -10,7 +9,7 @@ describe ActiveFedora do
     unstub_blacklight
     # Restore to default fedora configs
     fedora_config_path = File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml")
-    ActiveFedora.init(:environment=>"test", :fedora_config=>fedora_config_path)
+    ActiveFedora.init(:environment=>"test", :fedora_config_path=>fedora_config_path)
   end
   
   before(:each) do
@@ -237,13 +236,11 @@ describe ActiveFedora do
       ActiveFedora.fedora_config_path.should eql(expected_config+'/fedora.yml')
       ActiveFedora.solr_config_path.should eql(expected_config+'/solr.yml')
     end
-    it "overrides any other config file when a file is passed in explicitly" do
-      ActiveFedora.init("#{@fake_rails_root}/config/fake_fedora.yml")
-      ActiveFedora.fedora_config_path.should eql("#{@fake_rails_root}/config/fake_fedora.yml")
-#ActiveFedora.config_path.should eql("#{@fake_rails_root}/config/fake_fedora.yml")
+    it "raises an error if you pass in a string" do
+      lambda{ ActiveFedora.init("#{@fake_rails_root}/config/fake_fedora.yml") }.should raise_exception(ArgumentError)
     end
     it "raises an error if you pass in a non-existant config file" do
-      lambda{ ActiveFedora.init("really_fake_fedora.yml") }.should raise_exception(ActiveFedora::ActiveFedoraConfigurationException)
+      lambda{ ActiveFedora.init(:fedora_config_path=>"really_fake_fedora.yml") }.should raise_exception(ActiveFedora::ActiveFedoraConfigurationException)
     end
     
     describe "within Rails" do
@@ -310,7 +307,7 @@ describe ActiveFedora do
       mock_file = mock("fedora.yml")
       File.expects(:open).returns(mock_file)
       YAML.expects(:load).returns({"test"=>{"solr"=>{"url"=>"http://127.0.0.1:8983/solr/development"}, "fedora"=>{"url"=>"http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"}}})
-      ActiveFedora.init("/path/to/my/files/fedora.yml")
+      ActiveFedora.init(:fedora_config_path => "/path/to/my/files/fedora.yml")
       ActiveFedora.predicate_config.should == "/path/to/my/files/predicate_mappings.yml"
     end
   end
@@ -342,7 +339,7 @@ describe ActiveFedora do
     
     after(:all) do
       # Restore to default fedora configs
-      ActiveFedora.init(File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
+      ActiveFedora.init(:fedora_config_path => File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
 
     end
 
@@ -351,10 +348,6 @@ describe ActiveFedora do
         ActiveFedora.init()
         ActiveFedora.fedora.options[:url].to_s.should == "http://127.0.0.1:8983/fedora"
       end
-      it "should load the passed config if explicit config passed in as a string" do
-        ActiveFedora.init('./spec/fixtures/rails_root/config/fedora.yml')
-        ActiveFedora.fedora_config[:url].should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
-      end
       it "should load the passed config if explicit config passed in as a string" do
         ActiveFedora.init(:fedora_config_path=>'./spec/fixtures/rails_root/config/fedora.yml')
         ActiveFedora.fedora_config[:url].should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"