mongoid-archivable 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971dca70add99ed3cc798f9e4ed83daaccc69aaf
-  data.tar.gz: 043e3d3d71ad79494169137ad2920a17efed9111
+  metadata.gz: ddee3e043b9d4b417645ca3bc5ee3afc4372b4f2
+  data.tar.gz: 82addf9eb775e8218bdb7ef90271de14ebd6e3c7
 SHA512:
-  metadata.gz: 4aad631225297e7e89130f4a919370935e7250c2d8ccf611203505323e274b2aa84f850bb521f6185e5e3244844cfa1cb446b620b939c1007cc374ef3a774fac
-  data.tar.gz: aae341b6b79edcad33457008ce696b80dd870ae473d90bdb2260ddc935b4a3cbf15d434d14f76bdf2b432e9ad61e0a1881908f73e752683c0e23949afba559b7
+  metadata.gz: 2b0dec185d816f6c7e344cb8d833e782037842da01d7fdcdd4d90054d9c0497d9fe0b97661e94a00bbb9a8382c454193abb9aab72114f3afd02e6b0a4a4daecf
+  data.tar.gz: 577e54c3a9cab48f1bbfa0e95dae6ddcce202ebefbd3dea4d4577537ca87e0906a24830f90faa8139885bb0ac406a0e6be3cf2c91d1a376fc009fb9a57a37ea7

data/lib/mongoid/archivable.rb

@@ -8,12 +8,26 @@ module Mongoid
     module Restoration
       # Restores the archived document to its former glory.
       def restore
-        document = self.class.to_s.gsub(/::Archive\z/, '') # Turns User::Archive into User.
+        original_document.save
+        original_document
+      end
 
-        self.class.const_get(document).create(attributes.except("_id", "original_id", "archived_at")) do |doc|
+      def original_document
+        self.original_class_name.constantize.new(attributes.except("_id", "original_id", "original_type", "archived_at")) do |doc|
           doc.id = self.original_id
         end
       end
+
+      # first, try to retrieve the original_class from the stored :original_type
+      # since previous versions of this gem did not use this field, fall back
+      # to previous method -- removing the '::Archive' from archive class name
+      def original_class_name
+        if self.respond_to?(:original_type) && self.original_type.present? # gem version >= 1.3.0, stored as a field.
+          self.original_type
+        else
+          self.class.to_s.gsub(/::Archive\z/, '') # gem version < 1.3.0, turns "User::Archive" into "User".
+        end
+      end
     end
 
     included do
@@ -24,6 +38,7 @@ module Mongoid
         include Mongoid::Archivable::Restoration
         field :archived_at, type: Time
         field :original_id, type: String
+        field :original_type, type: String
       end
 
       before_destroy :archive
@@ -32,8 +47,9 @@ module Mongoid
     private
 
     def archive
-      self.class.const_get("Archive").create(attributes.except("_id")) do |doc|
+      self.class.const_get("Archive").create(attributes.except("_id", "_type")) do |doc|
         doc.original_id = self.id
+        doc.original_type = self.class.to_s
         doc.archived_at = Time.now.utc
       end
     end

data/lib/mongoid/archivable/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Archivable
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-archivable
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Joost Baaij
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid