active-fedora 4.0.0.rc1 → 4.0.0.rc2

data/spec/unit/ntriples_datastream_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe ActiveFedora::NtriplesRDFDatastream do
-
   describe "an instance with content" do
     before do 
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+        register_vocabularies RDF::DC, RDF::FOAF, RDF::RDFS
         map_predicates do |map|
           map.created(:in => RDF::DC)
           map.title(:in => RDF::DC)
@@ -58,6 +58,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
   describe "a new instance" do
     before do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+        register_vocabularies RDF::DC
         map_predicates do |map|
           map.publisher(:in => RDF::DC)
         end
@@ -70,4 +71,154 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject.save
     end
   end
+
+  describe "solr integration" do
+    before(:all) do
+      class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+        register_vocabularies RDF::DC, RDF::FOAF, RDF::RDFS
+        map_predicates do |map|
+          map.created(:in => RDF::DC, :type => :date)
+          map.title(:in => RDF::DC, :type => :text)
+          map.publisher(:in => RDF::DC)
+          map.based_near(:in => RDF::FOAF, :type => :text)
+          map.related_url(:to => "seeAlso", :in => RDF::RDFS, :type => :string)
+        end
+      end
+      @subject = MyDatastream.new(@inner_object, 'solr_rdf')
+      @subject.content = File.new('spec/fixtures/solr_rdf_descMetadata.nt').read
+      @subject.stubs(:pid => 'test:1')
+      @subject.stubs(:new? => false)
+      @sample_fields = {:publisher => {:values => ["publisher1"], :type => :string}, 
+        :based_near => {:values => ["coverage1", "coverage2"], :type => :text}, 
+        :created => {:values => "fake-date", :type => :date},
+        :title => {:values => "fake-title", :type => :text},
+        :related_url => {:values => "http://example.org/", :type => :string},
+        :empty_field => {:values => []}
+      } 
+      @sample_xml = XmlSimple.xml_in("<fields><based_near>coverage1</based_near><based_near>coverage2</based_near><created>fake-date</created><publisher>publisher1</publisher><related_url>http://example.org/</related_url><title>fake-title</title></fields>")
+    end
+    after(:all) do
+      # Revert to default mappings after running tests
+      ActiveFedora::SolrService.load_mappings
+    end
+    it "should provide .to_solr and return a SolrDocument" do
+      @subject.should respond_to(:to_solr)
+      @subject.to_solr.should be_kind_of(Hash)
+    end
+    it "should provide .fields and return a Hash" do
+      @subject.should respond_to(:fields)
+      @subject.fields.should be_kind_of(Hash)
+    end   
+    it "should optionally allow you to provide the Solr::Document to add fields to and return that document when done" do
+      doc = Hash.new
+      @subject.to_solr(doc).should == doc
+    end
+    it "should iterate through @fields hash" do
+      @subject.expects(:fields).returns(@sample_fields)
+      solr_doc = @subject.to_solr
+      solr_doc["publisher_t"].should == ["publisher1"]
+      solr_doc["based_near_t"].sort.should == ["coverage1", "coverage2"]
+      solr_doc["created_dt"].should == ["fake-date"]
+      solr_doc["title_t"].should == ["fake-title"]
+      solr_doc["related_url_t"].should == ["http://example.org/"]
+      solr_doc["empty_field_t"].should be_nil
+    end
+    it "should allow multiple values for a single field"
+    it 'should append create keys in format field_name + _ + field_type' do
+      @subject.stubs(:fields).returns(@sample_fields)
+      
+      #should have these            
+      @subject.to_solr["publisher_t"].should_not be_nil
+      @subject.to_solr["based_near_t"].should_not be_nil
+      @subject.to_solr["created_dt"].should_not be_nil
+      @subject.to_solr["title_t"].should_not be_nil
+      
+      #should NOT have these
+      @subject.to_solr["narrator"].should be_nil
+      @subject.to_solr["empty_field"].should be_nil
+      @subject.to_solr["creator"].should be_nil
+    end
+    it "should use Solr mappings to generate field names" do
+      ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
+      @subject.stubs(:fields).returns(@sample_fields)
+      solr_doc =  @subject.to_solr
+      
+      #should have these            
+      solr_doc["publisher_field"].should == ["publisher1"]
+      solr_doc["based_near_field"].sort.should == ["coverage1", "coverage2"]
+      solr_doc["created_date"].should == ["fake-date"]
+      solr_doc["title_field"].should == ["fake-title"]
+        
+      solr_doc["title_t"].should be_nil
+      solr_doc["publisher_t"].should be_nil
+      solr_doc["based_near_t"].should be_nil
+      solr_doc["created_dt"].should be_nil
+      
+      # Reload default mappings
+      ActiveFedora::SolrService.load_mappings
+    end
+    it 'should append _dt to dates' do
+      ActiveFedora::SolrService.load_mappings
+      @subject.expects(:fields).returns(@sample_fields).at_least_once
+      @subject.to_solr["created_dt"].should_not be_nil
+      
+      #should NOT have these      
+      @subject.to_solr["created"].should be_nil
+      @subject.to_solr["created_date"].should be_nil
+    end
+    describe "with an actual object" do
+      before(:all) do
+        @obj = MyDatastream.new(@inner_object, 'solr_rdf')
+        @obj.created = "2012-03-04"
+        @obj.title = "Of Mice and Men, The Sequel"
+        @obj.publisher = "Bob's Blogtastic Publishing"
+        @obj.based_near = ["Tacoma, WA", "Renton, WA"]
+        @obj.related_url = "http://example.org/blogtastic/"
+        @obj.save
+      end
+      describe ".fields()" do
+        it "should return the right # of fields" do
+          @obj.fields.keys.count.should == 5
+        end
+        it "should return the right fields" do
+          @obj.fields.keys.should include(:related_url)
+          @obj.fields.keys.should include(:publisher)
+          @obj.fields.keys.should include(:created)
+          @obj.fields.keys.should include(:title)
+          @obj.fields.keys.should include(:based_near)
+        end
+        it "should return the right values" do
+          @obj.fields[:related_url][:values].should == ["http://example.org/blogtastic/"]
+        end
+        it "should return the right type information" do
+          @obj.fields[:created][:type].should == :date
+        end
+        it "should return multi-value fields as expected" do
+          @obj.fields[:based_near][:values].count.should == 2
+          @obj.fields[:based_near][:values].should include("Tacoma, WA")
+          @obj.fields[:based_near][:values].should include("Renton, WA")
+        end
+      end
+      describe ".to_solr()" do
+        it "should return the right # of fields" do
+          @obj.to_solr.keys.count.should == 5
+        end
+        it "should return the right fields" do
+          @obj.to_solr.keys.should include("related_url_t")
+          @obj.to_solr.keys.should include("publisher_t")
+          @obj.to_solr.keys.should include("created_dt")
+          @obj.to_solr.keys.should include("title_t")
+          @obj.to_solr.keys.should include("based_near_t")
+        end
+        it "should return the right values" do
+          @obj.to_solr["related_url_t"].should == ["http://example.org/blogtastic/"]
+        end
+        it "should return multi-value fields as expected" do
+          @obj.to_solr["based_near_t"].count.should == 2
+          @obj.to_solr["based_near_t"].should include("Tacoma, WA")
+          @obj.to_solr["based_near_t"].should include("Renton, WA")
+        end
+      end
+    end
+  end
 end

data/spec/unit/relationships_spec.rb

@@ -11,6 +11,7 @@ describe ActiveFedora::Relationships do
       class SpecNode
         include ActiveFedora::Relationships
         include ActiveFedora::SemanticNode
+        include ActiveFedora::Model
         
         attr_accessor :pid
         def init_with(inner_obj)
@@ -160,16 +161,15 @@ describe ActiveFedora::Relationships do
         local_node.should respond_to(:containers_query)
       end
       
-      it "resulting finder should search against solr and use Model#load_instance to build an array of objects" do
+      it "resulting finder should search against solr and use Model#find to build an array of objects" do
         @sample_solr_hits = [{"id"=>"_PID1_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
                               {"id"=>"_PID2_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
                               {"id"=>"_PID3_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]}]
-        solr_result = mock("solr result", :hits => @sample_solr_hits)
         SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
         local_node = SpecNode.new()
         local_node.expects(:pid).returns("test:sample_pid")
         SpecNode.expects(:relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once()
-        ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(solr_result)
+        ActiveFedora::SolrService.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(@sample_solr_hits)
         local_node.parts_ids.should == ["_PID1_", "_PID2_", "_PID3_"]
       end
       
@@ -178,11 +178,12 @@ describe ActiveFedora::Relationships do
         SpecNode.create_inbound_relationship_finders("constituents", :is_constituent_of, :inbound => true)
         local_node = SpecNode.new
         mock_repo = mock("repo")
-        mock_repo.expects(:load_instance).never
+        mock_repo.expects(:find).never
         local_node.expects(:pid).returns("test:sample_pid")
         SpecNode.expects(:relationships_desc).returns({:inbound=>{"constituents"=>{:predicate=>:is_constituent_of}}}).at_least_once()
-        ActiveFedora::SolrService.instance.conn.expects(:query).with("is_constituent_of_s:info\\:fedora/test\\:sample_pid", :rows=>101).returns(solr_result)
-        local_node.constituents(:response_format => :solr, :rows=>101).should equal(solr_result)
+        instance = stub(:conn=>stub(:conn))
+        ActiveFedora::SolrService.expects(:query).with("is_constituent_of_s:info\\:fedora/test\\:sample_pid", :raw=>true, :rows=>101).returns(solr_result)
+        local_node.constituents(:response_format => :solr, :rows=>101).should == solr_result
       end
       
       
@@ -191,7 +192,7 @@ describe ActiveFedora::Relationships do
         local_node = SpecNode.new
         local_node.expects(:pid).returns("test:sample_pid")
         SpecNode.expects(:relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once() 
-        ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(mock("solr result", :hits => [Hash["id"=>"pid1"], Hash["id"=>"pid2"]]))
+        ActiveFedora::SolrService.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns([Hash["id"=>"pid1"], Hash["id"=>"pid2"]])
         local_node.parts(:response_format => :id_array).should == ["pid1", "pid2"]
       end
       
@@ -230,18 +231,15 @@ describe ActiveFedora::Relationships do
       end
       
       describe " resulting finder" do
-        it "should read from relationships array and use Repository.load_instance to build an array of objects" do
+        it "should read from relationships array and use Repository.find to build an array of objects" do
           SpecNode.create_outbound_relationship_finders("containers", :is_member_of)
           local_node = SpecNode.new
           local_node.expects(:ids_for_outbound).with(:is_member_of).returns(["my:_PID1_", "my:_PID2_", "my:_PID3_"])
-          mock_repo = mock("repo")
-          solr_result = mock("solr result", :is_a? => true)
-          solr_result.expects(:hits).returns(
-                        [{"id"=> "my:_PID1_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]},
+
+          ActiveFedora::ContentModel.expects(:known_models_for).returns([SpecNode]).times(3)
+          ActiveFedora::SolrService.expects(:query).with("id:my\\:_PID1_ OR id:my\\:_PID2_ OR id:my\\:_PID3_").returns([{"id"=> "my:_PID1_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]},
                          {"id"=> "my:_PID2_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}, 
                          {"id"=> "my:_PID3_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}])
-
-          ActiveFedora::SolrService.instance.conn.expects(:query).with("id:my\\:_PID1_ OR id:my\\:_PID2_ OR id:my\\:_PID3_").returns(solr_result)
           local_node.containers.map(&:pid).should == ["my:_PID1_", "my:_PID2_", "my:_PID3_"]
         end
       
@@ -250,10 +248,10 @@ describe ActiveFedora::Relationships do
           SpecNode.create_outbound_relationship_finders("constituents", :is_constituent_of)
           local_node = SpecNode.new
           mock_repo = mock("repo")
-          mock_repo.expects(:load_instance).never
+          mock_repo.expects(:find).never
           local_node.expects(:rels_ext).returns(stub('rels-ext', :content=>''))
-          ActiveFedora::SolrService.instance.conn.expects(:query).returns(solr_result)
-          local_node.constituents(:response_format => :solr).should equal(solr_result)
+          ActiveFedora::SolrService.expects(:query).returns(solr_result)
+          local_node.constituents(:response_format => :solr).should == solr_result
         end
         
         it "(:response_format => :id_array) should read from relationships array" do
@@ -319,7 +317,7 @@ describe ActiveFedora::Relationships do
         @local_node.expects(:ids_for_outbound).with(:has_part).returns(["mypid:1"])
         id_array_query = ActiveFedora::SolrService.construct_query_for_pids(["mypid:1"])
         solr_result = mock("solr result")
-        ActiveFedora::SolrService.instance.conn.expects(:query).with("#{id_array_query} OR (is_part_of_s:info\\:fedora/test\\:sample_pid)", :rows=>25).returns(solr_result)
+        ActiveFedora::SolrService.expects(:query).with("#{id_array_query} OR (is_part_of_s:info\\:fedora/test\\:sample_pid)", :rows=>25).returns(solr_result)
         @local_node.all_parts(:response_format=>:solr)
       end
 

data/spec/unit/solr_config_options_spec.rb

@@ -50,10 +50,8 @@ describe ActiveFedora do
     end
 
     it "should be used by ActiveFedora::Base#find_by_solr" do
-      mock_solr = mock("SolrConnection")
       mock_response = mock("SolrResponse")
-      mock_solr.expects(:query).with(SOLR_DOCUMENT_ID + ':changeme\:30', {}).returns(mock_response)
-      ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
+      ActiveFedora::SolrService.expects(:query).with(SOLR_DOCUMENT_ID + ':changeme\:30', {}).returns(mock_response)
   
       SolrSpecModel::Basic.find_by_solr("changeme:30").should equal(mock_response)
     end

data/spec/unit/solr_service_spec.rb

@@ -11,29 +11,20 @@ describe ActiveFedora::SolrService do
   end
   
   it "should take a narg constructor and configure for localhost" do
-    mconn = mock('conn')
-    Solr::Connection.expects(:new).with('http://localhost:8080/solr', {:autocommit=>:on}).returns(mconn)
-    ss = ActiveFedora::SolrService.register
+    RSolr.expects(:connect).with(:url => 'http://localhost:8080/solr')
+    ActiveFedora::SolrService.register
   end
   it "should accept host arg into constructor" do
-    mconn = mock('conn')
-    Solr::Connection.expects(:new).with('http://fubar', {:autocommit=>:on}).returns(mconn)
-    ss = ActiveFedora::SolrService.register('http://fubar')
-  end
-  it "should merge options" do
-    mconn = mock('conn')
-    Solr::Connection.expects(:new).with('http://localhost:8080/solr', {:autocommit=>:on, :foo=>'bar'}).returns(mconn)
-    ss = ActiveFedora::SolrService.register(nil, {:foo=>'bar'})
+    RSolr.expects(:connect).with(:url => 'http://fubar')
+    ActiveFedora::SolrService.register('http://fubar')
   end
   it "should clobber options" do
-    mconn = mock('conn')
-    Solr::Connection.expects(:new).with('http://localhost:8080/solr', {:autocommit=>:off, :foo=>:bar}).returns(mconn)
-    ss = ActiveFedora::SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
+    RSolr.expects(:connect).with(:url => 'http://localhost:8080/solr', :autocommit=>:off, :foo=>:bar)
+    ActiveFedora::SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
   end
 
   it "should set the threadlocal solr service" do
-    mconn = mock('conn')
-    Solr::Connection.expects(:new).with('http://localhost:8080/solr', {:autocommit=>:off, :foo=>:bar}).returns(mconn)
+    RSolr.expects(:connect).with(:url => 'http://localhost:8080/solr', :autocommit=>:off, :foo=>:bar)
     ss = ActiveFedora::SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
     Thread.current[:solr_service].should == ss
     ActiveFedora::SolrService.instance.should == ss
@@ -60,14 +51,11 @@ describe ActiveFedora::SolrService do
                             {"id"=>"my:_PID2_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]},
                             {"id"=>"my:_PID3_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]}]
     end
-    it "should only take Solr::Response::Standard objects as input" do
-      mocko = mock("input", :is_a? => false)
-      lambda {ActiveFedora::SolrService.reify_solr_results(mocko)}.should raise_error(ArgumentError)
-    end
-    it "should use Repository.load_instance to instantiate objects" do
-      solr_result = mock("solr result", :is_a? => true)
-      solr_result.expects(:hits).returns(@sample_solr_hits)
-      ActiveFedora::SolrService.reify_solr_results(solr_result).map(&:pid).should == ["my:_PID1_", "my:_PID2_", "my:_PID3_"] 
+    it "should use Repository.find to instantiate objects" do
+      AudioRecord.expects(:find).with("my:_PID1_")
+      AudioRecord.expects(:find).with("my:_PID2_")
+      AudioRecord.expects(:find).with("my:_PID3_")
+      ActiveFedora::SolrService.reify_solr_results(@sample_solr_hits)
     end
   end
   

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424151
+  hash: 15424145
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 1
-  version: 4.0.0.rc1
+  - 2
+  version: 4.0.0.rc2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,26 +19,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-04 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
         - 0
-        - 0
-        - 6
-        version: 0.0.6
-  requirement: *id001
-  name: solr-ruby
+        version: "0"
+  version_requirements: *id001
+  name: rsolr
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +48,12 @@ dependencies:
         - 0
         - 12
         version: 1.0.12
-  requirement: *id002
+  version_requirements: *id002
   name: xml-simple
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +63,12 @@ dependencies:
         - 1
         - 16
         version: "1.16"
-  requirement: *id003
+  version_requirements: *id003
   name: mime-types
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -80,12 +79,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  requirement: *id004
+  version_requirements: *id004
   name: multipart-post
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -94,12 +93,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  version_requirements: *id005
   name: nokogiri
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,12 +109,12 @@ dependencies:
         - 5
         - 3
         version: 1.5.3
-  requirement: *id006
+  version_requirements: *id006
   name: om
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,12 +125,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id007
+  version_requirements: *id007
   name: solrizer
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,12 +141,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id008
+  version_requirements: *id008
   name: activeresource
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,12 +157,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id009
+  version_requirements: *id009
   name: activesupport
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -172,12 +171,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
+  version_requirements: *id010
   name: mediashelf-loggable
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -186,12 +185,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  version_requirements: *id011
   name: equivalent-xml
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -202,12 +201,12 @@ dependencies:
         - 5
         - 4
         version: 0.5.4
-  requirement: *id012
+  version_requirements: *id012
   name: rubydora
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -216,12 +215,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
+  version_requirements: *id013
   name: rdf
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -230,12 +229,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id014
+  version_requirements: *id014
   name: rdf-rdfxml
   type: :runtime
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -244,12 +243,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id015
+  version_requirements: *id015
   name: yard
   type: :development
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -258,12 +257,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id016
+  version_requirements: *id016
   name: RedCloth
   type: :development
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -272,28 +271,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id017
+  version_requirements: *id017
   name: rake
   type: :development
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
-  requirement: *id018
-  name: solrizer-fedora
-  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -304,12 +287,12 @@ dependencies:
         - 2
         - 0
         version: 1.2.0
-  requirement: *id019
+  version_requirements: *id018
   name: jettywrapper
   type: :development
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id020 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -319,12 +302,12 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  requirement: *id020
+  version_requirements: *id019
   name: rspec
   type: :development
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id021 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -335,10 +318,9 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
-  requirement: *id021
+  version_requirements: *id020
   name: mocha
   type: :development
-  prerelease: false
 description: ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.
 email: 
 - matt.zumwalt@yourmediashelf.com
@@ -452,12 +434,12 @@ files:
 - spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
 - spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
 - spec/fixtures/sharded_fedora.yml
+- spec/fixtures/solr_rdf_descMetadata.nt
 - spec/fixtures/test_12.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/associations_spec.rb
 - spec/integration/base_file_management_spec.rb
 - spec/integration/base_find_by_fields_spec.rb
-- spec/integration/base_loader_spec.rb
 - spec/integration/base_spec.rb
 - spec/integration/bug_spec.rb
 - spec/integration/datastream_collections_spec.rb
@@ -609,12 +591,12 @@ test_files:
 - spec/fixtures/rails_root/config/solr_mappings_af_0.1.yml
 - spec/fixtures/rails_root/config/solr_mappings_bl_2.4.yml
 - spec/fixtures/sharded_fedora.yml
+- spec/fixtures/solr_rdf_descMetadata.nt
 - spec/fixtures/test_12.foxml.xml
 - spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/associations_spec.rb
 - spec/integration/base_file_management_spec.rb
 - spec/integration/base_find_by_fields_spec.rb
-- spec/integration/base_loader_spec.rb
 - spec/integration/base_spec.rb
 - spec/integration/bug_spec.rb
 - spec/integration/datastream_collections_spec.rb