persistent_record 0.1.4 → 0.2.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjM3MzQ2MDk2MmY2NTAwMDYzZjQxMWI3YzkwYWIwYTcwZWY2MDA2Yg==
-  data.tar.gz: !binary |-
-    Nzg2MjM3YTY0MzhjMzAyNzdkNWU1YWZiZjFmOWE3Yjc0NzZjNjhlMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    M2NhOWVkMGNmNzJjMTJjMDVlMTFlMGIwMzUyNGEzMWUwZDZjMzlmNjg2OGQx
-    NzA3ZjY2ZjI1MGZkMmMxYTlhYTc1NDA3ZDA2YzU5NDg0NTEzMzdiYzBiZTY0
-    YmM1ODc4ZDhmNDIxODYzNWE0MjJjYWRiMDk4MjRmMDkwMDQzN2Q=
-  data.tar.gz: !binary |-
-    YjUyYzVkMmNjNDc5M2RlNmZjMDkxZGIwY2I4Y2YyZjAyMzZlYmQ3Mjg1OThm
-    NmFhOGQ3Yjc2NTQwZjgyMjY1MDM2OWEwNTI5MDkwZWQ3ZjhiZjE4ZDk4NTZm
-    MWI5NWQ4ZjVhMzI2MTUwNTY3ODBhMzVjYWNhNDRkNmYwYThkZTE=
+SHA1:
+  metadata.gz: 03c628082ab95e937cbd6c019a4aea9d955fd691
+  data.tar.gz: d90074909b0ecc7ae829b412399a62e33c656ef5
+SHA512:
+  metadata.gz: 9e072f141558dc266742681781377612fcc555b3b3f259a057976ad5554b2ff3a5ad33eb4a4e87f82a638751bc71148d7a16ee20e6651193993d474ee131b6bf
+  data.tar.gz: 80e662d88496637c335616f8a4749d62f1192fbcc51bc166c617446dfd1bafbf789516937028b2d8b3f7767785a24e9d43cc6c45fa7c8463460a1cb5e8f891d4

data/README.md

@@ -13,5 +13,10 @@ Migrate your models by adding a "deleted_at" timestamp, `rails generate migratio
 	class YourModel < ActiveRecord::Base
 
 		acts_as_persistent
-	
-	end
+
+	end
+
+
+## Deprecation Warning
+
+* `zap!` is now an alias for `force_destroy!`, will be removed in 1.0.

data/lib/persistent_record/version.rb

@@ -1,3 +1,3 @@
 module PersistentRecord
-  VERSION = '0.1.4'
+  VERSION = '0.2.2'
 end

data/lib/persistent_record.rb

@@ -1,8 +1,6 @@
 require "persistent_record/version"
 require 'active_record' unless defined? ActiveRecord
 
-
-
 module PersistentRecord
 
   def self.included(source)
@@ -28,9 +26,6 @@ module PersistentRecord
       with_discarded.where.not(record_deleted_at_column => nil)
     end
 
-    alias :discarded :with_discarded
-    alias :discarded! :only_discarded
-
     def restore(id, options = {})
       if id.is_a?(Array)
         id.map { |one_id| restore(one_id, options) }
@@ -42,25 +37,20 @@ module PersistentRecord
   end
 
   module Callbacks
-
     def self.extended(source)
-
-      source.define_callbacks :restore
-
-      source.define_singleton_method("before_restore") do |*args, &block|
-        set_callback(:restore, :before, *args, &block)
-      end
-
-      source.define_singleton_method("around_restore") do |*args, &block|
-        set_callback(:restore, :around, *args, &block)
-      end
-
-      source.define_singleton_method("after_restore") do |*args, &block|
-        set_callback(:restore, :after, *args, &block)
+      [:restore, :force_destroy].each do |callback_name|
+        source.define_callbacks callback_name
+        source.define_singleton_method("before_#{callback_name}") do |*args, &block|
+          set_callback(callback_name, :before, *args, &block)
+        end
+        source.define_singleton_method("around_#{callback_name}") do |*args, &block|
+          set_callback(callback_name, :around, *args, &block)
+        end
+        source.define_singleton_method("after_#{callback_name}") do |*args, &block|
+          set_callback(callback_name, :after, *args, &block)
+        end
       end
-
     end
-
   end
 
   def destroy
@@ -94,6 +84,24 @@ module PersistentRecord
     !!send(record_deleted_at_column)
   end
 
+  def force_destroy!
+    transaction do
+      run_callbacks(:force_destroy) do
+        dependent_reflections = self.class.reflections.select do |name, reflection|
+          reflection.options[:dependent] == :destroy
+        end
+        if dependent_reflections.any?
+          dependent_reflections.each do |name|
+            associated_records = self.send(name)
+            associated_records = associated_records.with_discarded if associated_records.respond_to?(:with_discarded)
+            associated_records.each(&:force_destroy!)
+          end
+        end
+        default_destroy
+      end
+    end
+  end
+
   private
 
   def touch_record_deleted_at_column(with_transaction = false)
@@ -107,11 +115,9 @@ module PersistentRecord
   end
 
   def restore_associated_records
-
     destroyed_associations = self.class.reflect_on_all_associations.select do |association|
       association.options[:dependent] == :destroy
     end
-
     destroyed_associations.each do |association|
       association_data = send(association.name)
       unless association_data.nil?
@@ -124,7 +130,6 @@ module PersistentRecord
         end
       end
     end
-
   end
 
 end
@@ -133,22 +138,7 @@ class ActiveRecord::Base
 
   def self.acts_as_persistent(options = {})
 
-    alias :destroy! :destroy
-    alias :delete! :delete
-
-    def zap!
-      dependent_reflections = self.reflections.select do |name, reflection|
-        reflection.options[:dependent] == :destroy
-      end
-      if dependent_reflections.any?
-        dependent_reflections.each do |name|
-          associated_records = self.send(name)
-          associated_records = associated_records.with_discarded if associated_records.respond_to?(:with_discarded)
-          associated_records.each(&:zap!)
-        end
-      end
-      destroy!
-    end
+    alias_method :default_destroy, :destroy
 
     include PersistentRecord
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: persistent_record
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.2
 platform: ruby
 authors:
 - Robin Grass
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Introduces soft deletions for ActiveRecord.
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - DOCUMENTATION.md
 - Gemfile
 - LICENSE.txt
@@ -78,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Introduces soft deletions for ActiveRecord.