effective_roles 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fea6abc1820780d612a22a1c66c180cdc17f1ab6
-  data.tar.gz: 37047ba965d662456396b4bd1aa1c7557b655677
+  metadata.gz: aa6baafe8b9e81b1baa9862c885beb88c8483735
+  data.tar.gz: b4beee32f21b88b94046c6a467b681f0c1142ce7
 SHA512:
-  metadata.gz: d5214db952f1b44cf46f0d95239e27b938a97a3d27282a3be7a1863f530a1eba9c63d43a7c1f89669e8d42bdead1f57dd231fa59a2e33779b64e8b6db7c5ecc2
-  data.tar.gz: 833ae9a7a654221bb1144b289628a8aeb35b2817d39fcee986ea3e9df62a7dd3fe0ed15c69f926e6a2e8173292b2df09228e7ebca9634cd757096c3676d07a19
+  metadata.gz: ebb6efc26b4c837b5c8ed50dbb3c277c146092c439f374ad42740cfbb3a8803650479e19dcd9e5a0b09eed19c5e2e2f7327383f69a1bf24e726c7b93e35b8355
+  data.tar.gz: bf6748ec5daa3e3560a8c3352bde647a12ebc4d3565ac6bd17c4071641ce22ed17855588ccc70566574be6fcbde93edfe3b37be5fd73c38104df48ca053d19f7

data/README.md

@@ -103,39 +103,29 @@ post.roles
 Compare against another acts_as_role_restricted object:
 
 ```ruby
-user = User.new()
-user.roles = []
-
 post = Post.new()
 post.roles = [:admin]
 
-user.roles_match_with?(post)
-=> false  # User has no roles, but Post requires :admin
+user = User.new()
+user.roles = []
 
-post.roles_match_with?(user)
-=> true   # Post has the role of :admin, but User requires no roles
+post.roles_permit?(user)
+=> false  # Post requires the :admin role, but User has no admin role
 ```
 
 ```ruby
-user.roles = [:admin]
 post.roles = [:superadmin]
+user.roles = [:admin]
 
-user.roles_match_with?(post)
+post.roles_permit?(user)
 => false  # User does not have the superadmin role
 
-post.roles_match_with?(user)
-=> false  # Post does not have the admin role
-```
-
 ```ruby
-user.roles = [:superadmin, :admin]
 post.roles = [:admin]
+user.roles = [:superadmin, :admin]
 
-user.roles_match_with?(post)
-=> true  # User has :admin and so does Post
-
-post.roles_match_with?(user)
-=> true  # Post has :admin and so does User
+post.roles_permit?(user)
+=> true  # User has required :admin role
 ```
 
 ### Finder Methods

data/app/models/concerns/acts_as_role_restricted.rb

@@ -74,19 +74,27 @@ module ActsAsRoleRestricted
     roles.include?(role.try(:to_sym))
   end
 
-  # Does self have permission to view obj?
-  def roles_match_with?(obj)
-    if obj.respond_to?(:is_role_restricted?)
-      obj.is_role_restricted? == false || (roles & obj.roles).any?
-    elsif Integer(obj) > 0
-      (roles & EffectiveRoles.roles_for_roles_mask(obj)).any?
-    else
-      raise 'unsupported object passed to roles_permit?(obj).  Expecting an acts_as_role_restricted object or a roles_mask integer'
-    end
+  # Are both objects unrestricted, or do any roles overlap?
+  def roles_overlap?(obj)
+    obj_roles = EffectiveRoles.roles_for(obj)
+    (roles.blank? && obj_roles.blank?) || (roles & obj_roles).any?
+  end
+
+  # Are both objects unrestricted, or are both roles identical?
+  def roles_match?(obj)
+    obj_roles = EffectiveRoles.roles_for(obj)
+    matching_roles = (roles & obj_roles)
+    matching_roles.length == roles.length && matching_roles.length == obj_roles.length
+  end
+
+  # Any I unrestricted, or do any roles overlap?
+  def roles_permit?(obj)
+    roles.blank? || roles_overlap?(obj)
   end
 
   def is_role_restricted?
-    (roles_mask || 0) > 0
+    roles.present?
   end
+
 end
 

data/lib/effective_roles.rb

@@ -12,9 +12,16 @@ module EffectiveRoles
     yield self
   end
 
-  def self.roles_for_roles_mask(roles_mask)
-    roles_mask = Integer(roles_mask || 0)
-    roles.reject { |r| (roles_mask & 2**roles.index(r)).zero? }
+  def self.roles_for(obj)
+    if obj.respond_to?(:is_role_restricted?)
+     obj.roles
+    elsif obj.kind_of?(Integer)
+      roles.reject { |r| (obj & 2**roles.index(r)).zero? }
+    elsif obj.nil?
+      []
+    else
+      raise 'unsupported object passed to EffectiveRoles.roles_for method.  Expecting an acts_as_role_restricted object or a roles_mask integer'
+    end
   end
 
   def self.roles_collection(obj = nil, user = nil)

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/spec/dummy/log/test.log

@@ -90,3 +90,117 @@
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.8ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"

data/spec/effective_roles_spec.rb

@@ -16,16 +16,16 @@ describe EffectiveRoles do
 
   describe '#roles_for_roles_mask' do
     it 'computes the appropriate roles for the given mask' do
-      EffectiveRoles.roles_for_roles_mask(nil).should eq []
-      EffectiveRoles.roles_for_roles_mask(0).should eq []
-      EffectiveRoles.roles_for_roles_mask(1).should eq [:superadmin]
-      EffectiveRoles.roles_for_roles_mask(2).should eq [:admin]
-      EffectiveRoles.roles_for_roles_mask(3).should eq [:superadmin, :admin]
-      EffectiveRoles.roles_for_roles_mask(4).should eq [:member]
-      EffectiveRoles.roles_for_roles_mask(5).should eq [:superadmin, :member]
-      EffectiveRoles.roles_for_roles_mask(6).should eq [:admin, :member]
-      EffectiveRoles.roles_for_roles_mask(7).should eq [:superadmin, :admin, :member]
-      EffectiveRoles.roles_for_roles_mask(8).should eq []
+      EffectiveRoles.roles_for(nil).should eq []
+      EffectiveRoles.roles_for(0).should eq []
+      EffectiveRoles.roles_for(1).should eq [:superadmin]
+      EffectiveRoles.roles_for(2).should eq [:admin]
+      EffectiveRoles.roles_for(3).should eq [:superadmin, :admin]
+      EffectiveRoles.roles_for(4).should eq [:member]
+      EffectiveRoles.roles_for(5).should eq [:superadmin, :member]
+      EffectiveRoles.roles_for(6).should eq [:admin, :member]
+      EffectiveRoles.roles_for(7).should eq [:superadmin, :admin, :member]
+      EffectiveRoles.roles_for(8).should eq []
     end
   end
 

data/spec/models/acts_as_role_restricted_spec.rb

@@ -0,0 +1,192 @@
+describe 'Acts As Role Restricted' do
+  let(:roles) { [:superadmin, :admin, :member] }
+
+  let(:user) { User.new.tap { |user| user.roles = [] } }
+  let(:member) { User.new.tap { |user| user.roles = [:member] } }
+  let(:admin) { User.new.tap { |user| user.roles = [:admin] } }
+  let(:superadmin) { User.new.tap { |user| user.roles = [:superadmin] } }
+  let(:member_and_admin) { User.new.tap { |user| user.roles = [:member, :admin] } }
+
+  before(:each) do
+    EffectiveRoles.setup { |config| config.roles = roles }
+  end
+
+  describe '#roles_permit?(obj)' do
+    describe 'when subject has no roles' do
+      let(:post) { Post.new }
+
+      it 'should be true when passed nil' do
+        post.roles_permit?(nil).should eq true
+      end
+
+      it 'should be true for any user' do
+        post.roles_permit?(user).should eq true
+        post.roles_permit?(member).should eq true
+        post.roles_permit?(admin).should eq true
+        post.roles_permit?(superadmin).should eq true
+      end
+    end
+
+    describe 'when subject has one role' do
+      let(:post) { Post.new.tap { |post| post.roles = [:member] } }
+
+      it 'should be false when passed nil' do
+        post.roles_permit?(nil).should eq false
+      end
+
+      it 'should be false when passed object doesnt share roles' do
+        post.roles_permit?(user).should eq false
+        post.roles_permit?(admin).should eq false
+        post.roles_permit?(superadmin).should eq false
+      end
+
+      it 'should be true for a user with all the same roles' do
+        post.roles_permit?(member).should eq true
+        post.roles_permit?(member_and_admin).should eq true
+      end
+    end
+
+    describe 'when subject has multiple roles' do
+      let(:post) { Post.new.tap { |post| post.roles = [:member, :admin] } }
+
+      it 'should be false when passed nil' do
+        post.roles_permit?(nil).should eq false
+      end
+
+      it 'should be false when passed object doesnt share all roles' do
+        post.roles_permit?(user).should eq false
+        post.roles_permit?(superadmin).should eq false
+      end
+
+      it 'should be true for a user with overlapping roles' do
+        post.roles_permit?(member).should eq true
+        post.roles_permit?(admin).should eq true
+        post.roles_permit?(member_and_admin).should eq true
+      end
+    end
+  end
+
+  describe '#roles_overlap?(obj)' do
+    describe 'when subject has no roles' do
+      let(:post) { Post.new }
+
+      it 'should be true when passed nil' do
+        post.roles_overlap?(nil).should eq true
+      end
+
+      it 'should be true when user has no roles either' do
+        post.roles_overlap?(user).should eq true
+      end
+
+      it 'should be false for any user with roles' do
+        post.roles_overlap?(member).should eq false
+        post.roles_overlap?(admin).should eq false
+        post.roles_overlap?(superadmin).should eq false
+      end
+    end
+
+    describe 'when subject has one role' do
+      let(:post) { Post.new.tap { |post| post.roles = [:member] } }
+
+      it 'should be false when passed nil' do
+        post.roles_overlap?(nil).should eq false
+      end
+
+      it 'should be false when passed object doesnt share roles' do
+        post.roles_overlap?(user).should eq false
+        post.roles_overlap?(admin).should eq false
+        post.roles_overlap?(superadmin).should eq false
+      end
+
+      it 'should be true for a user with all the same roles' do
+        post.roles_overlap?(member).should eq true
+        post.roles_overlap?(member_and_admin).should eq true
+      end
+    end
+
+    describe 'when subject has multiple roles' do
+      let(:post) { Post.new.tap { |post| post.roles = [:member, :admin] } }
+
+      it 'should be false when passed nil' do
+        post.roles_overlap?(nil).should eq false
+      end
+
+      it 'should be false when passed object doesnt share all roles' do
+        post.roles_overlap?(user).should eq false
+        post.roles_overlap?(superadmin).should eq false
+      end
+
+      it 'should be true for a user with overlapping roles' do
+        post.roles_overlap?(member).should eq true
+        post.roles_overlap?(admin).should eq true
+        post.roles_overlap?(member_and_admin).should eq true
+      end
+    end
+  end
+
+
+  describe '#roles_match?(obj)' do
+    describe 'when subject has no roles' do
+      let(:post) { Post.new }
+
+      it 'should be true when passed nil' do
+        post.roles_match?(nil).should eq true
+      end
+
+      it 'should be true when user has no roles either' do
+        post.roles_match?(user).should eq true
+      end
+
+      it 'should be false for any user with roles' do
+        post.roles_match?(member).should eq false
+        post.roles_match?(admin).should eq false
+        post.roles_match?(superadmin).should eq false
+      end
+    end
+
+    describe 'when subject has one role' do
+      let(:post) { Post.new.tap { |post| post.roles = [:member] } }
+
+      it 'should be false when passed nil' do
+        post.roles_match?(nil).should eq false
+      end
+
+      it 'should be false when passed object doesnt share roles' do
+        post.roles_match?(user).should eq false
+        post.roles_match?(admin).should eq false
+        post.roles_match?(superadmin).should eq false
+      end
+
+      it 'should be true for a user with all the same roles' do
+        post.roles_match?(member).should eq true
+      end
+
+      it 'should be false when the user has more roles' do
+        post.roles_match?(member_and_admin).should eq false
+      end
+    end
+
+    describe 'when subject has multiple roles' do
+      let(:post) { Post.new.tap { |post| post.roles = [:member, :admin] } }
+
+      it 'should be false when passed nil' do
+        post.roles_match?(nil).should eq false
+      end
+
+      it 'should be false when passed object doesnt share all roles' do
+        post.roles_match?(user).should eq false
+        post.roles_match?(superadmin).should eq false
+        post.roles_match?(member).should eq false
+        post.roles_match?(admin).should eq false
+      end
+
+      it 'should be true for a user with same roles' do
+        post.roles_match?(member_and_admin).should eq true
+      end
+    end
+  end
+
+
+
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,6 +200,7 @@ files:
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/test.log
 - spec/effective_roles_spec.rb
+- spec/models/acts_as_role_restricted_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb
 homepage: https://github.com/code-and-effect/effective_roles
@@ -257,5 +258,6 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/effective_roles_spec.rb
+- spec/models/acts_as_role_restricted_spec.rb
 - spec/spec_helper.rb
 - spec/support/factories.rb