effective_roles 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dcace94c980b6d3d8ca8e2e3a89ff62ddf29048
-  data.tar.gz: 2c67c15ec721d5e346095ed9bcab84b12af3500e
+  metadata.gz: 3b5041b2db41d9522772b70dc37c388b7a57e9c0
+  data.tar.gz: ea01182fa2ba7126f0cd565728e0d0d6baf66741
 SHA512:
-  metadata.gz: f88182a9352373f99b95eef827fcb827a642e866cda029c5fb29caf9a1680c2aa6b089321295f853d541e0d2f452987687b8ee7992f52e6134cfae5e9bcb2423
-  data.tar.gz: b6ba9bb14af5d0bba32135aacc92955dffb5d3498d88884da0f095b29b37d675c8aeed00c4301729637b409fe37d1181f6c9a98104c40a532c18c67300f315f6
+  metadata.gz: 077e5eda1e614235919466f6dd16d6aed8a1e8d5ebc2882cf8a5654f8415a6fd543d476fd06b244e50bdf866aa4c7534f39a93d20a2adf5e2cb6b0e3c50ec4d6
+  data.tar.gz: a58d013d1779f351632cad1e6b60610decd6caa40ea413faad653d350996b5c9c2c343490e57ec8b3ef17c44f74e965c71b0815ca921afb1605d54b72b0d09a7

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2017 Code and Effect Inc.
+Copyright 2018 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -61,17 +61,6 @@ class AddRolesToPost < ActiveRecord::Migration
 end
 ```
 
-## Strong Parameters
-
-Make your controller aware of the acts_as_role_restricted passed parameters:
-
-```ruby
-def permitted_params
-  params.require(:base_object).permit(:roles => [])
-end
-```
-
-
 ## Usage
 
 ### Defining Roles
@@ -178,37 +167,32 @@ before_filter :only => [:create, :update] do
 end
 ```
 
-
 ## Form Helper
 
 If you pass current_user (or any acts_as_role_restricted object) into these helpers, only the assignable_roles will be displayed.
 
-### Formtastic
+### effective_form_with
 
 ```ruby
-semantic_form_for @user do |f|
-  = effective_roles_fields(f)
+effective_form_with(model: @user) do |f|
+  = f.checks :roles, EffectiveRoles.roles_collection(f.object, current_user)
 ```
 
-or
-
 ```ruby
-semantic_form_for @user do |f|
-  = effective_roles_fields(f, current_user)
+effective_form_with(model: @user) do |f|
+  = f.radios :roles, EffectiveRoles.roles_collection(f.object, current_user)
 ```
 
 ### simple_form
 
 ```ruby
 simple_form_for @user do |f|
-  = f.input :roles, :collection => EffectiveRoles.roles_collection(f.object), :as => :check_boxes
+  = f.input :roles, collection: EffectiveRoles.roles_collection(f.object), as: :check_boxes
 ```
 
-or
-
 ```ruby
 simple_form_for @user do |f|
-  = f.input :roles, :collection => EffectiveRoles.roles_collection(f.object, current_user), :as => :check_boxes
+  = f.input :roles, collection: EffectiveRoles.roles_collection(f.object, current_user), as: :check_boxes
 ```
 
 ### Strong Parameters
@@ -328,17 +312,6 @@ MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 
 This model implements the https://github.com/ryanb/cancan/wiki/Role-Based-Authorization multi role based authorization based on the roles_mask field
 
-## Testing
-
-The test suite for this gem is unfortunately not yet complete.
-
-Run tests by:
-
-```ruby
-rake spec
-```
-
-
 ## Contributing
 
 1. Fork it

data/app/controllers/admin/roles_controller.rb

@@ -1,13 +1,12 @@
 module Admin
   class RolesController < ApplicationController
-    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
+    before_action :authenticate_user!
 
     layout (EffectiveRoles.layout.kind_of?(Hash) ? EffectiveRoles.layout[:admin_roles] : EffectiveRoles.layout)
 
     def index
       @page_title = 'Roles'
-
-      EffectiveRoles.authorized?(self, :admin, :effective_roles)
+      EffectiveRoles.authorize!(self, :admin, :effective_roles)
     end
   end
 end

data/app/helpers/effective_roles_helper.rb

@@ -1,23 +1,11 @@
 module EffectiveRolesHelper
-  # For use in formtastic forms
-  def effective_roles_fields(form, user = nil, options = {})
-    raise ArgumentError.new('EffectiveRoles config.role_descriptions must be a Hash.  The Array syntax is deprecated.') unless EffectiveRoles.role_descriptions.kind_of?(Hash)
-
-    roles = EffectiveRoles.assignable_roles_for(user, form.object)
-    descriptions = EffectiveRoles.role_descriptions[form.object.class.name] || EffectiveRoles.role_descriptions || {}
-
-    opts = {:f => form, :roles => roles, :descriptions => descriptions}.merge(options)
-
-    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)
+    opts = { obj: obj, roles: obj.roles, descriptions: descriptions }.merge(options)
 
-    render :partial => 'effective/roles/summary', :locals => opts
+    render partial: 'effective/roles/summary', locals: opts
   end
 
   # Output a table of permissions for each role based on current permissions
@@ -33,17 +21,17 @@ module EffectiveRolesHelper
 
     if opts[:only].present?
       klasses = Array(opts[:only])
-      render partial: '/effective/roles/summary_table', locals: {klasses: klasses, roles: roles}
+      render partial: '/effective/roles/summary_table', locals: { klasses: klasses, roles: roles }
       return
     end
 
     # Figure out all klasses (ActiveRecord objects)
     Rails.application.eager_load!
-    tables = ActiveRecord::Base.connection.tables - ['schema_migrations', 'delayed_jobs']
+    tables = ActiveRecord::Base.connection.tables - ['schema_migrations', 'delayed_jobs', 'active_storage_attachments']
 
-    klasses = ActiveRecord::Base.descendants.map do |model|
-      model if (model.respond_to?(:table_name) && tables.include?(model.table_name))
-    end.compact
+    klasses = ActiveRecord::Base.descendants.select do |model|
+      (model.respond_to?(:table_name) && tables.include?(model.table_name))
+    end
 
     if opts[:except]
       klasses = klasses - Array(opts[:except])
@@ -71,35 +59,35 @@ module EffectiveRolesHelper
       klasses = klasses + Array(opts[:additionally])
     end
 
-    render partial: '/effective/roles/summary_table', locals: {klasses: klasses, roles: roles}
+    render partial: '/effective/roles/summary_table', locals: { klasses: klasses, roles: roles }
   end
 
   def effective_roles_authorization_badge(level)
     case level
     when :manage
-      content_tag(:span, 'Full', class: 'label label-primary')
+      content_tag(:span, 'Full', class: 'label label-primary badge badge-primary')
     when :update
-      content_tag(:span, 'Edit', class: 'label label-success')
+      content_tag(:span, 'Edit', class: 'label label-success badge badge-success')
     when :update_own
-      content_tag(:span, 'Edit Own', class: 'label label-info')
+      content_tag(:span, 'Edit Own', class: 'label label-info badge badge-info')
     when :create
-      content_tag(:span, 'Create', class: 'label label-success')
+      content_tag(:span, 'Create', class: 'label label-success badge badge-success')
     when :show
-      content_tag(:span, 'Read only', class: 'label label-warning')
+      content_tag(:span, 'Read only', class: 'label label-warning badge badge-warning')
     when :index
-      content_tag(:span, 'Read only', class: 'label label-warning')
+      content_tag(:span, 'Read only', class: 'label label-warning badge badge-warning')
     when :destroy
-      content_tag(:span, 'Delete only', class: 'label label-warning')
+      content_tag(:span, 'Delete only', class: 'label label-warning badge badge-warning')
     when :none
-      content_tag(:span, 'No Access', class: 'label label-danger')
+      content_tag(:span, 'No Access', class: 'label label-danger badge badge-danger')
     when :yes
-      content_tag(:span, 'Yes', class: 'label label-primary')
+      content_tag(:span, 'Yes', class: 'label label-primary badge badge-primary')
     when :no
-      content_tag(:span, 'No', class: 'label label-danger')
+      content_tag(:span, 'No', class: 'label label-danger badge badge-danger')
     when :unknown
-      content_tag(:span, 'Unknown', class: 'label')
+      content_tag(:span, 'Unknown', class: 'label badge')
     else
-      content_tag(:span, level.to_s.titleize, class: 'label label-info')
+      content_tag(:span, level.to_s.titleize, class: 'label label-info badge badge-info')
     end
   end
 
@@ -108,13 +96,7 @@ module EffectiveRolesHelper
     return "#{klass.keys.first} #{klass.values.first}" if klass.kind_of?(Hash) && klass.length == 1
 
     klass = klass.keys.first if klass.kind_of?(Hash)
-    label = (klass.respond_to?(:name) ? klass.name : klass.to_s)
-
-    ['Effective::Datatables::'].each do |replace|
-      label = label.sub(replace, '')
-    end
-
-    label
+    klass.respond_to?(:name) ? klass.name : klass.to_s
   end
 
 end

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

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

data/config/routes.rb

@@ -1,9 +1,9 @@
-Rails.application.routes.draw do
-  mount EffectiveRoles::Engine => '/', as: 'effective_roles'
-end
-
 EffectiveRoles::Engine.routes.draw do
   namespace :admin do
     resources :roles, only: [:index]
   end
 end
+
+Rails.application.routes.draw do
+  mount EffectiveRoles::Engine => '/', as: 'effective_roles'
+end

data/lib/effective_roles.rb

@@ -17,14 +17,24 @@ module EffectiveRoles
   end
 
   def self.permitted_params
-    {roles: []}
+    { 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)
+    @_exceptions ||= [Effective::AccessDenied, (CanCan::AccessDenied if defined?(CanCan)), (Pundit::NotAuthorizedError if defined?(Pundit))].compact
+
+    return !!authorization_method unless authorization_method.respond_to?(:call)
+    controller = controller.controller if controller.respond_to?(:controller)
+
+    begin
+      !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
+    rescue *@_exceptions
+      false
     end
-    true
+  end
+
+  def self.authorize!(controller, action, resource)
+    raise Effective::AccessDenied unless authorized?(controller, action, resource)
   end
 
   # This method converts whatever is given into its roles
@@ -93,7 +103,7 @@ module EffectiveRoles
     when :public
       controller.instance_variable_set(:@current_user, nil)
 
-      if defined?(EffectiveLogging) && EffectiveLogging.respond_to?(:supressed?)
+      if defined?(EffectiveLogging)
         EffectiveLogging.supressed { (controller.request.env['warden'].set_user(false) rescue nil) }
       else
         (controller.request.env['warden'].set_user(false) rescue nil)
@@ -108,7 +118,7 @@ module EffectiveRoles
     # Restore the existing current_user stuff
     if role == :public
       ActiveRecord::Base.transaction do
-        if defined?(EffectiveLogging) && EffectiveLogging.respond_to?(:supressed?)
+        if defined?(EffectiveLogging)
           EffectiveLogging.supressed { (controller.request.env['warden'].set_user(current_user) rescue nil) }
         else
           (controller.request.env['warden'].set_user(current_user) rescue nil)

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '1.4.4'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,132 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Assign multiple roles to any User or other ActiveRecord object. Select
   only the appropriate objects based on intelligent, chainable ActiveRecord::Relation
   finder methods.
@@ -161,13 +35,11 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
 - app/controllers/admin/roles_controller.rb
 - app/helpers/effective_roles_helper.rb
 - 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/_fields.html.haml
 - app/views/effective/roles/_summary.html.haml
 - app/views/effective/roles/_summary_table.html.haml
 - config/effective_roles.rb
@@ -176,37 +48,6 @@ files:
 - lib/effective_roles/engine.rb
 - lib/effective_roles/version.rb
 - lib/generators/effective_roles/install_generator.rb
-- lib/tasks/effective_roles_tasks.rake
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/post.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- 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
 licenses:
 - MIT
@@ -233,34 +74,4 @@ specification_version: 4
 summary: Assign multiple roles to any User or other ActiveRecord object. Select only
   the appropriate objects based on intelligent, chainable ActiveRecord::Relation finder
   methods.
-test_files:
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/post.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config.ru
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- 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
+test_files: []