active-fedora 3.3.2 → 4.0.0.rc1

data/spec/integration/datastream_collections_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe ActiveFedora::DatastreamCollections do
   before(:all) do
-    ActiveSupport::Deprecation.expects(:warn).with("Deprecation: DatastreamCollections will not be included by default in the next version.   To use has_datastream add 'include ActiveFedora::DatastreamCollections' to your model")
     class MockAFBaseDatastream < ActiveFedora::Base
+      include ActiveFedora::DatastreamCollections
       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

data/spec/integration/full_featured_model_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'rexml/document'
-require File.join(File.dirname(__FILE__), "../..", "lib/active_fedora/samples", 'hydra-mods_article_datastream')
 
 include ActiveFedora
 
@@ -8,7 +7,7 @@ describe ActiveFedora::Base do
 
   before(:all) do
     class OralHistory < ActiveFedora::Base
-        #include Model
+        include ActiveFedora::Relationships
 
         # Imitating DataMapper ...
 

data/spec/integration/model_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
-
-require 'active_fedora'
-require 'active_fedora/model'
-require "rexml/document"
-require 'mocha'
+require 'spec/samples/models/hydrangea_article'
 
 include ActiveFedora::Model
 include Mocha::API
@@ -45,12 +41,15 @@ describe ActiveFedora::Model do
       end
     end
   end
+
+  describe "#find_document with a valid pid" do
+    subject { ActiveFedora::Base.find_document('hydrangea:fixture_mods_article1') }
+    it { should be_instance_of HydrangeaArticle}
+  end
   
-  describe '#find_model' do
-    
+  describe '#load_instance' do
     it "should return an object of the given Model whose inner object is nil" do
-      #result = ModelIntegrationSpec::Basic.find_model(@test_instance.pid, ModelIntegrationSpec::Basic)
-      result = ActiveFedora::RubydoraConnection.instance.find_model(@test_instance.pid, ModelIntegrationSpec::Basic)
+      result = ModelIntegrationSpec::Basic.load_instance(@test_instance.pid)
       result.class.should == ModelIntegrationSpec::Basic
       result.inner_object.new?.should be_false
     end

data/spec/integration/mods_article_integration_spec.rb

@@ -4,7 +4,7 @@ describe ActiveFedora::Base do
 
   before(:all) do
     class HydrangeaArticle < ActiveFedora::Base
-
+      include ActiveFedora::Relationships
       has_relationship "parts", :is_part_of, :inbound => true
 
       # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright

data/spec/integration/nokogiri_datastream_spec.rb

@@ -6,7 +6,7 @@ describe ActiveFedora::NokogiriDatastream do
   before(:all) do
     class HydrangeaArticle2 < ActiveFedora::Base
 
-      has_relationship "parts", :is_part_of, :inbound => true
+      #has_relationship "parts", :is_part_of, :inbound => true
 
       # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
       # has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadata 

data/spec/integration/ntriples_datastream_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe ActiveFedora::NtriplesRDFDatastream do
+  before do
+    class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+      map_predicates do |map|
+        map.title(:in => RDF::DC)
+        map.part(:to => "hasPart", :in => RDF::DC)
+        map.based_near(:in => RDF::FOAF)
+        map.related_url(:to => "seeAlso", :in => RDF::RDFS)
+      end
+    end
+    class RdfTest < ActiveFedora::Base 
+      has_metadata :name=>'rdf', :type=>MyDatastream
+      delegate :based_near, :to=>'rdf'
+      delegate :related_url, :to=>'rdf'
+      delegate :part, :to=>'rdf'
+      delegate :title, :to=>'rdf', :unique=>true
+    end
+    @subject = RdfTest.new
+  end
+
+  after do
+    Object.send(:remove_const, :RdfTest)
+    Object.send(:remove_const, :MyDatastream)
+  end
+
+  it "should set and recall values" do
+    @subject.title = 'War and Peace'
+    @subject.based_near = "Moscow, Russia"
+    @subject.related_url = "http://en.wikipedia.org/wiki/War_and_Peace"
+    @subject.part = "this is a part"
+    @subject.save
+    @subject.title.should == 'War and Peace'
+    @subject.based_near.should == ["Moscow, Russia"]
+    @subject.related_url.should == ["http://en.wikipedia.org/wiki/War_and_Peace"]
+    @subject.part.should == ["this is a part"]    
+  end
+  it "should set, persist, and recall values" do
+    @subject.title = 'War and Peace'
+    @subject.based_near = "Moscow, Russia"
+    @subject.related_url = "http://en.wikipedia.org/wiki/War_and_Peace"
+    @subject.part = "this is a part"
+    @subject.save
+
+    loaded = RdfTest.find(@subject.pid)
+    loaded.title.should == 'War and Peace'
+    loaded.based_near.should == ['Moscow, Russia']
+    loaded.related_url.should == ['http://en.wikipedia.org/wiki/War_and_Peace']
+    loaded.part.should == ['this is a part']
+  end
+  it "should set multiple values" do
+    @subject.part = ["part 1", "part 2"]
+    @subject.save
+
+    loaded = RdfTest.find(@subject.pid)
+    loaded.part.should == ['part 1', 'part 2']
+  end
+  it "should append values" do
+    @subject.part = "thing 1"
+    @subject.save
+
+    @subject.part << "thing 2"
+    @subject.part.should == ["thing 1", "thing 2"]
+  end
+  it "should delete values" do
+    @subject.title = "Hamlet"
+    @subject.related_url = "http://psu.edu/"
+    @subject.related_url << "http://projecthydra.org/"
+    @subject.save
+    @subject.title.should == "Hamlet"
+    @subject.related_url.should include("http://psu.edu/")
+    @subject.related_url.should include("http://projecthydra.org/")
+    @subject.title = ""
+    @subject.related_url.delete("http://projecthydra.org/")
+    @subject.save
+    @subject.title.should be_nil
+    @subject.related_url.should == ["http://psu.edu/"]
+  end
+end

data/spec/integration/rels_ext_datastream_spec.rb

@@ -80,7 +80,6 @@ describe ActiveFedora::RelsExtDatastream do
 
   describe '#from_solr' do
     before do
-      ActiveSupport::Deprecation.stubs(:warn)
       class MockAFRelsSolr < ActiveFedora::Base
         include ActiveFedora::FileManagement
         has_relationship "testing", :has_part, :type=>MockAFRelsSolr

data/spec/integration/semantic_node_spec.rb

@@ -6,20 +6,17 @@ describe ActiveFedora::SemanticNode do
   
   before(:all) do 
     class SNSpecNode < ActiveFedora::Base
-      # 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
+      include ActiveFedora::FileManagement
     end
     @node = SNSpecNode.new
     class SNSpecModel < ActiveFedora::Base
+      include ActiveFedora::Relationships
       has_relationship("parts", :is_part_of, :inbound => true)
       has_relationship("containers", :is_member_of)
       has_bidirectional_relationship("bi_containers", :is_member_of, :has_member)
     end
     class SpecNodeSolrFilterQuery < ActiveFedora::Base
+      include ActiveFedora::Relationships
       has_relationship("parts", :is_part_of, :inbound => true)
       has_relationship("special_parts", :is_part_of, :inbound => true, :solr_fq=>"has_model_s:info\\:fedora/afmodel\\:SpecialPart")
       has_relationship("containers", :is_member_of)
@@ -56,8 +53,8 @@ describe ActiveFedora::SemanticNode do
     @container4.add_relationship(:has_member,@test_object)
     @container4.save
 
-    class SpecialContainer; end;
-    class SpecialPart; end;
+    class SpecialContainer < ActiveFedora::Base; end;
+    class SpecialPart < ActiveFedora::Base; end;
     @special_container = ActiveFedora::Base.new()
     @special_container.add_relationship(:has_model, SpecialContainer.to_class_uri)
     @special_container.save
@@ -161,19 +158,27 @@ describe ActiveFedora::SemanticNode do
   describe "inbound relationship finders" do
     describe "when inheriting from parents" do
       before do
-        @part4 = ActiveFedora::Base.new()
-        @part4.parts  ## Includes the FileManagement onto AF::Base. This happens in another test (and caries into this one) if you run the whole suite, but it doesn't get set up if you just run this test.
+        class Test1 < ActiveFedora::Base
+          include ActiveFedora::FileManagement
+        end
+        @part4 = Test1.new()
+        @part4.parts 
+
         class Test2 < ActiveFedora::Base
+          include ActiveFedora::FileManagement
         end
         class Test3 < Test2
+          include ActiveFedora::Relationships
           has_relationship "testing", :has_member
         end
 
         class Test4 < Test3
+          include ActiveFedora::Relationships
           has_relationship "testing_inbound", :is_member_of, :inbound=>true
         end
 
         class Test5 < Test4
+          include ActiveFedora::Relationships
           has_relationship "testing_inbound", :is_part_of, :inbound=>true
         end 
  
@@ -181,21 +186,9 @@ describe ActiveFedora::SemanticNode do
         @test_object2.save
       end
       it "should have relationships defined" do
-        # puts "Test2 relationships_desc:"
-        # puts Test2.relationships_desc.inspect
-        # puts "ActiveFedora::Base relationships_desc:"
-        # puts ActiveFedora::Base.relationships_desc.inspect
-        ActiveFedora::Base.relationships_desc.should have_key(:inbound)
+        Test1.relationships_desc.should have_key(:inbound)
         Test2.relationships_desc.should have_key(:inbound)
-        ActiveFedora::Base.relationships_desc[:inbound].each_pair do |key, value|
-          Test2.relationships_desc[:inbound].should have_key(key)
-          Test2.relationships_desc[:inbound][key].should == value
-          Test2.inbound_relationship_query("foo:1",key.to_s).should_not be_empty
-        end
-        ActiveFedora::Base.relationships_desc[:self].each_pair do |key, value|
-          Test2.relationships_desc[:self].should have_key(key)
-          Test2.relationships_desc[:self][key].should == value
-        end
+        Test2.relationships_desc[:inbound]["parts_inbound"].should == {:inbound=>true, :predicate=>:is_part_of, :singular=>nil}
       end
 
       it "should have relationships defined from more than one ancestor class" do
@@ -213,7 +206,7 @@ describe ActiveFedora::SemanticNode do
 
       it "should not have relationships bleeding over from other sibling classes" do
         SpecNodeSolrFilterQuery.relationships_desc[:inbound].should have_key("bi_special_containers_inbound")
-        ActiveFedora::Base.relationships_desc[:inbound].should_not have_key("bi_special_containers_inbound")
+        Test1.relationships_desc[:inbound].should_not have_key("bi_special_containers_inbound")
         Test2.relationships_desc[:inbound].should_not have_key("bi_special_containers_inbound")
       end
       it "should return an empty set" do
@@ -431,7 +424,6 @@ describe ActiveFedora::SemanticNode do
   #putting this test here instead of relationships_helper because testing that relationships_by_name hash gets refreshed if the relationships hash is changed
   describe "relationships_by_name" do
     before do
-      ActiveSupport::Deprecation.stubs(:warn)
       class MockSemNamedRelationships  < ActiveFedora::Base
         include ActiveFedora::FileManagement
         has_relationship "testing", :has_part

data/spec/integration/solr_service_spec.rb

@@ -23,7 +23,9 @@ describe ActiveFedora::SolrService do
         end
       end
       @test_object = ActiveFedora::Base.new
+      @test_object.label = 'test_object'
       @foo_object = FooObject.new
+      @foo_object.label = 'foo_object'
       attributes = {"holding_id"=>{0=>"Holding 1"},
                     "language"=>{0=>"Italian"},
                     "creator"=>{0=>"Linguist, A."},
@@ -32,6 +34,13 @@ describe ActiveFedora::SolrService do
       @foo_object.update_indexed_attributes(attributes)
       @test_object.save
       @foo_object.save
+      @profiles = {
+        'test' => @test_object.inner_object.profile,
+        'foo' => @foo_object.inner_object.profile,
+        'foo_properties' => @foo_object.datastreams['properties'].profile,
+        'foo_descMetadata' => @foo_object.datastreams['descMetadata'].profile
+      }
+      @foo_content = @foo_object.datastreams['descMetadata'].content
     end
     after(:all) do
       @test_object.delete
@@ -53,10 +62,51 @@ describe ActiveFedora::SolrService do
       result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
       result.length.should == 2
       result.each do |r|
-        (r.class == ActiveFedora::Base || r.class == FooObject).should be_true
+        r.inner_object.should be_a(ActiveFedora::SolrDigitalObject)
+        [ActiveFedora::Base, FooObject].should include(r.class)
+        ['test_object','foo_object'].should include(r.label)
+        @test_object.inner_object.profile.should == @profiles['test']
+        @foo_object.inner_object.profile.should == @profiles['foo']
+        @foo_object.datastreams['properties'].profile.should == @profiles['foo_properties']
+        @foo_object.datastreams['descMetadata'].profile.should == @profiles['foo_descMetadata']
+        @foo_object.datastreams['descMetadata'].content.should be_equivalent_to(@foo_content)
       end
     end
     
+    it 'should #reify a lightweight object as a new instance' do
+      query = "id\:#{ActiveFedora::SolrService.escape_uri_for_query(@foo_object.pid)}"
+      solr_result = ActiveFedora::SolrService.instance.conn.query(query)
+      result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
+      solr_foo = result.first
+      real_foo = solr_foo.reify
+      solr_foo.inner_object.should be_a(ActiveFedora::SolrDigitalObject)
+      real_foo.inner_object.should be_a(ActiveFedora::DigitalObject)
+      solr_foo.label.should == 'foo_object'
+      real_foo.label.should == 'foo_object'
+    end
+    
+    it 'should #reify! a lightweight object within the same instance' do
+      query = "id\:#{ActiveFedora::SolrService.escape_uri_for_query(@foo_object.pid)}"
+      solr_result = ActiveFedora::SolrService.instance.conn.query(query)
+      result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
+      solr_foo = result.first
+      solr_foo.inner_object.should be_a(ActiveFedora::SolrDigitalObject)
+      solr_foo.reify!
+      solr_foo.inner_object.should be_a(ActiveFedora::DigitalObject)
+      solr_foo.label.should == 'foo_object'
+    end
+    
+    it 'should raise an exception when attempting to reify a first-class object' do
+      query = "id\:#{ActiveFedora::SolrService.escape_uri_for_query(@foo_object.pid)}"
+      solr_result = ActiveFedora::SolrService.instance.conn.query(query)
+      result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
+      solr_foo = result.first
+      lambda {solr_foo.reify}.should_not raise_exception
+      lambda {solr_foo.reify!}.should_not raise_exception
+      lambda {solr_foo.reify!}.should raise_exception(/already a full/)
+      lambda {solr_foo.reify}.should raise_exception(/already a full/)
+    end
+  
     it 'should call load_instance_from_solr if :load_from_solr option passed in' do
       query = "id\:#{ActiveFedora::SolrService.escape_uri_for_query(@test_object.pid)} OR id\:#{ActiveFedora::SolrService.escape_uri_for_query(@foo_object.pid)}"
       solr_result = ActiveFedora::SolrService.instance.conn.query(query)

data/spec/samples/models/hydrangea_article.rb

@@ -1,6 +1,6 @@
 require "active-fedora"
-require "lib/active_fedora/samples/hydra-mods_article_datastream"
-require "lib/active_fedora/samples/hydra-rights_metadata_datastream"
+require 'spec/samples/hydra-mods_article_datastream.rb'
+require 'spec/samples/hydra-rights_metadata_datastream.rb'
 
 # This Model is used to load & index the hydrangea:fixture_mods_article1 fixture for use in tests.
 #

data/spec/samples/samples.rb

@@ -0,0 +1,2 @@
+# require all of the files in the samples directory
+require 'spec/samples/models/hydrangea_article'

data/{lib/active_fedora → spec}/samples/special_thing.rb

@@ -1,7 +1,7 @@
 require "active-fedora"
-require "active_fedora/samples/hydra-mods_article_datastream.rb"
-require "active_fedora/samples/hydra-rights_metadata_datastream.rb"
-require "active_fedora/samples/marpa-dc_datastream.rb"
+# require "active_fedora/samples/hydra-mods_article_datastream.rb"
+# require "active_fedora/samples/hydra-rights_metadata_datastream.rb"
+# require "active_fedora/samples/marpa-dc_datastream.rb"
 
 # This is an example of an ActiveFedora Model
 #

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'rspec'
 require 'equivalent-xml/rspec_matchers'
 
 require 'support/mock_fedora'
+require 'samples/samples'
 
 
 logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method

data/spec/unit/active_fedora_spec.rb

@@ -92,28 +92,17 @@ describe ActiveFedora do
       end
       
       it "should return the solr.yml file in the same directory as the fedora.yml if it exists" do
-        ActiveFedora.expects(:config_options).at_least_once.returns({})
-        ActiveFedora.expects(:fedora_config_path).returns("/path/to/fedora/config/fedora.yml")
+        ActiveFedora::Config.any_instance.expects(:path).returns("/path/to/fedora/config/fedora.yml")
         File.expects(:file?).with("/path/to/fedora/config/solr.yml").returns(true)
         ActiveFedora.get_config_path(:solr).should eql("/path/to/fedora/config/solr.yml")
       end
       
-      it "should raise an error if there is not a solr.yml in the same directory as the fedora.yml and the fedora.yml has a solr url defined" do
-        ActiveFedora.expects(:config_options).at_least_once.returns({})
-        ActiveFedora.expects(:fedora_config_path).returns("/path/to/fedora/config/fedora.yml")
-        File.expects(:file?).with("/path/to/fedora/config/solr.yml").returns(false)
-        ActiveFedora.expects(:fedora_config).returns({"test"=>{"solr"=>{"url"=>"http://some_url"}}})
-        ActiveSupport::Deprecation.expects(:warn)
-        lambda { ActiveFedora.get_config_path(:solr) }.should raise_exception
-      end
-
       context "no solr.yml in same directory as fedora.yml and fedora.yml does not contain solr url" do
 
         before :each do
           ActiveFedora.expects(:config_options).at_least_once.returns({})
-          ActiveFedora.expects(:fedora_config_path).returns("/path/to/fedora/config/fedora.yml")
+          ActiveFedora::Config.any_instance.expects(:path).returns("/path/to/fedora/config/fedora.yml")
           File.expects(:file?).with("/path/to/fedora/config/solr.yml").returns(false)
-          ActiveFedora.expects(:fedora_config).returns({"test"=>{"url"=>"http://some_url"}})
         end
         after :each do
           unstub_rails
@@ -144,12 +133,6 @@ describe ActiveFedora do
 
 
     describe "#determine url" do
-      it "should support config['environment']['fedora']['url'] if config_type is fedora" do
-        config = {:test=> {:fedora=>{"url"=>"http://fedoraAdmin:fedorAdmin@localhost:8983/fedora"}}}
-        ActiveSupport::Deprecation.expects(:warn).with("Using \"fedora\" in the fedora.yml file is no longer supported")
-        ActiveFedora.determine_url("fedora",config).should eql("http://localhost:8983/fedora")
-      end
-
       it "should support config['environment']['url'] if config_type is fedora" do
         config = {:test=> {:url=>"http://fedoraAdmin:fedorAdmin@localhost:8983/fedora"}}
         ActiveFedora.determine_url("fedora",config).should eql("http://localhost:8983/fedora")
@@ -163,12 +146,6 @@ describe ActiveFedora do
     end
 
     describe "load_config" do
-      it "should load the file specified in fedora_config_path" do
-        ActiveFedora.expects(:fedora_config_path).returns("/path/to/fedora.yml")
-        File.expects(:open).with("/path/to/fedora.yml").returns("test:\n  url: http://myfedora:8080")
-        ActiveFedora.load_config(:fedora).should eql({:url=>"http://myfedora:8080",:test=>{:url=>"http://myfedora:8080", :user=>nil, :password=>nil}})
-        ActiveFedora.fedora_config.should eql({:url=>"http://myfedora:8080",:test=>{:url=>"http://myfedora:8080", :user=>nil, :password=>nil}})
-      end
       it "should load the file specified in solr_config_path" do
         ActiveFedora.expects(:solr_config_path).returns("/path/to/solr.yml")
         File.expects(:open).with("/path/to/solr.yml").returns("development:\n  default:\n    url: http://devsolr:8983\ntest:\n  default:\n    url: http://mysolr:8080")
@@ -183,7 +160,7 @@ describe ActiveFedora do
           ActiveFedora.instance_variable_set :@config_loaded, nil
         end
         it "should load the fedora and solr configs" do
-          ActiveFedora.expects(:load_config).with(:fedora)
+          #ActiveFedora.expects(:load_config).with(:fedora)
           ActiveFedora.expects(:load_config).with(:solr)
           ActiveFedora.config_loaded?.should be_false
           ActiveFedora.load_configs
@@ -205,12 +182,12 @@ describe ActiveFedora do
 
     describe "check_fedora_path_for_solr" do
       it "should find the solr.yml file and return it if it exists" do
-        ActiveFedora.expects(:fedora_config_path).returns("/path/to/fedora/fedora.yml")
+        ActiveFedora::Config.any_instance.expects(:path).returns("/path/to/fedora/fedora.yml")
         File.expects(:file?).with("/path/to/fedora/solr.yml").returns(true)
         ActiveFedora.check_fedora_path_for_solr.should == "/path/to/fedora/solr.yml"
       end
       it "should return nil if the solr.yml file is not there" do
-        ActiveFedora.expects(:fedora_config_path).returns("/path/to/fedora/fedora.yml")
+        ActiveFedora::Config.any_instance.expects(:path).returns("/path/to/fedora/fedora.yml")
         File.expects(:file?).with("/path/to/fedora/solr.yml").returns(false)
         ActiveFedora.check_fedora_path_for_solr.should be_nil
       end
@@ -236,28 +213,27 @@ describe ActiveFedora do
   
     it "can tell its config paths" do
       ActiveFedora.init
-      ActiveFedora.should respond_to(:fedora_config_path)
       ActiveFedora.should respond_to(:solr_config_path)
     end
     it "loads a config from the current working directory as a second choice" do
       Dir.stubs(:getwd).returns(@fake_rails_root)
       ActiveFedora.init
-      ActiveFedora.fedora_config_path.should eql("#{@fake_rails_root}/config/fedora.yml")
+      ActiveFedora.get_config_path(:fedora).should eql("#{@fake_rails_root}/config/fedora.yml")
       ActiveFedora.solr_config_path.should eql("#{@fake_rails_root}/config/solr.yml")
     end
     it "loads the config that ships with this gem as a last choice" do
       Dir.stubs(:getwd).returns("/fake/path")
-      logger.expects(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml) - or set Rails.root and put fedora.yml into \#{Rails.root}/config.")
+      logger.expects(:warn).with("Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml) - or set Rails.root and put fedora.yml into \#{Rails.root}/config.").twice
       ActiveFedora.init
       expected_config = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config"))
-      ActiveFedora.fedora_config_path.should eql(expected_config+'/fedora.yml')
+      ActiveFedora.get_config_path(:fedora).should eql(expected_config+'/fedora.yml')
       ActiveFedora.solr_config_path.should eql(expected_config+'/solr.yml')
     end
     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(:fedora_config_path=>"really_fake_fedora.yml") }.should raise_exception(ActiveFedora::ActiveFedoraConfigurationException)
+      lambda{ ActiveFedora.init(:fedora_config_path=>"really_fake_fedora.yml") }.should raise_exception(ActiveFedora::ConfigurationError)
     end
     
     describe "within Rails" do
@@ -271,7 +247,7 @@ describe ActiveFedora do
       
       it "loads a config from Rails.root as a first choice" do
         ActiveFedora.init
-        ActiveFedora.fedora_config_path.should eql("#{Rails.root}/config/fedora.yml")
+        ActiveFedora.get_config_path(:fedora).should eql("#{Rails.root}/config/fedora.yml")
         ActiveFedora.solr_config_path.should eql("#{Rails.root}/config/solr.yml")
       end
       
@@ -315,9 +291,7 @@ describe ActiveFedora do
       before do
         
         ActiveFedora.instance_variable_set :@predicate_config_path, nil
-        ActiveFedora.instance_variable_set(:@fedora_config_path, "/path/to/my/files/fedora.yml")
-        # ActiveFedora.expects(:load_config).with(:fedora)
-        # ActiveFedora.expects(:load_config).with(:solr)
+        ActiveFedora::Config.any_instance.expects(:path).returns("/path/to/my/files/fedora.yml")
       end
       it "should return the path that was set at initialization" do
         File.expects(:exist?).with("/path/to/my/files/predicate_mappings.yml").returns(true)
@@ -360,17 +334,11 @@ describe ActiveFedora do
     describe "outside of rails" do
       it "should load the default packaged config/fedora.yml file if no explicit config path is passed" do
         ActiveFedora.init()
-        ActiveFedora.fedora_config[:url].to_s.should == "http://127.0.0.1:8983/fedora-test"
-        ActiveFedora.fedora_config[:test][:url].to_s.should == "http://127.0.0.1:8983/fedora-test"
-        ActiveFedora.fedora_config[:test][:user].to_s.should == "fedoraAdmin"
-        ActiveFedora.fedora_config[:test][:password].to_s.should == "fedoraAdmin"
+        ActiveFedora.config.credentials.should == {:url=> "http://127.0.0.1:8983/fedora-test", :user=>'fedoraAdmin', :password=>'fedoraAdmin'}
       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://testhost.com:8983/fedora"
-        ActiveFedora.fedora_config[:test][:url].to_s.should == "http://testhost.com:8983/fedora"
-        ActiveFedora.fedora_config[:test][:user].to_s.should == "fedoraAdmin"
-        ActiveFedora.fedora_config[:test][:password].to_s.should == "fedoraAdmin"
+        ActiveFedora.config.credentials.should == {:url=> "http://testhost.com:8983/fedora", :user=>'fedoraAdmin', :password=>'fedoraAdmin'}
       end
     end
 
@@ -383,7 +351,7 @@ describe ActiveFedora do
       describe "versions prior to 3.0" do
         describe "with explicit config path passed in" do
           it "should load the specified config path" do
-            fedora_config="test:\n  fedora:\n    url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
+            fedora_config="test:\n  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
             solr_config = "test:\n  default:\n    url: http://foosolr:8983"
 
             fedora_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/fedora.yml"))
@@ -394,10 +362,9 @@ describe ActiveFedora do
             File.stubs(:open).with(solr_config_path).returns(solr_config)
 
 
-            ActiveSupport::Deprecation.expects(:warn).with("Using \"fedora\" in the fedora.yml file is no longer supported")
+            ActiveSupport::Deprecation.expects(:warn).with("Using \":url\" in the fedora.yml file without :user and :password is no longer supported")
             ActiveFedora.init(:fedora_config_path=>fedora_config_path,:solr_config_path=>solr_config_path)
             ActiveFedora.solr.class.should == ActiveFedora::SolrService
-            ActiveFedora.fedora.class.should == ActiveFedora::RubydoraConnection
           end
         end
 
@@ -405,12 +372,12 @@ describe ActiveFedora do
           it "should look for the file in the path defined at Rails.root" do
             stub_rails(:root=>File.join(File.dirname(__FILE__),"../fixtures/rails_root"))
             ActiveFedora.init()
-            ActiveFedora.fedora_config[:url].should == "http://testhost.com:8983/fedora"
+            ActiveFedora.config.credentials[:url].should == "http://testhost.com:8983/fedora"
           end
           it "should load the default file if no config is found at Rails.root" do
             stub_rails(:root=>File.join(File.dirname(__FILE__),"../fixtures/bad/path/to/rails_root"))
             ActiveFedora.init()
-            ActiveFedora.fedora_config[:url].should == "http://127.0.0.1:8983/fedora-test"
+            ActiveFedora.config.credentials[:url].should == "http://127.0.0.1:8983/fedora-test"
           end
         end
       end