effective_roles 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58eaf0d1c8638d1f0f99db14e020ee9d1b8d44b8
-  data.tar.gz: c6357c32354161bdd205cd1d1166324da3dcbda1
+  metadata.gz: e7b3c3686d78be5fc3ac9d9a81fe5fad8901c03e
+  data.tar.gz: ae7e62f7cef4c2029709d448e7720f784c042c12
 SHA512:
-  metadata.gz: 1534d3a0e1aa8de3f66d5f57432e87ed2e5e67b3af72afa923d55ab2f1c8bc96f83ce356d6bae4699e856b6989bd3afda4ced5203119a2ae9a8e70cff9306dcb
-  data.tar.gz: aab908afc6cad823ffb41e6b95f2e3bc58d3ba40614d12576a953f984dbad1044ebc48d3b38f0a3b7775618abfa3dbbe3835bf8003110c294fa19f0cb82bbbfe
+  metadata.gz: 7331da01447ec7fda1dfd106632078ff8bf54c62f80c2aebd8f09e1fe6ab7a71cddf222e09d6f57d582704e34c8e2da46c3b820bc0c3964e1c5d2a7ef8599664
+  data.tar.gz: edbb944a7efa16e069cf2c544d4990c0c7b6492ab78f8fc9143245634e8b599769d460143827f6f558dd70b879bd6e32a5965ca3e233e113d2ca0cafa028c2e9

data/app/controllers/admin/roles_controller.rb

@@ -0,0 +1,13 @@
+module Admin
+  class RolesController < ApplicationController
+    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+
+    layout (EffectiveRoles.layout.kind_of?(Hash) ? EffectiveRoles.layout[:admin_roles] : EffectiveRoles.layout)
+
+    def index
+      @page_title = 'Roles'
+
+      EffectiveOrders.authorized?(self, :admin, :effective_roles)
+    end
+  end
+end

data/app/helpers/effective_roles_helper.rb

@@ -19,7 +19,8 @@ module EffectiveRolesHelper
   def effective_roles_summary_table(opts = {})
     raise 'Expected argument to be a Hash' unless opts.kind_of?(Hash)
 
-    roles = Array(opts[:roles]).presence || EffectiveRoles.roles
+    roles = Array(opts[:roles]).presence
+    roles ||= EffectiveRoles.roles + [:signed_in, :signed_out]
 
     if opts[:only].present?
       klasses = Array(opts[:only])
@@ -82,6 +83,10 @@ module EffectiveRolesHelper
       content_tag(:span, 'Delete only', class: 'label label-warning')
     when :none
       content_tag(:span, 'No Access', class: 'label label-danger')
+    when :yes
+      content_tag(:span, 'Yes', class: 'label label-success')
+    when :no
+      content_tag(:span, 'No', class: 'label label-danger')
     when :unknown
       content_tag(:span, 'Unknown', class: 'label')
     else
@@ -90,8 +95,10 @@ module EffectiveRolesHelper
   end
 
   def effective_roles_authorization_label(klass)
-    klass = klass.keys.first if klass.kind_of?(Hash)
+    # Custom permissions
+    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::', 'Effective::'].each do |replace|

data/app/views/admin/roles/index.html.haml

@@ -0,0 +1,3 @@
+%h2= @page_title
+
+= effective_roles_summary_table

data/config/routes.rb

@@ -0,0 +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

data/lib/effective_roles.rb

@@ -5,6 +5,8 @@ module EffectiveRoles
   mattr_accessor :roles
   mattr_accessor :role_descriptions
 
+  mattr_accessor :layout
+
   mattr_accessor :assignable_roles
   mattr_accessor :disabled_roles
 
@@ -14,6 +16,8 @@ module EffectiveRoles
     yield self
   end
 
+  # This method converts whatever is given into its roles
+  # Pass an object, Integer, or Symbol to find corresponding role
   def self.roles_for(obj)
     if obj.respond_to?(:is_role_restricted?)
      obj.roles
@@ -57,17 +61,41 @@ module EffectiveRoles
 
     # Store the current ability (cancan support) and roles
     current_ability = controller.instance_variable_get(:@current_ability)
+    current_user = controller.instance_variable_get(:@current_user)
     current_user_roles = controller.current_user.roles
 
     # Set up the user, so the check is done with the desired permission level
     controller.instance_variable_set(:@current_ability, nil)
-    controller.current_user.roles = [role]
+
+    case role
+    when :signed_in
+      controller.current_user.roles = []
+    when :signed_out
+      controller.instance_variable_set(:@current_user, nil)
+
+      if defined?(EffectiveLogging) && EffectiveLogging.respond_to?(:supressed?)
+        EffectiveLogging.supressed { (controller.request.env['warden'].set_user(false) rescue nil) }
+      else
+        (controller.request.env['warden'].set_user(false) rescue nil)
+      end
+    else
+      controller.current_user.roles = [role]
+    end
 
     # Find the actual authorization level
     level = _authorization_level(controller, role, resource, authorization_method_for_summary_table)
 
     # Restore the existing current_user stuff
+    if role == :signed_out
+      if defined?(EffectiveLogging) && EffectiveLogging.respond_to?(:supressed?)
+        EffectiveLogging.supressed { (controller.request.env['warden'].set_user(current_user) rescue nil) }
+      else
+        (controller.request.env['warden'].set_user(current_user) rescue nil)
+      end
+    end
+
     controller.instance_variable_set(:@current_ability, current_ability)
+    controller.instance_variable_set(:@current_user, current_user)
     controller.current_user.roles = current_user_roles
 
     level
@@ -99,7 +127,7 @@ module EffectiveRoles
     # Custom actions
     if resource.kind_of?(Hash)
       resource.each do |key, value|
-        return value if (controller.instance_exec(controller, value, key, &auth_method) rescue false)
+        return (controller.instance_exec(controller, key, value, &auth_method) rescue false) ? :yes : :no
       end
     end
 

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '1.3.5'.freeze
+  VERSION = '1.3.6'.freeze
 end

data/lib/generators/templates/effective_roles.rb

@@ -71,10 +71,13 @@ EffectiveRoles.setup do |config|
   #
   # Or just keep it simple, and use this Array syntax of permissions for every resource
   #
-  # config.unassignable_roles = [:member]
-  config.disabled_roles = {
-    'User' => [:member]
-  }
+  # config.disabled_roles = [:member]
+  #
+  # or
+  #
+  # config.disabled_roles = {
+  #   'User' => [:member]
+  # }
 
 
   # config.authorization_method_for_summary_table
@@ -86,4 +89,8 @@ EffectiveRoles.setup do |config|
   # Use CanCan: can?(action, resource)
   config.authorization_method_for_summary_table = Proc.new { |controller, action, resource| true }
 
+  # Layout Settings
+  # Configure the Layout per controller, or all at once
+  config.layout = 'application'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -159,20 +159,25 @@ executables: []
 extensions: []
 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/views/admin/roles/index.html.haml
 - app/views/effective/roles/_roles_fields.html.haml
 - app/views/effective/roles/_summary_table.html.haml
+- config/routes.rb
+- lib/effective_roles.rb
 - lib/effective_roles/engine.rb
 - lib/effective_roles/version.rb
-- lib/effective_roles.rb
 - lib/generators/effective_roles/install_generator.rb
-- lib/generators/templates/effective_roles.rb
 - lib/generators/templates/README
+- lib/generators/templates/effective_roles.rb
 - lib/tasks/effective_roles_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
+- 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
@@ -180,6 +185,7 @@ files:
 - 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
@@ -194,11 +200,8 @@ files:
 - 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
@@ -223,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Assign multiple roles to any User or other ActiveRecord object. Select only