rubydora 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 367d66a9cebd58fd4efd62fb00f6e644f9c998a6
-  data.tar.gz: 9303285358a919f262b9e99329c5788ec7136025
+  metadata.gz: 613a09dfb2ffdd26f9e0823e55cff69c6b961c00
+  data.tar.gz: 66603795ff46db8c1d2422ae81794eb6577fa9e8
 SHA512:
-  metadata.gz: a47dacdf70d4fd80ae03cfb0deac47685fa6fad96e49d018d5ce5da1b8a4694767d11e1e020101c7ffd7602dc0b4618035786ba2c7c9fe7de40ca5bca9cc5f05
-  data.tar.gz: bbfa8466a29af4ac8801e53383a0165839f4162d7e0fe7d862ae885931db73608aadc16c1a99fef6b739cd560a0a18e3647c95299b4659eedd7d1440e5baded0
+  metadata.gz: 29615bcda338d44a3e40972d5e1adb54946ffc14e3473b5c5e3763eff87aac40c792dfc4e6450b3beadcaf896bd2960ff160c065458d2b21dcac118c7a080d8f
+  data.tar.gz: ea6981f21d6c4cac06f40b2f563f257cdd4bc8ec26591346935593914f27f73b17ee4ab5a9e8fc58ea367f3302045ae2e14bbcf60aed9b0f6291094a3e5959d5

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.7.3

data/lib/rubydora/datastream.rb

@@ -290,8 +290,9 @@ module Rubydora
     def create
       check_if_read_only
       run_callbacks :create do
-        repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid, :content => content })
+        p = repository.add_datastream( to_api_params.merge({ :pid => pid, :dsid => dsid, :content => content })) || {}
         reset_profile_attributes
+        self.profile= p unless p.empty?
         self.class.new(digital_object, dsid, @options)
       end
     end
@@ -303,8 +304,9 @@ module Rubydora
       run_callbacks :save do
         raise RubydoraError.new("Unable to save #{self.inspect} without content") unless has_content?
         return create if new?
-        repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
+        p = repository.modify_datastream(to_api_params.merge({ :pid => pid, :dsid => dsid })) || {}
         reset_profile_attributes
+        self.profile= p unless p.empty?
         self.class.new(digital_object, dsid, @options)
       end
     end

data/lib/rubydora/digital_object.rb

@@ -185,23 +185,31 @@ module Rubydora
     # persist the object to Fedora, either as a new object 
     # by modifing the existing object
     #
-    # also will save all `:dirty?` datastreams that already exist 
+    # also will save all `:changed?` datastreams that already exist 
     # new datastreams must be directly saved
     # 
     # @return [Rubydora::DigitalObject] a new copy of this object
     def save
       check_if_read_only
+      mod_time = nil
       run_callbacks :save do
         if self.new?
           self.pid = repository.ingest to_api_params.merge(:pid => pid)
           @profile = nil #will cause a reload with updated data
         else                       
           p = to_api_params
-          repository.modify_object p.merge(:pid => pid) unless p.empty?
+          unless p.empty?
+            mod_time = repository.modify_object p.merge(:pid => pid)
+            changed_attributes.clear
+          end
         end
       end
-
-      self.datastreams.select { |dsid, ds| ds.changed? }.each { |dsid, ds| ds.save }
+      mod_time = save_datastreams(mod_time)
+      # mod_time will be nil on new objects with no ds changes
+      unless mod_time.nil?
+        self.lastModifiedDate = mod_time
+        changed_attributes.delete 'lastModifiedDate'
+      end
       self
     end
 
@@ -268,5 +276,16 @@ module Rubydora
       super
     end
 
+    # save changed datastreams
+    # @param [String] memo_time : the time before changes, or nil
+    # @return [String] the time of the last datastream change, or nil if no changes
+    def save_datastreams(memo_time=nil)
+      mod_time = memo_time
+      self.datastreams.select { |dsid, ds| ds.changed? }.each do |dsid, ds|
+        ds.save
+        mod_time = ProfileParser.canonicalize_date(ds.dsCreateDate)
+      end
+      mod_time
+    end
   end
 end

data/lib/rubydora/profile_parser.rb

@@ -46,6 +46,7 @@ module Rubydora
         next if key == "objModels"
         h[key] = values.reject { |x| x.empty? }.first
       end
+      h['objLastModDate'] = canonicalize_date_string(h['objLastModDate']) if h['objLastModDate']
       h.with_indifferent_access
     end
 
@@ -65,5 +66,25 @@ module Rubydora
                  end
       h.with_indifferent_access
     end
+
+    # Some versions of Fedora 3 return lexical representations of a w3c date
+    # in the object profile, which will not compare correctly to the canonical
+    # representations returned from update operations
+    def self.canonicalize_date_string(input)
+      if input =~ /0Z/
+        lmd = input.sub(/\.[0]+Z$/,'Z')
+        lmd = lmd.sub(/\.([^0]+)[0]+Z$/,'.\1Z')
+        lmd
+      else
+        input
+      end
+    end
+    def self.canonicalize_date(input)
+      if input.is_a? Time
+        canonicalize_date_string(input.utc.strftime("%Y-%m-%dT%H:%M:%S.%3NZ"))
+      else
+        canonicalize_date_string(input.to_s)
+      end
+    end
   end
 end

data/lib/rubydora/repository.rb

@@ -17,7 +17,7 @@ module Rubydora
     end
 
     delegate :client, :transaction, :mint, :ingest, :find_objects, :purge_object,
-      :modify_object, :datastreams, :add_datastream, :modify_datastream,
+      :modify_object, :datastream_url, :datastreams, :add_datastream, :modify_datastream,
       :set_datastream_options, :datastream_dissemination, :purge_datastream,
       :add_relationship, :purge_relationship, :repository_profile,
       :object_profile, :datastream_profile, :versions_for_datastream,
@@ -31,8 +31,9 @@ module Rubydora
     # @option options [String] :user
     # @option options [String] :password
     # @option options [Boolean] :validateChecksum
-    def initialize options = {}
+    def initialize options = {}, api = nil
       @config = options.symbolize_keys
+      @api = api if api
       check_repository_version!
     end
 

data/lib/rubydora/rest_api_client.rb

@@ -162,7 +162,7 @@ module Rubydora
       query_options = options.dup
       pid = query_options.delete(:pid)
       run_hook :before_modify_object, :pid => pid, :options => options
-      client[object_url(pid, query_options)].put nil
+      ProfileParser.canonicalize_date_string(client[object_url(pid, query_options)].put(nil))
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -340,7 +340,7 @@ module Rubydora
       run_hook :before_add_datastream, :pid => pid, :dsid => dsid, :file => file, :options => options
       str = file.respond_to?(:read) ? file.read : file
       file.rewind if file.respond_to?(:rewind)
-      client[datastream_url(pid, dsid, query_options)].post(str, :content_type => content_type.to_s, :multipart => true)
+      ProfileParser.parse_datastream_profile(client[datastream_url(pid, dsid, query_options)].post(str, :content_type => content_type.to_s, :multipart => true))
     rescue Exception => exception
         rescue_with_handler(exception) || raise
     end
@@ -365,7 +365,7 @@ module Rubydora
       run_hook :before_modify_datastream, :pid => pid, :dsid => dsid, :file => file, :content_type => content_type, :options => options
       str = file.respond_to?(:read) ? file.read : file
       file.rewind if file.respond_to?(:rewind)
-      client[datastream_url(pid, dsid, query_options)].put(str, rest_client_options)
+      ProfileParser.parse_datastream_profile(client[datastream_url(pid, dsid, query_options)].put(str, rest_client_options))
 
     rescue Exception => exception
         rescue_with_handler(exception) || raise

data/spec/lib/datastream_spec.rb

@@ -3,7 +3,9 @@ require 'stringio'
 
 describe Rubydora::Datastream do
   before do
-    @mock_repository = Rubydora::Fc3Service.new({})
+    @mock_api = Rubydora::Fc3Service.new({})
+    @mock_api.stub(:repository_profile, {"repositoryVersion" => "3.4"})
+    @mock_repository = Rubydora::Repository.new({}, @mock_api)
     @mock_object = double(Rubydora::DigitalObject)
     @mock_object.stub(:repository => @mock_repository, :pid => 'pid', :new_record? => false)
   end
@@ -25,7 +27,7 @@ describe Rubydora::Datastream do
     before do
       stub_response = double
       stub_response.stub(:read_body).and_yield("one1").and_yield('two2').and_yield('thre').and_yield('four')
-      @mock_repository.should_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_yield(stub_response) 
+      @mock_api.should_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_yield(stub_response) 
       prof = <<-XML
         <datastreamProfile>
           <dsSize>16</dsSize>
@@ -69,7 +71,7 @@ describe Rubydora::Datastream do
 
   describe "create" do
     before(:each) do
-      @mock_repository.stub(:datastream) { raise(RestClient::ResourceNotFound) }
+      @mock_api.stub(:datastream) { raise(RestClient::ResourceNotFound) }
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
     end
 
@@ -147,12 +149,12 @@ describe Rubydora::Datastream do
 
     it "should call the appropriate api on save" do
       @datastream.stub(:content => 'content')
-      @mock_repository.should_receive(:add_datastream).with(hash_including(:content => 'content', :pid => 'pid', :dsid => 'dsid', :controlGroup => 'M', :dsState => 'A'))
+      @mock_api.should_receive(:add_datastream).with(hash_including(:content => 'content', :pid => 'pid', :dsid => 'dsid', :controlGroup => 'M', :dsState => 'A'))
       @datastream.save
     end
 
     it "should be able to override defaults" do
-      @mock_repository.should_receive(:add_datastream).with(hash_including(:controlGroup => 'E'))
+      @mock_api.should_receive(:add_datastream).with(hash_including(:controlGroup => 'E'))
       @datastream.controlGroup = 'E'
       @datastream.dsLocation = "uri:asdf"
       @datastream.save
@@ -164,7 +166,7 @@ describe Rubydora::Datastream do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
     end
     it "should be true by default" do
-      @mock_repository.should_receive(:datastream).and_return <<-XML
+      @mock_api.should_receive(:datastream).and_return <<-XML
         <datastreamProfile>
         </datastreamProfile>
       XML
@@ -172,7 +174,7 @@ describe Rubydora::Datastream do
     end
 
     it "should be true when it's returned as true" do
-      @mock_repository.should_receive(:datastream).and_return <<-XML
+      @mock_api.should_receive(:datastream).and_return <<-XML
         <datastreamProfile>
           <dsVersionable>true</dsVersionable>
         </datastreamProfile>
@@ -181,7 +183,7 @@ describe Rubydora::Datastream do
     end
 
     it "should be false when it's returned as false" do
-      @mock_repository.should_receive(:datastream).and_return <<-XML
+      @mock_api.should_receive(:datastream).and_return <<-XML
         <datastreamProfile>
           <dsVersionable>false</dsVersionable>
         </datastreamProfile>
@@ -195,7 +197,7 @@ describe Rubydora::Datastream do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
     end
     it "should be nil when it hasn't been set" do
-      @mock_repository.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
+      @mock_api.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
         <datastreamProfile>
         </datastreamProfile>
       XML
@@ -203,7 +205,7 @@ describe Rubydora::Datastream do
     end
 
     it "should be true when it's returned as true" do
-      @mock_repository.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
+      @mock_api.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
         <datastreamProfile>
           <dsChecksumValid>true</dsChecksumValid>
         </datastreamProfile>
@@ -212,7 +214,7 @@ describe Rubydora::Datastream do
     end
 
     it "should be false when it's returned as false" do
-      @mock_repository.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
+      @mock_api.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
         <datastreamProfile>
           <dsChecksumValid>false</dsChecksumValid>
         </datastreamProfile>
@@ -224,7 +226,7 @@ describe Rubydora::Datastream do
   describe "retrieve" do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-      @mock_repository.stub(:datastream).and_return <<-XML
+      @mock_api.stub(:datastream).and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
           <dsLabel>label</dsLabel>
@@ -246,12 +248,12 @@ describe Rubydora::Datastream do
     end
 
     it "should mediate access to datastream contents" do
-      @mock_repository.should_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
+      @mock_api.should_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
       @datastream.content.should == "asdf"
     end
 
     it "should not load contents if they say not to" do
-      @mock_repository.should_not_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid'))
+      @mock_api.should_not_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid'))
       @datastream.local_or_remote_content(false).should be_nil
     end
 
@@ -273,7 +275,7 @@ describe Rubydora::Datastream do
     describe "for a managed datastream" do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-        @mock_repository.stub(:datastream).and_return <<-XML
+        @mock_api.stub(:datastream).and_return <<-XML
           <datastreamProfile>
             <dsLocation>some:uri</dsLocation>
             <dsLabel>label</dsLabel>
@@ -282,35 +284,35 @@ describe Rubydora::Datastream do
       end
 
       it "should not be changed after a read-only access" do
-        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
+        @mock_api.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
         @datastream.content
         @datastream.content_changed?.should == false
       end
       it "should not load content just to check and see if it was changed." do
-        @mock_repository.should_not_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid'))
+        @mock_api.should_not_receive(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid'))
         @datastream.content_changed?.should == false
       end
       it "should be changed when the new content is different than the old content" do
-        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
+        @mock_api.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('asdf') 
         @datastream.content = "test"
         @datastream.content_changed?.should == true 
       end
 
       it "should not be changed when the new content is the same as the existing content (when eager-loading is enabled)" do
-        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
+        @mock_api.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
         @datastream.eager_load_datastream_content = true
         @datastream.content = "test"
         @datastream.content_changed?.should  == false 
       end
 
       it "should  be changed when the new content is the same as the existing content (without eager loading, the default)" do
-        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
+        @mock_api.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
         @datastream.content = "test"
         @datastream.content_changed?.should  == true
       end
 
       it "should not be changed when the new content is the same as the existing content (and we have accessed #content previously)" do
-        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
+        @mock_api.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('test') 
         @datastream.content
         @datastream.content = "test"
         @datastream.content_changed?.should  == false 
@@ -319,7 +321,7 @@ describe Rubydora::Datastream do
 
     describe "for an inline datastream" do
       before(:each) do
-        @mock_repository.stub(:datastream).and_return <<-XML
+        @mock_api.stub(:datastream).and_return <<-XML
           <datastreamProfile>
             <dsLocation>some:uri</dsLocation>
             <dsLabel>label</dsLabel>
@@ -328,14 +330,14 @@ describe Rubydora::Datastream do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid', :controlGroup => 'X'
       end
       it "should not be changed when the new content is the same as the existing content (when eager-loading is enabled)" do
-        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('<xml>test</xml>') 
+        @mock_api.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('<xml>test</xml>') 
         @datastream.eager_load_datastream_content = true
         @datastream.content = "<xml>test</xml>"
         @datastream.content_changed?.should  == false 
       end
 
       it "should  be changed when the new content is the same as the existing content (without eager loading, the default)" do
-        @mock_repository.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('<xml>test</xml>') 
+        @mock_api.stub(:datastream_dissemination).with(hash_including(:pid => 'pid', :dsid => 'dsid')).and_return('<xml>test</xml>') 
         @datastream.content = "<xml>test</xml>"
         @datastream.content_changed?.should  == true
       end
@@ -383,7 +385,7 @@ describe Rubydora::Datastream do
   describe "update" do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-      @mock_repository.stub(:datastream).and_return <<-XML
+      @mock_api.should_receive(:datastream).once.and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
           <dsLabel>label</dsLabel>
@@ -406,7 +408,7 @@ describe Rubydora::Datastream do
       end
 
       it "should call the appropriate api with any dirty attributes" do
-        @mock_repository.should_receive(:modify_datastream).with(hash_including(:dsLabel => "New Label"))
+        @mock_api.should_receive(:modify_datastream).with(hash_including(:dsLabel => "New Label"))
         @datastream.dsLabel = "New Label"
         @datastream.save
       end
@@ -414,9 +416,10 @@ describe Rubydora::Datastream do
 
     describe "update when content is changed" do
       it "should update the datastream when the content is changed" do
-        @mock_repository.should_receive(:modify_datastream).with(hash_including(:content => 'test'))
+        @mock_api.should_receive(:modify_datastream).with(hash_including(:content => 'test')).and_return({'dsLocation' => 'some:uri', 'dsLabel' => 'label', 'dsSize' => 4})
         @datastream.content = "test"
         @datastream.save
+        @datastream.dsSize.should == 4
       end
 
       it "should be marked as changed when the content is updated" do
@@ -432,7 +435,7 @@ describe Rubydora::Datastream do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
       @datastream.stub :content_changed? => false
-      @mock_repository.stub(:datastream).and_return <<-XML
+      @mock_api.stub(:datastream).and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
           <dsLabel>label</dsLabel>
@@ -446,13 +449,13 @@ describe Rubydora::Datastream do
     end
 
     it "before saving an object" do
-      @mock_repository.should_receive(:modify_datastream)
+      @mock_api.should_receive(:modify_datastream)
       @datastream.should_receive(:check_if_read_only)
       @datastream.save
     end
 
     it "before deleting an object" do
-      @mock_repository.should_receive(:purge_datastream)
+      @mock_api.should_receive(:purge_datastream)
       @mock_object.should_receive(:datastreams).and_return([])
       @datastream.should_receive(:check_if_read_only)
       @datastream.delete
@@ -464,7 +467,7 @@ describe Rubydora::Datastream do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
         @datastream.stub(:new? => false)
-        @mock_repository.stub(:datastream_versions).and_return <<-XML
+        @mock_api.stub(:datastream_versions).and_return <<-XML
         <datastreamHistory>
           <datastreamProfile>
             <dsVersionID>dsid.1</dsVersionID>
@@ -487,13 +490,13 @@ describe Rubydora::Datastream do
       end
 
       it "should lookup content of datastream using the asOfDateTime parameter" do
-        @mock_repository.should_receive(:datastream_dissemination).with(hash_including(:asOfDateTime => '2008-08-05T01:30:05.012Z'))
+        @mock_api.should_receive(:datastream_dissemination).with(hash_including(:asOfDateTime => '2008-08-05T01:30:05.012Z'))
         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
+        @mock_api.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>
@@ -503,7 +506,7 @@ describe Rubydora::Datastream do
       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
+        @mock_api.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>
@@ -513,7 +516,7 @@ describe Rubydora::Datastream do
       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
+        @mock_api.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>
@@ -525,7 +528,7 @@ describe Rubydora::Datastream do
     describe "when no versions are found" do
       before(:each) do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-        @mock_repository.stub(:datastream_versions).and_return nil
+        @mock_api.stub(:datastream_versions).and_return nil
       end
 
       it "should have an emptylist of previous versions" do
@@ -543,7 +546,7 @@ describe Rubydora::Datastream do
 
   describe "datastream attributes" do
     before do
-      @mock_repository.stub(:datastream => <<-XML
+      @mock_api.stub(:datastream => <<-XML
         <datastreamProfile>
         <anyProfileValue />
         </datastreamProfile>
@@ -587,10 +590,11 @@ describe Rubydora::Datastream do
         end
 
         it "should appear in the save request" do 
-          @mock_repository.should_receive(:modify_datastream).with(hash_including(method.to_sym => 'new_value'))
+          @mock_api.should_receive(:modify_datastream).with(hash_including(method.to_sym => 'new_value'))
           subject.send("#{method}=", 'new_value')
           subject.save
-        end
+          expect(subject).to_not be_changed, "#{subject.changes.inspect}"
+       end
       end
     end
 
@@ -633,7 +637,7 @@ describe Rubydora::Datastream do
       end
 
       it "should appear in the save request" do
-          @mock_repository.should_receive(:modify_datastream).with(hash_including(method.to_sym => 'http://example.com'))
+          @mock_api.should_receive(:modify_datastream).with(hash_including(method.to_sym => 'http://example.com'))
           subject.stub(:content_changed? => false)
           subject.dsLocation = 'http://example.com'
           subject.save
@@ -741,7 +745,7 @@ describe Rubydora::Datastream do
         @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
       end
       it "should accept a validateChecksum argument" do
-        @mock_repository.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
+        @mock_api.should_receive(:datastream).with(hash_including(:validateChecksum => true)).and_return <<-XML
           <datastreamProfile>
             <dsChecksumValid>true</dsChecksumValid>
           </datastreamProfile>
@@ -749,13 +753,13 @@ describe Rubydora::Datastream do
         @datastream.profile(:validateChecksum=>true).should == {'dsChecksumValid' =>true}
       end
       it "should reraise Unauthorized errors" do
-        @mock_repository.should_receive(:datastream).and_raise(RestClient::Unauthorized)
+        @mock_api.should_receive(:datastream).and_raise(RestClient::Unauthorized)
         lambda{@datastream.profile}.should raise_error(RestClient::Unauthorized)
       end
 
       describe "once it has a profile" do
         it "should use the profile from cache" do
-          @mock_repository.should_receive(:datastream).once.and_return <<-XML
+          @mock_api.should_receive(:datastream).once.and_return <<-XML
             <datastreamProfile>
               <dsChecksumValid>true</dsChecksumValid>
             </datastreamProfile>
@@ -765,12 +769,12 @@ describe Rubydora::Datastream do
           @datastream.profile().should == {'dsChecksumValid' =>true}
         end
         it "should re-fetch and replace the profile when validateChecksum is passed in, and there is no dsChecksumValid in the existing profile" do
-          @mock_repository.should_receive(:datastream).once.and_return <<-XML
+          @mock_api.should_receive(:datastream).once.and_return <<-XML
             <datastreamProfile>
               <dsLabel>The description of the content</dsLabel>
             </datastreamProfile>
           XML
-          @mock_repository.should_receive(:datastream).with(hash_including(:validateChecksum => true)).once.and_return <<-XML
+          @mock_api.should_receive(:datastream).with(hash_including(:validateChecksum => true)).once.and_return <<-XML
             <datastreamProfile>
               <dsLabel>The description of the content</dsLabel>
               <dsChecksumValid>true</dsChecksumValid>
@@ -822,5 +826,16 @@ describe Rubydora::Datastream do
       end
     end
   end
+
+  describe "url" do
+    before(:each) do
+      @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+    end
+
+    it "should call appropriate repository methods" do
+      @mock_api.should_receive(:datastream_url).once.and_return("http://example.org/foo")
+      @datastream.url.should == "http://example.org/foo/content"
+    end
+  end
 end