mongoid_ability 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b22befcca304fbace4cd22f72704b7d5a109a0b
-  data.tar.gz: 56a19a326bdb60d7d462558c51cd0d7196146d8b
+  metadata.gz: d14cea1999e69a46f9ab6999787d58498fa59984
+  data.tar.gz: ace3845f26fd9cf1ccb8f6572005ef9584448af9
 SHA512:
-  metadata.gz: 740466111f499e95e981197abc5567740c7ecb829126a863bf6720cddadb5f4b9a75ad9fc851f93bfecb8e90e55ce73a40b20ee8d7741b893412270a7ac71c3b
-  data.tar.gz: 83f00db0cdb31b4f1ebd024c40f5b1390059a0b686119bcf7e27d97a081f4e5d7208286920cf929b55253e73450182201133c63c1dcf882bc10b4ca24e2ab35b
+  metadata.gz: b7c6a973a830ebac23878e9fdc05174e518c1bcd3c889fd860ea03af7edb12ba10921fd852e75b09375a39420e8d3738795e5d036f5e158fe229697276a0dee4
+  data.tar.gz: fd015fa0b0e23d86fc7f4689b931d0a08c96af7cc30262d9f4d51dd4954fd3e7631a073091320eddf3be247abb7a98ed77391a5288d220fac35168aadc249df8

data/lib/mongoid_ability/lock.rb

@@ -7,6 +7,7 @@ module MongoidAbility
       base.class_eval do
         field :action, type: Symbol, default: :read
         field :outcome, type: Boolean, default: false
+        field :options, type: Hash, default: {}
 
         belongs_to :subject, polymorphic: true, touch: true
 
@@ -41,11 +42,16 @@ module MongoidAbility
     end
 
     # calculates outcome as if this lock is not present
-    def inherited_outcome
-      return calculated_outcome unless owner.present?
+    def inherited_outcome options=default_options
+      return calculated_outcome(options) unless owner.present?
       cloned_owner = owner.clone
       cloned_owner.locks_relation = cloned_owner.locks_relation - [self]
-      MongoidAbility::Ability.new(cloned_owner).can? action, (subject.present? ? subject : subject_class)
+      MongoidAbility::Ability.new(cloned_owner).can? action, (subject.present? ? subject : subject_class), options
+    end
+
+    # this is used when calculating inherited outcome
+    def default_options
+      {}
     end
 
     # ---------------------------------------------------------------------

data/lib/mongoid_ability/subject.rb

@@ -16,14 +16,14 @@ module MongoidAbility
         @default_locks = locks
       end
 
-      def default_lock lock_cls, action, outcome, attrs={}
+      def default_lock lock_cls, action, outcome, options={}
         unless is_root_class?
           unless root_class.has_default_lock_for_action?(action)
             raise StandardError, "action is not defined on root class (#{root_class})"
           end
         end
 
-        lock = lock_cls.new( { subject_type: self.to_s, action: action, outcome: outcome }.merge(attrs))
+        lock = lock_cls.new( subject_type: self.to_s, action: action, outcome: outcome, options: options )
 
         # remove any existing locks
         if existing_lock = default_locks.detect{ |l| l.action == lock.action }

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

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