cancancan-mongoid 2.0.0.beta1 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +5 -5
  2. data/cancancan-mongoid.gemspec +3 -3
  3. data/lib/cancancan/model_adapters/mongoid_adapter.rb +3 -1
  4. data/lib/cancancan/mongoid/version.rb +1 -1
  5. metadata +15 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 3c275fa47fbb5d178ce3394e6bc7219071e9857a
4
- data.tar.gz: 457a6830cf74c1b204436bb2dccfb60ca9ab81c9
2
+ SHA256:
3
+ metadata.gz: f72ec52cd31a09123935f7fa7b28312b6518f862b87d35e87c0044ed62a87956
4
+ data.tar.gz: 7ae2c03a7f51dfba23a62c86f9d0321b24aff06ebbf7c88c0e61483aa26f8330
5
5
  SHA512:
6
- metadata.gz: d16c97592cc3a57743c1830f9282a9e4ca3f46f3ac2dedb1312a766c98f2498c3a5997c8d5f8ee295951d8389ce717c1322b43c6a4b2bf0b1abfab317c07aa59
7
- data.tar.gz: 54ac17561b823440b73c201a48ffbf35001662bf780f28098468d541f56dbd72193eff3517f0867187d0099e9f5875fa05856efc83f52c6d1a74f62759f544c7
6
+ metadata.gz: '008aeacd028bcca7452e6f19997a93b9dae144ce1464f111677e19c80df0cc9faf12d1d323f39fc947d358de7466a8de1951ecae0eeb61947e84a9cb771e4a7e'
7
+ data.tar.gz: 44868014acd8f643f004b9a956091fd1b4d74734c7e3ce5d026d85f7abd82eb716f29e17c0988454416bedd8b869cd95a659e1c87844c0b0b3ab957d68936e72
data/cancancan-mongoid.gemspec CHANGED
@@ -12,15 +12,15 @@ Gem::Specification.new do |spec|
12
12
  spec.homepage = 'https://github.com/CanCanCommunity/cancancan-mongoid'
13
13
  spec.summary = 'Mongoid database adapter for CanCanCan.'
14
14
  spec.description = "Implements CanCanCan's rule-based record fetching using Mongoid."
15
- spec.platform = Gem::Platform::RUBY
15
+ spec.platform = Gem::Platform::RUBY
16
16
  spec.license = 'MIT'
17
17
 
18
18
  spec.files = `git ls-files lib init.rb cancancan-mongoid.gemspec`.split($INPUT_RECORD_SEPARATOR)
19
19
  spec.require_paths = ['lib']
20
20
 
21
- spec.add_dependency 'cancancan', '~> 2.0'
21
+ spec.add_dependency 'cancancan', ['>= 2.0', '< 4']
22
22
 
23
- spec.add_development_dependency 'bundler', '~> 1.3'
23
+ spec.add_development_dependency 'bundler', '>= 1.3'
24
24
  spec.add_development_dependency 'rake', '~> 10.1'
25
25
  spec.add_development_dependency 'rspec', '~> 3.2'
26
26
  spec.add_development_dependency 'rubocop', '~> 0.48.1'
data/lib/cancancan/model_adapters/mongoid_adapter.rb CHANGED
@@ -65,7 +65,9 @@ module CanCan
65
65
  Hash[
66
66
  conditions.map do |k, v|
67
67
  if (relation = model_relations[k])
68
- relation_class_name = relation[:class_name].blank? ? k.to_s.classify : relation[:class_name]
68
+ relation_class_name =
69
+ (relation.respond_to?(:class_name) ? relation.class_name : relation[:class_name]).presence ||
70
+ k.to_s.classify
69
71
  v = simplify_relations(relation_class_name.constantize, v)
70
72
  relation_ids = relation_class_name.constantize.where(v).distinct(:_id)
71
73
  k = "#{k}_id"
data/lib/cancancan/mongoid/version.rb CHANGED
@@ -2,6 +2,6 @@ module CanCanCan
2
2
  end
3
3
  module CanCanCan
4
4
  module Mongoid
5
- VERSION = '2.0.0.beta1'.freeze
5
+ VERSION = '2.0.0'.freeze
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,41 +1,47 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cancancan-mongoid
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.beta1
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alessandro Rodi
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-07-11 00:00:00.000000000 Z
11
+ date: 2020-03-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cancancan
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '2.0'
20
+ - - "<"
21
+ - !ruby/object:Gem::Version
22
+ version: '4'
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
- - - "~>"
27
+ - - ">="
25
28
  - !ruby/object:Gem::Version
26
29
  version: '2.0'
30
+ - - "<"
31
+ - !ruby/object:Gem::Version
32
+ version: '4'
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: bundler
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
- - - "~>"
37
+ - - ">="
32
38
  - !ruby/object:Gem::Version
33
39
  version: '1.3'
34
40
  type: :development
35
41
  prerelease: false
36
42
  version_requirements: !ruby/object:Gem::Requirement
37
43
  requirements:
38
- - - "~>"
44
+ - - ">="
39
45
  - !ruby/object:Gem::Version
40
46
  version: '1.3'
41
47
  - !ruby/object:Gem::Dependency
@@ -177,12 +183,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
177
183
  version: '0'
178
184
  required_rubygems_version: !ruby/object:Gem::Requirement
179
185
  requirements:
180
- - - ">"
186
+ - - ">="
181
187
  - !ruby/object:Gem::Version
182
- version: 1.3.1
188
+ version: '0'
183
189
  requirements: []
184
- rubyforge_project:
185
- rubygems_version: 2.6.11
190
+ rubygems_version: 3.0.6
186
191
  signing_key:
187
192
  specification_version: 4
188
193
  summary: Mongoid database adapter for CanCanCan.