active-fedora 5.1.0 → 5.2.0

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.1.0"
+  VERSION = "5.2.0"
 end

data/spec/config_helper.rb

@@ -1,8 +1,8 @@
 def mock_yaml(hash, path)
   mock_file = mock(path.split("/")[-1])
-  File.stubs(:exist?).with(path).returns(true)
-  File.expects(:open).with(path).returns(mock_file)
-  YAML.expects(:load).returns(hash)
+  File.stub(:exist?).with(path).and_return(true)
+  File.stub(:open).with(path).and_return(mock_file)
+  YAML.stub(:load).and_return(hash)
 end
 
 def default_predicate_mapping_file

data/spec/integration/base_spec.rb

@@ -108,7 +108,7 @@ describe "A base object with metadata" do
     it 'should raise an error if not persisted' do
       @object = MockAFBaseRelationship.new
       # You will want this stub or else it will be really chatty in your STDERR
-      @object.inner_object.logger.stubs(:error)
+      @object.inner_object.logger.stub(:error)
       expect {
         @object.reload
       }.to raise_error(ActiveFedora::ObjectNotFoundError)
@@ -144,6 +144,18 @@ end
 
 
 describe ActiveFedora::Base do
+  before(:all) do
+    @behavior = ActiveFedora::Relationships.deprecation_behavior
+    @c_behavior = ActiveFedora::Relationships::ClassMethods.deprecation_behavior
+    ActiveFedora::Relationships.deprecation_behavior = :silence
+    ActiveFedora::Relationships::ClassMethods.deprecation_behavior = :silence
+  end
+  
+  after :all do
+    ActiveFedora::Relationships.deprecation_behavior = @behavior
+    ActiveFedora::Relationships::ClassMethods.deprecation_behavior = @c_behavior
+  end
+  
   before :all do
     class MockAFBaseRelationship < ActiveFedora::Base
       include ActiveFedora::FileManagement
@@ -280,7 +292,7 @@ describe ActiveFedora::Base do
     it "should initialize the datastream pointers with @new_object=false" do
       datastreams = @test_object.datastreams
       datastreams.each_value do |ds| 
-        ds.new_object?.should be_false
+        ds.should_not be_new
       end
     end
   end
@@ -427,7 +439,7 @@ describe ActiveFedora::Base do
         @test_object3 = MockAFBaseRelationship.create
         @test_object4 = MockAFBaseRelationship.create
         @test_object5 = MockAFBaseRelationship.create
-        Deprecation.stubs(:warn)
+        Deprecation.stub(:warn)
         #append to relationship by 'testing'
         @test_object2.add_relationship_by_name("testing",@test_object3)
         @test_object2.add_relationship_by_name("testing2",@test_object4)

data/spec/integration/bug_spec.rb

@@ -3,10 +3,7 @@ require 'spec_helper'
 require 'active_fedora'
 require 'active_fedora/model'
 require "rexml/document"
-require 'mocha'
-
 include ActiveFedora::Model
-include Mocha::API
 
 describe 'bugs' do
   before :all do

data/spec/integration/datastream_collections_spec.rb

@@ -17,8 +17,8 @@ describe ActiveFedora::DatastreamCollections do
       @test_object2 = MockAFBaseDatastream.new
       f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
       f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
-      f2.stubs(:original_filename).returns("dino.jpg")
-      f.stubs(:content_type).returns("image/jpeg")
+      f2.stub(:original_filename).and_return("dino.jpg")
+      f.stub(:content_type).and_return("image/jpeg")
       @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})
       @test_object2.add_named_datastream("high",{:content_type=>"image/jpeg",:blob=>f2})
       ds = @test_object2.thumbnail.first
@@ -50,7 +50,7 @@ describe ActiveFedora::DatastreamCollections do
       @test_object2 = MockAFBaseDatastream.new
 #      @test_object2.new_object = true
       f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
-      f.stubs(:content_type).returns("image/jpeg")
+      f.stub(:content_type).and_return("image/jpeg")
       @test_object2.add_named_file_datastream("thumbnail",f)
       ds = @test_object2.thumbnail.first
       @test_object2.save
@@ -79,10 +79,10 @@ describe ActiveFedora::DatastreamCollections do
       f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
       dino = f2.read
       f2.rewind
-      f.stubs(:content_type).returns("image/jpeg")
-      f.stubs(:original_filename).returns("minivan.jpg")
-      f2.stubs(:content_type).returns("image/jpeg")
-      f2.stubs(:original_filename).returns("dino.jpg")
+      f.stub(:content_type).and_return("image/jpeg")
+      f.stub(:original_filename).and_return("minivan.jpg")
+      f2.stub(:content_type).and_return("image/jpeg")
+      f2.stub(:original_filename).and_return("dino.jpg")
       #check raise exception if dsid not supplied
       @test_object2.add_named_datastream("thumbnail",{:file=>f})
       @test_object2.save
@@ -119,8 +119,8 @@ describe ActiveFedora::DatastreamCollections do
 #      @test_object2.new_object = true
       f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
       f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
-      f2.stubs(:original_filename).returns("dino.jpg")
-      f.stubs(:content_type).returns("image/jpeg")
+      f2.stub(:original_filename).and_return("dino.jpg")
+      f.stub(:content_type).and_return("image/jpeg")
       @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})
       @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f2})
       @test_object2.save

data/spec/integration/datastream_spec.rb

@@ -34,7 +34,7 @@ describe ActiveFedora::Datastream do
     title.namespace = xml_content.xpath('//oai_dc:dc/dc:identifier').first.namespace
     xml_content.root.add_child title
     
-    @test_object.datastreams["DC"].stubs(:before_save)
+    @test_object.datastreams["DC"].stub(:before_save)
     @test_object.datastreams["DC"].content = xml_content.to_s
     @test_object.datastreams["DC"].save
     

data/spec/integration/full_featured_model_spec.rb

@@ -9,10 +9,9 @@ describe ActiveFedora::Base do
     class OralHistory < ActiveFedora::Base
         include ActiveFedora::Relationships
 
-        # Imitating DataMapper ...
-
-        has_relationship "parts", :is_part_of, :inbound => true
-        
+        Deprecation.silence(ActiveFedora::Relationships::ClassMethods) do
+          has_relationship "parts", :is_part_of, :inbound => true
+        end
         # These are all the properties that don't quite fit into Qualified DC
         # Put them on the object itself (in the properties datastream) for now.
         has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|

data/spec/integration/ntriples_datastream_spec.rb

@@ -43,7 +43,6 @@ describe ActiveFedora::NtriplesRDFDatastream do
     @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']

data/spec/integration/rels_ext_datastream_spec.rb

@@ -77,7 +77,18 @@ describe ActiveFedora::RelsExtDatastream do
     new_rels.should == @test_object.relationships
   end
 
-  describe '#from_solr' do
+  describe '#from_solr' do     
+   before(:all) do
+        @behavior = ActiveFedora::Relationships.deprecation_behavior
+        @c_behavior = ActiveFedora::Relationships::ClassMethods.deprecation_behavior
+        ActiveFedora::Relationships.deprecation_behavior = :silence
+        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = :silence
+      end
+  
+      after :all do
+        ActiveFedora::Relationships.deprecation_behavior = @behavior
+        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = @c_behavior
+      end
     before do
       class MockAFRelsSolr < ActiveFedora::Base
         include ActiveFedora::FileManagement

data/spec/integration/semantic_node_spec.rb

@@ -3,7 +3,17 @@ require 'spec_helper'
 require 'active_fedora'
 
 describe ActiveFedora::SemanticNode do
+        before(:all) do
+        @behavior = ActiveFedora::Relationships.deprecation_behavior
+        @c_behavior = ActiveFedora::Relationships::ClassMethods.deprecation_behavior
+        ActiveFedora::Relationships.deprecation_behavior = :silence
+        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = :silence
+      end
   
+      after :all do
+        ActiveFedora::Relationships.deprecation_behavior = @behavior
+        ActiveFedora::Relationships::ClassMethods.deprecation_behavior = @c_behavior
+      end
   before(:all) do 
     class SNSpecNode < ActiveFedora::Base
       include ActiveFedora::FileManagement

data/spec/integration/solr_service_spec.rb

@@ -108,8 +108,8 @@ describe ActiveFedora::SolrService do
     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.query(query)
-      ActiveFedora::Base.expects(:load_instance_from_solr).times(1)
-      FooObject.expects(:load_instance_from_solr).times(1)
+      ActiveFedora::Base.should_receive(:load_instance_from_solr).once
+      FooObject.should_receive(:load_instance_from_solr).once
       result = ActiveFedora::SolrService.reify_solr_results(solr_result,{:load_from_solr=>true})
     end
     

data/spec/spec_helper.rb

@@ -1,13 +1,11 @@
 ENV["environment"] ||= 'test'
 require "bundler/setup"
 
-if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
-  require 'simplecov'
-  require 'simplecov-rcov'
+require 'simplecov'
+require 'simplecov-rcov'
 
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start
-end
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+SimpleCov.start
 
 require 'active-fedora'
 require 'rspec'
@@ -31,7 +29,6 @@ restore_spec_configuration
 ActiveSupport::Deprecation.behavior= Proc.new { |message, callstack| }
 
 RSpec.configure do |config|
-  config.mock_with :mocha
   config.color_enabled = true
 end
 

data/spec/support/mock_fedora.rb

@@ -2,44 +2,44 @@ def mock_client
   return @mock_client if @mock_client
   @mock_client = mock("client")
   @getter = mock("getter")
-  @getter.stubs(:get).returns('')
-  @mock_client.stubs(:[]).with("describe?xml=true").returns('')
+  @getter.stub(:get).and_return('')
+  @mock_client.stub(:[]).with("describe?xml=true").and_return('')
   @mock_client 
 end
   
 def stub_get(pid, datastreams=nil, record_exists=false)
   pid.gsub!(/:/, '%3A')
   if record_exists
-    mock_client.stubs(:[]).with("objects/#{pid}?format=xml").returns(stub('get getter', :get=>'foobar'))
+    mock_client.stub(:[]).with("objects/#{pid}?format=xml").and_return(stub('get getter', :get=>'foobar'))
   else
-    mock_client.stubs(:[]).with("objects/#{pid}?format=xml").raises(RestClient::ResourceNotFound)
+    mock_client.stub(:[]).with("objects/#{pid}?format=xml").and_raise(RestClient::ResourceNotFound)
   end
-  mock_client.stubs(:[]).with("objects/#{pid}/datastreams?format=xml").returns(@getter)
+  mock_client.stub(:[]).with("objects/#{pid}/datastreams?format=xml").and_return(@getter)
   datastreams ||= ['someData', 'withText', 'withText2', 'RELS-EXT']
   datastreams.each do |dsid|
-    mock_client.stubs(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").returns(@getter)
+    mock_client.stub(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").and_return(@getter)
   end
 end
 
 def stub_ingest(pid=nil)
   n = pid ? pid.gsub(/:/, '%3A') : nil
-  mock_client.expects(:[]).with("objects/#{n || 'new'}").returns(stub("ingester", :post=>pid))
+  mock_client.should_receive(:[]).with("objects/#{n || 'new'}").and_return(stub("ingester", :post=>pid))
 end
 
 def stub_add_ds(pid, dsids)
   pid.gsub!(/:/, '%3A')
   dsids.each do |dsid|
-    client = mock_client.stubs(:[]).with do |params|
+    client = mock_client.stub(:[]).with do |params|
       /objects\/#{pid}\/datastreams\/#{dsid}/.match(params)
     end
-    client.returns(stub("ds_adder", :post=>pid, :get=>''))
+    client.and_return(stub("ds_adder", :post=>pid, :get=>''))
   end
 end
 
 def stub_get_content(pid, dsids)
   pid.gsub!(/:/, '%3A')
   dsids.each do |dsid|
-    mock_client.stubs(:[]).with { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.returns(stub("content_accessor", :post=>pid, :get=>''))
+    mock_client.stub(:[]).with { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.and_return(stub("content_accessor", :post=>pid, :get=>''))
   end
 end
 

data/spec/unit/active_fedora_spec.rb

@@ -14,20 +14,20 @@ describe ActiveFedora do
   describe "initialization methods" do
     describe "environment" do
       it "should use config_options[:environment] if set" do
-        ActiveFedora.expects(:config_options).at_least_once.returns(:environment=>"ballyhoo")
+        ActiveFedora.stub(:config_options => {:environment=>"ballyhoo"})
         ActiveFedora.environment.should eql("ballyhoo")
       end
 
       it "should use Rails.env if no config_options and Rails.env is set" do
         stub_rails(:env => "bedbugs")
-        ActiveFedora.expects(:config_options).at_least_once.returns({})
+        ActiveFedora.stub(:config_options => {})
         ActiveFedora.environment.should eql("bedbugs")
         unstub_rails
       end
 
       it "should use ENV['environment'] if neither config_options nor Rails.env are set" do
         ENV['environment'] = "wichita"
-        ActiveFedora.expects(:config_options).at_least_once.returns({})
+        ActiveFedora.stub(:config_options => {})
         ActiveFedora.environment.should eql("wichita")
         ENV['environment']='test'
       end
@@ -42,7 +42,7 @@ describe ActiveFedora do
       it "should be development if none of the above are present" do
         ENV['environment']=nil
         ENV['RAILS_ENV'] = nil
-        ActiveFedora.expects(:config_options).at_least_once.returns({})
+        ActiveFedora.stub(:config_options => {})
         ActiveFedora.environment.should == 'development'
         ENV['environment']="test"
       end
@@ -79,12 +79,12 @@ describe ActiveFedora do
             solr_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/solr.yml"))
             pred_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/predicate_mappings.yml"))
             
-            File.stubs(:open).with(fedora_config_path).returns(fedora_config)
-            File.stubs(:open).with(solr_config_path).returns(solr_config)
-            ActiveFedora::SolrService.stubs(:load_mappings) #For the solrizer solr_mappings.yml
+            File.stub(:open).with(fedora_config_path).and_return(fedora_config)
+            File.stub(:open).with(solr_config_path).and_return(solr_config)
+            ActiveFedora::SolrService.stub(:load_mappings) #For the solrizer solr_mappings.yml
 
 
-#            ActiveSupport::Deprecation.expects(:warn).with("Configuring fedora with \":url\" without :user and :password is no longer supported.")
+#            ActiveSupport::Deprecation.should_receive(:warn).with("Configuring fedora with \":url\" 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
           end

data/spec/unit/association_proxy_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 
 describe ActiveFedora::Associations::AssociationProxy do
   it "should delegate to_param" do
+  	pending
     @owner = stub(:new_record? => false)
     @assoc = ActiveFedora::Associations::AssociationProxy.new(@owner, @reflection)
-    @assoc.expects(:find_target).returns(stub(:to_param => '1234'))
+    @assoc.should_receive(:find_target).and_return(stub(:to_param => '1234'))
     @assoc.send(:load_target)
     @assoc.to_param.should == '1234'
   

data/spec/unit/base_cma_spec.rb

@@ -9,8 +9,8 @@ describe ActiveFedora::Base do
   describe '.save' do
 
     it "should add hasModel relationship that points to the CModel if @new_object" do
-      @test_object.stubs(:update_index)
-      @test_object.expects(:refresh)
+      @test_object.stub(:update_index)
+      @test_object.should_receive(:refresh)
       @test_object.save
     end
   end

data/spec/unit/base_datastream_management_spec.rb

@@ -9,7 +9,7 @@ describe ActiveFedora::Base do
   describe '.generate_dsid' do
     it "should return a dsid that is not currently in use" do
       dsids = Hash["DS1"=>1, "DS2"=>1]
-      @test_object.expects(:datastreams).returns(dsids)
+      @test_object.should_receive(:datastreams).and_return(dsids)
       generated_id = @test_object.generate_dsid
       generated_id.should_not be_nil
       generated_id.should == "DS3"
@@ -20,7 +20,7 @@ describe ActiveFedora::Base do
 
     it "if delete a datastream it should still use next index for a prefix" do
       dsids = Hash["DS2"=>1]
-      @test_object.expects(:datastreams).returns(dsids)
+      @test_object.should_receive(:datastreams).and_return(dsids)
       generated_id = @test_object.generate_dsid
       generated_id.should_not be_nil
       generated_id.should == "DS3"
@@ -29,7 +29,7 @@ describe ActiveFedora::Base do
   describe '.add_datastream' do
     it "should not call Datastream.save" do
       ds = ActiveFedora::Datastream.new(@test_object.inner_object, 'ds_to_add')
-      ds.expects(:save).never
+      ds.should_receive(:save).never
       @test_object.add_datastream(ds)
     end
     it "should add the datastream to the datastreams_in_memory array" do
@@ -42,16 +42,16 @@ describe ActiveFedora::Base do
       ds = ActiveFedora::Datastream.new(@test_object.inner_object, nil)
       ds.dsid.should == nil
       ds_emptystringid = ActiveFedora::Datastream.new(@test_object.inner_object, '')
-      @test_object.expects(:generate_dsid).returns("foo").times(2)
-     # ds.expects(:dsid=).with("foo")
-      @test_object.add_datastream(ds)
-      @test_object.add_datastream(ds_emptystringid)
+      @test_object.stub(:generate_dsid => 'foo')
+     # ds.should_receive(:dsid=).with("foo")
+      @test_object.add_datastream(ds).should == 'foo'
+      @test_object.add_datastream(ds_emptystringid).should == 'foo'
     end
     it "should accept a prefix option and apply it to automatically assigned dsids" do
       ds = ActiveFedora::Datastream.new(@test_object.inner_object, nil)
       ds.dsid.should == nil
-      @test_object.expects(:generate_dsid).with("FOO")
-      @test_object.add_datastream(ds, :prefix => "FOO")
+      @test_object.stub(:generate_dsid => "FOO")
+      @test_object.add_datastream(ds, :prefix => "FOO").should == 'FOO'
     end
   end
 end

data/spec/unit/base_extra_spec.rb

@@ -9,40 +9,40 @@ describe ActiveFedora::Base do
   describe ".update_index" do
     before do
       mock_conn = mock("SolrConnection")
-      mock_conn.expects(:add)
-      mock_conn.expects(:commit)
+      mock_conn.should_receive(:add)
+      mock_conn.should_receive(:commit)
       mock_ss = mock("SolrService")
-      mock_ss.stubs(:conn).returns(mock_conn)
-      ActiveFedora::SolrService.stubs(:instance).returns(mock_ss)
+      mock_ss.stub(:conn).and_return(mock_conn)
+      ActiveFedora::SolrService.stub(:instance).and_return(mock_ss)
     end
     
     it "should call .to_solr on all SimpleDatastreams AND RelsExtDatastreams and pass the resulting document to solr" do
       # Actually uses self.to_solr internally to gather solr info from all metadata datastreams
-      mock1 = mock("ds1", :to_solr)
-      mock2 = mock("ds2", :to_solr)
-      mock3 = mock("RELS-EXT", :to_solr)
+      mock1 = mock("ds1", :to_solr => {})
+      mock2 = mock("ds2", :to_solr => {})
+      mock3 = mock("RELS-EXT", :to_solr => {})
       
       mock_datastreams = {:ds1 => mock1, :ds2 => mock2, :rels_ext => mock3}
-      mock1.expects(:solrize_profile).returns({})
-      mock2.expects(:solrize_profile).returns({})
-      mock3.expects(:solrize_profile).returns({})
-      @test_object.expects(:datastreams).twice.returns(mock_datastreams)
-      @test_object.expects(:solrize_relationships)
+      mock1.should_receive(:solrize_profile).and_return({})
+      mock2.should_receive(:solrize_profile).and_return({})
+      mock3.should_receive(:solrize_profile).and_return({})
+      @test_object.should_receive(:datastreams).twice.and_return(mock_datastreams)
+      @test_object.should_receive(:solrize_relationships)
       @test_object.update_index
     end
 
     it "should call .to_solr on all RDFDatastreams and pass the resulting document to solr" do
       # Actually uses self.to_solr internally to gather solr info from all metadata datastreams
-      mock1 = mock("ds1", :to_solr)
-      mock2 = mock("ds2", :to_solr)
-      mock3 = mock("RELS-EXT", :to_solr)
+      mock1 = mock("ds1", :to_solr => {})
+      mock2 = mock("ds2", :to_solr => {})
+      mock3 = mock("RELS-EXT", :to_solr => {})
       
       mock_datastreams = {:ds1 => mock1, :ds2 => mock2, :rels_ext => mock3}
-      mock1.expects(:solrize_profile).returns({})
-      mock2.expects(:solrize_profile).returns({})
-      mock3.expects(:solrize_profile).returns({})
-      @test_object.expects(:datastreams).twice.returns(mock_datastreams)
-      @test_object.expects(:solrize_relationships)
+      mock1.should_receive(:solrize_profile).and_return({})
+      mock2.should_receive(:solrize_profile).and_return({})
+      mock3.should_receive(:solrize_profile).and_return({})
+      @test_object.should_receive(:datastreams).twice.and_return(mock_datastreams)
+      @test_object.should_receive(:solrize_relationships)
       @test_object.update_index
     end
 
@@ -58,13 +58,13 @@ describe ActiveFedora::Base do
     end
     
     it "should delete object from repository and index" do
-      @test_object.inner_object.stubs(:delete)
+      @test_object.inner_object.stub(:delete)
       mock_conn = mock("SolrConnection")
-      mock_conn.expects(:delete_by_id).with("__DO_NOT_USE__") 
-      mock_conn.expects(:commit)
+      mock_conn.should_receive(:delete_by_id).with("__DO_NOT_USE__") 
+      mock_conn.should_receive(:commit)
       mock_ss = mock("SolrService")
-      mock_ss.stubs(:conn).returns(mock_conn)
-      ActiveFedora::SolrService.stubs(:instance).returns(mock_ss)
+      mock_ss.stub(:conn).and_return(mock_conn)
+      ActiveFedora::SolrService.stub(:instance).and_return(mock_ss)
       @test_object.delete
     end