effective_datatables 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8dde14a2c549834fa79c68dc0631d892cd13e16
-  data.tar.gz: 0a6c3c8a8b7b2b3ace863ff3529eb42e50c1fd5c
+  metadata.gz: 04e0a6631353c2886a27998e81421932eab67e61
+  data.tar.gz: e8ebacdf2f46047dc0b1c83577c6fda40e8c28c0
 SHA512:
-  metadata.gz: df0878341b50d73ab2cae46045d436e21f0c755790786fdab0c4763d5085a25f1fcaa94ce9cd06ff4bf4cef3d731279cc499c875b28f58931f4443164be5fba6
-  data.tar.gz: 6ff3ca409d916d1e32809e2b65676128f0171b275a84286b00d2cdfb9b30a3257b5d21ba1a4ebe01d3842cdc2e7f30764c3007f863777cd29846d42313506e29
+  metadata.gz: d3b227fc1bc1fac6642c927ff68b0af939d35ffcc3ba307bf18793de924f34b0be5337cccec271efac3bcde5280880dc577fa7887e880156bf4247cb3edad60c
+  data.tar.gz: ea3164ff927280bc31f52b6d5d65c0a9b019f484aba9602d5249728e4dbb5397bcb2334857b6dc227d591e9fb257cb9342e61039fa4d5b4ce23baf407371af22

data/README.md

@@ -92,7 +92,7 @@ We're going to display this DataTable on the posts#index action.
 ```ruby
 class PostsController < ApplicationController
   def index
-    @datatable = PostsDatatable.new(self)
+    @datatable = PostsDatatable.new
   end
 end
 ```
@@ -131,7 +131,7 @@ class PostsDatatable < Effective::Datatable
   # Everything in the filters block ends up in a single form
   # The form is submitted by datatables javascript as an AJAX post
   filters do
-    # Scopes are rendered as a single radio button form field (works well with effective_form_inputs gem)
+    # Scopes are rendered as a single radio button form field (works well with effective_bootstrap gem)
     # The scopes only work when your collection is an ActiveRecord class, and they must exist on the model
     # The current scope is automatically applied by effective_datatables to your collection
     # You don't have to consider the current scope when writing your collection block
@@ -256,7 +256,7 @@ In the above example, when `attributes[:user_id]` is present, the table displays
 ```ruby
 class PostsController < ApplicationController
   def index
-    @datatable = PostsDatatable.new(self, user_id: current_user.id)
+    @datatable = PostsDatatable.new(user_id: current_user.id)
   end
 end
 ```
@@ -312,7 +312,7 @@ Attributes cannot be changed by search, filter, or state in any way. They're gua
 ```ruby
 class PostsController < ApplicationController
   def index
-    @datatable = PostsDatatable.new(self, user_id: current_user.id, admin: true)
+    @datatable = PostsDatatable.new(user_id: current_user.id, admin: true)
   end
 end
 ```

data/app/models/effective/datatable_column.rb

@@ -1,3 +1,4 @@
+# In practice this is just a regular hash with the aggregate, format, search, sort do syntax that saves a block
 module Effective
   class DatatableColumn
     attr_accessor :attributes

data/app/models/effective/datatable_dsl_tool.rb

@@ -16,16 +16,24 @@ module Effective
       @view = datatable.view
     end
 
-    def method_missing(method, *args)
+    def method_missing(method, *args, &block)
       # Catch a common error
       if [:bulk_actions, :charts, :collection, :filters].include?(method) && in_datatables_do_block
         raise "#{method} block must be declared outside the datatable do ... end block"
       end
 
       if datatable.respond_to?(method)
-        datatable.send(method, *args)
+        if block_given?
+          datatable.send(method, *args) { yield }
+        else
+          datatable.send(method, *args)
+        end
       elsif view.respond_to?(method)
-        view.send(method, *args)
+        if block_given?
+          view.send(method, *args) { yield }
+        else
+          view.send(method, *args)
+        end
       else
         super
       end

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

@@ -75,6 +75,8 @@ module Effective
                 resource.send(name)
               end
 
+            elsif opts[:as] == :actions
+              obj
             elsif opts[:as] == :effective_obfuscation
               obj.to_param
             elsif array_collection?

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

@@ -1,7 +1,7 @@
 module Effective
   module EffectiveDatatable
     module Cookie
-      MAX_COOKIE_SIZE = 2500  # String size. Real byte size is about 1.5 times bigger.
+      MAX_COOKIE_SIZE = 2000  # String size. Real byte size is about 1.5 times bigger.
 
       def cookie
         @cookie

data/app/models/effective/effective_datatable/dsl/datatable.rb

@@ -97,7 +97,7 @@ module Effective
           )
         end
 
-        def actions_col(show: true, edit: true, destroy: true, col_class: nil, partial: nil, partial_as: nil, responsive: 5000, visible: true, &format)
+        def actions_col(show: nil, edit: nil, destroy: nil, col_class: nil, partial: nil, partial_as: nil, responsive: 5000, visible: true, &format)
           raise 'You can only have one actions column' if datatable.columns[:_actions].present?
 
           datatable._columns[:_actions] = Effective::DatatableColumn.new(
@@ -109,7 +109,7 @@ module Effective
             index: nil,
             label: false,
             name: :actions,
-            partial: partial || '/effective/datatables/actions_column',
+            partial: partial,
             partial_as: partial_as,
             responsive: responsive,
             search: false,
@@ -119,9 +119,7 @@ module Effective
             th_append: nil,
             visible: visible,
 
-            show: show,
-            edit: edit,
-            destroy: destroy
+            actions: { show: show, edit: edit, destroy: destroy, partial: :dropleft }.reject { |k, v| v.nil? }
           )
         end
 

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

@@ -15,7 +15,7 @@ module Effective
               datatable: self,
               column: columns[name],
               controller_namespace: controller_namespace
-            }.merge(actions_col_locals(opts)).merge(resource_col_locals(opts))
+            }.merge(resource_col_locals(opts))
 
             rendered[name] = (view.render(
               partial: opts[:partial],
@@ -58,6 +58,8 @@ module Effective
         end
 
         case column[:as]
+        when :actions
+          view.render_resource_actions(value, **column[:actions].merge(effective_resource: resource))
         when :boolean
           case value
           when true   ; 'Yes'
@@ -100,26 +102,6 @@ module Effective
         end
       end
 
-      def actions_col_locals(opts)
-        return {} unless opts[:as] == :actions
-
-        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?
 

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

@@ -1,10 +1 @@
-= dropdown(variation: :dropleft) do
-  - if edit_action && EffectiveDatatables.authorized?(self, :edit, resource)
-    = dropdown_link_to 'Edit', effective_resource.action_path(:edit, resource), title: "Edit #{resource}"
-
-  - if show_action && EffectiveDatatables.authorized?(self, :show, resource)
-    = dropdown_link_to 'View', effective_resource.action_path(:show, resource), title: resource.to_s
-
-  - if destroy_action && EffectiveDatatables.authorized?(self, :destroy, resource)
-    = dropdown_link_to "Delete #{resource}", effective_resource.action_path(:destroy, resource),
-      title: "Delete #{resource}", data: { method: :delete, confirm: "Delete #{resource}?" }
+= render_resource_actions(resource, **actions_col_locals)

data/lib/effective_datatables.rb

@@ -30,7 +30,7 @@ module EffectiveDatatables
   end
 
   def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied unless authorized?(controller, action, resource)
+    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
   end
 
 end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.0.4'.freeze
+  VERSION = '4.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails