paranoid2 1.1.4 → 1.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/paranoid2/scoping.rb +12 -3
- data/lib/paranoid2/version.rb +1 -1
- data/paranoid2.gemspec +1 -1
- data/spec/paranoid2_spec.rb +1 -0
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b04b2e1f16af33f9e96a486529e7bee5daba9b5f
|
4
|
+
data.tar.gz: 28a01ac65b8d54aa2272aa1e90a66357bd468ef7
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 524da4b320a355f902faad7c29714f3ba89bdc666d899eaec636e81169c9c597c6b3fbed1f5b6abb64a4771bf15d550e02268738c499ddf601cff2bfc86818e7
|
7
|
+
data.tar.gz: 8ba87e39f81286a35b3033418de91de74fc6dbf39200539067eafa3807fd25094d778715ab298e9029eeaadc5cefb8926763464337c4c393e6ba53f2740c0489
|
data/lib/paranoid2/scoping.rb
CHANGED
@@ -16,9 +16,18 @@ module Paranoid2
|
|
16
16
|
with_deleted.where.not(deleted_at: nil)
|
17
17
|
end
|
18
18
|
|
19
|
-
|
20
|
-
|
19
|
+
|
20
|
+
if ActiveRecord::Base.respond_to?(:unscope)
|
21
|
+
# Rails >= 4.1
|
22
|
+
def with_deleted
|
23
|
+
unscope(where: :deleted_at)
|
24
|
+
end
|
25
|
+
else
|
26
|
+
# Rails < 4.1
|
27
|
+
def with_deleted
|
28
|
+
all.tap {|s| s.default_scope = false}
|
29
|
+
end
|
21
30
|
end
|
22
31
|
end
|
23
32
|
end
|
24
|
-
end
|
33
|
+
end
|
data/lib/paranoid2/version.rb
CHANGED
data/paranoid2.gemspec
CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
|
|
18
18
|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
|
19
19
|
gem.require_paths = ["lib"]
|
20
20
|
|
21
|
-
gem.add_dependency 'activerecord', '>= 4.
|
21
|
+
gem.add_dependency 'activerecord', '>= 4.1.0'
|
22
22
|
|
23
23
|
gem.add_development_dependency "rake"
|
24
24
|
gem.add_development_dependency "sqlite3"
|
data/spec/paranoid2_spec.rb
CHANGED
@@ -116,6 +116,7 @@ describe Paranoid2 do
|
|
116
116
|
a.destroy
|
117
117
|
b.destroy
|
118
118
|
parent1.paranoid_models.count.must_equal 0
|
119
|
+
puts parent1.paranoid_models.only_deleted.inspect
|
119
120
|
parent1.paranoid_models.only_deleted.count.must_equal 1
|
120
121
|
|
121
122
|
c = model.create(parent_model: parent1)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: paranoid2
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- yury
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-04-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activerecord
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 4.
|
19
|
+
version: 4.1.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - ">="
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 4.
|
26
|
+
version: 4.1.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: rake
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|