rubydora 1.6.3 → 1.7.0

data/spec/lib/digital_object_spec.rb

@@ -2,14 +2,8 @@ require 'spec_helper'
 
 describe Rubydora::DigitalObject do
   before do
-    @mock_repository = mock(Rubydora::Repository, :config=>{})
+    @mock_repository = Rubydora::Fc3Service.new({})
   end
-  describe "new" do
-    it "should load a DigitalObject instance" do
-      Rubydora::DigitalObject.new("pid").should be_a_kind_of(Rubydora::DigitalObject)
-    end
-  end
-
   describe "profile" do
     before(:each) do
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
@@ -46,28 +40,38 @@ describe Rubydora::DigitalObject do
     end
   end
 
-  describe "new" do
+  describe "initialize" do
     before(:each) do
       @mock_repository.stub(:object) { raise RestClient::ResourceNotFound }
-      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
+    end
+    subject { Rubydora::DigitalObject.new 'pid', @mock_repository }
+
+    it "should load a DigitalObject instance" do
+      expect(subject).to be_a_kind_of(Rubydora::DigitalObject)
     end
 
     it "should be new" do
-      @object.new?.should == true
+      expect(subject).to be_new
+    end
+
+    it "should be new_record" do
+      expect(subject).to be_new_record
     end
 
     it "should call ingest on save" do
-      @object.stub(:datastreams) { {} }
-      @mock_repository.should_receive(:ingest).with(hash_including(:pid => 'pid')).and_return('pid')
-      @object.save
+      subject.stub(:datastreams) { {} }
+      expect(@mock_repository).to receive(:ingest).with(hash_including(:pid => 'pid')).and_return('pid')
+      subject.save
     end
 
-    it "should create a new Fedora object with a generated PID if no PID is provided" do 
-      object = Rubydora::DigitalObject.new nil, @mock_repository
-      @mock_repository.should_receive(:ingest).with(hash_including(:pid => nil)).and_return('pid')
-      @mock_repository.should_receive(:datastreams).with(hash_including(:pid => 'pid')).and_raise(RestClient::ResourceNotFound)
-      object.save
-      object.pid.should == 'pid'
+    describe "without a provided pid" do
+      subject { Rubydora::DigitalObject.new nil, @mock_repository }
+      it "should create a new Fedora object with a generated PID if no PID is provided" do 
+        @mock_repository.should_receive(:ingest).with(hash_including(:pid => nil)).and_return('pid')
+        @mock_repository.should_receive(:datastreams).with(hash_including(:pid => 'pid')).and_raise(RestClient::ResourceNotFound)
+        subject.save
+        subject.pid.should == 'pid'
+      end
     end
   end
 
@@ -92,7 +96,7 @@ describe Rubydora::DigitalObject do
         "<objectDatastreams><datastream dsid='a'></datastream>><datastream dsid='b'></datastream>><datastream dsid='c'></datastream></objectDatastreams>"
       end
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
-      @object.stub(:new? => false)
+      @object.stub(:new_record? => false)
     end
 
     describe "datastreams" do
@@ -172,17 +176,17 @@ describe Rubydora::DigitalObject do
 
     describe "saving an object's datastreams" do
       before do
-        @new_ds = mock(Rubydora::Datastream)
+        @new_ds = double(Rubydora::Datastream)
         @new_ds.stub(:new? => true, :changed? => true, :content_changed? => true, :content => 'XXX')
-        @new_empty_ds = mock(Rubydora::Datastream)
+        @new_empty_ds = double(Rubydora::Datastream)
         @new_empty_ds.stub(:new? => true, :changed? => false, :content_changed? => false, :content => nil)
-        @existing_ds = mock(Rubydora::Datastream)
+        @existing_ds = double(Rubydora::Datastream)
         @existing_ds.stub(:new? => false, :changed? => false, :content_changed? => false, :content => 'YYY')
-        @changed_attr_ds = mock(Rubydora::Datastream)
+        @changed_attr_ds = double(Rubydora::Datastream)
         @changed_attr_ds.stub(:new? => false, :changed? => true, :content_changed? => false, :content => 'YYY')
-        @changed_ds = mock(Rubydora::Datastream)
+        @changed_ds = double(Rubydora::Datastream)
         @changed_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => 'ZZZ')
-        @changed_empty_ds = mock(Rubydora::Datastream)
+        @changed_empty_ds = double(Rubydora::Datastream)
         @changed_empty_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => nil)
 
       end
@@ -262,7 +266,7 @@ describe Rubydora::DigitalObject do
     end
 
     it "should remove models from fedora" do
-      @object.should_receive(:profile).any_number_of_times.and_return({"objModels" => ['asdf']})
+      @object.stub(:profile).and_return({"objModels" => ['asdf']})
       @mock_repository.should_receive(:purge_relationship) do |params|
         params.should have_key(:subject)
         params[:predicate].should == 'info:fedora/fedora-system:def/model#hasModel'
@@ -272,7 +276,7 @@ describe Rubydora::DigitalObject do
     end
 
     it "should be able to handle complete model replacemenet" do
-      @object.should_receive(:profile).any_number_of_times.and_return({"objModels" => ['asdf']})
+      @object.stub(:profile).and_return({"objModels" => ['asdf']})
       @mock_repository.should_receive(:add_relationship).with(instance_of(Hash))
       @mock_repository.should_receive(:purge_relationship).with(instance_of(Hash))
       @object.models = '1234'
@@ -301,7 +305,7 @@ describe Rubydora::DigitalObject do
         params[:predicate].should == 'info:fedora/fedora-system:def/relations-external#hasPart'
         params[:object].should == 'asdf'
       end
-      @mock_object = mock(Rubydora::DigitalObject)
+      @mock_object = double(Rubydora::DigitalObject)
       @mock_object.should_receive(:fqpid).and_return('asdf')
       @mock_repository.should_receive(:find_by_sparql_relationship).with('info:fedora/pid', 'info:fedora/fedora-system:def/relations-external#hasPart').and_return([])
       @object.parts << @mock_object
@@ -313,7 +317,7 @@ describe Rubydora::DigitalObject do
         params[:predicate].should == 'info:fedora/fedora-system:def/relations-external#hasPart'
         params[:object].should == 'asdf'
       end
-      @mock_object = mock(Rubydora::DigitalObject)
+      @mock_object = double(Rubydora::DigitalObject)
       @mock_object.should_receive(:fqpid).and_return('asdf')
       @mock_repository.should_receive(:find_by_sparql_relationship).with('info:fedora/pid', 'info:fedora/fedora-system:def/relations-external#hasPart').and_return([@mock_object])
       @object.parts.delete(@mock_object)
@@ -410,8 +414,53 @@ describe Rubydora::DigitalObject do
   end
 
   describe "#state" do
-    it_behaves_like "an object attribute"
-    let(:method) { 'state' }
+    subject { Rubydora::DigitalObject.new 'pid', @mock_repository }
+
+    describe "getter" do
+      it "should return the value" do
+        subject.instance_variable_set("@state", 'asdf')
+        subject.state.should == 'asdf'
+      end
+
+      it "should look in the object profile" do
+        subject.should_receive(:profile) { { Rubydora::DigitalObject::OBJ_ATTRIBUTES[:state].to_s => 'qwerty' } }
+        subject.state.should == 'qwerty'
+      end
+
+      it "should fall-back to the set of default attributes" do
+        @mock_repository.should_receive(:object).with(:pid=>"pid").and_raise(RestClient::ResourceNotFound)
+        Rubydora::DigitalObject::OBJ_DEFAULT_ATTRIBUTES.should_receive(:[]).with(:state) { 'zxcv'} 
+        subject.state.should == 'zxcv'
+      end
+    end
+
+    describe "setter" do
+      before do
+        subject.stub(:datastreams => [])
+      end
+      it "should mark the object as changed after setting" do
+        @mock_repository.should_receive(:object).with(:pid=>"pid").and_raise(RestClient::ResourceNotFound)
+        subject.state= 'D'
+        subject.should be_changed
+      end
+
+      it "should raise an error when setting an invalid value" do
+        expect {subject.state= 'Q'}.to raise_error ArgumentError, "Allowed values for state are 'I', 'A' and 'D'. You provided 'Q'"
+      end
+
+      it "should not mark the object as changed if the value does not change" do
+        subject.should_receive(:state) { 'A' }
+        subject.state= 'A'
+        subject.should_not be_changed
+      end
+
+      it "should appear in the save request" do 
+        @mock_repository.should_receive(:ingest).with(hash_including(:state => 'A'))
+        @mock_repository.should_receive(:object).with(:pid=>"pid").and_raise(RestClient::ResourceNotFound)
+        subject.state='A'
+        subject.save
+      end
+    end
   end
 
   describe "#ownerId" do
@@ -433,4 +482,9 @@ describe Rubydora::DigitalObject do
     it_behaves_like "an object attribute"
     let(:method) { 'lastModifiedDate' }
   end
+
+  describe "#createdDate" do
+    it_behaves_like "an object attribute"
+    let(:method) { 'createdDate' }
+  end
 end

data/spec/lib/integration_test_spec.rb

@@ -34,17 +34,17 @@ describe "Integration testing against a live Fedora repository", :integration =>
   end
 
   it "should create an object" do
-    obj = Rubydora::DigitalObject.new('test:1', @repository)
+    obj = @repository.find_or_initialize('test:1')
     obj.new?.should == true
     obj.save
     obj.new?.should == false
   end
 
   it "new should not return true until the profile is read" do
-    obj = Rubydora::DigitalObject.new('test:1', @repository)
+    obj = @repository.find_or_initialize('test:1')
     obj.save
-    new_obj = Rubydora::DigitalObject.new('test:1', @repository)
-    new_obj.new?.should == false 
+    obj = @repository.find('test:1')
+    obj.should_not be_new
   end
 
   it "should have default datastreams" do
@@ -58,13 +58,13 @@ describe "Integration testing against a live Fedora repository", :integration =>
   end
 
   it "should create another object" do
-    obj = Rubydora::DigitalObject.new('test:2', @repository)
+    obj = @repository.find_or_initialize('test:2')
     obj.save
     obj.new?.should == false
   end
 
   it "should create and update object labels" do
-    obj = Rubydora::DigitalObject.new('test:3', @repository)
+    obj = @repository.find_or_initialize('test:3')
     obj.label = 'asdf'
     obj.save
 
@@ -78,12 +78,10 @@ describe "Integration testing against a live Fedora repository", :integration =>
 
   end
 
-  it "should persist parts" do
-    obj = @repository.find('test:1')
-  end
+  describe "datastream stuff" do
 
   it "should create a managed datastream" do
-    obj = @repository.find('test:1')
+    obj = @repository.find_or_initialize('test:1')
     obj.save
     ds = obj.datastreams["Test"]
 
@@ -93,7 +91,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
   end
 
   it "should create a redirect datastream" do
-    obj = @repository.find('test:1')
+    obj = @repository.find_or_initialize('test:1')
     ds = obj.datastreams["Redirect"]
     ds.controlGroup = "R"
     ds.dsLocation = "http://example.org"
@@ -101,7 +99,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
   end
 
   it "should have datastreams" do
-    obj = @repository.find('test:1')
+    obj = @repository.find_or_initialize('test:1')
     obj.datastreams.keys.should include("Test")
     obj.datastreams.keys.should include("Redirect")
   end
@@ -112,7 +110,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
   end
 
   it "should have profile attributes" do
-    obj = @repository.find('test:1')
+    obj = @repository.find_or_initialize('test:1')
     ds = obj.datastreams["Test"]
 
     ds.versionID.should == "Test.0"
@@ -122,15 +120,16 @@ describe "Integration testing against a live Fedora repository", :integration =>
     ds.controlGroup.should == "M"
     ds.size.should be > 100
   end
+  end
 
   it "should delete datastreams" do
-    obj = @repository.find('test:1')
+    obj = @repository.find_or_initialize('test:1')
     ds = obj.datastreams["Test"].delete
     obj.datastreams.keys.should_not include("Test")
   end
 
   it "should save changed datastreams when the object is saved" do
-    obj = Rubydora::DigitalObject.new('test:1', @repository)
+    obj = @repository.find_or_initialize('test:1')
     obj.datastreams["new_ds"].content = "XXX"
     obj.datastreams["empty_ds"].new?
     obj.save
@@ -140,7 +139,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
   end
 
   it "should update datastream attributes without changing the content (or mime type)" do
-    obj = Rubydora::DigitalObject.new('test:1', @repository)
+    obj = @repository.find_or_initialize('test:1')
     obj.datastreams["my_ds"].content = "XXX"
     obj.datastreams["my_ds"].mimeType = "application/x-text"
     obj.save
@@ -156,7 +155,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
   end
 
   it "should save IO-based datastreams" do
-    obj = @repository.find('test:1')
+    obj = @repository.find_or_initialize('test:1')
     ds = obj.datastreams['gemspec']
     ds.controlGroup = 'M'
     ds.content = File.open('rubydora.gemspec', 'r')
@@ -170,7 +169,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
        @repository.find('transactions:1').delete rescue nil
 
        @repository.transaction do |t|
-         obj = Rubydora::DigitalObject.new('transactions:1', @repository)
+         obj = @repository.find_or_initialize('transactions:1')
          obj.save
 
          t.rollback
@@ -182,7 +181,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
     it "should work on purge" do
        @repository.find('transactions:1').delete rescue nil
 
-       obj = Rubydora::DigitalObject.new('transactions:1', @repository)
+       obj = @repository.find_or_initialize('transactions:1')
        obj.save
 
        @repository.transaction do |t|
@@ -239,9 +238,10 @@ describe "Integration testing against a live Fedora repository", :integration =>
     end
 
     it "should work on relationships" do
+      pending("fcrepo 3.6's relationship api is busted; skipping") if @repository.version == 3.6
        @repository.find('transactions:1').delete rescue nil
 
-       obj = Rubydora::DigitalObject.new('transactions:1', @repository)
+      obj = @repository.find_or_initialize('transactions:1')
        obj.save
        @repository.add_relationship :subject => obj.pid, :predicate => 'uri:asdf', :object => 'fedora:object'
 
@@ -266,7 +266,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
     end
 
     it "should have read-only versions" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
       expect { obj.versions.first.label = "asdf" }.to raise_error
     end
 
@@ -285,7 +285,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
     #end
 
     it "should access datastreams list using asOfDateTime (and pass the asOfDateTime through to the datastreams)" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
       oldest = obj.versions.first.datastreams.keys
       newest = obj.versions.last.datastreams.keys
       (newest - oldest).should_not be_empty
@@ -297,21 +297,21 @@ describe "Integration testing against a live Fedora repository", :integration =>
   describe "datastream versions" do
 
     it "should have versions" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
       versions = obj.datastreams["my_ds"].versions
       versions.should_not be_empty
       versions.map { |x| x.versionID }.should include('my_ds.1', 'my_ds.0')
     end
 
     it "should have read-only versions" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
       ds = obj.datastreams["my_ds"].asOfDateTime(Time.now)
       expect { ds.dsLabel = 'asdf' }.to raise_error
       expect { ds.content = 'asdf' }.to raise_error
     end
 
     it "should access the content of older datastreams" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
 
       ds = obj.datastreams["my_ds"]
       ds.content = "YYY"
@@ -322,7 +322,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
     end
 
     it "should allow the user to go from a versioned datastream to an unversioned datastream" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
       versions_count = obj.datastreams["my_ds"].versions.length
 
       obj.datastreams["my_ds"].versionable.should be_true
@@ -345,12 +345,12 @@ describe "Integration testing against a live Fedora repository", :integration =>
 
   context "mime types" do
     before(:each) do
-      obj = @repository.find('test:1')
+      obj = @repository.find_or_initialize('test:1')
       obj.datastreams["my_ds"].delete rescue nil
     end
 
     it "should default to application/octet-stream" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
       obj.datastreams["my_ds"].content = "XXX"
       obj.save
 
@@ -359,7 +359,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
     end
 
     it "should allow the user to specify a mimetype" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
       obj.datastreams["my_ds"].content = "XXX"
       obj.datastreams["my_ds"].mimeType = "text/plain"
       obj.save
@@ -369,7 +369,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
     end
 
     it "should preserve the mimetype on update" do
-      obj = Rubydora::DigitalObject.new('test:1', @repository)
+      obj = @repository.find_or_initialize('test:1')
       obj.datastreams["my_ds"].content = "XXX"
       obj.datastreams["my_ds"].mimeType = "text/plain"
       obj.save
@@ -383,7 +383,7 @@ describe "Integration testing against a live Fedora repository", :integration =>
     end
 
     it "should allow the mimetype to be changed" do
-      obj = @repository.find('test:1')
+      obj = @repository.find_or_initialize('test:1')
       obj.datastreams["my_ds"].content = "XXX"
       obj.datastreams["my_ds"].mimeType = "text/plain"
       obj.save

data/spec/lib/repository_spec.rb

@@ -1,8 +1,10 @@
 require 'spec_helper'
 
 describe Rubydora::Repository do
+  include Rubydora::FedoraUrlHelpers
+  
   before(:each) do
-    @repository = Rubydora::Repository.new
+    @repository = Rubydora::Repository.new 
   end
 
   describe "initialize" do
@@ -22,13 +24,24 @@ describe Rubydora::Repository do
 
   describe "find" do
     it "should load objects by pid" do
-      @mock_object = mock(Rubydora::DigitalObject)
+      @mock_object = double(Rubydora::DigitalObject)
       Rubydora::DigitalObject.should_receive(:find).with("pid", instance_of(Rubydora::Repository)).and_return @mock_object
 
       @repository.find('pid')
     end
   end
 
+  describe "mint" do
+    before do
+      xml = "<resp xmlns:fedora=\"http://www.fedora.info/definitions/1/0/management/\"><fedora:pid>test:123</fedora:pid></resp>"
+      @repository.api.should_receive(:next_pid).and_return xml 
+    end
+    it "should call nextPID" do
+      @repository.mint.should == 'test:123'
+    end
+  end
+
+
   describe "sparql" do
     it "should return csv results for sparql queries" do
       resource_index_query = ""
@@ -40,13 +53,13 @@ describe Rubydora::Repository do
 
   describe "profile" do
     it "should map the fedora repository description to a hash" do
-      @mock_response = mock()
-      @mock_client = mock(RestClient::Resource)
+      @mock_response = double
+      @mock_client = double
+      @repository.api.should_receive(:client).and_return(@mock_client)
+      @mock_client.should_receive(:[]).with(describe_repository_url(:xml=> true)).and_return(@mock_response)
       @mock_response.should_receive(:get).and_return <<-XML
         <?xml version="1.0" encoding="UTF-8"?><fedoraRepository  xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.fedora.info/definitions/1/0/access/ http://www.fedora.info/definitions/1/0/fedoraRepository.xsd"><repositoryName>Fedora Repository</repositoryName><repositoryBaseURL>http://localhost:8983/fedora</repositoryBaseURL><repositoryVersion>3.3</repositoryVersion><repositoryPID>    <PID-namespaceIdentifier>changeme</PID-namespaceIdentifier>    <PID-delimiter>:</PID-delimiter>    <PID-sample>changeme:100</PID-sample>    <retainPID>*</retainPID></repositoryPID><repositoryOAI-identifier>    <OAI-namespaceIdentifier>example.org</OAI-namespaceIdentifier>    <OAI-delimiter>:</OAI-delimiter>    <OAI-sample>oai:example.org:changeme:100</OAI-sample></repositoryOAI-identifier><sampleSearch-URL>http://localhost:8983/fedora/search</sampleSearch-URL><sampleAccess-URL>http://localhost:8983/fedora/get/demo:5</sampleAccess-URL><sampleOAI-URL>http://localhost:8983/fedora/oai?verb=Identify</sampleOAI-URL><adminEmail>bob@example.org</adminEmail><adminEmail>sally@example.org</adminEmail></fedoraRepository>
       XML
-      @mock_client.should_receive(:[]).with('describe?xml=true').and_return(@mock_response)
-      @repository.should_receive(:client).and_return(@mock_client)
       profile = @repository.profile
       profile['repositoryVersion'].should == '3.3'
     end

data/spec/lib/resource_index_spec.rb

@@ -18,8 +18,8 @@ describe Rubydora::ResourceIndex do
   end
 
   it "should send sparql queries with appropriate parameters" do
-    @mock_risearch = mock()
-    @mock_client = mock(RestClient::Resource)
+    @mock_risearch = double()
+    @mock_client = double(RestClient::Resource)
     @mock_risearch.should_receive(:post).with(hash_including(:dt => 'on', :format => 'CSV', :lang => 'sparql', :limit => nil, :query => 'placeholder SPARQL query', :type => 'tuples' ))
     @mock_client.should_receive(:[]).with('risearch').and_return(@mock_risearch)
     @mock_repository.should_receive(:client).and_return(@mock_client)