effective_roles 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77423c072ab8659b9e632cebcd9fe939743abac4d0b374f12b3e144a70bcdfe1
-  data.tar.gz: 929bbf885819e6303f7a09ffe7c58988f4607403903b3dfdc3c141f175714eee
+  metadata.gz: 663715e96a52fd2472bcc606272284e1292c6b33b95914bfb9f8349cd367fef4
+  data.tar.gz: 9fc246e383b8b416cf755043f4f88bc5a764bfc7964a5c4736bef09b385516e3
 SHA512:
-  metadata.gz: a6917b11179747ff215fd926a595594de592b6881a3ca74c7b699fb52a1a0b482259ff2edddd0cd02d2eaebf8d265ebea506128641d32fb7f296567bad2466bf
-  data.tar.gz: 90a7d053382163c74cf8df9dee3d03b84239f4f39bd199d1b0ada04f124fd88b8ff4d7222dd8e3fce9f0eb37544c2bf386ab0a0d8c3a38ee9384b6b04b861907
+  metadata.gz: 2a07058e19d7e5b088cac749bfb2512625ea505c052559902940da20aa40a53ba47febdf64897fa5400cb883a929ac90b8d16d94a7b25ee2c0c874536a89c835
+  data.tar.gz: c48b105bf52531ee64cad811eebab4bdb078f8559435d89bc32fa74e27a5fdf7392c108710b9f220fa1e7030750564a5a770ea30286aea264a8429edd67ea04f

data/app/models/concerns/acts_as_role_restricted.rb

@@ -53,6 +53,8 @@ module ActsAsRoleRestricted
   end
 
   module ClassMethods
+    def acts_as_role_restricted?; true; end
+
     # Call with for_role(:admin) or for_role(@user.roles) or for_role([:admin, :member]) or for_role(:admin, :member, ...)
 
     # Returns all records which have been assigned any of the the given roles
@@ -87,17 +89,42 @@ module ActsAsRoleRestricted
     end
   end
 
+  def roles
+    EffectiveRoles.roles_for(roles_mask)
+  end
+
   def roles=(roles)
     self.roles_mask = EffectiveRoles.roles_mask_for(roles)
   end
 
-  def roles
-    EffectiveRoles.roles_for(roles_mask)
+  def add_role(role)
+    raise('expected role to be a symbol') unless role.kind_of?(Symbol)
+    raise('unknown role') unless EffectiveRoles.roles_mask_for(role) > 0
+
+    assign_attributes(roles: roles | [role])
+  end
+
+  def add_role!(role)
+    add_role(role); save!
+  end
+
+  def remove_role(role)
+    raise('expected role to be a symbol') unless role.kind_of?(Symbol)
+    raise('unknown role') unless EffectiveRoles.roles_mask_for(role) > 0
+
+    assign_attributes(roles: roles - [role])
+  end
+
+  def remove_role!(role)
+    remove_role(role); save!
   end
 
   # if user.is? :admin
   def is?(role)
-    roles.include?(role.try(:to_sym))
+    raise('expected role to be a symbol') unless role.kind_of?(Symbol)
+    raise('unknown role') unless EffectiveRoles.roles_mask_for(role) > 0
+
+    roles.include?(role)
   end
 
   # if user.is_any?(:admin, :editor)

data/lib/effective_roles/engine.rb

@@ -4,7 +4,7 @@ module EffectiveRoles
 
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_roles.active_record' do |app|
-      ActiveSupport.on_load :active_record do
+      app.config.to_prepare do
         ActiveRecord::Base.extend(ActsAsRoleRestricted::Base)
       end
     end

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.3.1'.freeze
 end

data/lib/effective_roles.rb

@@ -39,7 +39,7 @@ module EffectiveRoles
     roles_for(roles).map { |r| 2 ** config.roles.index(r) }.sum
   end
 
-  def self.roles_collection(resource, current_user = nil, only: nil, except: nil, multiple: nil)
+  def self.roles_collection(resource, current_user = nil, only: nil, except: nil, multiple: nil, skip_disabled: nil)
     if assignable_roles.present?
       raise('expected object to respond to is_role_restricted?') unless resource.respond_to?(:is_role_restricted?)
       raise('expected current_user to respond to is_role_restricted?') if current_user && !current_user.respond_to?(:is_role_restricted?)
@@ -49,15 +49,19 @@ module EffectiveRoles
     except = Array(except).compact
     multiple = resource.acts_as_role_restricted_options[:multiple] if multiple.nil?
     assignable = assignable_roles_collection(resource, current_user, multiple: multiple)
+    skip_disabled = assignable_roles.kind_of?(Hash) if skip_disabled.nil?
 
     roles.map do |role|
       next if only.present? && !only.include?(role)
       next if except.present? && except.include?(role)
 
+      disabled = !assignable.include?(role)
+      next if disabled && skip_disabled
+
       [
         "#{role}<p class='help-block text-muted'>#{role_description(role, resource)}</p>".html_safe,
         role,
-        ({:disabled => :disabled} unless assignable.include?(role))
+        ({:disabled => :disabled} if disabled)
       ]
     end.compact
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails