mongoid_ability 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a82de3d605e183be4312f39a57f7bbd9766166
-  data.tar.gz: 533cc7a7f76e8aa3b0867e60f9363253397a5202
+  metadata.gz: 4350f8ee2aa6783ba0bd4790264aae87341062fa
+  data.tar.gz: 7f58c17ff7e7e441fb761d0ed33f48ab298c3ec3
 SHA512:
-  metadata.gz: 02231a5fd23515b5842104d16a0a9b8a83548c6ab47e68d7c150fc2a13373e6898125be0c8381c2e4740ea1ab71ccd991539706273298ebe37f8986b351e87e3
-  data.tar.gz: 4f3c0714a5dfe7f17b9adeddb0e42f79086f50e8af1ebbdb86b4a750be0be607988c7f03a89df88a72ba2548b3b5205096339d2707676a663e2e17889958de22
+  metadata.gz: 701fa1fee1c99245b7c6dada06da608352bfe4e153ac728334d54d1394516ea1ac0707f24550ff7ab88b7e7aa96eb18db396aeeaa814e29933af2217b2e6a2ee
+  data.tar.gz: ac018c43208f7089fe308504fec8188c5fece9cdccccc6ec76447a2ce9917740c6ef4aa5984183625ff9f3b4d3db23c04e5e5472c842ee025c83e7581017690e

data/lib/mongoid_ability/subject.rb

@@ -27,7 +27,7 @@ module MongoidAbility
       # override if needed
       # return for example 'MyLock'
       def lock_class_name
-        Object.descendants.detect{ |cls| cls < MongoidAbility::Lock }.name
+        @lock_class_name ||= Object.descendants.detect{ |cls| cls < MongoidAbility::Lock }.name
       end
 
       # ---------------------------------------------------------------------
@@ -73,7 +73,11 @@ module MongoidAbility
             
             excluded_ids << id_locks.map(&:subject_id)
 
-            cr = cr.or(_type: cls.to_s, :_id.nin => excluded_ids.flatten)
+            if subject_classes.count == 1
+              cr = cr.or(:_id.nin => excluded_ids.flatten)
+            else
+              cr = cr.or(_type: cls.to_s, :_id.nin => excluded_ids.flatten)
+            end
           else
             included_ids = []
 
@@ -82,7 +86,11 @@ module MongoidAbility
 
             included_ids << id_locks.map(&:subject_id)
 
-            cr = cr.or(_type: cls.to_s, :_id.in => included_ids.flatten)
+            if subject_classes.count == 1
+              cr = cr.or(:_id.in => included_ids.flatten)
+            else
+              cr = cr.or(_type: cls.to_s, :_id.in => included_ids.flatten)
+            end
           end
         end
 

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/mongoid_ability/subject_test.rb

@@ -15,13 +15,11 @@ module MongoidAbility
 
     subject { SubjectTest.new }
 
+    let(:subject_single_test) { SubjectSingleTest.create! }
+
     let(:subject_test_1) { SubjectTestOne.create! }
     let(:subject_test_2) { SubjectTestTwo.create! }
 
-    # let(:embedded_test_subject_1) { EmbeddedTestSubject.new }
-    # let(:embedded_test_subject_2) { EmbeddedTestSubjectTwo.new }
-    # let(:embedded_test_subject_owner) { EmbeddedTestSubjectOwner.new(embedded_test_subjects: [ embedded_test_subject_1, embedded_test_subject_2 ]) }
-
     let(:role_1) { TestRole.new }
     let(:role_2) { TestRole.new }
 
@@ -70,33 +68,41 @@ module MongoidAbility
         before do
           subject_test_1
           subject_test_2
+          subject_single_test
         end
 
         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.class.stub(:default_locks, [ subject_type_lock(subject.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
+
+          describe 'single class' do
             it 'returns everything when open' do
-              subject.class.stub(:default_locks, [ subject_type_lock(subject.class, true) ]) do
-                subject.class.accessible_by(ability).must_include subject_test_1
-                subject.class.accessible_by(ability).must_include subject_test_2
+              subject_single_test.class.stub(:default_locks, [ subject_type_lock(subject_single_test.class, true) ]) do
+                subject_single_test.class.accessible_by(ability).must_include subject_single_test
               end
             end
+          end
+
+          it 'returns nothing when closed' do
+            subject.class.stub(:default_locks, [ subject_type_lock(subject.class, false) ]) do
+              subject.class.accessible_by(ability).must_be :empty?
+            end
+          end
 
+          describe 'single class' do
             it 'returns nothing when closed' do
-              subject.class.stub(:default_locks, [ subject_type_lock(subject.class, false) ]) do
-                subject.class.accessible_by(ability).must_be :empty?
+              subject_single_test.class.stub(:default_locks, [ subject_type_lock(subject_single_test.class, false) ]) do
+                subject_single_test.class.accessible_by(ability).wont_include subject_single_test
               end
             end
           end

data/test/test_helper.rb

@@ -84,22 +84,12 @@ end
 class SubjectTestTwo < SubjectTest
 end
 
+class SubjectSingleTest
+  include Mongoid::Document
+  include MongoidAbility::Subject
 
-
-# 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 EmbeddedTestSubjectTwo < TestSubject
-#   embedded_in :embedded_test_subject_owner
-# end
+  default_lock :read, true
+end
 
 # ---------------------------------------------------------------------
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tomas Celizna