effective_roles 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5e585f998b2061367570bc40dbff8085f877a6
-  data.tar.gz: a0fab03af238f58c876de0f477d14692391ea8ec
+  metadata.gz: 2d832ec2924f72a3152a0fe14101828688567e16
+  data.tar.gz: 7fe30643ec98f42e1c9a31f5a75737f3a2c4d182
 SHA512:
-  metadata.gz: df1780092055c2617a963a0949999fe988a5aa296f83f6e6ac1ee121d181c7924ac773f8dcc608b1fad274a1181f9b8b00f5b218e1c134cdd4529af656c14807
-  data.tar.gz: 50572e287aae3987ddb2142a7044993f5d87edf80e37ad753145f75210bb81f18d91eb6c5477678dc86735589a52737e69c728291f36900389219f66f7d1b9db
+  metadata.gz: 0b5bfb39046d1917b89dc245ceb3649349667d08b7e1652c79842a3b77fa6042fc3a98f02610996c896d6ac5061f997405759595731b177555913530596b0959
+  data.tar.gz: 8cba4ba09d26c7cda64fdd0bfb05adcb97bf92c0cd76e8e65076d12aaef9bb5112347240fb803e59834b025229d2df2ca6a7a346dfbc6172e094d0f3836675df

data/README.md

@@ -107,25 +107,25 @@ Compare against another acts_as_role_restricted object:
 
 ```ruby
 post = Post.new()
-post.roles = [:admin]
+post.roles = :admin
 
 user = User.new()
-user.roles = []
+user.roles = nil
 
 post.roles_permit?(user)
 => false  # Post requires the :admin role, but User has no admin role
 ```
 
 ```ruby
-post.roles = [:superadmin]
-user.roles = [:admin]
+post.roles = :superadmin
+user.roles = :admin
 
 post.roles_permit?(user)
 => false  # User does not have the superadmin role
 ```
 
 ```ruby
-post.roles = [:admin]
+post.roles = :admin
 user.roles = [:superadmin, :admin]
 
 post.roles_permit?(user)
@@ -211,6 +211,32 @@ simple_form_for @user do |f|
   = f.input :roles, :collection => EffectiveRoles.roles_collection(f.object, current_user), :as => :check_boxes
 ```
 
+### Strong Parameters
+
+Make your controller aware of the passed parameters:
+
+```ruby
+def permitted_params
+  params.require(:base_object).permit(EffectiveRoles.permitted_params)
+end
+```
+
+The actual permitted parameters are:
+
+```ruby
+roles: []
+```
+
+## Summary
+
+Use the `effective_roles_summary` view helper to output a list of roles and descriptions.
+
+```ruby
+effective_roles_summary(user) # any acts_as_role_restricted object
+effective_roles_summary(post)
+```
+
+
 ## Summary table
 
 Use the `effective_roles_summary_table` view helper to output a table of the actual permission levels for each role and ActiveRecord object combination.

data/app/helpers/effective_roles_helper.rb

@@ -8,7 +8,16 @@ module EffectiveRolesHelper
 
     opts = {:f => form, :roles => roles, :descriptions => descriptions}.merge(options)
 
-    render :partial => 'effective/roles/roles_fields', :locals => opts
+    render :partial => 'effective/roles/fields', :locals => opts
+  end
+
+  def effective_roles_summary(obj, options = {}) # User or a Post, any acts_as_roleable
+    raise 'expected an acts_as_roleable object' unless obj.respond_to?(:roles)
+
+    descriptions = EffectiveRoles.role_descriptions[obj.class.name] || EffectiveRoles.role_descriptions || {}
+    opts = {:obj => obj, :roles => obj.roles, :descriptions => descriptions}.merge(options)
+
+    render :partial => 'effective/roles/summary', :locals => opts
   end
 
   # Output a table of permissions for each role based on current permissions

data/app/models/concerns/acts_as_role_restricted.rb

@@ -62,7 +62,7 @@ module ActsAsRoleRestricted
   end
 
   def roles=(roles)
-    self.roles_mask = (roles.map(&:to_sym) & EffectiveRoles.roles).map { |r| 2**EffectiveRoles.roles.index(r) }.sum
+    self.roles_mask = (Array(roles).flatten.map(&:to_sym) & EffectiveRoles.roles).map { |r| 2**EffectiveRoles.roles.index(r) }.sum
   end
 
   def roles

data/app/views/effective/roles/_summary.html.haml

@@ -0,0 +1,8 @@
+.effective-role
+  %p
+    %label.control-label Roles
+
+- roles.each do |role|
+  .effective-role
+    %p= role
+    %p.help-block= descriptions[role]

data/lib/effective_roles.rb

@@ -16,6 +16,10 @@ module EffectiveRoles
     yield self
   end
 
+  def self.permitted_params
+    {roles: []}
+  end
+
   def self.authorized?(controller, action, resource)
     if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
       raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
@@ -41,7 +45,7 @@ module EffectiveRoles
 
   # EffectiveRoles.roles_mask_for(:admin, :member)
   def self.roles_mask_for(*roles)
-    (Array(roles).map(&:to_sym) & EffectiveRoles.roles).map { |r| 2**EffectiveRoles.roles.index(r) }.sum
+    (Array(roles).flatten.map(&:to_sym) & EffectiveRoles.roles).map { |r| 2**EffectiveRoles.roles.index(r) }.sum
   end
 
   def self.roles_collection(obj = nil, user = nil)

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -167,7 +167,8 @@ files:
 - app/models/concerns/acts_as_role_restricted.rb
 - app/models/effective/access_denied.rb
 - app/views/admin/roles/index.html.haml
-- app/views/effective/roles/_roles_fields.html.haml
+- app/views/effective/roles/_fields.html.haml
+- app/views/effective/roles/_summary.html.haml
 - app/views/effective/roles/_summary_table.html.haml
 - config/effective_roles.rb
 - config/routes.rb