rubydora 1.6.3 → 1.7.0

data/spec/lib/rest_api_client_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper' 
 
 describe Rubydora::RestApiClient do
+  
+  include Rubydora::FedoraUrlHelpers
+
   class FakeException < Exception
 
   end
@@ -24,6 +27,7 @@ describe Rubydora::RestApiClient do
       }
 
       it "should replace a RestClient exception with a Rubydora one" do
+        Deprecation.stub(:warn)
         subject.stub_chain(:client, :[], :get).and_raise RestClient::InternalServerError.new
         subject.stub_chain(:client, :[], :put).and_raise RestClient::InternalServerError.new
         subject.stub_chain(:client, :[], :delete).and_raise RestClient::InternalServerError.new
@@ -32,7 +36,7 @@ describe Rubydora::RestApiClient do
       end
     end
 
-    [:next_pid, :find_objects, :object, :ingest, :export, :modify_object, :purge_object, :object_versions, :object_xml, :datastream, :datastreams, :set_datastream_options, :datastream_versions, :datastream_history, :datastream_dissemination, :add_datastream, :modify_datastream, :purge_datastream, :relationships, :add_relationship, :purge_relationship, :dissemination].each do |method|
+    [:next_pid, :find_objects, :object, :ingest, :mint_pid_and_ingest, :export, :modify_object, :purge_object, :object_versions, :object_xml, :datastream, :datastreams, :set_datastream_options, :datastream_versions, :datastream_history, :datastream_dissemination, :add_datastream, :modify_datastream, :purge_datastream, :relationships, :add_relationship, :purge_relationship, :dissemination].each do |method|
 
       class_eval %Q{
     describe "##{method}" do
@@ -45,13 +49,16 @@ describe Rubydora::RestApiClient do
   end
 
 
+  let :base_url do
+    "http://example.org"
+  end
 
 
   before(:each) do
     @fedora_user = 'fedoraAdmin'
     @fedora_password = 'fedoraAdmin'
     @mock_repository = MockRepository.new
-    @mock_repository.config = { :url => 'http://example.org',:user => @fedora_user, :password => @fedora_password}
+    @mock_repository.config = { :url => base_url,:user => @fedora_user, :password => @fedora_password}
   end
 
   it "should create a REST client" do
@@ -76,42 +83,48 @@ describe Rubydora::RestApiClient do
   end
   
   it "should call nextPID" do
-    RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/nextPID?format=xml"))
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + next_pid_url(:format => 'xml')))
     @mock_repository.next_pid
   end
 
   it "should find objects" do
      RestClient::Request.should_receive(:execute) do |params|
        params.should have_key(:url)
-       params[:url].should =~ /^#{Regexp.escape("http://example.org/objects?")}.*query=a/
+       params[:url].should =~ /^#{Regexp.escape(base_url + "/" + find_objects_url + "?")}.*query=a/
      end
     @mock_repository.find_objects :query => 'a'
   end
 
 
   it "should show object properties" do
-    RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/z?format=xml"))
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + object_url('z', :format => 'xml')))
     @mock_repository.object :pid => 'z'
   end
 
   it "should raise not found exception when retrieving object" do
-    RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/z?format=xml")).and_raise( RestClient::ResourceNotFound)
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + object_url('z', :format => 'xml'))).and_raise( RestClient::ResourceNotFound)
     lambda {@mock_repository.object(:pid => 'z')}.should raise_error RestClient::ResourceNotFound
   end
   
   it "ingest" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/new"))
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + new_object_url))
+    @mock_repository.ingest
+  end
+
+
+  it "mint_pid_and_ingest" do
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + new_object_url))
     @mock_repository.ingest
   end
 
   it "ingest with pid" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + object_url('mypid')))
     @mock_repository.ingest :pid => 'mypid'
   end
 
   describe "export" do
     it "should work on the happy path" do
-       RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/export"))
+       RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + export_object_url('mypid')))
       @mock_repository.export :pid => 'mypid'
     end
     it "should require a pid" do
@@ -122,56 +135,68 @@ describe Rubydora::RestApiClient do
   it "modify_object" do
      RestClient::Request.should_receive(:execute) do |params|
        params.should have_key(:url)
-       params[:url].should =~ /^#{Regexp.escape("http://example.org/objects/mypid?")}.*state=Z/
+       params[:url].should =~ /^#{Regexp.escape(base_url + "/" + object_url('mypid'))}.*state=Z/
      end
     @mock_repository.modify_object :pid => 'mypid', :state => 'Z'
   end
 
   it "purge_object" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + object_url('mypid')))
     @mock_repository.purge_object :pid => 'mypid'
   end
 
   it "should raise not found exception when purging" do
-    RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid")).and_raise( RestClient::ResourceNotFound)
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + object_url('mypid'))).and_raise( RestClient::ResourceNotFound)
     lambda {@mock_repository.purge_object(:pid => 'mypid')}.should raise_error RestClient::ResourceNotFound
   end
 
   it "object_versions" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/versions?format=xml"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + object_versions_url('mypid', :format => 'xml')))
     @mock_repository.object_versions :pid => 'mypid'
   end
 
   it "object_xml" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/objectXML?format=xml"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + object_xml_url('mypid', :format => 'xml')))
     @mock_repository.object_xml :pid => 'mypid'
   end
 
   it "datastream" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams?format=xml"))
+    RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastreams_url('mypid', :format => 'xml')))
     logger.should_receive(:debug) # squelch message "Loaded datastream list for mypid (time)"
+    @mock_repository.datastreams :pid => 'mypid'
+  end
+
+  it "datastreams" do
+    @mock_repository.should_receive(:datastream).with(:pid => 'mypid', :dsid => 'asdf')
+    Deprecation.should_receive(:warn)
+    @mock_repository.datastreams :pid => 'mypid', :dsid => 'asdf'
+  end
+
+  it "datastream" do
+    @mock_repository.should_receive(:datastreams).with(:pid => 'mypid')
+    Deprecation.should_receive(:warn)
     @mock_repository.datastream :pid => 'mypid'
   end
 
   it "datastream" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa?format=xml"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_url('mypid', 'aaa', :format => 'xml')))
     logger.should_receive(:debug) # squelch message "Loaded datastream mypid/aaa (time)"
     @mock_repository.datastream :pid => 'mypid', :dsid => 'aaa'
   end
 
   it "should raise not found exception when getting a datastream" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa?format=xml")).and_raise( RestClient::ResourceNotFound)
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_url('mypid', 'aaa', :format => 'xml'))).and_raise( RestClient::ResourceNotFound)
     lambda {@mock_repository.datastream :pid => 'mypid', :dsid => 'aaa'}.should raise_error RestClient::ResourceNotFound
   end
 
   it "should raise Unauthorized exception when getting a datastream" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa?format=xml")).and_raise( RestClient::Unauthorized)
-    logger.should_receive(:error).with("Unauthorized at http://example.org/objects/mypid/datastreams/aaa?format=xml")
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_url('mypid', 'aaa', :format => 'xml'))).and_raise( RestClient::Unauthorized)
+    logger.should_receive(:error).with("Unauthorized at #{base_url + "/" + datastream_url('mypid', 'aaa', :format => 'xml')}")
     lambda {@mock_repository.datastream :pid => 'mypid', :dsid => 'aaa'}.should raise_error RestClient::Unauthorized
   end
 
   it "datastream_dissemination" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/content"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_content_url('mypid', 'aaa')))
     @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'
   end
   it "should allow http methods besides GET on datastream_dissemination" do
@@ -184,13 +209,13 @@ describe Rubydora::RestApiClient do
     @mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa', &_proc
   end
   it "should raise not found exception when retrieving datastream_dissemination" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/content")).and_raise( RestClient::ResourceNotFound)
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_content_url('mypid', 'aaa'))).and_raise( RestClient::ResourceNotFound)
     lambda {@mock_repository.datastream_dissemination :pid => 'mypid', :dsid => 'aaa'}.should raise_error RestClient::ResourceNotFound
   end
 
   describe "add_datastream" do
     it "should post to the correct url" do
-       RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa"))
+       RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_url('mypid', 'aaa')))
       @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa' 
     end
 
@@ -199,18 +224,18 @@ describe Rubydora::RestApiClient do
         RestClient::Request.any_instance.should_receive(:transmit) #stub transmit so that Request.execute can close the file we pass
         file = StringIO.new('test', 'r') # StringIO is a good stand it for a real File (it has read, rewind and close)
         @mock_repository.add_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
-        lambda {file.read}.should_not raise_error IOError
+        lambda {file.read}.should_not raise_error
       end
     end
   end
 
   describe "modify datastream" do
     it "should not set mime-type when it's not provided" do
-       RestClient::Request.should_receive(:execute).with(:url => "http://example.org/objects/mypid/datastreams/aaa",:open_timeout=>nil, :payload=>nil, :user=>@fedora_user, :password=>@fedora_password, :method=>:put, :headers=>{})
+       RestClient::Request.should_receive(:execute).with(:url => base_url + "/" + datastream_url('mypid', 'aaa'),:open_timeout=>nil, :payload=>nil, :user=>@fedora_user, :password=>@fedora_password, :method=>:put, :headers=>{})
       @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa' 
     end
     it "should pass the provided mimeType header" do
-       RestClient::Request.should_receive(:execute).with(:url => "http://example.org/objects/mypid/datastreams/aaa?mimeType=application%2Fjson",:open_timeout=>nil, :payload=>nil, :user=>@fedora_user, :password=>@fedora_password, :method=>:put, :headers=>{})
+       RestClient::Request.should_receive(:execute).with(:url => base_url + "/" + datastream_url('mypid', 'aaa', :mimeType => 'application/json'),:open_timeout=>nil, :payload=>nil, :user=>@fedora_user, :password=>@fedora_password, :method=>:put, :headers=>{})
       @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :mimeType=>'application/json'
     end
     describe "when a file is passed" do
@@ -218,49 +243,49 @@ describe Rubydora::RestApiClient do
         RestClient::Request.any_instance.should_receive(:transmit) #stub transmit so that Request.execute can close the file we pass
         file = StringIO.new('test', 'r') # StringIO is a good stand it for a real File (it has read, rewind and close)
         @mock_repository.modify_datastream :pid => 'mypid', :dsid => 'aaa', :content=>file
-        lambda {file.read}.should_not raise_error IOError
+        lambda {file.read}.should_not raise_error
       end
     end
   end
 
   it "purge_datastream" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_url('mypid', 'aaa')))
     @mock_repository.purge_datastream :pid => 'mypid', :dsid => 'aaa' 
   end
 
   it "set_datastream_options" do
      RestClient::Request.should_receive(:execute) do |params|
        params.should have_key(:url)
-       params[:url].should =~ /^#{Regexp.escape("http://example.org/objects/mypid/datastreams/aaa?")}.*aparam=true/ 
+       params[:url].should =~ /^#{Regexp.escape(base_url + "/" + datastream_url('mypid', 'aaa') + "?")}.*aparam=true/ 
      end
     @mock_repository.set_datastream_options :pid => 'mypid', :dsid => 'aaa', :aparam => true 
   end
 
   describe "datastream_versions" do
     it "should be successful" do
-       RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/history?format=xml")).and_return("expected result")
+       RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_history_url('mypid', 'aaa', :format=>'xml'))).and_return("expected result")
       @mock_repository.datastream_versions(:pid => 'mypid', :dsid => 'aaa').should == 'expected result'
     end
     it "should not break when fedora doesn't have datastream history" do
-       RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/history?format=xml")).and_raise(RestClient::ResourceNotFound)
+       RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_history_url('mypid', 'aaa', :format=>'xml'))).and_raise(RestClient::ResourceNotFound)
       @mock_repository.datastream_versions(:pid => 'mypid', :dsid => 'aaa').should be_nil
     end
   end
 
   it "datastream_history" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/datastreams/aaa/history?format=xml"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + datastream_history_url('mypid', 'aaa', :format=>'xml')))
     @mock_repository.datastream_history :pid => 'mypid', :dsid => 'aaa'
   end
 
   it "relationships" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/relationships?format=xml"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + object_relationship_url('mypid', :format => 'xml')))
     @mock_repository.relationships :pid => 'mypid'
   end
 
   it "add_relationship" do
      RestClient::Request.should_receive(:execute) do |params|
        params.should have_key(:url)
-       params[:url].should =~ /^#{Regexp.escape("http://example.org/objects/mypid/relationships/new?")}.*subject=z/
+       params[:url].should =~ /^#{Regexp.escape(base_url + "/" + new_object_relationship_url('mypid') + "?")}.*subject=z/
      end
     @mock_repository.add_relationship :pid => 'mypid', :subject => 'z'
   end
@@ -268,23 +293,23 @@ describe Rubydora::RestApiClient do
   it "purge_relationships" do
      RestClient::Request.should_receive(:execute) do |params|
        params.should have_key(:url)
-       params[:url].should =~ /^#{Regexp.escape("http://example.org/objects/mypid/relationships?")}.*subject=z/
+       params[:url].should =~ /^#{Regexp.escape(base_url + "/" + object_relationship_url('mypid') + "?")}.*subject=z/
      end
     @mock_repository.purge_relationship :pid => 'mypid', :subject => 'z' 
   end
 
   it "dissemination" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/methods?format=xml"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + dissemination_url('mypid', nil, nil, :format => 'xml')))
     @mock_repository.dissemination :pid => 'mypid'
   end
 
   it "dissemination" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/methods/sdef?format=xml"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + dissemination_url('mypid', 'sdef', nil, :format => 'xml')))
     @mock_repository.dissemination :pid => 'mypid', :sdef => 'sdef'
   end
 
   it "dissemination" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/methods/sdef/method"))
+     RestClient::Request.should_receive(:execute).with(hash_including(:url => base_url + "/" + dissemination_url('mypid', 'sdef', 'method')))
     @mock_repository.dissemination :pid => 'mypid', :sdef => 'sdef', :method => 'method'
   end
 

data/spec/lib/transactions_spec.rb

@@ -4,8 +4,9 @@ describe Rubydora::Transactions do
   
 
   subject { 
-    Rubydora::Repository.any_instance.stub(:version).and_return(100)
-    repository = Rubydora::Repository.new :url => 'http://example.org'
+    # Rubydora::Repository.any_instance.stub(:version).and_return(100)
+    # repository = Rubydora::Repository.new :url => 'http://example.org'
+    Rubydora::Fc3Service.new :url => 'http://example.org'
   }
 
   describe "#transaction_is_redundant?" do
@@ -69,9 +70,8 @@ describe Rubydora::Transactions do
     it "modify_object" do
       subject.client.stub_chain(:[], :put).and_return 'asdf'
 
-      mock_object = double('Rubydora::DigitalObject', :state => 'A', :ownerId => '567', :logMessage => 'dfghj')
-      subject.should_receive(:find).with('asdf').and_return mock_object
-      
+      profile_xml = "<objectProfile><objState>A</objState><objOwnerId>567</objOwnerId></objectProfile>"
+      subject.should_receive(:object).with(pid: 'asdf').and_return profile_xml 
 
       subject.transaction do |t|
         subject.modify_object :pid => 'asdf', :state => 'I', :ownerId => '123', :logMessage => 'changing asdf'
@@ -122,9 +122,8 @@ describe Rubydora::Transactions do
     it "set_datastream_options" do
       subject.client.stub_chain(:[], :put)
 
-      mock_object = double('Rubydora::DigitalObject')
-      mock_object.stub_chain(:datastreams, :[], :versionable).and_return(false)
-      subject.should_receive(:find).with('asdf').and_return mock_object
+      profile_xml = "<datastreamProfile><dsVersionable>false</dsVersionable></datastreamProfile>"
+      subject.should_receive(:datastream).with(pid: 'asdf', dsid: 'mydsid').and_return profile_xml
 
       subject.transaction do |t|
         subject.set_datastream_options :pid => 'asdf', :dsid => 'mydsid', :versionable => true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.7.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -112,16 +112,16 @@ dependencies:
   name: hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +150,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -243,21 +229,28 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
+- .mailmap
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - History.textile
 - LICENSE.txt
+- Notices.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- gemfiles/gemfile.rails3
+- gemfiles/gemfile.rails4
 - lib/rubydora.rb
 - lib/rubydora/array_with_callback.rb
 - lib/rubydora/audit_trail.rb
 - lib/rubydora/callbacks.rb
 - lib/rubydora/datastream.rb
 - lib/rubydora/digital_object.rb
+- lib/rubydora/fc3_service.rb
 - lib/rubydora/fedora_url_helpers.rb
 - lib/rubydora/models_mixin.rb
+- lib/rubydora/profile_parser.rb
 - lib/rubydora/relationships_mixin.rb
 - lib/rubydora/repository.rb
 - lib/rubydora/resource_index.rb
@@ -294,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Fedora Commons REST API ruby library