Merge pull request #73 from barmintor/rubydora-72

rubydora-72: Make use of ds profiles on create and update

Author: jcoyne

lib/rubydora/datastream.rb

@@ -290,8 +290,9 @@ def current_version?
     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 @@ def save
       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

lib/rubydora/digital_object.rb

@@ -185,12 +185,13 @@ def fetch dsid
     # 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)
@@ -199,13 +200,16 @@ def save
           p = to_api_params
           unless p.empty?
             mod_time = repository.modify_object p.merge(:pid => pid)
-            self.lastModifiedDate = mod_time
             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
 
@@ -272,5 +276,16 @@ def attribute_will_change! *args
       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

lib/rubydora/profile_parser.rb

@@ -79,6 +79,12 @@ def self.canonicalize_date_string(input)
         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

lib/rubydora/rest_api_client.rb

@@ -340,7 +340,7 @@ def add_datastream options = {}
       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 @@ def modify_datastream options = {}
       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

spec/lib/datastream_spec.rb

@@ -385,7 +385,7 @@
   describe "update" do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
-      @mock_api.stub(:datastream).and_return <<-XML
+      @mock_api.should_receive(:datastream).once.and_return <<-XML
         <datastreamProfile>
           <dsLocation>some:uri</dsLocation>
           <dsLabel>label</dsLabel>
@@ -416,9 +416,10 @@
 
     describe "update when content is changed" do
       it "should update the datastream when the content is changed" do
-        @mock_api.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

spec/lib/digital_object_spec.rb

@@ -243,17 +243,17 @@ class MyCustomDatastreamClass < Rubydora::Datastream; end
     describe "saving an object's datastreams" do
       before do
         @new_ds = double(Rubydora::Datastream)
-        @new_ds.stub(:new? => true, :changed? => true, :content_changed? => true, :content => 'XXX')
+        @new_ds.stub(:new? => true, :changed? => true, :content_changed? => true, :content => 'XXX', :dsCreateDate => '12345')
         @new_empty_ds = double(Rubydora::Datastream)
-        @new_empty_ds.stub(:new? => true, :changed? => false, :content_changed? => false, :content => nil)
+        @new_empty_ds.stub(:new? => true, :changed? => false, :content_changed? => false, :content => nil, :dsCreateDate => '12345')
         @existing_ds = double(Rubydora::Datastream)
-        @existing_ds.stub(:new? => false, :changed? => false, :content_changed? => false, :content => 'YYY')
+        @existing_ds.stub(:new? => false, :changed? => false, :content_changed? => false, :content => 'YYY', :dsCreateDate => '12345')
         @changed_attr_ds = double(Rubydora::Datastream)
-        @changed_attr_ds.stub(:new? => false, :changed? => true, :content_changed? => false, :content => 'YYY')
+        @changed_attr_ds.stub(:new? => false, :changed? => true, :content_changed? => false, :content => 'YYY', :dsCreateDate => '12345')
         @changed_ds = double(Rubydora::Datastream)
-        @changed_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => 'ZZZ')
+        @changed_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => 'ZZZ', :dsCreateDate => '2012-01-02:05:15:45.100Z')
         @changed_empty_ds = double(Rubydora::Datastream)
-        @changed_empty_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => nil)
+        @changed_empty_ds.stub(:new? => false, :changed? => true, :content_changed? => true, :content => nil, :dsCreateDate => '12345')
 
       end
       it "should save a new datastream with content" do
@@ -266,6 +266,8 @@ class MyCustomDatastreamClass < Rubydora::Datastream; end
         @object.stub(:datastreams) { { :changed_ds => @changed_ds } }
         @changed_ds.should_receive(:save)
         @object.save
+        # object date should be canonicalized and updated
+        @object.lastModifiedDate.should == '2012-01-02:05:15:45.1Z'
       end
 
       it "should save a datastream whose attributes have changed" do

spec/lib/integration_test_spec.rb

@@ -175,6 +175,18 @@
     ds.content
   end
 
+  it "should cache object's lastModifiedDate from ds changes" do
+    @repository.ping.should == true
+    obj = @repository.find_or_initialize('test:1')
+    obj.save
+    obj.label = "abc"
+    obj.datastreams["my_ds"].content = "XXX"
+    obj.save
+    obj.label = "123"
+    obj.save
+  end
+
+
   describe "with transactions" do
     it "should work on ingest" do
        @repository.find('transactions:1').delete rescue nil