active-fedora 6.6.0.rc2 → 6.6.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e34459d1ad716b37cd7174ec1312abe1ca33cd87
-  data.tar.gz: 85f71b569ee2010337e1733092c982b4b4021809
+  metadata.gz: b35e64f462528b26276ef2a730c8f03b80a24658
+  data.tar.gz: 616b6f3a7ac2297f197bf6792bb76d0055aaa377
 SHA512:
-  metadata.gz: 535fc44e507b82bfcd884033bf95e40df1207b484540eb952c7f1a7163545819a4f6afcfc47636ca6f98865c59ee6441517031d22f25d7fb552a0094af7f8643
-  data.tar.gz: d34bcfcd2d6326a34726337ab744ee284c4ae8dbce9750a9cf1be370ca16a0e7793dc80aef87aecd687ce1fba9e326ef3a1ddb09197a7766d55cd434f0674a1b
+  metadata.gz: de1f89551de40f7d43ad138efc174a5428f03561f2ddcf1b475dfdae96abf4e55f2bb6e510f091c7567cb33162d02c5a674ad2540b4bf97a693077a4fbfde68e
+  data.tar.gz: cf48aec03e4bb5502823a1537128aa827c503bc06f4a2d945275d099d6ff40dac82c0257abe1a16a191d2b4876054d1269e61018e6cdd4f9624843bdd4e8232d

data/History.txt

@@ -1,10 +1,11 @@
-v6.6.0 (rc2)
-2013-10-02: Cast relationship results if class is ActiveFedora::Base [Justin
+v6.6.0 (rc3)
+Explicitly set cast to false on reload to avoid deprecation warnings [Justin Coyne]
+Cast relationship results if class is ActiveFedora::Base [Justin
 Coyne]
+* Need to put changes for rc1 here* 
 
 v6.5.1 (2013-09-10)
 
-
 ActiveFedora::Predicates.set_predicates allows you to set predicates
 without wiping out existing configs [Matt Zumwalt]
 

data/lib/active_fedora/base.rb

@@ -97,7 +97,7 @@ module ActiveFedora
     # Reloads the object from Fedora.
     def reload
       clear_association_cache
-      init_with(self.class.find(self.pid).inner_object)
+      init_with(self.class.find(self.pid, cast: false).inner_object)
     end
 
     # Initialize an empty model object and set the +inner_obj+

data/lib/active_fedora/relation.rb

@@ -230,7 +230,13 @@ module ActiveFedora
       if conditions
         where(conditions).destroy_all
       else
-        to_a.each {|object| object.destroy }.tap { reset }.size
+        to_a.each {|object| 
+          begin
+            object.destroy
+          rescue ActiveFedora::ObjectNotFoundError
+            logger.error "When trying to destroy #{object.pid}, encountered an ObjectNotFoundError. Solr may be out of sync with Fedora"
+          end
+        }.tap { reset }.size
       end
     end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.6.0.rc2"
+  VERSION = "6.6.0.rc3"
 end

data/spec/integration/delete_all_spec.rb

@@ -20,9 +20,10 @@ describe ActiveFedora::Base do
     Object.send(:remove_const, :SpecModel)
   end
 
+  let!(:model1) { SpecModel::Basic.create! }
+  let!(:model2) { SpecModel::Basic.create! }
+
   before do
-    SpecModel::Basic.create!
-    SpecModel::Basic.create!
     SpecModel::Basic.callback_counter = 0
   end
 
@@ -34,6 +35,19 @@ describe ActiveFedora::Base do
       SpecModel::Basic.callback_counter.should == 2
     end
 
+    describe "when a model is missing" do
+      let(:model3) { SpecModel::Basic.create! }
+      after { model3.delete }
+      it "should be able to skip a missing model" do 
+        model1.should_receive(:destroy).and_call_original
+        model2.should_receive(:destroy).and_call_original
+        model3.should_receive(:destroy).and_raise(ActiveFedora::ObjectNotFoundError)
+        ActiveFedora::Relation.any_instance.should_receive(:to_a).and_return([model1, model3, model2])
+        ActiveFedora::Relation.logger.should_receive(:error).with("When trying to destroy #{model3.pid}, encountered an ObjectNotFoundError. Solr may be out of sync with Fedora")
+        SpecModel::Basic.destroy_all
+        SpecModel::Basic.count.should == 1 
+      end
+    end
   end
 
   describe ".delete_all" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.6.0.rc2
+  version: 6.6.0.rc3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr