effective_datatables 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7a8fec13eb037474ef6f6ee0d105540c7e2dd9e
-  data.tar.gz: f69f7de6525a423b215899666992c7b87892cffe
+  metadata.gz: 86d13c3823bb2ead08f5b0f149710589c150fd22
+  data.tar.gz: 8892b0cf84bd7f3e22e1381b6b32934e3f61b04d
 SHA512:
-  metadata.gz: 40876b7464cfaa47b458e905f0e3fe97094052da5cb5ea345c9d0f446ccfcef53728cd0eb155c5e799534e6c1adc153f27606cd1131fc382f7afa0b4234e938a
-  data.tar.gz: 5250d21495b069d3a1e8fe359e628b39251d1c862793fc0fcb9ca0bd8e13d206e00a302e587f4f1bcb1a410af39a914a464c9d02aa8b2b6933a6430af6c21e3e
+  metadata.gz: f79b2cd9bdb8f4e498f0231502a5afdb002632603aa662ecd61951c2910b8a56ed155ded0d371137bbc6eac677196f53da4c2cf48c28f2379e950e3aeb5af99c
+  data.tar.gz: 14389f933ab9567434827750946dbf65b7ad760d0023b4e0edcf68d12d097a7883c086ec353df44be4e56781afe974b22d59b78a7b15634c78e08e4fed2c5701

data/README.md

@@ -91,7 +91,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
 ```
@@ -255,7 +255,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
 ```
@@ -311,7 +311,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
 ```
@@ -407,7 +407,7 @@ Sometimes it's handy to call `.reorder(nil)` on a scope.
 
 The `datatable do ... end` block configures a table of data.
 
-Initialize the datatable in your controller or view, `@datatable = PostsDatatable.new(self)`, and render it in your view `<%= render_datatable(@datatable) %>`
+Initialize the datatable in your controller or view, `@datatable = PostsDatatable.new`, and render it in your view `<%= render_datatable(@datatable) %>`
 
 ### col
 
@@ -608,7 +608,7 @@ Creates a single form with fields for each `filter` and a single radio input fie
 
 The form is submitted by an AJAX POST action, or, in some advanced circumstances (see Dynamic Columns below) as a regular POST or even GET.
 
-Initialize the datatable in your controller or view, `@datatable = PostsDatatable.new(self)`, and render its filters anywhere with `<%= render_datatable_filters(@datatable) %>`.
+Initialize the datatable in your controller or view, `@datatable = PostsDatatable.new`, and render its filters anywhere with `<%= render_datatable_filters(@datatable) %>`.
 
 ### scope
 
@@ -864,7 +864,7 @@ If you just want to render a datatable and nothing else, there is a quick way to
 ```ruby
 class PostsController < ApplicationController
   def index
-    render_datatable_index PostsDatatable.new(self)
+    render_datatable_index PostsDatatable.new
   end
 end
 ```

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: '',
             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: :glyphicons }.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'
@@ -101,23 +103,11 @@ module Effective
       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
-        }
+        if opts[:as] == :actions
+          { actions_col_locals: opts[:actions].merge(effective_resource: resource) }
+        else
+          {}
+        end
       end
 
       def resource_col_locals(opts)

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

@@ -1,8 +1 @@
-- if show_action && EffectiveDatatables.authorized?(self, :show, resource)
-  = show_icon_to effective_resource.action_path(:show, resource)
-
-- if edit_action && EffectiveDatatables.authorized?(self, :edit, resource)
-  = edit_icon_to effective_resource.action_path(:edit, resource)
-
-- if destroy_action && EffectiveDatatables.authorized?(self, :destroy, resource)
-  = destroy_icon_to effective_resource.action_path(:destroy, resource), data: { method: :delete, confirm: "Delete #{resource}?" }
+= render_resource_actions(resource, **actions_col_locals)

data/lib/effective_datatables.rb

@@ -21,7 +21,7 @@ module EffectiveDatatables
     @_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
+    controller = controller.controller if controller.respond_to?(:controller)
 
     begin
       !!(controller || self).instance_exec((controller || self), action, resource, &authorization_method)
@@ -31,7 +31,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 = '3.4.4'.freeze
+  VERSION = '3.4.5'.freeze
 end

metadata

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