effective_roles 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc53981f7c579c5ff33a87070f1d0a761c2d7fc2
-  data.tar.gz: eb79c31edb80c855541bf78a35eb717b22849af9
+  metadata.gz: a21d42ce9fbe7bbae58d667f38184abd0c55040a
+  data.tar.gz: 99fa18bac81fbed5b20643238c3a8fd31849dddc
 SHA512:
-  metadata.gz: 5f8bc2e438991c33a6eca9a851763d698f9ee664f21757336137901dac1b52f517f2f7c2f0c99b0cd6dd48c8c5505e08eb7f5b29c23c25e9052d2789a16822b8
-  data.tar.gz: 9ed90a7550a6ead52c3a49d43e315fec04e262f8947de555bc7c930128cf00e4f284b2c215c2d6a012c42ced234a6d953a69cd8fd03fa4f3ea0f42e152d1c852
+  metadata.gz: 13c45bd6247a2c4c6f265728cb19796ce92d354d3f86c787551f8e3504e07b0397bdb126780acbbf731867238d2969a757a71893e06178bdd10180ccfc7f0ffb
+  data.tar.gz: eb599a4b8f4cfdf5e7cfbee54acacce834579d8eee4d60cea3d51202d5dbb882cc442cab73c32894de91a75b74adefccbafd63a67fe098e058c1df3dafd16fb3

data/app/helpers/effective_roles_helper.rb

@@ -16,7 +16,10 @@ module EffectiveRolesHelper
   # effective_roles_summary_table(roles: [:admin, :superadmin], only: [Post, Event])
   # effective_roles_summary_table(except: [Post, User])
   # effective_roles_summary_table(aditionally: [Report::PostReport, User])
+  # effective_roles_summary_table({clinic_report: :export})
   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
 
     if opts[:only].present?
@@ -26,6 +29,7 @@ module EffectiveRolesHelper
     end
 
     # Figure out all klasses (ActiveRecord objects)
+    Rails.application.eager_load!
     tables = ActiveRecord::Base.connection.tables - ['schema_migrations', 'delayed_jobs']
 
     klasses = ActiveRecord::Base.descendants.map do |model|

data/lib/effective_roles.rb

@@ -52,13 +52,48 @@ module EffectiveRoles
 
   # This is used by the effective_roles_summary_table helper method
   def self.authorization_level(controller, role, resource)
-    auth_method = authorization_method_for_summary_table
-
-    return :unknown unless (auth_method.respond_to?(:call) || auth_method.kind_of?(Symbol))
+    return :unknown unless (authorization_method_for_summary_table.respond_to?(:call) || authorization_method_for_summary_table.kind_of?(Symbol))
     return :unknown unless (controller.current_user rescue nil).respond_to?(:roles=)
 
+    # Store the current ability (cancan support) and roles
+    current_ability = controller.instance_variable_get(:@current_ability)
+    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]
+
+    # Find the actual authorization level
+    level = _authorization_level(controller, role, resource, authorization_method_for_summary_table)
+
+    # Restore the existing current_user stuff
+    controller.instance_variable_set(:@current_ability, current_ability)
+    controller.current_user.roles = current_user_roles
+
+    level
+  end
+
+  private
+
+  def self.role_description(role, obj = nil)
+    raise 'EffectiveRoles config.role_descriptions must be a Hash' unless role_descriptions.kind_of?(Hash)
+    (role_descriptions[obj.try(:class).to_s] || {})[role] || role_descriptions[role] || ''
+  end
+
+  def self.disabled_roles_for(obj)
+    raise 'EffectiveRoles config.disabled_roles must be a Hash, Array or nil' unless [Hash, Array, NilClass].include?(disabled_roles.class)
+
+    case disabled_roles
+    when Array
+      disabled_roles
+    when Hash
+      Array(disabled_roles[obj.try(:class).to_s])
+    else
+      []
+    end
+  end
+
+  def self._authorization_level(controller, role, resource, auth_method)
     resource = (resource.new() rescue resource)
 
     # Custom actions
@@ -107,24 +142,4 @@ module EffectiveRoles
     :none
   end
 
-  private
-
-  def self.role_description(role, obj = nil)
-    raise 'EffectiveRoles config.role_descriptions must be a Hash' unless role_descriptions.kind_of?(Hash)
-    (role_descriptions[obj.try(:class).to_s] || {})[role] || role_descriptions[role] || ''
-  end
-
-  def self.disabled_roles_for(obj)
-    raise 'EffectiveRoles config.disabled_roles must be a Hash, Array or nil' unless [Hash, Array, NilClass].include?(disabled_roles.class)
-
-    case disabled_roles
-    when Array
-      disabled_roles
-    when Hash
-      Array(disabled_roles[obj.try(:class).to_s])
-    else
-      []
-    end
-  end
-
 end

data/lib/effective_roles/version.rb

@@ -1,3 +1,3 @@
 module EffectiveRoles
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_roles
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails