effective_roles 2.2.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7ff9e1eeeb8d78b3f50617feee6d0de9d591478bb8a8cc69f11d2a94bb7c4d0
-  data.tar.gz: 66289a8ec1e2206d24a3e612b43b1da5e34311fdaff50973d7995b23052d5ee8
+  metadata.gz: 9bfa0c4c2878a1c88ee466c2cc321ad1ad8016adf44b521d710b81f11bda17d1
+  data.tar.gz: bb370586b9e8ff441156be67dcc9b296c7a445602100a8d571b49db406ee9300
 SHA512:
-  metadata.gz: dc6fccdfa2a4e1b534218b0d37ca175e6b5e339bc493130569ee3e0649c4a4505e52d358d28be3ab2de90c9b2cc7f74beb4c8fed9afffaadc2ab7f3877ed5e33
-  data.tar.gz: 0a5c756b3e12e9dd69c156ba2fe8360dd7caf3612a623641c45f08bf18b8fcffe9790687bf344141cd149f877907b41fbb9a2f0270a4546dbf3e555b031e7a66
+  metadata.gz: 85b549b0bddf0e29f1ac29eb37b49a227f49a6d8fd44396c727bc47c067e6ecb9f9297f4f5cf1f4ae274ac96b7bdd7aad6a59a8453dd2b46ca748d6f5585e44d
+  data.tar.gz: 45c5c8fd2a446bec85814198e8e609e67011758ddac0f2d8529ef8854f2a4b51d4a389f39f9f72ad7614c738f675b9bbc366901217bb94e50e8a98e4427e1f17

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.1'.freeze
+  VERSION = '2.3.2'.freeze
 end

data/lib/effective_roles.rb

@@ -102,12 +102,7 @@ module EffectiveRoles
       assignable_roles
     end.uniq
 
-    # Check boxes
-    multiple = resource.acts_as_role_restricted_options[:multiple] if multiple.nil?
-    return assigned_roles if multiple
-
-    # Radios
-    (resource.roles - assigned_roles).present? ? [] : assigned_roles
+    assigned_roles
   end
 
   def self.assignable_roles_present?(resource)

metadata

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