Merge pull request #380 from psu-stewardship/frozen

Adding check to be certain the owner has not already been deleted before...

lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -58,7 +58,7 @@ def count_records
         end
 
         def delete_records(records, method)
-          records.each do |r| 
+          records.each do |r|
             @owner.remove_relationship(@reflection.options[:property], r)
 
             if (@reflection.options[:inverse_of])
@@ -71,7 +71,7 @@ def delete_records(records, method)
               r.save
             end
           end
-          @owner.save!
+          @owner.save! unless @owner.new_record?
         end
 
     end

spec/unit/has_and_belongs_to_many_collection_spec.rb

@@ -63,4 +63,34 @@ class Page < ActiveFedora::Base
     ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
     ac.find_target
   end
+
+  context "class with association" do
+    before do
+      class Collection < ActiveFedora::Base
+        has_and_belongs_to_many :members, :property => :has_collection_member, :class_name => "ActiveFedora::Base" , :after_remove => :remove_member
+        def remove_member (m)
+        end
+      end
+
+      class Thing < ActiveFedora::Base
+        has_many :collections, property: :has_collection_member, :class_name => "ActiveFedora::Base"
+      end
+    end
+
+    after do
+      Collection.destroy_all
+      Thing.destroy_all
+      Object.send(:remove_const, :Collection)
+      Object.send(:remove_const, :Thing)
+    end
+
+    let(:thing) {Thing.create()}
+    let(:collection) {Collection.create().tap {|c| c.members << thing}}
+
+    it "should call destroy" do
+      expect(collection.destroy).to_not raise_error
+    end
+
+  end
+
 end