effective_datatables 3.5.4 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb6cc238f24434a34c62758d12f4fde3bbf4df04
-  data.tar.gz: 9b256d994da5bc2cd2cea3ff806022df755e9a9b
+SHA256:
+  metadata.gz: 831a378f29e67058bc5d8d313fd61f33f91589fc8a4968a1163963c63e1fa2ab
+  data.tar.gz: '0106983a5a9a22c509c3bb2f5302bcf1e9a0b15a6d9a00c296a62d1379f0f040'
 SHA512:
-  metadata.gz: 691651d1bee6cada62b81b2157a096bd0c95d7bdf71251005854e05cf928a75fd0853820d2bcd468ba8a50e6702f8f1900feb2be8812f21b186c8f722a191185
-  data.tar.gz: 892b8b0a4f070e714118ffad499e0a119c5ec9fc25cc57192e24f95d40a046ebc4045fa727358f59a1cef0f4013c922c5297d45413a42d2a10d98b5b02297fde
+  metadata.gz: 239f60681837ec733870367b539697a50249ba25380d727a147b084f170251457be6ab79665387a8edaf0642d5d81a214c9e84f83c21fff48c9e3bed6f288c59
+  data.tar.gz: 8daf8acdbcadc0c4de990bd1ddf0f3d1e49edb692dd1108ca415116717d459ce567f6d82016f25bd63e5cfaff1138ecebb60f516be81ad11d64d1954474a9282

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

@@ -16,7 +16,7 @@ module Effective
           next unless state[:visible][name]
 
           if opts[:partial]
-            locals = { datatable: self, column: columns[name] }.merge(resource_col_locals(opts))
+            locals = { datatable: self, column: opts }.merge(resource_col_locals(opts))
 
             rendered[name] = (view.render(
               partial: opts[:partial],
@@ -29,11 +29,24 @@ module Effective
           elsif opts[:as] == :actions # This is actions_col and actions_col do .. end, but not actions_col partial: 'something'
             resources = collection.map { |row| row[opts[:index]] }
             locals = { datatable: self, column: opts, spacer_template: SPACER_TEMPLATE }
-            atts = { actions: actions_col_actions(opts), effective_resource: resource, locals: locals, partial: opts[:actions_partial] }.merge(opts[:actions])
 
-            rendered[name] = (view.render_resource_actions(resources, atts, &opts[:format]) || '').split(SPACER)
-          end
+            atts = {
+              actions: actions_col_actions(opts),
+              btn_class: opts[:btn_class],
+              effective_resource: effective_resource,
+              locals: locals,
+              partial: opts[:actions_partial],
+            }.compact.merge(opts[:actions])
 
+            rendered[name] = if effective_resource.blank?
+              resources.map do |resource|
+                polymorphic_resource = Effective::Resource.new(resource, namespace: controller_namespace)
+                (view.render_resource_actions(resource, atts.merge(effective_resource: polymorphic_resource), &opts[:format]) || '')
+              end
+            else
+              (view.render_resource_actions(resources, atts, &opts[:format]) || '').split(SPACER)
+            end
+          end
         end
 
         collection.each_with_index do |row, row_index|
@@ -69,8 +82,7 @@ module Effective
 
         case column[:as]
         when :actions
-          atts = { actions: actions_col_actions(column), effective_resource: resource, partial: column[:actions_partial] }.merge(column[:actions])
-          (view.render_resource_actions(value, atts) || '')
+          raise("please use actions_col instead of col(#{name}, as: :actions)")
         when :boolean
           case value
           when true   ; 'Yes'
@@ -96,10 +108,10 @@ module Effective
           view.mail_to(value)
         when :integer
           value
-        when :percentage
+        when :percent
           case value
-          when Integer    ; "#{value}%"
-          when Numeric    ; view.number_to_percentage(value * 100, precision: 2)
+          when Integer    ; view.number_to_percentage(value / 1000.0, precision: 3).gsub('.000%', '%')
+          when Numeric    ; view.number_to_percentage(value, precision: 3).gsub('.000%', '%')
           end
         when :price
           case value
@@ -115,29 +127,66 @@ module Effective
 
       # Takes all default resource actions
       # Applies data-remote to anything that's data-method post or delete
+      # Merges in any extra attributes when passed as a Hash
       def actions_col_actions(column)
-        resource.resource_actions
+        resource_actions = (effective_resource&.resource_actions || fallback_effective_resource.fallback_resource_actions)
+
+        actions = if column[:inline]
+          resource_actions.transform_values { |opts| opts['data-remote'] = true; opts }
+        else
+          resource_actions.transform_values { |opts| opts['data-remote'] = true if opts['data-method']; opts }
+        end
+
+        # Merge local options. Special behaviour for remote: false
+        if column[:actions].kind_of?(Hash)
+          column[:actions].each do |action, opts|
+            next unless opts.kind_of?(Hash)
+
+            existing = actions.find { |_, v| v[:action] == action }&.first
+            next unless existing.present?
+
+            actions[existing]['data-remote'] = opts[:remote] if opts.key?(:remote)
+            actions[existing]['data-remote'] = opts['remote'] if opts.key?('remote')
+
+            actions[existing].merge!(opts.except(:remote, 'remote'))
+          end
+
+          actions = actions.sort do |(_, a), (_, b)|
+            (column[:actions].keys.index(a[:action]) || 99) <=> (column[:actions].keys.index(b[:action]) || 99)
+          end.to_h
+
+        end
+
+        actions
       end
 
       def resource_col_locals(opts)
-        return {} unless (resource = opts[:resource]).present?
+        return {} unless (associated_resource = opts[:resource]).present?
+
+        associated = associated_resource.macros.include?(opts[:as])
+        polymorphic = (opts[:as] == :belongs_to_polymorphic)
 
-        locals = { name: opts[:name], effective_resource: resource, show_action: false, edit_action: false }
+        resource_name = opts[:name] if associated
+        resource_to_s = opts[:name] unless associated || array_collection?
+
+        locals = {
+          resource_name: resource_name,
+          resource_to_s: resource_to_s,
+          effective_resource: associated_resource,
+          show_action: false,
+          edit_action: false
+        }
 
         case opts[:action]
         when :edit
-          locals[:edit_action] = (resource.routes[:edit] && EffectiveDatatables.authorized?(view.controller, :edit, resource.klass))
+          locals[:edit_action] = (polymorphic || associated_resource.routes[:edit].present?)
         when :show
-          locals[:show_action] = (resource.routes[:show] && EffectiveDatatables.authorized?(view.controller, :show, resource.klass))
+          locals[:show_action] = (polymorphic || associated_resource.routes[:show].present?)
         when false
-          # Nothing
+          # Nothing. Already false.
         else
-          # Fallback to defaults - check edit then show
-          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
+          locals[:edit_action] = (polymorphic || associated_resource.routes[:edit].present?)
+          locals[:show_action] = (polymorphic || associated_resource.routes[:show].present?)
         end
 
         locals

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

@@ -1,8 +1,11 @@
-- Array(datatable.array_collection? ? resource : resource.send(name)).each do |resource|
-  .col-resource_item
-    - 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
-      = resource.to_s.html_safe
+- Array(local_assigns[:resource_name] ? resource.public_send(resource_name) : resource).each do |resource|
+  - resource_to_s = ((local_assigns[:resource_to_s] && resource) ? resource.public_send(resource_to_s) : resource.to_s)
+
+  - if resource_to_s.present?
+    .col-resource_item
+      - if edit_action && EffectiveDatatables.authorized?(controller, :edit, resource) && (path = effective_resource.action_path(:edit, resource)).present?
+        = link_to resource_to_s, path, title: resource_to_s
+      - elsif show_action && EffectiveDatatables.authorized?(controller, :show, resource) && (path = effective_resource.action_path(:show, resource)).present?
+        = link_to resource_to_s, path, title: resource_to_s
+      - else
+        = resource_to_s.to_s.html_safe

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.5.4'.freeze
+  VERSION = '3.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.6.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -113,9 +113,9 @@ files:
 - app/assets/javascripts/effective_datatables/responsive.js.coffee
 - app/assets/javascripts/vendor/jquery.delayedChange.js
 - app/assets/javascripts/vendor/jquery.fileDownload.js
-- app/assets/stylesheets/dataTables/buttons/buttons.bootstrap.css
-- app/assets/stylesheets/dataTables/dataTables.bootstrap.css
-- app/assets/stylesheets/dataTables/responsive/responsive.bootstrap.css
+- app/assets/stylesheets/dataTables/buttons/buttons.bootstrap.scss
+- app/assets/stylesheets/dataTables/dataTables.bootstrap.scss
+- app/assets/stylesheets/dataTables/responsive/responsive.bootstrap.scss
 - app/assets/stylesheets/effective_datatables.scss
 - app/assets/stylesheets/effective_datatables/_filters.scss
 - app/assets/stylesheets/effective_datatables/_overrides.scss
@@ -179,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord