mongoid_ability 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c94126d8c7b257f7a07a4523aa5967a197e4ed5
-  data.tar.gz: 0a7daeea08caa81ed98c488185928942eb144aa4
+  metadata.gz: bde67f16382046638b7c44bbffaee16d487e249e
+  data.tar.gz: 865cfbd05868412373e72e4e026636a04292d710
 SHA512:
-  metadata.gz: bac9709c73d4d227bdb3786d8de7ffdda5aea899f294c9e3adbf0d7f543832f2c82266c41e73ef7f7bc938d409e2ab8dbafd8402c21545923745287b213411dc
-  data.tar.gz: 9174b6fa5c46d17cd480d1fd468874d1c67cef6562e2fd77f43406fb5e392e0d0cbe56fd32ba505534d7ffbcbbda810e426f66cf954f4aef2df56033938df930
+  metadata.gz: 7ae18b864f57c2b87a8e19bbcb2995dfc2435840eb688bb1c34b7adeecd7113800afdabc3b7da9a602a986384efcc0ccb35ff8769a5879b07d886757b85966be
+  data.tar.gz: f35c6dda2fa87911e840856963bc84f8b85e0c00e289051cde6dc457352bcc7616528e8e179659640827f639e7c4083b2b2f16bb45f13d287657fe952e8259fa

data/lib/mongoid_ability/ability.rb

@@ -26,10 +26,12 @@ module MongoidAbility
       subject_class = subject_type.to_s.constantize
       outcome = nil
       options ||= {}
+
       subject_class.self_and_ancestors_with_default_locks.each do |cls|
         outcome = ResolveInheritedLocks.call(owner, action, cls, subject, options)
         break if outcome != nil
       end
+
       outcome
     end
 

data/lib/mongoid_ability/accessible_query_builder.rb

@@ -8,12 +8,16 @@ module MongoidAbility
     # =====================================================================
 
     def call
-      if defined? Rails
-        # FIXME: this is a bit of a dirty hack, since the marshalling of criteria does not preserve the embedded attributes
-        Rails.cache.fetch( [ 'ability-query', base_class, ability.cache_key, action, ability.options_cache_key(options) ] ) { _call }.tap { |criteria| criteria.embedded = base_criteria.embedded }
-      else
-        _call
-      end
+      _call
+
+      # if defined? Rails
+      #   # FIXME: this is a bit of a dirty hack, since the marshalling of criteria does not preserve the embedded attributes
+      #   Rails.cache.fetch( [ 'ability-query', base_class, ability.cache_key, action, ability.options_cache_key(options) ] ) do
+      #     _call
+      #   end.tap { |c| c.embedded = base_criteria.embedded }
+      # else
+      #   _call
+      # end
     end
 
     private # =============================================================

data/lib/mongoid_ability/subject.rb

@@ -3,21 +3,29 @@ module MongoidAbility
 
     def self.included base
       base.extend ClassMethods
+      base.class_eval do
+      end
     end
 
     # ---------------------------------------------------------------------
 
     module ClassMethods
       def default_locks
-        @default_locks ||= DefaultLocksExtension.new
+        @default_locks ||= []
       end
 
       def default_locks= locks
-        @default_locks = DefaultLocksExtension.new(locks)
+        @default_locks = locks
       end
 
       def default_lock lock_cls, action, outcome, attrs={}
-        default_locks << 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 }.merge(attrs))
+
+        if existing_lock = default_locks.detect{ |l| l.action.to_s == lock.action.to_s }
+          default_locks.delete(existing_lock)
+        end
+
+        default_locks.push lock
       end
 
       def self_and_ancestors_with_default_locks
@@ -33,26 +41,5 @@ module MongoidAbility
       end
     end
 
-    # ---------------------------------------------------------------------
-
-    require 'forwardable'
-    class DefaultLocksExtension
-      extend Forwardable
-      def_delegators :@default_locks, :any?, :collect, :delete, :detect, :first, :map, :push, :select
-
-      attr_reader :default_locks
-
-      def initialize default_locks=[]
-        @default_locks = default_locks
-      end
-
-      def << lock
-        if existing_lock = self.detect{ |l| l.action.to_s == lock.action.to_s }
-          @default_locks.delete(existing_lock)
-        end
-        @default_locks.push lock
-      end
-    end
-
   end
 end

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

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