mongoid_ability 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f8c03f91ed61aacbed7566298e047477a3a6b5
-  data.tar.gz: 2f7a8e17c320ecd2fa53bcd21bb6daa06aa436a4
+  metadata.gz: 1541d93003dfaadfd76721962e2e8c299ac86f81
+  data.tar.gz: cd39407e3a4f06d0320493bfd327b7127b7e96d4
 SHA512:
-  metadata.gz: 4689294020abcf62b7b3b344e2a226a0ca6c54c49b3e531a5b21e637da44d89b27f34257e40f750135802b4bb5fd1a47944a444ba87aa1536bb42294b88d5a21
-  data.tar.gz: 815cc02e48e356466b72f347839a692ca305fc3d0fe7138d6afc54b61fcadb740cde9f1f711e44b769dbb8505baa4490d0f11a66a25a41240a8ee6d68f691e58
+  metadata.gz: b44dd1f63f22cc8f3caac82f6da16475fb17fcaa6a84c45a5a3cc889009ed4405e98d10a0aee161a6e89f4efa8954a74dea1d6c2616a54d3114c30e8be8b5eff
+  data.tar.gz: ffeda7ae0ad1ffa0a0d9d682030a47b3e466967dd403f9413fe953f07fdea3f8de9c0a51593f6d9bd0ce5240103a862bf3601b8e71caa2067d2cea4cf83a993a

data/lib/mongoid_ability/ability.rb

@@ -1,23 +1,23 @@
 require 'cancancan'
-  
+
 module MongoidAbility
   class Ability
 
     include CanCan::Ability
-    
-    attr_reader :user
+
+    attr_reader :owner
 
     # =====================================================================
 
-    def initialize user
-      @user = user
-      
+    def initialize owner
+      @owner = owner
+
       can do |action, subject_type, subject|
         subject_class = subject_type.to_s.constantize
         outcome = nil
 
         subject_class.self_and_ancestors_with_default_locks.each do |cls|
-          outcome = combined_outcome(user, action, cls, subject)
+          outcome = combined_outcome(owner, action, cls, subject)
           break unless outcome.nil?
         end
 
@@ -26,21 +26,23 @@ module MongoidAbility
     end
 
     private # =============================================================
-    
-    def combined_outcome  user, action, cls, subject
-      uo = user_outcome(user, action, cls, subject)
+
+    def combined_outcome  owner, action, cls, subject
+      uo = user_outcome(owner, action, cls, subject)
       return uo unless uo.nil?
 
-      ro = user.roles_relation.collect{ |role| AbilityResolver.new(role, action, cls.to_s, subject).outcome }.compact
-      return ro.any?{ |i| i == true } unless ro.empty?
+      if owner.respond_to?(owner.class.roles_relation_name)
+        ro = owner.roles_relation.collect{ |role| AbilityResolver.new(role, action, cls.to_s, subject).outcome }.compact
+        return ro.any?{ |i| i == true } unless ro.empty?
+      end
 
       class_outcome(cls, action)
     end
 
     # ---------------------------------------------------------------------
-    
-    def user_outcome user, action, cls, subject
-      AbilityResolver.new(user, action, cls.to_s, subject).outcome
+
+    def user_outcome owner, action, cls, subject
+      AbilityResolver.new(owner, action, cls.to_s, subject).outcome
     end
 
     def role_outcome role, action, cls, subject
@@ -54,4 +56,4 @@ module MongoidAbility
     end
 
   end
-end
+end

data/lib/mongoid_ability/accessible_query_builder.rb

@@ -43,21 +43,23 @@ module MongoidAbility
 
     # ---------------------------------------------------------------------
 
-    def user
-      ability.user
+    def owner
+      ability.owner
     end
 
     def roles
-      user.roles_relation
+      return unless owner.respond_to?(owner.class.roles_relation_name)
+      owner.roles_relation
     end
 
     # ---------------------------------------------------------------------
 
     def user_id_locks_for_subject_type cls
-      user.locks_relation.id_locks.for_action(action).for_subject_type(cls.to_s)
+      owner.locks_relation.id_locks.for_action(action).for_subject_type(cls.to_s)
     end
 
     def roles_ids_locks_for_subject_type cls
+      return [] unless roles
       roles.collect { |role| role.locks_relation.id_locks.for_action(action).for_subject_type(cls.to_s) }.flatten
     end
 

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/test/mongoid_ability/ability_role_test.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+
+module MongoidAbility
+  describe 'ability on Role' do
+
+    let(:read_lock) { TestLock.new(subject_type: TestAbilitySubject.to_s, action: :read, outcome: false) }
+    let(:role) { TestRole.new(test_locks: [read_lock]) }
+    let(:ability) { Ability.new(role) }
+
+    # ---------------------------------------------------------------------
+
+    it 'role can?' do
+      ability.can?(:read, TestAbilitySubject).must_equal false
+    end
+
+    it 'role cannot?' do
+      ability.cannot?(:update, TestAbilitySubject).must_equal false
+    end
+
+    it 'is accessible by' do
+      TestAbilitySubject.accessible_by(ability, :read).must_be_kind_of Mongoid::Criteria
+    end
+
+  end
+end

data/test/mongoid_ability/ability_test.rb

@@ -7,15 +7,13 @@ module MongoidAbility
     let(:ability) { Ability.new(user) }
 
     # ---------------------------------------------------------------------
-    
-    describe 'user' do
-      it 'exposes user' do
-        ability.user.must_equal user
-      end
+
+    it 'exposes owner' do
+      ability.owner.must_equal user
     end
 
     # ---------------------------------------------------------------------
-    
+
     describe 'default locks' do
       it 'propagates from superclass to all subclasses' do
         ability.can?(:update, TestAbilitySubjectSuper1).must_equal true
@@ -35,7 +33,7 @@ module MongoidAbility
           ]) do
             ability.can?(:read, TestAbilitySubject).must_equal true
           end
-        end      
+        end
       end
 
       describe 'when defined for some superclasses' do
@@ -47,12 +45,12 @@ module MongoidAbility
           ]) do
             ability.can?(:read, TestAbilitySubject).must_equal true
           end
-        end  
+        end
       end
     end
 
     # ---------------------------------------------------------------------
-    
+
     describe 'user locks' do
       describe 'when defined for superclass' do
         before do
@@ -67,7 +65,7 @@ module MongoidAbility
     end
 
     # ---------------------------------------------------------------------
-    
+
     describe 'role locks' do
       describe 'when multiple roles' do
         before do
@@ -104,13 +102,13 @@ module MongoidAbility
     end
 
     # ---------------------------------------------------------------------
-    
+
     describe 'combined locks' do
       describe 'user and role locks' do
         before do
           user.tap do |u|
             u.test_locks = [
-              TestLock.new(subject_type: TestAbilitySubjectSuper2.to_s, action: :read, outcome: false) 
+              TestLock.new(subject_type: TestAbilitySubjectSuper2.to_s, action: :read, outcome: false)
             ]
             u.roles = [
               TestRole.new(test_locks: [
@@ -141,7 +139,7 @@ module MongoidAbility
     end
 
     # ---------------------------------------------------------------------
-    
+
     describe 'class locks' do
       it 'prefers negative outcome across same class' do
         TestAbilityResolverSubject.stub(:default_locks, [
@@ -155,6 +153,3 @@ module MongoidAbility
 
   end
 end
-
-
-

data/test/support/test_classes.rb

@@ -9,7 +9,7 @@ class TestLockSub < TestLock
 end
 
 # ---------------------------------------------------------------------
-  
+
 class TestOwnerSuper
   include Mongoid::Document
   include MongoidAbility::Owner
@@ -43,7 +43,7 @@ class SubjectSingleTest
 end
 
 # ---------------------------------------------------------------------
-  
+
 class TestAbilityResolverSubject
   include Mongoid::Document
   include MongoidAbility::Subject
@@ -66,7 +66,7 @@ class TestAbilitySubject < TestAbilitySubjectSuper1
 end
 
 # ---------------------------------------------------------------------
-  
+
 class TestRole
   include Mongoid::Document
   include MongoidAbility::Owner
@@ -75,7 +75,7 @@ class TestRole
 
   embeds_many :test_locks, class_name: 'TestLock', as: :owner
   has_and_belongs_to_many :users, class_name: 'TestUser'
-end  
+end
 
 class TestUser
   include Mongoid::Document
@@ -83,4 +83,4 @@ class TestUser
 
   embeds_many :test_locks, class_name: 'TestLock', as: :owner
   has_and_belongs_to_many :roles, class_name: 'TestRole'
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -162,6 +162,7 @@ files:
 - lib/mongoid_ability/version.rb
 - mongoid_ability.gemspec
 - test/mongoid_ability/ability_resolver_test.rb
+- test/mongoid_ability/ability_role_test.rb
 - test/mongoid_ability/ability_test.rb
 - test/mongoid_ability/accessible_query_builder_test.rb
 - test/mongoid_ability/lock_test.rb
@@ -196,6 +197,7 @@ summary: Custom Ability class that allows CanCanCan authorization library store
   in MongoDB via the Mongoid gem.
 test_files:
 - test/mongoid_ability/ability_resolver_test.rb
+- test/mongoid_ability/ability_role_test.rb
 - test/mongoid_ability/ability_test.rb
 - test/mongoid_ability/accessible_query_builder_test.rb
 - test/mongoid_ability/lock_test.rb