active-fedora 6.4.2 → 6.4.3

data/spec/unit/has_and_belongs_to_many_collection_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
   it "should call add_relationship" do
-    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a', :ids_for_outbound => [])
-    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
+    subject = double("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a', :ids_for_outbound => [])
+    predicate = double(:klass => double.class, :options=>{:property=>'predicate'}, :class_name=> nil)
     ActiveFedora::SolrService.stub(:query).and_return([])
     ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
-    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
+    object = double("object", :new_record? => false, :pid => 'object:b', :save => nil)
   
     subject.should_receive(:add_relationship).with('predicate', object)
  
@@ -15,11 +15,11 @@ describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
   end
 
   it "should call add_relationship on subject and object when inverse_of given" do
-    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a', :ids_for_outbound => [])
-    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate', :inverse_of => 'inverse_predicate'}, :class_name=> nil)
+    subject = double("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a', :ids_for_outbound => [])
+    predicate = double(:klass => double.class, :options=>{:property=>'predicate', :inverse_of => 'inverse_predicate'}, :class_name=> nil)
     ActiveFedora::SolrService.stub(:query).and_return([])
     ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
-    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
+    object = double("object", :new_record? => false, :pid => 'object:b', :save => nil)
   
     subject.should_receive(:add_relationship).with('predicate', object)
  

data/spec/unit/has_many_collection_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe ActiveFedora::Associations::HasManyAssociation do
   it "should call add_relationship" do
-    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
-    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
+    subject = double("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
+    predicate = double(:klass => double.class, :options=>{:property=>'predicate'}, :class_name=> nil)
     ActiveFedora::SolrService.stub(:query).and_return([])
     ac = ActiveFedora::Associations::HasManyAssociation.new(subject, predicate)
-    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
+    object = double("object", :new_record? => false, :pid => 'object:b', :save => nil)
   
     object.should_receive(:add_relationship).with('predicate', subject)
  

data/spec/unit/ntriples_datastream_spec.rb

@@ -14,7 +14,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
           map.related_url(:to => "seeAlso", :in => RDF::RDFS)
         end
       end
-      @subject = MyDatastream.new(stub('inner object', :pid=>'test:1', :new? =>true), 'descMetadata')
+      @subject = MyDatastream.new(double('inner object', :pid=>'test:1', :new? =>true), 'descMetadata')
       @subject.content = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
     end
     after do
@@ -208,7 +208,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
           delegate :rights, :to => :descMetadata
         end
         @obj = MyDatastream.new(@inner_object, 'solr_rdf')
-        repository = mock()
+        repository = double()
           @obj.stub(:repository => repository, :pid => 'test:1')
           repository.stub(:modify_datastream)
           repository.stub(:add_datastream)

data/spec/unit/om_datastream_spec.rb

@@ -9,7 +9,7 @@ describe ActiveFedora::OmDatastream do
                       :empty_field => {:values => {}}
                       } 
     @sample_raw_xml = "<foo><xmlelement/></foo>"
-    @solr_doc = {"id"=>"hydrange_article1",
+    @solr_doc = {"id"=>"mods_article1",
       ActiveFedora::SolrService.solr_name("name_role_roleTerm", type: :string) =>["creator","submitter","teacher"],
       ActiveFedora::SolrService.solr_name("name_0_role", type: :string)=>"\r\ncreator\r\nsubmitter\r\n",
       ActiveFedora::SolrService.solr_name("name_1_role", type: :string)=>"\r\n teacher \r\n",
@@ -19,9 +19,9 @@ describe ActiveFedora::OmDatastream do
   end
   
   before(:each) do
-    @mock_inner = mock('inner object')
-    @mock_repo = mock('repository')
-    @mock_repo.stub(:datastream_dissemination=>'My Content', :config=>{})
+    @mock_inner = double('inner object')
+    @mock_repo = double('repository')
+    @mock_repo.stub(:datastream_dissemination=>'My Content', :config=>{}, :datastream=>'')
     @mock_inner.stub(:repository).and_return(@mock_repo)
     @mock_inner.stub(:pid)
     @mock_inner.stub(:new? => false)
@@ -262,9 +262,9 @@ describe ActiveFedora::OmDatastream do
     end
  
     it "should return correct values from solr_doc given different term pointers" do
-      mock_term = mock("OM::XML::Term")
+      mock_term = double("OM::XML::Term")
       mock_term.stub(:type).and_return(:text)
-      mock_terminology = mock("OM::XML::Terminology")
+      mock_terminology = double("OM::XML::Terminology")
       mock_terminology.stub(:retrieve_term).and_return(mock_term)
       ActiveFedora::OmDatastream.stub(:terminology).and_return(mock_terminology)
       @mods_ds.from_solr(@solr_doc)

data/spec/unit/query_spec.rb

@@ -42,7 +42,7 @@ describe ActiveFedora::Base do
       describe "and a pid is specified" do
         it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
           SpecModel::Basic.any_instance.should_receive(:init_with).and_return(SpecModel::Basic.new)
-          ActiveFedora::DigitalObject.should_receive(:find).and_return(stub("inner obj", :'new?'=>false))
+          ActiveFedora::DigitalObject.should_receive(:find).and_return(double("inner obj", :'new?'=>false))
           SpecModel::Basic.find("_PID_").should be_a SpecModel::Basic
         end
         it "should raise an exception if it is not found" do
@@ -54,8 +54,8 @@ describe ActiveFedora::Base do
     end
     describe "with :cast" do
       it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
-        SpecModel::Basic.any_instance.should_receive(:init_with).and_return(mock("Model", :adapt_to_cmodel=>SpecModel::Basic.new ))
-        ActiveFedora::DigitalObject.should_receive(:find).and_return(stub("inner obj", :'new?'=>false))
+        SpecModel::Basic.any_instance.should_receive(:init_with).and_return(double("Model", :adapt_to_cmodel=>SpecModel::Basic.new ))
+        ActiveFedora::DigitalObject.should_receive(:find).and_return(double("inner obj", :'new?'=>false))
         SpecModel::Basic.find("_PID_", :cast=>true)
       end
     end
@@ -115,7 +115,7 @@ describe ActiveFedora::Base do
       
       SpecModel::Basic.should_receive(:find_one).with("changeme:30", nil).and_return(SpecModel::Basic.new(:pid=>'changeme:30'))
       SpecModel::Basic.should_receive(:find_one).with("changeme:22", nil).and_return(SpecModel::Basic.new(:pid=>'changeme:22'))
-      yielded = mock("yielded method")
+      yielded = double("yielded method")
       yielded.should_receive(:run).with { |obj| obj.class == SpecModel::Basic}.twice
       SpecModel::Basic.find_each(){|obj| yielded.run(obj) }
     end
@@ -138,7 +138,7 @@ describe ActiveFedora::Base do
             hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
             hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
         }.and_return('response'=>{'docs'=>mock_docs})
-        yielded = mock("yielded method")
+        yielded = double("yielded method")
         yielded.should_receive(:run).with { |obj| obj.class == SpecModel::Basic}.twice
         SpecModel::Basic.find_each({:foo=>'bar', :baz=>['quix','quack']}){|obj| yielded.run(obj) }
       end
@@ -148,7 +148,7 @@ describe ActiveFedora::Base do
   describe '#find_in_batches' do
     describe "with conditions hash" do
       it "should filter by the provided fields" do
-        mock_docs = mock('docs')
+        mock_docs = double('docs')
         mock_docs.should_receive(:has_next?).and_return(false)
         ActiveFedora::SolrService.instance.conn.should_receive(:paginate).with() { |page, rows, method, hash|
             page == 1 &&
@@ -162,7 +162,7 @@ describe ActiveFedora::Base do
             hash[:params][:q].split(" AND ").include?("baz:\"quix\"") &&
             hash[:params][:q].split(" AND ").include?("baz:\"quack\"")
         }.and_return('response'=>{'docs'=>mock_docs})
-        yielded = mock("yielded method")
+        yielded = double("yielded method")
         yielded.should_receive(:run).with(mock_docs)
         SpecModel::Basic.find_in_batches({:foo=>'bar', :baz=>['quix','quack']}, {:batch_size=>1002, :fl=>'id'}){|group| yielded.run group }.should
       end
@@ -191,7 +191,7 @@ describe ActiveFedora::Base do
   
   describe '#find_with_conditions' do
     it "should make a query to solr and return the results" do
-      mock_result = stub('Result')
+      mock_result = double('Result')
            ActiveFedora::SolrService.should_receive(:query).with() { |args|
             q = args.first if args.is_a? Array
             q ||= args
@@ -204,7 +204,7 @@ describe ActiveFedora::Base do
     end
 
     it "should escape quotes" do
-      mock_result = stub('Result')
+      mock_result = double('Result')
            ActiveFedora::SolrService.should_receive(:query).with() { |args|
             q = args.first if args.is_a? Array
             q ||= args
@@ -218,12 +218,12 @@ describe ActiveFedora::Base do
     end
 
     it "shouldn't use the class if it's called on AF:Base " do
-      mock_result = stub('Result')
+      mock_result = double('Result')
       ActiveFedora::SolrService.should_receive(:query).with('baz:"quack"', {:sort => [@sort_query]}).and_return(mock_result)
       ActiveFedora::Base.find_with_conditions(:baz=>'quack').should == mock_result
     end
     it "should use the query string if it's provided" do
-      mock_result = stub('Result')
+      mock_result = double('Result')
       ActiveFedora::SolrService.should_receive(:query).with('chunky:monkey', {:sort => [@sort_query]}).and_return(mock_result)
       ActiveFedora::Base.find_with_conditions('chunky:monkey').should == mock_result
     end

data/spec/unit/rdf_list_spec.rb

@@ -39,7 +39,7 @@ describe ActiveFedora::RdfList do
   end
 
   describe "a new list" do
-    let (:ds) { DemoList.new(stub('inner object', :pid=>'foo', :new? =>true), 'descMetadata')}
+    let (:ds) { DemoList.new(double('inner object', :pid=>'foo', :new? =>true), 'descMetadata')}
     subject { ds.elementList.build}
 
     it "should insert at the end" do
@@ -102,7 +102,7 @@ END
 
   describe "a list with content" do
     subject do
-      subject = DemoList.new(stub('inner object', :pid=>'foo', :new? =>true), 'descMetadata')
+      subject = DemoList.new(double('inner object', :pid=>'foo', :new? =>true), 'descMetadata')
       subject.content =<<END
   <rdf:RDF
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">

data/spec/unit/rdfxml_rdf_datastream_spec.rb

@@ -93,7 +93,7 @@ describe ActiveFedora::RdfxmlRDFDatastream do
     end
 
     describe "a new instance" do
-      subject { MyDatastream.new(stub('inner object', :pid=>'test:1', :new? =>true), 'descMetadata', about:"http://library.ucsd.edu/ark:/20775/") }
+      subject { MyDatastream.new(double('inner object', :pid=>'test:1', :new? =>true), 'descMetadata', about:"http://library.ucsd.edu/ark:/20775/") }
       it "should have a subject" do
         subject.rdf_subject.to_s.should == "http://library.ucsd.edu/ark:/20775/"
       end
@@ -102,7 +102,7 @@ describe ActiveFedora::RdfxmlRDFDatastream do
 
     describe "an instance with content" do
       subject do
-        subject = MyDatastream.new(stub('inner object', :pid=>'test:1', :new? =>true), 'descMetadata')
+        subject = MyDatastream.new(double('inner object', :pid=>'test:1', :new? =>true), 'descMetadata')
         subject.content = File.new('spec/fixtures/damsObjectModel.xml').read
         subject
       end

data/spec/unit/rels_ext_datastream_spec.rb

@@ -14,8 +14,8 @@ describe ActiveFedora::RelsExtDatastream do
   end
   
   before(:each) do
-      mock_inner = mock('inner object')
-      @mock_repo = mock('repository')
+      mock_inner = double('inner object')
+      @mock_repo = double('repository')
       @mock_repo.stub(:datastream_dissemination=>'My Content', :config=>{})
       mock_inner.stub(:repository).and_return(@mock_repo)
       mock_inner.stub(:pid).and_return(@pid)
@@ -37,7 +37,7 @@ describe ActiveFedora::RelsExtDatastream do
       subject.changed?.should == false
     end
     it "should be true when the model has changes" do
-      subject.model = stub(:relationships_are_dirty=>true)
+      subject.model = double(:relationships_are_dirty=>true)
       subject.changed?.should == true
     end
   end
@@ -50,7 +50,7 @@ describe ActiveFedora::RelsExtDatastream do
       subject = RDF::URI.new "info:fedora/test:sample_pid"
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('demo:10'))
       
-      @test_ds.stub(:new? => true, :relationships_are_dirty? =>true, :relationships => graph, :model => mock(:relationships_are_dirty= => true))
+      @test_ds.stub(:new? => true, :relationships_are_dirty? =>true, :relationships => graph, :model => double(:relationships_are_dirty= => true))
       @test_ds.serialize!
       EquivalentXml.equivalent?(@test_ds.content, "<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n        <rdf:Description rdf:about='info:fedora/test:sample_pid'>\n        <isMemberOf rdf:resource='demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/></rdf:Description>\n      </rdf:RDF>").should be_true
     end
@@ -83,7 +83,7 @@ describe ActiveFedora::RelsExtDatastream do
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:OtherModel"))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:SampleModel"))
 
-      @test_ds.should_receive(:model).and_return(stub("model", :relationships=>graph, :relationships_are_dirty= => true))
+      @test_ds.should_receive(:model).and_return(double("model", :relationships=>graph, :relationships_are_dirty= => true))
       EquivalentXml.equivalent?(@test_ds.to_rels_ext(), @sample_rels_ext_xml).should be_true
     end
     
@@ -96,7 +96,7 @@ describe ActiveFedora::RelsExtDatastream do
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:OtherModel"))
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:SampleModel"))
 
-      @test_ds.stub(:model).and_return(stub("model", :relationships=>graph, :relationships_are_dirty= => true))
+      @test_ds.stub(:model).and_return(double("model", :relationships=>graph, :relationships_are_dirty= => true))
       rels = @test_ds.to_rels_ext()
       EquivalentXml.equivalent?(rels, @sample_rels_ext_xml).should be_true
       rels.should_not =~ /fedora:isMemberOf/

data/spec/unit/semantic_node_spec.rb

@@ -45,11 +45,11 @@ describe ActiveFedora::SemanticNode do
       end
       
       @node = SpecNode.new
-      @node.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content=>''))
+      @node.stub(:rels_ext).and_return(double("rels_ext", :content_will_change! => true, :content=>''))
       @node.pid = increment_pid
       @test_object = SpecNode2.new
       @test_object.pid = increment_pid    
-      @test_object.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content=>''))
+      @test_object.stub(:rels_ext).and_return(double("rels_ext", :content_will_change! => true, :content=>''))
     end
     
     after(:each) do
@@ -103,9 +103,9 @@ describe ActiveFedora::SemanticNode do
       it "adding relationship to an instance should not affect class-level relationships hash" do 
         local_test_node1 = SpecNode.new
         local_test_node2 = SpecNode.new
-        local_test_node1.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content=>''))
+        local_test_node1.stub(:rels_ext).and_return(double("rels_ext", :content_will_change! => true, :content=>''))
         local_test_node1.add_relationship(:is_member_of, 'demo:10')
-        local_test_node2.stub(:rels_ext).and_return(stub('rels-ext', :content=>''))
+        local_test_node2.stub(:rels_ext).and_return(double('rels-ext', :content=>''))
         
         local_test_node1.relationships(:is_member_of).should == ["demo:10"]
         local_test_node2.relationships(:is_member_of).should == []
@@ -135,7 +135,7 @@ describe ActiveFedora::SemanticNode do
       
     describe '#remove_relationship' do
       it 'should remove a relationship from the relationships hash' do
-        @test_object.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content=>''))
+        @test_object.stub(:rels_ext).and_return(double("rels_ext", :content_will_change! => true, :content=>''))
         @test_object.add_relationship(:has_part, "info:fedora/3")
         @test_object.add_relationship(:has_part, "info:fedora/4")
         #check both are there

data/spec/unit/solr_config_options_spec.rb

@@ -33,7 +33,7 @@ describe ActiveFedora do
     end
 
     it "should be used by ActiveFedora::Base#find_with_conditions" do
-      mock_response = mock("SolrResponse")
+      mock_response = double("SolrResponse")
       ActiveFedora::SolrService.should_receive(:query).with("_query_:\"{!raw f=#{ActiveFedora::SolrService.solr_name("has_model", :symbol)}}info:fedora/afmodel:SolrSpecModel_Basic\" AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ["#{ActiveFedora::SolrService.solr_name("system_create", :stored_sortable, type: :date)} asc"]}).and_return(mock_response)
   
       SolrSpecModel::Basic.find_with_conditions(:id=>"changeme:30").should equal(mock_response)

data/spec/unit/solr_service_spec.rb

@@ -34,8 +34,8 @@ describe ActiveFedora::SolrService do
     proc{ActiveFedora::SolrService.instance}.should raise_error(ActiveFedora::SolrNotInitialized)
   end
 
-  describe "#reify_solr_results" do
-    before(:each) do
+  describe "reify solr results" do
+    before(:all) do
       class AudioRecord
         attr_accessor :pid
         def init_with(inner_obj)
@@ -46,14 +46,36 @@ describe ActiveFedora::SolrService do
         end
       end
       @sample_solr_hits = [{"id"=>"my:_PID1_", ActiveFedora::SolrService.solr_name("has_model", :symbol)=>["info:fedora/afmodel:AudioRecord"]},
-                            {"id"=>"my:_PID2_", ActiveFedora::SolrService.solr_name("has_model", :symbol)=>["info:fedora/afmodel:AudioRecord"]},
-                            {"id"=>"my:_PID3_", ActiveFedora::SolrService.solr_name("has_model", :symbol)=>["info:fedora/afmodel:AudioRecord"]}]
+                           {"id"=>"my:_PID2_", ActiveFedora::SolrService.solr_name("has_model", :symbol)=>["info:fedora/afmodel:AudioRecord"]},
+                           {"id"=>"my:_PID3_", ActiveFedora::SolrService.solr_name("has_model", :symbol)=>["info:fedora/afmodel:AudioRecord"]}]
     end
-    it "should use Repository.find to instantiate objects" do
-      AudioRecord.should_receive(:find).with("my:_PID1_")
-      AudioRecord.should_receive(:find).with("my:_PID2_")
-      AudioRecord.should_receive(:find).with("my:_PID3_")
-      ActiveFedora::SolrService.reify_solr_results(@sample_solr_hits)
+    describe ".reify_solr_results" do
+      it "should use AudioRecord.find to instantiate objects" do
+        AudioRecord.should_receive(:find).with("my:_PID1_")
+        AudioRecord.should_receive(:find).with("my:_PID2_")
+        AudioRecord.should_receive(:find).with("my:_PID3_")
+        ActiveFedora::SolrService.reify_solr_results(@sample_solr_hits)
+      end
+      it "should use AudioRecord.load_instance_from_solr when called with :load_from_solr option" do
+        AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID1_")
+        AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID2_")
+        AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID3_")
+        ActiveFedora::SolrService.reify_solr_results(@sample_solr_hits, load_from_solr: true)
+      end
+    end
+    describe ".lazy_reify_solr_results" do
+      it "should lazily reify solr results" do
+        AudioRecord.should_receive(:find).with("my:_PID1_")
+        AudioRecord.should_receive(:find).with("my:_PID2_")
+        AudioRecord.should_receive(:find).with("my:_PID3_")
+        ActiveFedora::SolrService.lazy_reify_solr_results(@sample_solr_hits).each {|r| r}
+      end
+      it "should use AudioRecord.load_instance_from_solr when called with :load_from_solr option" do
+        AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID1_")
+        AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID2_")
+        AudioRecord.should_receive(:load_instance_from_solr).with("my:_PID3_")
+        ActiveFedora::SolrService.lazy_reify_solr_results(@sample_solr_hits, load_from_solr: true).each {|r| r}
+      end
     end
   end
   
@@ -76,44 +98,44 @@ describe ActiveFedora::SolrService do
 
   describe ".query" do
     it "should call solr" do 
-      mock_conn = mock("Connection")
-      stub_result = stub("Result")
+      mock_conn = double("Connection")
+      stub_result = double("Result")
       mock_conn.should_receive(:get).with('select', :params=>{:q=>'querytext', :qt=>'standard'}).and_return(stub_result)
-      ActiveFedora::SolrService.stub(:instance =>stub("instance", :conn=>mock_conn))
+      ActiveFedora::SolrService.stub(:instance =>double("instance", :conn=>mock_conn))
       ActiveFedora::SolrService.query('querytext', :raw=>true).should == stub_result
     end
   end
   describe ".count" do
     it "should return a count of matching records" do 
-      mock_conn = mock("Connection")
+      mock_conn = double("Connection")
       stub_result = {'response' => {'numFound'=>'7'}}
       mock_conn.should_receive(:get).with('select', :params=>{:rows=>0, :q=>'querytext', :qt=>'standard'}).and_return(stub_result)
-      ActiveFedora::SolrService.stub(:instance =>stub("instance", :conn=>mock_conn))
+      ActiveFedora::SolrService.stub(:instance =>double("instance", :conn=>mock_conn))
       ActiveFedora::SolrService.count('querytext').should == 7 
     end
     it "should accept query args" do
-      mock_conn = mock("Connection")
+      mock_conn = double("Connection")
       stub_result = {'response' => {'numFound'=>'7'}}
       mock_conn.should_receive(:get).with('select', :params=>{:rows=>0, :q=>'querytext', :qt=>'standard', :fq=>'filter'}).and_return(stub_result)
-      ActiveFedora::SolrService.stub(:instance =>stub("instance", :conn=>mock_conn))
+      ActiveFedora::SolrService.stub(:instance =>double("instance", :conn=>mock_conn))
       ActiveFedora::SolrService.count('querytext', :fq=>'filter', :rows=>10).should == 7 
     end
   end
   describe ".add" do
     it "should call solr" do 
-      mock_conn = mock("Connection")
+      mock_conn = double("Connection")
       doc = {'id' => '1234'}
       mock_conn.should_receive(:add).with(doc)
-      ActiveFedora::SolrService.stub(:instance =>stub("instance", :conn=>mock_conn))
+      ActiveFedora::SolrService.stub(:instance =>double("instance", :conn=>mock_conn))
       ActiveFedora::SolrService.add(doc)
     end
   end
   describe ".commit" do
     it "should call solr" do 
-      mock_conn = mock("Connection")
+      mock_conn = double("Connection")
       doc = {'id' => '1234'}
       mock_conn.should_receive(:commit)
-      ActiveFedora::SolrService.stub(:instance =>stub("instance", :conn=>mock_conn))
+      ActiveFedora::SolrService.stub(:instance =>double("instance", :conn=>mock_conn))
       ActiveFedora::SolrService.commit()
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.4.2
+  version: 6.4.3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -120,16 +120,16 @@ dependencies:
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -394,8 +394,6 @@ files:
 - script/destroy
 - script/generate
 - spec/config_helper.rb
-- spec/fixtures/auditable.foxml.xml
-- spec/fixtures/changeme155.xml
 - spec/fixtures/damsObjectModel.xml
 - spec/fixtures/dino.jpg
 - spec/fixtures/dino_jpg_no_file_ext
@@ -412,11 +410,8 @@ files:
 - 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/fixtures/test_fixture_mods_article1.foxml.xml
-- spec/fixtures/test_fixture_mods_article2.foxml.xml
-- spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/associations_spec.rb
+- spec/integration/auditable_spec.rb
 - spec/integration/base_spec.rb
 - spec/integration/bug_spec.rb
 - spec/integration/complex_rdf_datastream_spec.rb
@@ -427,7 +422,6 @@ files:
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/has_many_associations_spec.rb
 - spec/integration/model_spec.rb
-- spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/ntriples_datastream_spec.rb
 - spec/integration/om_datastream_spec.rb
@@ -486,7 +480,6 @@ files:
 - spec/support/mock_fedora.rb
 - spec/unit/active_fedora_spec.rb
 - spec/unit/association_proxy_spec.rb
-- spec/unit/auditable_spec.rb
 - spec/unit/base_active_model_spec.rb
 - spec/unit/base_cma_spec.rb
 - spec/unit/base_datastream_management_spec.rb
@@ -536,7 +529,8 @@ files:
 - spec/unit/unsaved_digital_object_spec.rb
 - spec/unit/validations_spec.rb
 homepage: https://github.com/projecthydra/active_fedora
-licenses: []
+licenses:
+- APACHE2
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -560,8 +554,6 @@ specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files:
 - spec/config_helper.rb
-- spec/fixtures/auditable.foxml.xml
-- spec/fixtures/changeme155.xml
 - spec/fixtures/damsObjectModel.xml
 - spec/fixtures/dino.jpg
 - spec/fixtures/dino_jpg_no_file_ext
@@ -578,11 +570,8 @@ test_files:
 - 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/fixtures/test_fixture_mods_article1.foxml.xml
-- spec/fixtures/test_fixture_mods_article2.foxml.xml
-- spec/hydrangea_fixture_mods_article1.foxml.xml
 - spec/integration/associations_spec.rb
+- spec/integration/auditable_spec.rb
 - spec/integration/base_spec.rb
 - spec/integration/bug_spec.rb
 - spec/integration/complex_rdf_datastream_spec.rb
@@ -593,7 +582,6 @@ test_files:
 - spec/integration/full_featured_model_spec.rb
 - spec/integration/has_many_associations_spec.rb
 - spec/integration/model_spec.rb
-- spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/ntriples_datastream_spec.rb
 - spec/integration/om_datastream_spec.rb
@@ -652,7 +640,6 @@ test_files:
 - spec/support/mock_fedora.rb
 - spec/unit/active_fedora_spec.rb
 - spec/unit/association_proxy_spec.rb
-- spec/unit/auditable_spec.rb
 - spec/unit/base_active_model_spec.rb
 - spec/unit/base_cma_spec.rb
 - spec/unit/base_datastream_management_spec.rb