soft_deletion 0.8.0 → 0.8.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a42edc9ec2d5a09180a94a620629656e4acdb431
4
- data.tar.gz: 6413eb851ef605123500e28ebd4940bed55ecf67
3
+ metadata.gz: 9c38ff4e3d7bdbc70186a1c89328478f1c1ddb45
4
+ data.tar.gz: ae7ca5ac0261da84b8f6be925a906b5e75f5bc6e
5
5
  SHA512:
6
- metadata.gz: 61f4680b7a6c5d578afc731721c23b0949be4060de0aba48ccda635eca5ac5969abe6cd6fb9a8bf63774c967d79f9832eea6d5c3f206aad9061fff41f68345a0
7
- data.tar.gz: 8d907425bb0351c26e569fbf1d70f4d0e25959f1a851638bae7d64442ee8d9dfb8210287cddf065a78639aef67acd12daa73949237b260dc749125ef2fcdef4d
6
+ metadata.gz: 143ddcf36fd45613db6588d50f81e76c4fac780dd6bcc65180a2b550c60497b80ea56dc0941d0e5e5759093fdd6b60e68e14624889a5afe58d95bf2ac17bfd29
7
+ data.tar.gz: 7bbf2ba8a4671a149a55123986bad969cefc29b2d43c23bc544b5b44383e7ed0cbede5c3dc24a29b6cc7c8181a3bf188c5a6c6f92256978eda8a895e882ced1d
@@ -8,6 +8,7 @@ module SoftDeletion
8
8
 
9
9
  base.define_model_callbacks :soft_delete
10
10
  base.define_model_callbacks :soft_undelete
11
+ base.cattr_accessor :soft_delete_default_scope
11
12
  end
12
13
 
13
14
  module ClassMethods
@@ -18,7 +19,7 @@ module SoftDeletion
18
19
  end
19
20
 
20
21
  def with_deleted
21
- key = :"soft_deletion_with_deleted_#{name}"
22
+ key = :"soft_deletion_with_deleted_#{soft_delete_default_scope}"
22
23
  Thread.current[key] = true
23
24
  yield
24
25
  ensure
@@ -18,8 +18,9 @@ module SoftDeletion
18
18
  include SoftDeletion::Core
19
19
 
20
20
  if options[:default_scope]
21
+ self.soft_delete_default_scope = name
21
22
  default_scope do
22
- if Thread.current[:"soft_deletion_with_deleted_#{name}"]
23
+ if Thread.current[:"soft_deletion_with_deleted_#{soft_delete_default_scope}"]
23
24
  where(nil)
24
25
  else
25
26
  where(deleted_at: nil)
@@ -1,3 +1,3 @@
1
1
  module SoftDeletion
2
- VERSION = '0.8.0'
2
+ VERSION = '0.8.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: soft_deletion
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.0
4
+ version: 0.8.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Zendesk
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-01 00:00:00.000000000 Z
11
+ date: 2016-08-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord