mongoid_ability 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0e978ec258c3a3b3e93fa34b6943c8af6b09666722b0ac2b61f196fa972394
-  data.tar.gz: 132f93b4885b86db918c22739859944b86d98e83a07fd7f90ac0e259b5d6e901
+  metadata.gz: cc805cd65bf9cd6deb5fcf4492704ef31860639789ca5cb49825c4d6cc3b9a74
+  data.tar.gz: 566d6195f97fbe1ce3714a4c3d9831c77ed1aa973a2bf4ed6db223cd8795810d
 SHA512:
-  metadata.gz: 50b463ff75c3ecf23a1187b05fcba527c4b50bd47e3c4831d7aece79124b366194d28da44af3acb414f4d0a8de8c02799a24e321a138bab1046552463f7b8a4e
-  data.tar.gz: 06dee8bd65eacce1939aca16d3f6b001b7ed58e708f776903eeb3a2bd4873cf1a3d8d09e5a817590571113d29795b038ec979cacd6f243f43f18d07084d2efab
+  metadata.gz: 64306098207ce7c07afd427ace5f710048cfaab63c0dea919df0bfe1c181c75f730edde2bdd3da5b84f6241887b09acd091b487555ba9d6048ca1647fb17dd42
+  data.tar.gz: 802b0005642510a19cab284b15787090656dd96fbafc1c76d783b2d1f8f31c415e441b3934030e4eeb8953990009bfcd52725ea402d019d2eaa412e40bc08133

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.1
+
+* OPTMIZE: `.accessible_by` is now using `$nin` with multiple values rather than multiple of `$ne`
+
 ## 3.0.0
 
 * upgrade to Mongoid 7+

data/lib/cancancan/model_adapters/mongoid_adapter.rb

@@ -88,11 +88,15 @@ module CanCan
           condition_rules.reject(&:base_behavior).each_with_object([]) do |rule, res|
             rule.conditions.each do |key, value|
               key = id_key if %i[id _id].include?(key.to_sym)
-              res <<  case value
-                      when Regexp then { key => { '$not' => value } }
-                      when Array then { key => { '$nin' => value } }
-                      else { key => { '$ne' => value } }
-                      end
+              case value
+              when Regexp then res << { key => { '$not' => value } }
+              else
+                if prev_value = res.detect { |item| item.dig(key, '$nin') }
+                  prev_value[key]['$nin'] += Array(value)
+                else
+                  res << { key => { '$nin' => Array(value) } }
+                end
+              end
             end
           end
         end
@@ -100,6 +104,7 @@ module CanCan
 
       def subject_type_conditions
         return unless open_subject_types.present?
+
         { :"#{type_key}".nin => closed_subject_types.map(&:to_s) }
       end
 
@@ -112,7 +117,7 @@ module CanCan
       def database_records
         return @model_class.none unless has_any_conditions?
 
-        or_conditions = { '$or' => ([subject_type_conditions, *open_conditions]).compact }
+        or_conditions = { '$or' => [subject_type_conditions, *open_conditions].compact }
         or_conditions = nil if or_conditions['$or'].empty?
 
         and_conditions = { '$and' => [or_conditions, *closed_conditions].compact }

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

data/test/cancancan/model_adapters/mongoid_adapter_test.rb

@@ -196,7 +196,7 @@ module CanCan
                   { 'subject_type' => { '$nin' => [] } },
                   { 'subject_id' => my_subject1.id }
                 ] },
-                { 'subject_id' => { '$ne' => my_subject2.id } }
+                { 'subject_id' => { '$nin' => [my_subject2.id] } }
               ]
             )
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -207,8 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Custom Ability class that allows CanCanCan authorization library store permissions