active-fedora 5.1.0 → 5.2.0

data/spec/unit/rels_ext_datastream_spec.rb

@@ -16,11 +16,11 @@ describe ActiveFedora::RelsExtDatastream do
   before(:each) do
       mock_inner = mock('inner object')
       @mock_repo = mock('repository')
-      @mock_repo.stubs(:datastream_dissemination=>'My Content', :config=>{})
-      mock_inner.stubs(:repository).returns(@mock_repo)
-      mock_inner.stubs(:pid).returns(@pid)
+      @mock_repo.stub(:datastream_dissemination=>'My Content', :config=>{})
+      mock_inner.stub(:repository).and_return(@mock_repo)
+      mock_inner.stub(:pid).and_return(@pid)
       @test_ds = ActiveFedora::RelsExtDatastream.new(mock_inner, "RELS-EXT")
-      @test_ds.stubs(:profile).returns({})
+      @test_ds.stub(:profile).and_return({})
   end
 
   its(:metadata?) { should be_true}
@@ -49,7 +49,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.stubs(: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 => mock(: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
@@ -82,7 +82,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.expects(:model).returns(stub("model", :relationships=>graph, :relationships_are_dirty= => true))
+      @test_ds.should_receive(:model).and_return(stub("model", :relationships=>graph, :relationships_are_dirty= => true))
       EquivalentXml.equivalent?(@test_ds.to_rels_ext(), @sample_rels_ext_xml).should be_true
     end
     
@@ -95,7 +95,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.expects(:model).times(2).returns(stub("model", :relationships=>graph, :relationships_are_dirty= => true))
+      @test_ds.stub(:model).and_return(stub("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

@@ -47,11 +47,11 @@ describe ActiveFedora::SemanticNode do
       end
       
       @node = SpecNode.new
-      @node.stubs(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>''))
+      @node.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content=>''))
       @node.pid = increment_pid
       @test_object = SpecNode2.new
       @test_object.pid = increment_pid    
-      @test_object.stubs(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>''))
+      @test_object.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content=>''))
     end
     
     after(:each) do
@@ -105,9 +105,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.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
+        local_test_node1.stub(:rels_ext).and_return(stub("rels_ext", :content_will_change! => true, :content=>''))
         local_test_node1.add_relationship(:is_member_of, 'demo:10')
-        local_test_node2.expects(:rels_ext).returns(stub('rels-ext', :content=>''))
+        local_test_node2.stub(:rels_ext).and_return(stub('rels-ext', :content=>''))
         
         local_test_node1.relationships(:is_member_of).should == ["demo:10"]
         local_test_node2.relationships(:is_member_of).should == []
@@ -137,7 +137,7 @@ describe ActiveFedora::SemanticNode do
       
     describe '#remove_relationship' do
       it 'should remove a relationship from the relationships hash' do
-        @test_object.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).times(4)
+        @test_object.stub(:rels_ext).and_return(stub("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/service_definitions_spec.rb

@@ -13,11 +13,16 @@ describe ActiveFedora::ServiceDefinitions do
 <fmm:Method operationName="getDocumentStyle2"/>
 </fmm:MethodMap>
     MMAP
-    stub_get("monkey:99")
-    Rubydora::Repository.any_instance.stubs(:client).returns @mock_client
-    Rubydora::Repository.any_instance.stubs(:datastream_dissemination).with({:pid=>'test:12',:dsid=>'METHODMAP'}).returns mmap
+    @repository = ActiveFedora::Base.connection_for_pid(0)
+    @repository.stub(:datastream_dissemination).with({:pid=>'test:12',:dsid=>'METHODMAP'}).and_return mmap
     Test.has_service_definition "test:12"
   end
+
+  subject { 
+      obj = Test.new()
+      obj.stub(:pid).and_return('monkey:99')
+      obj
+    }
   describe "method lookup" do
     it "should find method keys in the YAML config" do
       ActiveFedora::ServiceDefinitions.lookup_method("fedora-system:3", "viewObjectProfile").should == :object_profile
@@ -25,32 +30,29 @@ describe ActiveFedora::ServiceDefinitions do
   end
   describe "method creation" do
     it "should create the system sdef methods" do
-      obj = Test.new()
-      (obj.respond_to? :object_profile).should == true
+      subject.should respond_to(:object_profile)
     end
     it "should create the declared sdef methods" do
-      obj = Test.new()
-      (obj.respond_to? :document_style_1).should == true
+      subject.should respond_to(:document_style_1)
     end
   end
   describe "generated method" do
     it "should call the appropriate rubydora rest api method" do
-      Rubydora::Repository.any_instance.expects(:dissemination).with({:pid=>'monkey:99',:sdef=>'test:12', :method=>'getDocumentStyle1'})
-      #@mock_client.stubs(:[]).with('objects/monkey%3A99/methods/test%3A12/getDocumentStyle1')
-      obj = Test.new()
-      obj.stubs(:pid).returns('monkey:99')
-      obj.document_style_1
+      @repository.should_receive(:dissemination).with({:pid=>'monkey:99',:sdef=>'test:12', :method=>'getDocumentStyle1'})
+      #@mock_client.stub(:[]).with('objects/monkey%3A99/methods/test%3A12/getDocumentStyle1')
+
+      subject.document_style_1
     end
     it "should call the appropriate rubydora rest api method with parameters" do
-      Rubydora::Repository.any_instance.expects(:dissemination).with({:pid=>'monkey:99',:sdef=>'test:12', :method=>'getDocumentStyle1', :format=>'xml'})
+      @repository.should_receive(:dissemination).with({:pid=>'monkey:99',:sdef=>'test:12', :method=>'getDocumentStyle1', :format=>'xml'})
       obj = Test.new()
-      obj.stubs(:pid).returns('monkey:99')
+      obj.stub(:pid).and_return('monkey:99')
       obj.document_style_1({:format=>'xml'})
     end
     it "should call the appropriate rubydora rest api method with a block" do
-      Rubydora::Repository.any_instance.stubs(:dissemination).with({:pid=>'monkey:99',:sdef=>'test:12', :method=>'getDocumentStyle1'}).yields "ping!","pang!"
+      @repository.stub(:dissemination).with({:pid=>'monkey:99',:sdef=>'test:12', :method=>'getDocumentStyle1'}).and_yield "ping!","pang!"
       obj = Test.new()
-      obj.stubs(:pid).returns('monkey:99')
+      obj.stub(:pid).and_return('monkey:99')
       block_response = ""
       obj.document_style_1 {|res,req|
         block_response += 'pong!' if res == "ping!" and req == "pang!"

data/spec/unit/solr_config_options_spec.rb

@@ -51,7 +51,7 @@ describe ActiveFedora do
 
     it "should be used by ActiveFedora::Base#find_with_conditions" do
       mock_response = mock("SolrResponse")
-      ActiveFedora::SolrService.expects(:query).with("has_model_s:info\\:fedora\\/afmodel\\:SolrSpecModel_Basic AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ['system_create_dt asc']}).returns(mock_response)
+      ActiveFedora::SolrService.should_receive(:query).with("has_model_s:info\\:fedora\\/afmodel\\:SolrSpecModel_Basic AND " + SOLR_DOCUMENT_ID + ':"changeme\\:30"', {:sort => ['system_create_dt asc']}).and_return(mock_response)
   
       SolrSpecModel::Basic.find_with_conditions(:id=>"changeme:30").should equal(mock_response)
     end
@@ -69,14 +69,14 @@ describe ActiveFedora do
     it "should prevent Base.save from calling update_index if false" do
       dirty_ds = ActiveFedora::SimpleDatastream.new(@test_object.inner_object, 'ds1')
       @test_object.datastreams['ds1'] = dirty_ds
-      @test_object.stubs(:datastreams).returns({:ds1 => dirty_ds})
-      @test_object.expects(:update_index).never
-      @test_object.expects(:refresh)
+      @test_object.stub(:datastreams).and_return({:ds1 => dirty_ds})
+      @test_object.should_receive(:update_index).never
+      @test_object.should_receive(:refresh)
       @test_object.save
     end
     it "should prevent Base.delete from deleting the corresponding Solr document if false" do
-      ActiveFedora::SolrService.instance.conn.expects(:delete).with(@test_object.pid).never 
-      @test_object.inner_object.expects(:delete)
+      ActiveFedora::SolrService.instance.conn.should_receive(:delete).with(@test_object.pid).never 
+      @test_object.inner_object.should_receive(:delete)
       @test_object.delete
     end
   end

data/spec/unit/solr_service_spec.rb

@@ -10,27 +10,27 @@ describe ActiveFedora::SolrService do
   end
   
   it "should take a narg constructor and configure for localhost" do
-    RSolr.expects(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr')
+    RSolr.should_receive(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr')
     ActiveFedora::SolrService.register
   end
   it "should accept host arg into constructor" do
-    RSolr.expects(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://fubar')
+    RSolr.should_receive(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://fubar')
     ActiveFedora::SolrService.register('http://fubar')
   end
   it "should clobber options" do
-    RSolr.expects(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr', :autocommit=>:off, :foo=>:bar)
+    RSolr.should_receive(:connect).with(:read_timeout => 120, :open_timeout => 120, :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
-    RSolr.expects(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr', :autocommit=>:off, :foo=>:bar)
+    RSolr.should_receive(:connect).with(:read_timeout => 120, :open_timeout => 120, :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
   end
   it "should try to initialize if the service not initialized, and fail if it does not succeed" do
     Thread.current[:solr_service].should be_nil
-    ActiveFedora::SolrService.expects(:register)
+    ActiveFedora::SolrService.should_receive(:register)
     proc{ActiveFedora::SolrService.instance}.should raise_error(ActiveFedora::SolrNotInitialized)
   end
 
@@ -50,9 +50,9 @@ describe ActiveFedora::SolrService do
                             {"id"=>"my:_PID3_", "has_model_s"=>["info:fedora/afmodel:AudioRecord"]}]
     end
     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_")
+      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
   end
@@ -77,8 +77,8 @@ describe ActiveFedora::SolrService do
     it "should call solr" do 
       mock_conn = mock("Connection")
       stub_result = stub("Result")
-      mock_conn.expects(:get).with('select', :params=>{:q=>'querytext', :qt=>'standard'}).returns(stub_result)
-      ActiveFedora::SolrService.stubs(:instance =>stub("instance", :conn=>mock_conn))
+      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.query('querytext', :raw=>true).should == stub_result
     end
   end
@@ -86,8 +86,8 @@ describe ActiveFedora::SolrService do
     it "should return a count of matching records" do 
       mock_conn = mock("Connection")
       stub_result = {'response' => {'numFound'=>'7'}}
-      mock_conn.expects(:get).with('select', :params=>{:rows=>0, :q=>'querytext', :qt=>'standard'}).returns(stub_result)
-      ActiveFedora::SolrService.stubs(:instance =>stub("instance", :conn=>mock_conn))
+      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.count('querytext').should == 7 
     end
   end
@@ -95,8 +95,8 @@ describe ActiveFedora::SolrService do
     it "should call solr" do 
       mock_conn = mock("Connection")
       doc = {'id' => '1234'}
-      mock_conn.expects(:add).with(doc)
-      ActiveFedora::SolrService.stubs(:instance =>stub("instance", :conn=>mock_conn))
+      mock_conn.should_receive(:add).with(doc)
+      ActiveFedora::SolrService.stub(:instance =>stub("instance", :conn=>mock_conn))
       ActiveFedora::SolrService.add(doc)
     end
   end
@@ -104,8 +104,8 @@ describe ActiveFedora::SolrService do
     it "should call solr" do 
       mock_conn = mock("Connection")
       doc = {'id' => '1234'}
-      mock_conn.expects(:commit)
-      ActiveFedora::SolrService.stubs(:instance =>stub("instance", :conn=>mock_conn))
+      mock_conn.should_receive(:commit)
+      ActiveFedora::SolrService.stub(:instance =>stub("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: 5.1.0
+  version: 5.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -285,22 +285,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.5
 description: ActiveFedora provides for creating and managing objects in the Fedora
   Repository Architecture.
 email:
@@ -560,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1107417416523628890
+      hash: 1765541384270860265
 requirements: []
 rubyforge_project: rubyfedora
 rubygems_version: 1.8.23