soft_deletion 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7136f033c5ffee183ad6ef6951cc6ebfa3293a51
-  data.tar.gz: 7f909e3a9392a86672828f7eca998302d341043c
+  metadata.gz: a42edc9ec2d5a09180a94a620629656e4acdb431
+  data.tar.gz: 6413eb851ef605123500e28ebd4940bed55ecf67
 SHA512:
-  metadata.gz: e2c5be8c5f2f13716fbaddb33cc5b9b5436672b91309df44aafff9066ad0850b0f376cda1fdeb85267ca2151bf4d48293313a38381ddbd0bb60c04bf48390ecf
-  data.tar.gz: 40b2fe532e615c6f5333cc181b93c5b833123af1ffae8441eecc07c97b4936e317974eab1c450dc5d746c9ac5ac9587aea2805589efa1044bf229452025e63c3
+  metadata.gz: 61f4680b7a6c5d578afc731721c23b0949be4060de0aba48ccda635eca5ac5969abe6cd6fb9a8bf63774c967d79f9832eea6d5c3f206aad9061fff41f68345a0
+  data.tar.gz: 8d907425bb0351c26e569fbf1d70f4d0e25959f1a851638bae7d64442ee8d9dfb8210287cddf065a78639aef67acd12daa73949237b260dc749125ef2fcdef4d

data/Readme.md

@@ -15,7 +15,7 @@ Usage
 require 'soft_deletion'
 
 class User < ActiveRecord::Base
-  has_soft_deletion :default_scope => true
+  has_soft_deletion default_scope: true
 
   before_soft_delete :validate_deletability # soft_delete stops if this returns false
   after_soft_delete :send_deletion_emails

data/lib/soft_deletion/core.rb

@@ -18,10 +18,11 @@ module SoftDeletion
       end
 
       def with_deleted
-        method = (ActiveRecord::VERSION::MAJOR >= 4 ? :unscoped : :with_exclusive_scope)
-        send(method) do
-          yield self
-        end
+        key = :"soft_deletion_with_deleted_#{name}"
+        Thread.current[key] = true
+        yield
+      ensure
+        Thread.current[key] = nil
       end
 
       def mark_as_soft_deleted_sql

data/lib/soft_deletion/setup.rb

@@ -15,12 +15,17 @@ module SoftDeletion
       #
       # It will check if the column "deleted_at" exist before applying default scope
       def has_soft_deletion(options={})
-        default_options = {:default_scope => false}
-
         include SoftDeletion::Core
 
-        options = default_options.merge(options)
-        default_scope { where(:deleted_at => nil) } if options[:default_scope]
+        if options[:default_scope]
+          default_scope do
+            if Thread.current[:"soft_deletion_with_deleted_#{name}"]
+              where(nil)
+            else
+              where(deleted_at: nil)
+            end
+          end
+        end
       end
     end
   end

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Zendesk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: single_cov
+  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: 
 email: michael@grosser.it
 executables: []
@@ -146,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Explicit soft deletion for ActiveRecord via deleted_at and default scope.