Rename Moped::BSON::ObjectID to BSON::ObjectId and Add restore callbacks.

lib/mongoid/paranoia.rb

@@ -23,6 +23,7 @@ module Paranoia
 
       default_scope where(deleted_at: nil)
       scope :deleted, ne(deleted_at: nil)
+      define_model_callbacks :restore
     end
 
     # Delete the paranoid +Document+ from the database completely. This will
@@ -96,11 +97,13 @@ def destroyed?
     #
     # @since 1.0.0
     def restore
-      paranoid_collection.find(atomic_selector).
-        update({ "$unset" => { paranoid_field => true }})
-      attributes.delete("deleted_at")
-      @destroyed = false
-      true
+      run_callbacks(:restore) do
+        paranoid_collection.find(atomic_selector).
+          update({ "$unset" => { paranoid_field => true }})
+        attributes.delete("deleted_at")
+        @destroyed = false
+        true
+      end
     end
 
     # Returns a string representing the documents's key suitable for use in URLs.

spec/app/models/paranoid_post.rb

@@ -4,7 +4,8 @@ class ParanoidPost
 
   field :title, type: String
 
-  attr_accessor :after_destroy_called, :before_destroy_called
+  attr_accessor :after_destroy_called, :before_destroy_called,
+    :after_restore_called, :before_restore_called
 
   belongs_to :person
 
@@ -16,6 +17,8 @@ class ParanoidPost
 
   before_destroy :before_destroy_stub
   after_destroy :after_destroy_stub
+  before_restore :before_restore_stub
+  after_restore :after_restore_stub
 
   def before_destroy_stub
     self.before_destroy_called = true
@@ -25,6 +28,14 @@ def after_destroy_stub
     self.after_destroy_called = true
   end
 
+  def before_restore_stub
+    self.before_restore_called = true
+  end
+
+  def after_restore_stub
+    self.after_restore_called = true
+  end
+
   class << self
     def old
       where(created_at: { "$lt" => 30.days.ago })

spec/app/models/person.rb

@@ -22,7 +22,7 @@ class Person
   field :owner_id, type: Integer
   field :security_code
   field :reading, type: Object
-  field :bson_id, type: Moped::BSON::ObjectId
+  field :bson_id, type: BSON::ObjectId
   field :pattern, type: Regexp
   field :override_me, type: Integer
   field :t, as: :test, type: String

spec/mongoid/paranoia_spec.rb

@@ -623,6 +623,14 @@
       it "marks document again as persisted" do
         post.persisted?.should be_true
       end
+
+      it "executes the before restore callbacks" do
+        post.before_restore_called.should be_true
+      end
+
+      it "executes the after restore callbacks" do
+        post.after_restore_called.should be_true
+      end
     end
 
     context "when the document is embedded" do