effective_roles 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac65492bdd69398ffcc0d3bd70f76860d3efebf0
-  data.tar.gz: 1fd2ee624d127650a9a705ef1473884b4f078a9c
+  metadata.gz: 411756a3ec04ce4e19ab11eee6446f9ca422f853
+  data.tar.gz: f1e95599e802a859d71e905f9776b24d5782389a
 SHA512:
-  metadata.gz: ff7c3480eb8fa686685ecfd00b431e3af6b7b19c2edbfdc6469fe540bf05ab0d1ef042082715e51424dd0eb8cc1db76a4b46f09a35de6467d2a9b8088201e712
-  data.tar.gz: c6dba3645429334945427c99ddccd78b754b1f4373ca2118c585f261cd7d33539e49beca1f4bf60d82f59500deb0f94690f1ed27599ad6f76db7c5eb084d1588
+  metadata.gz: 2bc8b3eec999f7a63d8c0b0bcea2121649e564209f794c206a40a617df0164b3404eeda37fa5a0b2a491084b4ab1ad343bd9cf174c8331214b9aaee0d2ed6e2f
+  data.tar.gz: b110ef8795df8e32c1b98e69f056902edb41b4aa2581ed846730fd6fcfd50769c7daeb854036f68ccf92100b5d5fea1fa1c295ddb70fe30c70158d28ba688987

data/app/models/concerns/acts_as_role_restricted.rb

@@ -74,11 +74,14 @@ 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?
-      true
+    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
-      (roles & obj.roles).any?
+      raise 'unsupported object passed to roles_permit?(obj).  Expecting an acts_as_role_restricted object or a roles_mask integer'
     end
   end
 

data/lib/effective_roles.rb

@@ -10,6 +10,11 @@ module EffectiveRoles
     yield self
   end
 
+  def self.roles_for_roles_mask(roles_mask)
+    roles_mask = Integer(roles_mask)
+    EffectiveRoles.roles.reject { |r| (roles_mask & 2**EffectiveRoles.roles.index(r)).zero? }
+  end
+
   def self.roles_collection(obj = nil, user = nil)
     raise ArgumentError.new('EffectiveRoles config.role_descriptions must be a Hash.  The Array syntax is deprecated.') unless EffectiveRoles.role_descriptions.kind_of?(Hash)
 

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails