mongoid_ability 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b05128ad1b7880b1082fbeddf304463a86bb60
-  data.tar.gz: a14d2b70096be646ed72fb2f20b87cb4bd351236
+  metadata.gz: dd50f6141566a2e2c5d2814db0a66d5bd7f8a419
+  data.tar.gz: 4410f6d3f4991cdb145c1f68ca8d80c1c8943562
 SHA512:
-  metadata.gz: 29c3b53f72217a2aa8489a338370da1925c4155b9a4dd4d251eb5f3720da8c7d0535532f0d38e251d6bf24d6f363b2742b8ea1ab59ba131252534cd5f22506af
-  data.tar.gz: 29932436d700cb14e9967a0e345b20a2919c93b31bf4747076043508686672ac42b06fa071c23bbee4235e9e938d5e9a78a7cbbbce3ca9904eaf2b0c6285c1c8
+  metadata.gz: 27e701a3f9991f7d03aa13e669e9764c85f4f233d5d15b759c044ccc10b2574dc474d62728dcf88de7cc25bb7e064cd8f04851f87780359673a6124490059df5
+  data.tar.gz: bbaeeaa89f8166741eb5c8f90d16bd00bcaede8c116099bea982446dc39b0824234acf1ada6c1eaaa978abc6bc9c7559102656c8580a7e263e71d33f862f8bc6

data/lib/mongoid_ability/lock.rb

@@ -8,16 +8,17 @@ module MongoidAbility
         field :outcome, type: Boolean, default: false
 
         # ---------------------------------------------------------------------
-        
+
         belongs_to :subject, polymorphic: true, touch: true
 
         # ---------------------------------------------------------------------
-          
+
+        # TODO: validate that action is defined on subject or its superclasses
         validates :action, presence: true, uniqueness: { scope: [ :subject_type, :subject_id, :outcome ] }
         validates :outcome, presence: true
 
         # ---------------------------------------------------------------------
-          
+
         scope :for_action, -> action { where(action: action.to_sym) }
 
         scope :for_subject_type, -> subject_type { where(subject_type: subject_type.to_s) }
@@ -30,18 +31,18 @@ module MongoidAbility
     end
 
     # =====================================================================
-      
+
     module ClassMethods
     end
 
     # =====================================================================
-    
+
     def calculated_outcome
       self.outcome
     end
 
     # ---------------------------------------------------------------------
-    
+
     def open?
       self.calculated_outcome == true
     end
@@ -51,7 +52,7 @@ module MongoidAbility
     end
 
     # ---------------------------------------------------------------------
-      
+
     def class_lock?
       !id_lock?
     end
@@ -61,7 +62,7 @@ module MongoidAbility
     end
 
     # ---------------------------------------------------------------------
-    
+
     def conditions
       res = { _type: subject_type }
       res = res.merge(_id: subject_id) if subject_id.present?

data/lib/mongoid_ability/subject.rb

@@ -24,7 +24,11 @@ module MongoidAbility
       end
 
       def default_lock action, outcome
-        default_locks << lock_class_name.constantize.new(subject_type: self, action: action, outcome: outcome)
+        if existing_lock = default_locks.detect{ |l| l.action.to_s == action.to_s }
+          existing_lock.outcome = outcome
+        else
+          default_locks << lock_class_name.constantize.new(subject_type: self, action: action, outcome: outcome)
+        end
       end
 
       # ---------------------------------------------------------------------

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/mongoid_ability/subject_test.rb

@@ -52,6 +52,19 @@ module MongoidAbility
           lock.subject_id.must_be_nil
           lock.action.must_equal :read
         end
+
+        describe 'when trying to insert another lock for same action' do
+          before do
+            subject.class.default_lock :read, false
+          end
+
+          it 'does not create duplicate' do
+            subject.class.default_locks.select{ |l| l.action == :read }.length.must_equal 1
+          end
+          it 'sets the new outcome' do
+            subject.class.default_locks.select{ |l| l.action == :read }.first.outcome.must_equal false
+          end
+        end
       end
 
       # =====================================================================

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan