mongoid_ability 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3966d3f6bc2143789632f8075458b796341c98
-  data.tar.gz: 6b8f7778d4a847da6616be4441b11b90ba979bb4
+  metadata.gz: d30d247467a000a4905761928d401f3a6adbbc10
+  data.tar.gz: a14eed2b95bd69392acc82b46d192902fef23a66
 SHA512:
-  metadata.gz: 3d9f643e20c1f6d8e0b255f5c2843f63db7836dd8a61d4961582f639b474f3ebb76d2ab595011319b631e1a65219b91e1307c73366f8544d0f66aaf0b016a550
-  data.tar.gz: 631e86ebe4293354623d1b6f0b8b6f5b146795f5f86330b506e1fe1f3a2455d9b3095f3aa67c0f8ecdd349098e7883db34323f76a7ed7a47bbc001fdc6793543
+  metadata.gz: 297e80b5fec91daeb637f9394fdac3021df1ba902b20f743855fc1951e0da7adcd401b8207bb034e46357aba1247c3aad20cefbd28507add1a17f0815d66737e
+  data.tar.gz: d8800d4844678c18e62eace9ae607e404fe469986a138fb0b9c3f2625c0986d897f16331b275fbbce266227beb72fce2032e01457ca1c2d9f154035101835890

data/lib/mongoid_ability/accessible_query_builder.rb

@@ -7,38 +7,27 @@ module MongoidAbility
     # =====================================================================
 
     def call
-      return base_class.criteria unless and_conditions.present?
       base_class.criteria.where(conditions)
     end
 
     def conditions
-      and_conditions
+      { '$and' => [{ '$or' => [closed_types_condition, open_types_and_ids_condition] }, closed_ids_condition] }
     end
 
     private # =============================================================
 
-    def and_conditions
-      return unless conditions = [or_conditions, closed_ids_condition].compact.presence
-      { '$and' => conditions }
-    end
-
-    def or_conditions
-      return unless conditions = [closed_types_condition, open_ids_condition].compact.presence
-      { '$or' => conditions }
-    end
-
     def closed_types_condition
-      return unless values.closed_types.present?
       { _type: { '$nin' => values.closed_types } }
     end
 
-    def open_ids_condition
-      return unless values.open_types_and_ids.present?
-      { _id: { '$in' => values.open_types_and_ids.map(&:id) } }
+    def open_types_and_ids_condition
+      {
+        _type: { '$in' => values.open_types_and_ids.map(&:type) },
+        _id: { '$in' => values.open_types_and_ids.map(&:id) }
+      }
     end
 
     def closed_ids_condition
-      return unless values.closed_ids.present?
       { _id: { '$nin' => values.closed_ids } }
     end
 

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/test/mongoid_ability/ability_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require 'test_helper'
 
 module MongoidAbility
   describe Ability do
@@ -12,7 +12,7 @@ module MongoidAbility
     describe 'default locks' do
       before do
         # NOTE: we might need to use the .default_lock macro in case we propagate down directly
-        MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :update, outcome: true) ]
+        MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :update, outcome: true)]
         MySubject1.default_locks = []
         MySubject2.default_locks = []
       end
@@ -26,9 +26,9 @@ module MongoidAbility
 
     describe 'when defined for all superclasses' do
       before do
-        MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ]
-        MySubject1.default_locks = [ MyLock.new(subject_type: MySubject1, action: :read, outcome: true) ]
-        MySubject2.default_locks = [ MyLock.new(subject_type: MySubject2, action: :read, outcome: false) ]
+        MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
+        MySubject1.default_locks = [MyLock.new(subject_type: MySubject1, action: :read, outcome: true)]
+        MySubject2.default_locks = [MyLock.new(subject_type: MySubject2, action: :read, outcome: false)]
       end
 
       it 'respects the definitions' do
@@ -40,9 +40,9 @@ module MongoidAbility
 
     describe 'when defined for some superclasses' do
       before do
-        MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ]
+        MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
         MySubject1.default_locks = []
-        MySubject2.default_locks = [ MyLock.new(subject_type: MySubject2, action: :read, outcome: true) ]
+        MySubject2.default_locks = [MyLock.new(subject_type: MySubject2, action: :read, outcome: true)]
       end
 
       it 'propagates default locks to subclasses' do
@@ -57,10 +57,10 @@ module MongoidAbility
     describe 'user locks' do
       describe 'when defined for superclass' do
         before do
-          MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ]
+          MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
           MySubject1.default_locks = []
           MySubject2.default_locks = []
-          owner.my_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: true) ]
+          owner.my_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: true)]
         end
 
         it 'applies the superclass lock' do
@@ -74,10 +74,10 @@ module MongoidAbility
     describe 'inherited owner locks' do
       describe 'when multiple inherited owners' do
         before do
-          MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ]
+          MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
           owner.my_roles = [
-            MyRole.new(my_locks: [ MyLock.new(subject_type: MySubject, action: :read, outcome: true) ]),
-            MyRole.new(my_locks: [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ])
+            MyRole.new(my_locks: [MyLock.new(subject_type: MySubject, action: :read, outcome: true)]),
+            MyRole.new(my_locks: [MyLock.new(subject_type: MySubject, action: :read, outcome: false)])
           ]
         end
 
@@ -88,10 +88,10 @@ module MongoidAbility
 
       describe 'when defined for superclass' do
         before do
-          MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ]
+          MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
           MySubject1.default_locks = []
           MySubject2.default_locks = []
-          owner.my_roles = [ MyRole.new(my_locks: [ MyLock.new(subject_type: MySubject, action: :read, outcome: true) ]) ]
+          owner.my_roles = [MyRole.new(my_locks: [MyLock.new(subject_type: MySubject, action: :read, outcome: true)])]
         end
 
         it 'applies the superclass lock' do
@@ -105,9 +105,9 @@ module MongoidAbility
     describe 'combined locks' do
       describe 'user and role locks' do
         before do
-          MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ]
-          owner.my_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ]
-          owner.my_roles = [ MyRole.new(my_locks: [ MyLock.new(subject_type: MySubject, action: :read, outcome: true) ]) ]
+          MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
+          owner.my_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
+          owner.my_roles = [MyRole.new(my_locks: [MyLock.new(subject_type: MySubject, action: :read, outcome: true)])]
         end
 
         it 'prefers user locks' do
@@ -117,8 +117,8 @@ module MongoidAbility
 
       describe 'roles and default locks' do
         before do
-          MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: false) ]
-          owner.my_roles = [ MyRole.new(my_locks: [ MyLock.new(subject_type: MySubject, action: :read, outcome: true) ]) ]
+          MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
+          owner.my_roles = [MyRole.new(my_locks: [MyLock.new(subject_type: MySubject, action: :read, outcome: true)])]
         end
 
         it 'prefers role locks' do
@@ -126,6 +126,5 @@ module MongoidAbility
         end
       end
     end
-
   end
 end

data/test/mongoid_ability/accessible_query_builder_test.rb

@@ -9,7 +9,7 @@ module MongoidAbility
     let(:options) { Hash.new }
 
     before do
-      MySubject.default_locks = [ MyLock.new(subject_type: MySubject, action: :read, outcome: true) ]
+      MySubject.default_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: true)]
     end
 
     subject { AccessibleQueryBuilder.call(base_class, ability, action, options) }
@@ -17,5 +17,56 @@ module MongoidAbility
     it 'returns Mongoid::Criteria' do
       subject.must_be_kind_of Mongoid::Criteria
     end
+
+    # ---------------------------------------------------------------------
+
+    describe 'closed_types' do
+      let(:my_subject) { MySubject.create! }
+      let(:my_subject_1) { MySubject1.create! }
+
+      before do
+        my_subject; my_subject_1
+        owner.my_locks = [MyLock.new(subject_type: MySubject, action: :read, outcome: false)]
+      end
+
+      it 'does not return subject with that id' do
+        MySubject.accessible_by(ability, :read).wont_include my_subject
+        MySubject.accessible_by(ability, :read).wont_include my_subject_1
+        MySubject1.accessible_by(ability, :read).wont_include my_subject_1
+      end
+    end
+
+    describe 'closed_ids' do
+      let(:my_subject_a) { MySubject.create! }
+      let(:my_subject_b) { MySubject.create! }
+
+      before do
+        my_subject_a; my_subject_b
+        owner.my_locks = [MyLock.new(subject: my_subject_a, action: :read, outcome: false)]
+      end
+
+      it 'does not return subject with that id' do
+        MySubject.accessible_by(ability, :read).wont_include my_subject_a
+        MySubject.accessible_by(ability, :read).must_include my_subject_b
+      end
+    end
+
+    describe 'closed_types & open_ids' do
+      let(:my_subject) { MySubject.create! }
+      let(:my_subject_1) { MySubject1.create! }
+
+      before do
+        owner.my_locks = [
+          MyLock.new(subject_type: MySubject, action: :read, outcome: false),
+          MyLock.new(subject: my_subject, action: :read, outcome: true),
+          MyLock.new(subject: my_subject_1, action: :read, outcome: true)
+        ]
+      end
+
+      it 'does not return subject with that id' do
+        MySubject.accessible_by(ability, :read).must_include my_subject
+        MySubject.accessible_by(ability, :read).must_include my_subject_1
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Tomáš Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan