rubydora 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3446c99b699e41f3fb8e24b636313a510c7b77cc
-  data.tar.gz: a0b85f13192eeb58e95423ce84eb5956285f1879
+  metadata.gz: 763537753ba63badc5604ff8c0e8973d2c9c66e2
+  data.tar.gz: 6ba0d875a73f459ef3d77d426eaebbc0992b50a1
 SHA512:
-  metadata.gz: 7b280b7c624ba9037034ee314a2a03e6e91bc36c8690a89dd3a74b43e58a7239afe52a05657f7ee41aa54f8cf9decc1426e9e8335f285baffa0a83046fce8937
-  data.tar.gz: 4b96fe24d6ec7878662bad578a9a4171d27af9e8bf245fe03a1f5b1b6dfe1b25d7156d8a9f695fe2575ed562671e7bb22c84a22eae6c63cc4b4c02b6a4cbe2de
+  metadata.gz: 1d4a724ddddd121e7276a6b001a633dca5d1b233c72bf7c724740f38f455cf1a44c268e3dc604638b0700c54981ce816a314fa8e827a1279d6bae928188c7a05
+  data.tar.gz: 5abd3a54fb74151c19dd37df480b694447a6a85c7e70e89c3d720023e128afe391c4c8d81c0209db80465023477ccf35f09d4f93e6da86f6ea7e699a9c25580a

data/VERSION

@@ -1 +1 @@
-1.6.3
+1.6.4

data/lib/rubydora/datastream.rb

@@ -318,6 +318,12 @@ module Rubydora
       end
     end
 
+    def current_version?
+      return true if new?
+      vers = versions
+      return vers.empty? || dsVersionID == vers.first.dsVersionID
+    end
+
     # Add datastream to Fedora
     # @return [Rubydora::Datastream]
     def create

data/lib/rubydora/fedora_url_helpers.rb

@@ -12,6 +12,10 @@ module Rubydora
       "#{base}" + (("?#{options.map { |key, value|  "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"}.join("&")  }" if options and not options.empty?) || '')
     end
 
+    def describe_repository_url options = nil
+      url_for("describe", options)
+    end
+
     # Generate a base object REST API endpoint URI
     # @param [String] pid
     # @param [Hash] options to convert to URL parameters
@@ -20,6 +24,10 @@ module Rubydora
       url_for("objects" + (("/#{CGI::escape(pid.to_s.gsub('info:fedora/', ''))}" if pid) || ''), options)
     end
 
+    def new_object_url options = nil
+      object_url "new", options
+    end
+
     # @param [Hash] options to convert to URL parameters
     # @return [String] URI
     def next_pid_url options = nil
@@ -48,9 +56,20 @@ module Rubydora
     # @param [String] dsid
     # @param [Hash] options to convert to URL parameters
     # @return [String] URI
-    def datastream_url pid, dsid = nil, options = nil
+    def datastream_url pid, dsid, options = nil
+      raise "" unless pid and dsid
+      url_for(object_url(pid) + "/datastreams/#{CGI::escape(dsid)}", options)
+    end
+
+
+    # Generate a base datastream REST API endpoint URI
+    # @param [String] pid
+    # @param [String] dsid
+    # @param [Hash] options to convert to URL parameters
+    # @return [String] URI
+    def datastreams_url pid, options = nil
       raise "" unless pid
-      url_for(object_url(pid) + "/datastreams" + (("/#{CGI::escape(dsid)}" if dsid) || ''), options)
+      url_for(object_url(pid) + "/datastreams", options)
     end
 
     # @param [String] pid

data/lib/rubydora/repository.rb

@@ -24,6 +24,10 @@ module Rubydora
       DigitalObject.find(pid, self)
     end
 
+    def find_or_initialize pid
+      DigitalObject.find_or_initialize(pid, self)
+    end
+
     # High-level access to the Fedora find_objects API
     #
     # @params [String] query
@@ -65,7 +69,7 @@ module Rubydora
     # @return [Hash]
     def profile
       @profile ||= begin
-        profile_xml = client['describe?xml=true'].get
+        profile_xml = self.describe.strip
         profile_xml.gsub! '<fedoraRepository', '<fedoraRepository xmlns="http://www.fedora.info/definitions/1/0/access/"' unless profile_xml =~ /xmlns=/
         doc = Nokogiri::XML(profile_xml)
         xmlns = { 'access' => "http://www.fedora.info/definitions/1/0/access/"  }

data/lib/rubydora/rest_api_client.rb

@@ -9,7 +9,9 @@ module Rubydora
     
     include Rubydora::FedoraUrlHelpers
     extend ActiveSupport::Concern
-    include ActiveSupport::Benchmarkable
+    include ActiveSupport::Benchmarkable    
+    extend Deprecation
+
 
 
     VALID_CLIENT_OPTIONS = [:user, :password, :timeout, :open_timeout, :ssl_client_cert, :ssl_client_key]
@@ -59,6 +61,14 @@ module Rubydora
       end
     end
 
+    def describe options = {}
+      query_options = options.dup
+      query_options[:xml] ||= 'true'
+      client[describe_repository_url(query_options)].get
+    rescue Exception => exception
+      rescue_with_handler(exception) || raise
+    end
+
     # {include:RestApiClient::API_DOCUMENTATION}
     # @param [Hash] options
     # @return [String]
@@ -106,7 +116,12 @@ module Rubydora
     # @return [String]
     def ingest options = {}
       query_options = options.dup
-      pid = query_options.delete(:pid) || 'new'
+      pid = query_options.delete(:pid)
+
+      if pid.nil?
+        return mint_pid_and_ingest options
+      end
+
       file = query_options.delete(:file)
       assigned_pid = client[object_url(pid, query_options)].post((file.dup if file), :content_type => 'text/xml')
       run_hook :after_ingest, :pid => assigned_pid, :file => file, :options => options
@@ -115,6 +130,17 @@ module Rubydora
         rescue_with_handler(exception) || raise
     end
 
+    def mint_pid_and_ingest options = {}
+      query_options = options.dup
+      file = query_options.delete(:file)
+
+      assigned_pid = client[new_object_url(query_options)].post((file.dup if file), :content_type => 'text/xml')
+      run_hook :after_ingest, :pid => assigned_pid, :file => file, :options => options
+      assigned_pid
+    rescue Exception => exception
+        rescue_with_handler(exception) || raise
+    end
+
     # {include:RestApiClient::API_DOCUMENTATION}
     # @param [Hash] options
     # @option options [String] :pid
@@ -193,10 +219,16 @@ module Rubydora
       query_options = options.dup
       pid = query_options.delete(:pid)
       dsid = query_options.delete(:dsid)
+      raise ArgumentError, "Missing required parameter :pid" unless pid
+
+      if dsid.nil?
+        #raise ArgumentError, "Missing required parameter :dsid" unless dsid
+        Deprecation.warn(RestApiClient, "Calling Rubydora::RestApiClient#datastream without a :dsid is deprecated, use #datastreams instead")
+        return datastreams(options)
+      end
       query_options[:format] ||= 'xml'
       val = nil
-      message = dsid.nil? ? "Loaded datastream list for #{pid}" : "Loaded datastream profile #{pid}/#{dsid}"
-      benchmark message, :level=>:debug do
+      benchmark "Loaded datastream profile #{pid}/#{dsid}", :level=>:debug do
         val = client[datastream_url(pid, dsid, query_options)].get
       end
 
@@ -208,7 +240,29 @@ module Rubydora
         rescue_with_handler(exception) || raise
     end
 
-    alias_method :datastreams, :datastream
+    def datastreams options = {}
+      unless options[:dsid].nil?
+        #raise ArgumentError, "Missing required parameter :dsid" unless dsid
+        Deprecation.warn(RestApiClient, "Calling Rubydora::RestApiClient#datastreams with a :dsid is deprecated, use #datastream instead")
+        return datastream(options)
+      end
+      query_options = options.dup
+      pid = query_options.delete(:pid)
+      raise ArgumentError, "Missing required parameter :pid" unless pid
+      query_options[:format] ||= 'xml'
+      val = nil
+      benchmark "Loaded datastream list for #{pid}", :level=>:debug do
+        val = client[datastreams_url(pid, query_options)].get
+      end
+
+      val
+    rescue RestClient::Unauthorized => e
+      logger.error "Unauthorized at #{client.url}/#{datastreams_url(pid, query_options)}"
+      raise e
+    rescue Exception => exception
+        rescue_with_handler(exception) || raise
+
+    end
 
     # {include:RestApiClient::API_DOCUMENTATION}
     # @param [Hash] options

data/rubydora.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mime-types"
   s.add_dependency "activesupport"
   s.add_dependency "activemodel"
-  s.add_dependency "hooks"
+  s.add_dependency "hooks", "~> 0.2.2"
   s.add_dependency "deprecation"
 
   s.add_development_dependency("rake")

data/spec/lib/datastream_spec.rb

@@ -123,6 +123,10 @@ describe Rubydora::Datastream do
       @datastream.versionable.should be_false
     end
 
+    it "should be the current version" do
+      @datastream.current_version?.should be_true
+    end
+
     # it "should cast versionable to boolean" do
     #   @datastream.profile['versionable'] = 'true'
     #   @datastream.versionable.should be_true
@@ -466,6 +470,36 @@ describe Rubydora::Datastream do
         Rubydora::Datastream.any_instance.stub(:new? => false)
         @datastream.versions.last.content
       end
+
+      it "should be the current version" do
+        @mock_repository.stub(:datastream).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return <<-XML
+          <datastreamProfile>
+            <dsVersionID>dsid.1</dsVersionID>
+            <dsCreateDate>2010-01-02T00:00:00.012Z</dsCreateDate>
+          </datastreamProfile>
+          XML
+        @datastream.current_version?.should be_true
+      end
+
+      it "should be the current version if it's the first version" do
+        @mock_repository.stub(:datastream).with(hash_including(:pid => 'pid', :dsid => 'dsid', :asOfDateTime =>'2010-01-02T00:00:00.012Z')).and_return <<-XML
+          <datastreamProfile>
+            <dsVersionID>dsid.1</dsVersionID>
+            <dsCreateDate>2010-01-02T00:00:00.012Z</dsCreateDate>
+          </datastreamProfile>
+          XML
+        @datastream.versions.first.current_version?.should be_true
+      end
+
+      it "should not be the current version if it's the second version" do
+        @mock_repository.stub(:datastream).with(hash_including(:pid => 'pid', :dsid => 'dsid', :asOfDateTime => '2008-08-05T01:30:05.012Z')).and_return <<-XML
+          <datastreamProfile>
+            <dsVersionID>dsid.0</dsVersionID>
+            <dsCreateDate>2008-08-05T01:30:05.012Z</dsCreateDate>
+          </datastreamProfile>
+          XML
+        @datastream.versions[1].current_version?.should be_false
+      end
     end
     describe "when no versions are found" do
       before(:each) do
@@ -477,6 +511,11 @@ describe Rubydora::Datastream do
         @datastream.versions.should be_empty
       end
 
+      it "should be the current version" do
+        @datastream.stub(:new? => false)
+        @datastream.current_version?.should be_true
+      end
+
     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,6 +1,8 @@
 require 'spec_helper'
 
 describe Rubydora::Repository do
+  include Rubydora::FedoraUrlHelpers
+  
   before(:each) do
     @repository = Rubydora::Repository.new
   end
@@ -45,7 +47,7 @@ describe Rubydora::Repository do
       @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)
+      @mock_client.should_receive(:[]).with(describe_repository_url(:xml=> true)).and_return(@mock_response)
       @repository.should_receive(:client).and_return(@mock_client)
       profile = @repository.profile
       profile['repositoryVersion'].should == '3.3'

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
 
@@ -206,11 +231,11 @@ describe Rubydora::RestApiClient do
 
   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
@@ -224,43 +249,43 @@ describe Rubydora::RestApiClient do
   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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-28 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.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement