active-fedora 6.4.1 → 6.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 967a4215aac7cba00431147cd02fd5e9f96b04f1
-  data.tar.gz: 3eb487a369aa83bfe1d9de8f1d016a5950ffa5a7
+  metadata.gz: 3121b41531277d5c0351a7e657d063fb628ba733
+  data.tar.gz: 48e5886abd01bc9afb4329004c8293401a89708d
 SHA512:
-  metadata.gz: 9fd89f5819540cb4cd994f4009151d089b5d45f4502a7a0ee1480c4e6eadf2a6386c83e0ae95ea182e9054f324a8b20ee011a34d6bfec987f07459048911cdae
-  data.tar.gz: 43f479f7be5b7a683eb748ac06e03150c897bc1b0ac9d1ea650a5b9c158fef9039aeeb1582b707a2136ac6c5b218aa011812e6492aa4b75e8f9e34078b75cb14
+  metadata.gz: 3757c8465f920bf90ce99c8319d58137c335929c8d5b115b157491e2f86a5df1a7686675f2e5c516ab434e28e55fa309afd0b0f4db02f58be10baf01684769e7
+  data.tar.gz: 6e3b6a10c6bc56d075df2779e2cc18b3574dd254e18df6fda760c8478177cf191281e6dad210f74cc4cb52dcc522756da66a43cff215d6d1eb265965bb41c14b

data/lib/active_fedora/callbacks.rb

@@ -242,7 +242,7 @@ module ActiveFedora
       run_callbacks(:create) { super }
     end
 
-    def update(*) #:nodoc:
+    def update_record(*) #:nodoc:
       run_callbacks(:update) { super }
     end
   end

data/lib/active_fedora/persistence.rb

@@ -11,7 +11,7 @@ module ActiveFedora
         result = create
         update_index if create_needs_index?
       else
-        result = update
+        result = update_record
         update_index if update_needs_index?
       end
       return result
@@ -27,11 +27,14 @@ module ActiveFedora
       add_relationship(:has_model, self.class.to_class_uri)
     end
 
-    def update_attributes(properties)
-      self.attributes=properties
+    # Pushes the object and all of its new or dirty datastreams into Fedora
+    def update(attributes)
+      self.attributes=attributes
       save
     end
 
+    alias update_attributes update
+    
     # Refreshes the object's info from Fedora
     # Note: Currently just registers any new datastreams that have appeared in fedora
     def refresh
@@ -138,16 +141,15 @@ module ActiveFedora
       persist
     end
 
+    def update_record
+      persist
+    end
+
     # replace the unsaved digital object with a saved digital object
     def assign_pid
       @inner_object = @inner_object.save 
     end
     
-    # Pushes the object and all of its new or dirty datastreams into Fedora
-    def update
-      persist
-    end
-
     def persist
       result = @inner_object.save
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.4.1"
+  VERSION = "6.4.2"
 end

data/spec/unit/base_spec.rb

@@ -339,7 +339,7 @@ describe ActiveFedora::Base do
 
       it "should update an existing record" do
         @test_object.stub(:new_record? => false)
-        @test_object.should_receive(:update)
+        @test_object.should_receive(:update_record)
         @test_object.should_receive(:update_index)
         @test_object.save     
       end
@@ -519,7 +519,6 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
     end
     
     describe "update_attributes" do
-
       it "should set the attributes and save" do
         m = FooHistory.new
         att= {"fubar"=> '1234', "baz" =>'stuff'}
@@ -530,6 +529,18 @@ pending "This is broken, and deprecated.  I don't want to fix it - jcoyne"
         m.update_attributes(att)
       end
     end
+
+    describe "update" do
+      it "should set the attributes and save" do
+        m = FooHistory.new
+        att= {"fubar"=> '1234', "baz" =>'stuff'}
+        
+        m.should_receive(:fubar=).with('1234')
+        m.should_receive(:baz=).with('stuff')
+        m.should_receive(:save)
+        m.update(att)
+      end
+    end
     
     describe "update_indexed_attributes" do
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.4.2
 platform: ruby
 authors:
 - Matt Zumwalt