effective_datatables 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80ef322422055559272f3145551bff1357ee74e5
-  data.tar.gz: 28bc97f374afb93abd7bf5a8007044a37afffef7
+  metadata.gz: 6e5ba7e9014cdedb565e735b68524303cbfaa929
+  data.tar.gz: 1ac9fef5c0813e8de5a8dd165b4cc19172980e23
 SHA512:
-  metadata.gz: 8ca29bb7239a4e4b526b628053926b7308020b01c41b3d4ca557eaff74be562f6c90df91b356794ab88a9bcdb35125d473d5927d34f9340fcfb2e4fd466f34df
-  data.tar.gz: d5d5ed8d06bc00aae6a3bfd046830d9f7f2d428ce95d6b3893698d29ed18a0f6d7b999f5f1fcde49fe5d43209cd33c9bb366e0f2be9bc0c4475b5118cf981f2b
+  metadata.gz: 892e67bedf81da91c2a66f9ac1e3fcf58dd4727503ca7336de967eea241a0b0fcc1b7749e428fd44af72192cbba4c2bef66c85e6a553806e6e8b54f33b2e79d4
+  data.tar.gz: f73e528fd21c6934bc6f0219554c33947c6e1e054059da70a38f1e561ebe7ecf0c171162e6a030feb17b0086ea344484ca87151d1976a706d4f3e3e3548402bf

data/app/controllers/effective/datatables_controller.rb

@@ -8,11 +8,11 @@ module Effective
         @datatable = find_datatable(params[:id]).try(:new) || raise('unable to find datatable')
         @datatable.view = view_context
 
-        EffectiveDatatables.authorized?(self, :index, @datatable.collection_class)
+        EffectiveDatatables.authorize!(self, :index, @datatable.collection_class)
 
         render json: @datatable.to_json
       rescue => e
-        (EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class)) rescue false)
+        EffectiveDatatables.authorized?(self, :index, @datatable.try(:collection_class))
 
         render json: error_json(e)
       end

data/app/helpers/effective_datatables_helper.rb

@@ -6,9 +6,7 @@ module EffectiveDatatablesHelper
 
     datatable.view ||= self
 
-    begin
-      EffectiveDatatables.authorized?(controller, :index, datatable.collection_class) || raise(Effective::AccessDenied)
-    rescue Effective::AccessDenied => e
+    unless EffectiveDatatables.authorized?(controller, :index, datatable.collection_class)
       return content_tag(:p, "You are not authorized to view this datatable. (cannot :index, #{datatable.collection_class})")
     end
 

data/app/models/effective/effective_datatable/format.rb

@@ -103,57 +103,42 @@ module Effective
 
       def actions_col_locals(opts)
         return {} unless opts[:as] == :actions
-        return { show_path: false, edit_path: false, destroy_path: false } unless active_record_collection?
 
-        locals = {}
-
-        locals[:show_action] = opts[:show]
-        locals[:edit_action] = opts[:edit]
-        locals[:destroy_action] = opts[:destroy]
-
-        if locals[:show_action] && (EffectiveDatatables.authorized?(view.controller, :show, collection_class) rescue false)
-          locals[:show_path] = resource.show_path(check: true)
-        else
-          locals[:show_path] = false
-        end
-
-        if locals[:edit_action] && (EffectiveDatatables.authorized?(view.controller, :edit, collection_class) rescue false)
-          locals[:edit_path] = resource.edit_path(check: true)
-        else
-          locals[:edit_path] = false
-        end
-
-        if locals[:destroy_action] && (EffectiveDatatables.authorized?(view.controller, :destroy, collection_class) rescue false)
-          locals[:destroy_path] = resource.destroy_path(check: true)
-        else
-          locals[:destroy_path] = false
-        end
-
-        locals
+        locals = {
+          show_action: (
+            active_record_collection? && opts[:show] && resource.routes[:show] &&
+            EffectiveDatatables.authorized?(view.controller, :show, collection_class)
+          ),
+          edit_action: (
+            active_record_collection? && opts[:edit] && resource.routes[:edit] &&
+            EffectiveDatatables.authorized?(view.controller, :edit, collection_class)
+          ),
+          destroy_action: (
+            active_record_collection? && opts[:destroy] && resource.routes[:destroy] &&
+            EffectiveDatatables.authorized?(view.controller, :destroy, collection_class)
+          ),
+          effective_resource: resource
+        }
       end
 
       def resource_col_locals(opts)
         return {} unless (resource = opts[:resource]).present?
 
-        locals = { name: opts[:name], macro: opts[:as], show_path: false, edit_path: false }
+        locals = { name: opts[:name], effective_resource: resource, show_action: false, edit_action: false }
 
         case opts[:action]
         when :edit
-          if (EffectiveDatatables.authorized?(view.controller, :edit, resource.klass) rescue false)
-            locals[:edit_path] = resource.edit_path(check: true)
-          end
+          locals[:edit_action] = (resource.routes[:edit] && EffectiveDatatables.authorized?(view.controller, :edit, resource.klass))
         when :show
-          if (EffectiveDatatables.authorized?(view.controller, :show, resource.klass) rescue false)
-            locals[:show_path] = resource.show_path(check: true)
-          end
+          locals[:show_action] = (resource.routes[:show] && EffectiveDatatables.authorized?(view.controller, :show, resource.klass))
         when false
           # Nothing
         else
           # Fallback to defaults - check edit then show
-          if (EffectiveDatatables.authorized?(view.controller, :edit, resource.klass) rescue false)
-            locals[:edit_path] = resource.edit_path(check: true)
-          elsif (EffectiveDatatables.authorized?(view.controller, :show, resource.klass) rescue false)
-            locals[:show_path] = resource.show_path(check: true)
+          if resource.routes[:edit] && EffectiveDatatables.authorized?(view.controller, :edit, resource.klass)
+            locals[:edit_action] = true
+          elsif resource.routes[:show] && EffectiveDatatables.authorized?(view.controller, :show, resource.klass)
+            locals[:show_action] = true
           end
         end
 

data/app/views/effective/datatables/_actions_column.html.haml

@@ -1,11 +1,8 @@
-- if show_path
-  - if show_action == true || (EffectiveDatatables.authorized?(controller, :show, resource) rescue false)
-    = show_icon_to send(show_path, resource.to_param)
+- if show_action && EffectiveDatatables.authorized?(self, :show, resource)
+  = show_icon_to effective_resource.action_path(:show, resource)
 
-- if edit_path
-  - if edit_action == true || (EffectiveDatatables.authorized?(controller, :edit, resource) rescue false)
-    = edit_icon_to send(edit_path, resource.to_param)
+- if edit_action && EffectiveDatatables.authorized?(self, :edit, resource)
+  = edit_icon_to effective_resource.action_path(:edit, resource)
 
-- if destroy_path
-  - if destroy_action == true || (EffectiveDatatables.authorized?(controller, :destroy, resource) rescue false)
-    = destroy_icon_to send(destroy_path, resource.to_param), data: { method: :delete, confirm: "Delete #{resource}?" }
+- if destroy_action && EffectiveDatatables.authorized?(self, :destroy, resource)
+  = destroy_icon_to effective_resource.action_path(:destroy, resource), data: { method: :delete, confirm: "Delete #{resource}?" }

data/app/views/effective/datatables/_resource_column.html.haml

@@ -1,8 +1,8 @@
-- Array(datatable.array_collection? ? resource : resource.send(name)).each do |associated|
+- Array(datatable.array_collection? ? resource : resource.send(name)).each do |resource|
   .col-resource_item
-    - if show_path
-      = link_to associated.to_s, send(show_path, associated.to_param), title: associated.to_s
-    - elsif edit_path
-      = link_to associated.to_s, send(edit_path, associated.to_param), title: associated.to_s
+    - if show_action
+      = link_to resource.to_s, effective_resource.action_path(:show, resource), title: resource.to_s
+    - elsif edit_action
+      = link_to resource.to_s, effective_resource.action_path(:edit, resource), title: resource.to_s
     - else
-      = associated.to_s.html_safe
+      = resource.to_s.html_safe

data/config/effective_datatables.rb

@@ -2,23 +2,24 @@ EffectiveDatatables.setup do |config|
   # Authorization Method
   #
   # This method is called by all controller actions with the appropriate action and resource
-  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
+  # If it raises an exception or returns false, an Effective::AccessDenied Error will be raised
   #
-  # Use via Proc (and with CanCan):
-  # config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
+  # Use via Proc:
+  # Proc.new { |controller, action, resource| authorize!(action, resource) }       # CanCan
+  # Proc.new { |controller, action, resource| can?(action, resource) }             # CanCan with skip_authorization_check
+  # Proc.new { |controller, action, resource| authorize "#{action}?", resource }   # Pundit
+  # Proc.new { |controller, action, resource| current_user.is?(:admin) }           # Custom logic
   #
-  # Use via custom method:
-  # config.authorization_method = :my_authorization_method
-  #
-  # And then in your application_controller.rb:
+  # Use via Boolean:
+  # config.authorization_method = true  # Always authorized
+  # config.authorization_method = false # Always unauthorized
   #
-  # def my_authorization_method(action, resource)
-  #   current_user.is?(:admin)
+  # Use via Method (probably in your application_controller.rb):
+  # config.authorization_method = :my_authorization_method
+  # def my_authorization_method(resource, action)
+  #   true
   # end
-  #
-  # Or disable the check completely:
-  # config.authorization_method = false
-  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
+  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
 
   # Default number of entries shown per page
   # Valid options are: 5, 10, 25, 50, 100, 250, 500, :all

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.3.6'.freeze
+  VERSION = '3.3.7'.freeze
 end

data/lib/effective_datatables.rb

@@ -17,10 +17,20 @@ module EffectiveDatatables
   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) # Do the right thing with a view
+
+    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
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.3.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement