effective_datatables 3.7.7 → 4.0.0

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

@@ -55,6 +55,7 @@ module Effective
       # This is called first. Our initial state is set.
       def initial_state
         {
+          attributes: {},
           filter: {},
           length: nil,
           order_name: nil,
@@ -88,27 +89,23 @@ module Effective
 
       def load_state!
         if datatables_ajax_request?
-          load_cookie! # but not state.
           load_filter_params!
           load_ajax_state!
-        elsif datatables_inline_request?
-          load_filter_params!
+        elsif cookie.present? && cookie[:params] == params.length
+          load_cookie_state!
         else
-          load_cookie!
-          load_cookie_state! if cookie.present? && cookie[:params] == cookie_state_params
-          load_filter_params!
+          # Nothing to do for default state
         end
 
+        load_filter_params! unless datatables_ajax_request?
         fill_empty_filters!
       end
 
       def load_ajax_state!
         state[:length] = params[:length].to_i
 
-        if params[:order]
-          state[:order_dir] = (params[:order]['0'][:dir] == 'desc' ? :desc : :asc)
-          state[:order_index] = params[:order]['0'][:column].to_i
-        end
+        state[:order_dir] = (params[:order]['0'][:dir] == 'desc' ? :desc : :asc)
+        state[:order_index] = params[:order]['0'][:column].to_i
 
         state[:scope] = _scopes.keys.find { |name| params[:scope] == name.to_s }
         state[:start] = params[:start].to_i
@@ -133,7 +130,7 @@ module Effective
           state[:filter][name] = parse_filter_value(_filters[name], value)
         end
 
-        state[:params] = cookie[:params] if cookie.present?
+        state[:params] = cookie[:params]
       end
 
       def load_cookie_state!
@@ -143,21 +140,14 @@ module Effective
       def load_columns!
         state[:length] ||= EffectiveDatatables.default_length
 
-        (columns || {}).each_with_index { |(_, column), index| column[:index] = index }
-
         if columns.present?
-          state[:order_name] = (
-            if columns.key?(:_reorder)
-              :_reorder
-            elsif order_index.present?
-              columns.keys[order_index]
-            elsif state[:order_name].present?
-              state[:order_name]
-            else
-              columns.find { |name, opts| opts[:sort] }.first
-            end
-          )
+          columns.each_with_index { |(_, column), index| column[:index] = index }
 
+          if order_index.present?
+            state[:order_name] = columns.keys[order_index]
+          end
+
+          state[:order_name] ||= columns.find { |name, opts| opts[:sort] }.first
           raise "order column :#{order_name} must exist as a col or val" unless columns[order_name]
 
           state[:order_index] = columns[order_name][:index]
@@ -186,7 +176,7 @@ module Effective
 
         unless datatables_ajax_request?
           search_params.each { |name, value| state[:search][name] = value }
-          state[:params] = cookie_state_params
+          state[:params] = params.length
         end
 
         state[:visible].delete_if { |name, _| columns.key?(name) == false }
@@ -197,14 +187,9 @@ module Effective
       # When we parse an incoming filter term for this filter.
       def parse_filter_value(filter, value)
         return filter[:parse].call(value) if filter[:parse]
-        return nil if value.blank? && !filter[:required]
         Effective::Attribute.new(filter[:value]).parse(value, name: filter[:name])
       end
 
-      def cookie_state_params
-        params.hash.abs.to_s.last(12)
-      end
-
     end
   end
 end

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

@@ -1 +1,8 @@
-= render_resource_actions(resource, **actions_col_locals)
+- 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}?" }

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

@@ -1,2 +1,2 @@
 - id = (resource.try(:to_param) || resource.try(:id) || resource.object_id)
-= check_box_tag 'bulk_actions_resources[]', id, false, autocomplete: 'off', id: "datatable_bulk_actions_resource_#{id}", data: { role: 'bulk-action' }, onClick: 'event.stopPropagation();'
+= check_box_tag 'bulk_actions_resources[]', id, false, autocomplete: 'off', id: "datatable_bulk_actions_resource_#{id}", data: { role: 'bulk-actions-resource' }, onClick: 'event.stopPropagation();'

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

@@ -1,17 +1,16 @@
 .effective-datatables-filters{'aria-controls': datatable.to_param}
-  = simple_form_for :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb], html: { class: 'form-inline' } do |form|
-    - if datatable._scopes.present?
-      .effective-datatables-filters-scopes
-        = datatable_scope_tag(form, datatable)
+  = effective_form_with(scope: :filters, url: (datatable._form[:url] || '#'), method: datatable._form[:verb]) do |form|
+    .form-row.align-items-center
+      - if datatable._scopes.present?
+        = form.radios :scope, datatable._scopes.map { |name, opts| [opts[:label], name] },
+          label: false, required: false, checked: datatable.state[:scope], buttons: true,
+          wrapper: { class: 'form-group col-auto' }
 
-    - if datatable._filters.present?
-      .effective-datatables-filters-inputs
-        - datatable._filters.each do |name, opts|
-          = datatable_filter_tag(form, datatable, name, opts)
+      - datatable._filters.each do |name, opts|
+        = datatable_filter_tag(form, datatable, name, opts)
 
-    - if datatable._scopes.present? || datatable._filters.present?
-      .effective-datatables-filters-btn
+      .form-group.col-auto
         - if datatable._filters_form_required?
-          = form.button :submit, t('effective_datatables.apply'), 'data-disable-with': t('effective_datatables.applying')
+          = form.save 'Apply', 'data-disable-with': 'Applying...'
         - else
-          = link_to t('effective_datatables.apply'), '#', class: 'btn btn-primary btn-sm btn-effective-datatables-filters', 'data-apply-effective-datatables-filters': true
+          = link_to 'Apply', '#', class: 'btn btn-primary btn-effective-datatables-filters', 'data-apply-effective-datatables-filters': true

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

@@ -1,11 +1,8 @@
-- 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
+- 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

data/config/effective_datatables.rb

@@ -28,19 +28,21 @@ EffectiveDatatables.setup do |config|
   # Default class used on the <table> tag
   config.html_class = 'table table-hover'
 
+  # When using the actions_column DSL method, apply the following behavior
+  # Valid values for each action are:
+  # true - display this action if authorized?(:show, Post)
+  # false - do not display this action
+  # :authorize - display this action if authorized?(:show, Post<3>)  (every instance is checked)
+  #
+  # You can override these defaults on a per-table basis
+  # by calling `actions_column(show: false, edit: true, destroy: :authorize)`
+  config.actions_column = {
+    show: true,
+    edit: true,
+    destroy: true
+  }
+
   # Log search/sort information to the console
   config.debug = true
 
-  # Use a cookie to save and restore state from previous page visits.
-  config.save_state = true
-
-  # Configure the _effective_dt cookie.
-  config.cookie_max_size = 2000       # String size. Final byte size is about 1.5 times bigger, after rails signs it
-  config.cookie_domain = :all         # Should usually be :all
-  config.cookie_tld_length = nil      # Leave nil to autodetect, or set to probably 2
-
-  # Date formatting
-  config.format_datetime = '%F %H:%M'
-  config.format_date = '%F'
-  config.format_time = '%H:%M'
 end

data/config/routes.rb

@@ -1,7 +1,6 @@
 EffectiveDatatables::Engine.routes.draw do
   scope :module => 'effective' do
     match 'datatables/:id(.:format)', to: 'datatables#show', via: [:get, :post], as: :datatable
-    match 'datatables/:id/reorder(.:format)', to: 'datatables#reorder', via: [:post], as: :reorder_datatable
   end
 end
 

data/lib/effective_datatables.rb

@@ -1,30 +1,17 @@
-require 'simple_form'
+require 'effective_bootstrap'
 require 'effective_resources'
 require 'effective_datatables/engine'
 require 'effective_datatables/version'
 
 module EffectiveDatatables
-  AVAILABLE_LOCALES = %w(en es nl)
-
   mattr_accessor :authorization_method
 
   mattr_accessor :default_length
   mattr_accessor :html_class
-  mattr_accessor :save_state
-
-  mattr_accessor :cookie_max_size
-  mattr_accessor :cookie_domain
-  mattr_accessor :cookie_tld_length
-
-  mattr_accessor :format_datetime
-  mattr_accessor :format_date
-  mattr_accessor :format_time
 
+  mattr_accessor :actions_column # A Hash
   mattr_accessor :debug
 
-  alias_method :max_cookie_size, :cookie_max_size
-  alias_method :max_cookie_size=, :cookie_max_size=
-
   def self.setup
     yield self
   end
@@ -33,7 +20,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)
+    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)
@@ -43,47 +30,7 @@ module EffectiveDatatables
   end
 
   def self.authorize!(controller, action, resource)
-    raise Effective::AccessDenied.new('Access Denied', action, resource) unless authorized?(controller, action, resource)
-  end
-
-  def self.find(id, attributes = nil)
-    id = id.to_s.gsub(/-\d+\z/, '').gsub('-', '/')
-    klass = (id.classify.safe_constantize || id.classify.pluralize.safe_constantize)
-    attributes = decrypt(attributes) || {}
-
-    klass.try(:new, **attributes) || raise('unable to find datatable')
-  end
-
-  # Locale is coming from view. I think it can be dynamic.
-  # We currently support: en, es, nl
-  def self.language(locale)
-    @_languages ||= {}
-
-    locale = :en unless AVAILABLE_LOCALES.include?(locale.to_s)
-
-    @_languages[locale] ||= begin
-      path = Gem::Specification.find_by_name('effective_datatables').gem_dir + "/app/assets/javascripts/dataTables/locales/#{locale}.lang"
-      JSON.parse(File.read(path)).to_json
-    end
-  end
-
-  def self.encrypt(attributes)
-    payload = message_encrypter.encrypt_and_sign(attributes)
-  end
-
-  def self.decrypt(payload)
-    return unless payload.present?
-    return payload if payload.kind_of?(Hash)
-
-    attributes = message_encrypter.decrypt_and_verify(payload)
-
-    raise 'invalid decoded inline payload' unless attributes.kind_of?(Hash)
-
-    attributes
-  end
-
-  def self.message_encrypter
-    ActiveSupport::MessageEncryptor.new(Rails.application.secret_key_base.to_s.first(32))
+    raise Effective::AccessDenied unless authorized?(controller, action, resource)
   end
 
 end

data/lib/effective_datatables/engine.rb

@@ -6,7 +6,7 @@ module EffectiveDatatables
 
     # Include Helpers to base application
     initializer 'effective_datatables.action_controller' do |app|
-      ActiveSupport.on_load :action_controller_base do
+      ActiveSupport.on_load :action_controller do
         helper EffectiveDatatablesHelper
         helper EffectiveDatatablesPrivateHelper
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.7.7'.freeze
+  VERSION = '4.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.7.7
+  version: 4.0.0
 platform: ruby
 authors:
 - Code and Effect
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_resources
+  name: effective_bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -91,40 +91,33 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- app/assets/images/dataTables/sort_asc.png
-- app/assets/images/dataTables/sort_both.png
-- app/assets/images/dataTables/sort_desc.png
-- app/assets/javascripts/dataTables/buttons/buttons.bootstrap.js
+- app/assets/images/dataTables/sort-down.svg
+- app/assets/images/dataTables/sort-up.svg
+- app/assets/images/dataTables/sort.svg
+- app/assets/javascripts/dataTables/buttons/buttons.bootstrap4.js
 - app/assets/javascripts/dataTables/buttons/buttons.colVis.js
 - app/assets/javascripts/dataTables/buttons/buttons.html5.js
 - app/assets/javascripts/dataTables/buttons/buttons.print.js
 - app/assets/javascripts/dataTables/buttons/dataTables.buttons.js
-- app/assets/javascripts/dataTables/dataTables.bootstrap.js
+- app/assets/javascripts/dataTables/dataTables.bootstrap4.js
 - app/assets/javascripts/dataTables/jquery.dataTables.js
-- app/assets/javascripts/dataTables/locales/en.lang
-- app/assets/javascripts/dataTables/locales/es.lang
-- app/assets/javascripts/dataTables/locales/nl.lang
 - app/assets/javascripts/dataTables/responsive/dataTables.responsive.js
-- app/assets/javascripts/dataTables/responsive/responsive.bootstrap.js
+- app/assets/javascripts/dataTables/responsive/responsive.bootstrap4.js
 - app/assets/javascripts/effective_datatables.js
 - app/assets/javascripts/effective_datatables/bulk_actions.js.coffee
 - app/assets/javascripts/effective_datatables/charts.js.coffee
 - app/assets/javascripts/effective_datatables/events.js.coffee
 - app/assets/javascripts/effective_datatables/filters.js.coffee
-- app/assets/javascripts/effective_datatables/flash.js.coffee
 - app/assets/javascripts/effective_datatables/initialize.js.coffee
-- app/assets/javascripts/effective_datatables/inline_crud.js.coffee
-- app/assets/javascripts/effective_datatables/overrides.js.coffee
-- app/assets/javascripts/effective_datatables/reorder.js.coffee
+- app/assets/javascripts/effective_datatables/overrides.js
 - app/assets/javascripts/effective_datatables/reset.js.coffee
 - 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.scss
-- app/assets/stylesheets/dataTables/dataTables.bootstrap.scss
-- app/assets/stylesheets/dataTables/responsive/responsive.bootstrap.scss
+- app/assets/stylesheets/dataTables/buttons/buttons.bootstrap4.css
+- app/assets/stylesheets/dataTables/dataTables.bootstrap4.css
+- app/assets/stylesheets/dataTables/responsive/responsive.bootstrap4.css
 - app/assets/stylesheets/effective_datatables.scss
-- app/assets/stylesheets/effective_datatables/_filters.scss
 - app/assets/stylesheets/effective_datatables/_overrides.scss
 - app/controllers/effective/datatables_controller.rb
 - app/datatables/effective_style_guide_datatable.rb
@@ -157,15 +150,11 @@ files:
 - app/views/effective/datatables/_chart.html.haml
 - app/views/effective/datatables/_datatable.html.haml
 - app/views/effective/datatables/_filters.html.haml
-- app/views/effective/datatables/_reorder_column.html.haml
 - app/views/effective/datatables/_resource_column.html.haml
 - app/views/effective/datatables/_spacer_template.html
 - app/views/effective/datatables/index.html.haml
 - app/views/effective/style_guide/_effective_datatables.html.haml
 - config/effective_datatables.rb
-- config/locales/en.yml
-- config/locales/es.yml
-- config/locales/nl.yml
 - config/routes.rb
 - lib/effective_datatables.rb
 - lib/effective_datatables/engine.rb
@@ -176,7 +165,7 @@ homepage: https://github.com/code-and-effect/effective_datatables
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -191,8 +180,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
 summary: Uniquely powerful server-side searching, sorting and filtering of any ActiveRecord
   or Array collection as well as post-rendered content displayed as a frontend jQuery