mongoid_ability 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a16f215f974b85cd17bd6675d923602799f392
-  data.tar.gz: 279a119c7ffab5ff22f94dd0879f835167013341
+  metadata.gz: f40f0a70a06a2ef26a9e545cd18a940cd46e4be5
+  data.tar.gz: 0f105daba66547732f737fb1928ab7615d2e9162
 SHA512:
-  metadata.gz: 1c3d0e88ad2427638da638689a72f19c2d6ba605aa9a0e0c4355dd57f44d5cc3940daa82e0658a029eb0a66baba24f04f63349bb3a3de9440c9171dab2681966
-  data.tar.gz: f1f8f836c9961bf9c114fb63993d9a99512deabb5cd09b85a028bceec24c9cc644aaf88a90e1c68a42eeeada20f074b9fe6330c81a30eb445a322cdf87f0d436
+  metadata.gz: c74b4310a0a87557bd113f71b067116137a3b9f6f09d0804ed3fb4757f6c090887520c2cedaac882c60e96cfbc76ee96e7e29193cf08d32a13952a55c3bd1215
+  data.tar.gz: 999a48cd89887c46366621f781a359208db66cd50fc512aeee4c812c52556d20abf6c4628852a59274fd83c4782f4f46c792b7efe157d03da2a0e73c4c0702e3

data/lib/mongoid_ability/subject.rb

@@ -43,9 +43,9 @@ module MongoidAbility
       # ---------------------------------------------------------------------
         
       def accessible_by ability, action=:read
-        criteria = Mongoid::Criteria.new(self)
+        cr = self.criteria
 
-        return criteria unless ability.user.present?
+        return cr unless ability.user.present?
 
         id_locks = [
           ability.user,
@@ -55,7 +55,7 @@ module MongoidAbility
         }.flatten
 
         if ability.can?(action, self)
-          criteria.nin({
+          cr.nin({
                          _id: id_locks.map(&:subject_id).select do |subject_id|
                            subject = self.new
                            subject.id = subject_id
@@ -63,7 +63,7 @@ module MongoidAbility
                          end
           })
         else
-          criteria.in({
+          cr.in({
                         _id: id_locks.map(&:subject_id).select do |subject_id|
                           subject = self.new
                           subject.id = subject_id

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/mongoid_ability/subject_test.rb

@@ -3,24 +3,29 @@ require 'test_helper'
 module MongoidAbility
   describe Subject do
 
-    subject { TestSubject.new }
-    let(:subject_super) { TestSubjectSuper.new }
+    def default_lock subject_cls, outcome
+      TestLock.new(subject_type: subject_cls.to_s, action: :read, outcome: outcome)
+    end
 
-    let(:user) { TestUser.new }
-    let(:ability) { Ability.new(user) }
+    def subject_lock subject, outcome
+      TestLock.new(subject: subject, action: :read, outcome: outcome)
+    end
 
-    let(:open_lock) { TestLock.new(outcome: true, action: :read, subject: subject) }
-    let(:closed_lock) { TestLock.new(outcome: false, action: :read, subject: subject) }
+    # ---------------------------------------------------------------------
 
-    # =====================================================================
+    subject { TestSubject.new }
 
-    describe 'fields' do
-    end
+    let(:subject_test_1) { TestSubject.create! }
+    let(:subject_test_2) { TestSubject.create! }
 
-    # =====================================================================
+    let(:subject_super) { TestSubjectSuper.new }
 
-    describe 'relations' do
-    end
+    let(:embedded_test_subject_1) { EmbeddedTestSubject.new }
+    let(:embedded_test_subject_2) { EmbeddedTestSubject.new }
+    let(:embedded_test_subject_owner) { EmbeddedTestSubjectOwner.new(embedded_test_subjects: [ embedded_test_subject_1, embedded_test_subject_2 ]) }
+
+    let(:user) { TestUser.new }
+    let(:ability) { Ability.new(user) }
 
     # =====================================================================
 
@@ -44,8 +49,8 @@ module MongoidAbility
         end
       end
 
-      # ---------------------------------------------------------------------
-        
+      # =====================================================================
+
       describe '.ancestors_with_default_locks' do
         it 'lists ancestors with default locks' do
           subject.class.ancestors_with_default_locks.must_equal [TestSubjectSuper]
@@ -58,45 +63,128 @@ module MongoidAbility
         end
       end
 
-      # ---------------------------------------------------------------------
-        
+      # =====================================================================
+
       describe '.accessible_by' do
+
         it 'returns Mongoid::Criteria' do
           subject.class.accessible_by(ability).must_be_kind_of Mongoid::Criteria
+          embedded_test_subject_1.class.accessible_by(ability).must_be_kind_of Mongoid::Criteria
+        end
+
+        describe 'embedded relations' do
+          it 'returns correct criteria type' do
+            embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).embedded?.must_equal true
+          end
+        end
+
+        # ---------------------------------------------------------------------
+
+        describe 'default locks' do
+          describe 'referenced relations' do
+            it 'returns everything when open' do
+              subject_test_1
+              subject_test_2
+
+              subject.class.stub(:default_locks, [ default_lock(subject_test_1.class, true) ]) do
+                subject.class.accessible_by(ability).must_include subject_test_1
+                subject.class.accessible_by(ability).must_include subject_test_2
+              end
+            end
+
+            it 'returns nothing when closed' do
+              subject.class.stub(:default_locks, [ default_lock(subject_test_1.class, false) ]) do
+                subject.class.accessible_by(ability).must_be :empty?
+              end
+            end
+          end
+
+          describe 'embedded relations' do
+            it 'returns everything when open' do
+              subject.class.stub(:default_locks, [ default_lock(embedded_test_subject_1.class, true) ]) do
+                embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).must_include embedded_test_subject_1
+                embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).must_include embedded_test_subject_2
+              end
+            end
+
+            it 'returns nothing when closed' do
+              subject.class.stub(:default_locks, [ default_lock(embedded_test_subject_1.class, false) ]) do
+                embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).must_be :empty?
+              end
+            end
+          end
         end
 
-        describe 'when closed lock on user' do
-          before { user.test_locks = [closed_lock] }
-          it 'returns criteria excluding such ids' do
-            subject.class.accessible_by(ability).selector.fetch('_id', {}).fetch('$nin', []).must_include subject.id
+        # ---------------------------------------------------------------------
+
+        describe 'id locks' do
+          describe 'referenced relations' do
+            it 'excludes subject when closed' do
+              user.test_locks = [ subject_lock(subject_test_1, true), subject_lock(subject_test_2, false) ]
+              subject.class.accessible_by(ability).must_include subject_test_1
+              subject.class.accessible_by(ability).wont_include subject_test_2
+            end
+          end
+
+          describe 'embedded relations' do
+            it 'excludes subject when closed' do
+              user.test_locks = [ subject_lock(embedded_test_subject_1, true), subject_lock(embedded_test_subject_2, false) ]
+              embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).must_include embedded_test_subject_1
+              embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).wont_include embedded_test_subject_2
+            end
           end
         end
 
-        # describe "when closed lock on user's role" do
-        #   before { user.roles = [TestRole.new(test_locks: [closed_lock])] }
-        #   it 'returns criteria excluding such ids' do
-        #     subject.class.accessible_by(ability).selector.fetch('_id', {}).fetch('$nin', []).must_include subject.id
-        #   end
-        # end
+        # ---------------------------------------------------------------------
+
+        describe 'default locks & id locks' do
+          describe 'referenced relations' do
+            describe 'default open' do
+              it 'excludes subject when id lock closed' do
+                subject.class.stub(:default_locks, [ default_lock(subject_test_1.class, true) ]) do
+                  user.test_locks = [ subject_lock(subject_test_2, false) ]
+                  subject.class.accessible_by(ability).must_include subject_test_1
+                  subject.class.accessible_by(ability).wont_include subject_test_2
+                end
+              end
+            end
 
-        describe "when class does not permit" do
-          before do
-            user.test_locks = [open_lock]
+            describe 'default closed' do
+              it 'includes subject when id lock open' do
+                subject.class.stub(:default_locks, [ default_lock(subject_test_1.class, false) ]) do
+                  user.test_locks = [ subject_lock(subject_test_2, true) ]
+                  subject.class.accessible_by(ability).wont_include subject_test_1
+                  subject.class.accessible_by(ability).must_include subject_test_2
+                end
+              end
+            end
           end
-          it 'returns criteria excluding everything but open id_locks' do
-            subject.class.stub(:default_locks, [TestLock.new(outcome: false, action: :read, subject_type: subject.class, outcome: false)]) do
-              subject.class.accessible_by(ability).selector.fetch('_id', {}).fetch('$in', []).must_include subject.id
+
+          describe 'embedded relations' do
+            describe 'default open' do
+              it 'excludes subject when id lock closed' do
+                subject.class.stub(:default_locks, [ default_lock(embedded_test_subject_1.class, true) ]) do
+                  user.test_locks = [ subject_lock(embedded_test_subject_2, false) ]
+                  embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).must_include embedded_test_subject_1
+                  embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).wont_include embedded_test_subject_2
+                end
+              end
+            end
+
+            describe 'default closed' do
+              it 'includes subject when id lock open' do
+                subject.class.stub(:default_locks, [ default_lock(embedded_test_subject_1.class, false) ]) do
+                  user.test_locks = [ subject_lock(embedded_test_subject_2, true) ]
+                  embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).wont_include embedded_test_subject_1
+                  embedded_test_subject_owner.embedded_test_subjects.accessible_by(ability).must_include embedded_test_subject_2
+                end
+              end
             end
           end
         end
-        
+
       end
     end
   end
 
-  # =====================================================================
-
-  describe 'instance methods' do
-  end
-
-end
+end

data/test/test_helper.rb

@@ -70,7 +70,7 @@ class TestOwner < TestOwnerSuper
 end
 
 # ---------------------------------------------------------------------
-  
+
 class TestSubjectSuper
   include Mongoid::Document
   include MongoidAbility::Subject
@@ -80,6 +80,17 @@ class TestSubject < TestSubjectSuper
   default_lock :read, true
 end
 
+class EmbeddedTestSubjectOwner
+  include Mongoid::Document
+  include MongoidAbility::Subject
+
+  embeds_many :embedded_test_subjects
+end
+
+class EmbeddedTestSubject < TestSubject
+  embedded_in :embedded_test_subject_owner
+end
+
 # ---------------------------------------------------------------------
   
 class TestAbilityResolverSubject

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan