mongoid_ability 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f068e6315f26aa262a2e85aaa2d533028b284f8
-  data.tar.gz: 22a58ce215e9fc9982c23e3ebef2a03642a60f29
+  metadata.gz: b5e922ad81d138949099439d6b784e0f61f478b2
+  data.tar.gz: 39097d4d5d0fa47b9df342e75d5daa0023f91393
 SHA512:
-  metadata.gz: 0823e671b6f4f9bc4e500fe83a0bb39502f26106012bd011be9dfea71ea71083b0936bbe6a24417467e7a56bffa7f85c28d86031e3a62ec58341e632cc0f6783
-  data.tar.gz: 2f416fbeecb89078b0846c9bb4a9084aad1db0c4c3b7c3c976ea5e40b7c00840949b783d45ea88da65d5cf181ad64094c2293eb482c05e9c9208ff71d9a55b98
+  metadata.gz: ac11777dadc4735bb86671358b190ff0d670a7af68849e68630eb76a31dd47300370960c59dc12f0dffca68e8ccd341f81222c58e3b605744c5d5881aae58fc8
+  data.tar.gz: c91acfed7222d481be96e740f5eecf2d760a116604f974e5f4756983f53bafc86cf43755fc4f783b9d953f9ebbb286e4ea84a41817288ed284189d511237bf4e

data/lib/mongoid_ability/owner.rb

@@ -40,8 +40,9 @@ module MongoidAbility
 
     # ---------------------------------------------------------------------
 
-    def has_lock? lock
-      locks_relation.where(action: lock.action, subject_type: lock.subject_type, subject_id: lock.subject_id.presence).exists?
+    def has_lock?(lock)
+      @has_lock ||= {}
+      @has_lock[lock] ||= locks_relation.where(action: lock.action, subject_type: lock.subject_type, subject_id: lock.subject_id.presence).cache.exists?
     end
 
     private # =============================================================

data/lib/mongoid_ability/resolve_owner_locks.rb

@@ -1,22 +1,23 @@
+# OPTIMIZE: this seems quite expensive
+
 module MongoidAbility
   class ResolveOwnerLocks < ResolveLocks
     def call
-      # FIXME: this is not a very nice fix
       return unless owner.respond_to?(:locks_relation)
 
-      locks_for_subject_type = owner.locks_relation.for_action(action).for_subject_type(subject_type)
+      locks_for_subject_type = owner.locks_relation.for_action(action).for_subject_type(subject_type).cache
 
       return unless locks_for_subject_type.exists?
 
       # return outcome if owner defines lock for id
-      if subject.present?
-        id_locks = locks_for_subject_type.id_locks.for_subject_id(subject_id)
+      if subject_id.present?
+        id_locks = locks_for_subject_type.id_locks.for_subject_id(subject_id).cache
         return false if id_locks.any? { |l| l.closed?(options) }
         return true if id_locks.any? { |l| l.open?(options) }
       end
 
       # return outcome if owner defines lock for subject_type
-      class_locks = locks_for_subject_type.class_locks
+      class_locks = locks_for_subject_type.class_locks.cache
       return false if class_locks.class_locks.any? { |l| l.closed?(options) }
       return true if class_locks.class_locks.any? { |l| l.open?(options) }
 

data/lib/mongoid_ability/values_for_accessible_query.rb

@@ -43,14 +43,14 @@ module MongoidAbility
 
     def owner_id_locks_for_subject_type(cls)
       @owner_id_locks_for_subject_type ||= {}
-      @owner_id_locks_for_subject_type[cls] ||= owner.locks_relation.id_locks.for_action(action).for_subject_type(cls.to_s)
+      @owner_id_locks_for_subject_type[cls] ||= owner.locks_relation.id_locks.for_action(action).for_subject_type(cls.to_s).cache
     end
 
     def inherited_from_relation_ids_locks_for_subject_type(cls)
       return [] unless inherited_from_relation
       @inherited_from_relation_ids_locks_for_subject_type ||= {}
       @inherited_from_relation_ids_locks_for_subject_type[cls] ||= inherited_from_relation.collect do |o|
-        o.locks_relation.id_locks.for_action(action).for_subject_type(cls.to_s)
+        o.locks_relation.id_locks.for_action(action).for_subject_type(cls.to_s).cache
       end.flatten
     end
 

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = '0.3.9'.freeze
+  VERSION = '0.3.10'.freeze
 end

data/test/mongoid_ability/subject_accessible_by_test.rb

@@ -135,5 +135,14 @@ module MongoidAbility
         MySubject2.accessible_by(ability, :update).to_a.wont_include my_subject2
       end
     end
+
+    # =====================================================================
+
+    describe 'prefix' do
+      it 'allows to pass prefix' do
+        skip 'not sure how to best test this'
+        MySubject.accessible_by(ability, :update, prefix: :subject).must_equal 'foo'
+      end
+    end
   end
 end

metadata

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