effective_datatables 4.7.16 → 4.15.1

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module Resource
       AGGREGATE_SQL_FUNCTIONS = ['ARRAY_AGG(', 'AVG(', 'COUNT(', 'MAX(', 'MIN(', 'STRING_AGG(', 'SUM(']
 
       def admin_namespace?
-        controller_namespace == 'admin'
+        [:admin, 'admin'].include?(controller_namespace)
       end
 
       def controller_namespace
@@ -31,7 +33,7 @@ module Effective
       end
 
       def load_effective_resource!
-        @effective_resource = if active_record_collection?
+        @effective_resource ||= if active_record_collection?
           Effective::Resource.new(collection_class, namespace: controller_namespace)
         end
       end
@@ -91,14 +93,18 @@ module Effective
             opts[:sql_column] = :effective_addresses
           when :effective_roles
             opts[:sql_column] = :effective_roles
+          when :active_storage
+            opts[:sql_column] = :active_storage
           when :string  # This is the fallback
             # Anything that doesn't belong to the model or the sql table, we assume is a SELECT SUM|AVG|RANK() as fancy
             opts[:sql_as_column] = true if (effective_resource.table && effective_resource.column(name).blank?)
           end
 
-          if opts[:sql_column].present? && AGGREGATE_SQL_FUNCTIONS.any? { |str| opts[:sql_column].to_s.start_with?(str) }
-            opts[:sql_as_column] = true
+          if opts[:sql_column].present?
+            sql_column = opts[:sql_column].to_s
+            opts[:sql_as_column] = true if AGGREGATE_SQL_FUNCTIONS.any? { |str| sql_column.start_with?(str) }
           end
+
         end
       end
 
@@ -137,6 +143,10 @@ module Effective
             opts[:partial] ||= '/effective/datatables/resource_column'
           end
 
+          if opts[:as] == :active_storage
+            opts[:partial] ||= '/effective/datatables/active_storage_column'
+          end
+
           opts[:col_class] = [
             "col-#{opts[:as]}",
             "col-#{name.to_s.parameterize}",
@@ -148,7 +158,6 @@ module Effective
 
       def load_resource_search!
         columns.each do |name, opts|
-
           case opts[:search]
           when false
             opts[:search] = { as: :null }; next
@@ -166,13 +175,12 @@ module Effective
 
           # Parameterize collection
           if search[:collection].kind_of?(ActiveRecord::Relation)
-            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
+            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
           elsif search[:collection].kind_of?(Array) && search[:collection].first.kind_of?(ActiveRecord::Base)
-            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
+            search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
           end
 
           search[:as] ||= :select if search.key?(:collection)
-          search[:fuzzy] ||= true unless search.key?(:fuzzy)
           search[:value] ||= search.delete(:selected) if search.key?(:selected)
 
           # Merge with defaults
@@ -185,6 +193,12 @@ module Effective
             search.reverse_merge!(search_resource.search_form_field(name, opts[:as]))
           end
 
+          # Assign default search operation
+          search[:operation] ||= search.delete(:op)
+          search[:operation] ||= :matches if search[:fuzzy]
+          search[:operation] ||= :eq if search[:as] == :select
+          search[:operation] ||= search_resource.sql_operation(name, as: opts[:as])
+
           # Assign default include_null
           if search[:as] == :select && !search.key?(:include_null)
             search[:include_null] = true
@@ -194,6 +208,7 @@ module Effective
 
       def load_resource_belongs_tos!
         return unless active_record_collection?
+        return unless @_collection_apply_belongs_to
 
         changed = attributes.select do |attribute, value|
           attribute = attribute.to_s
@@ -204,7 +219,7 @@ module Effective
           next unless columns[associated]
 
           if columns[associated][:as] == :belongs_to
-            if @_collection_apply_belongs_to && !@_collection.where_values_hash.include?(attribute)
+            unless @_collection.where_values_hash.include?(attribute)
               @_collection = @_collection.where(attribute => value)
             end
 
@@ -212,10 +227,8 @@ module Effective
           elsif columns[associated][:as] == :belongs_to_polymorphic
             associated_type = attributes["#{associated}_type".to_sym] || raise("Expected #{associated}_type attribute to be present when #{associated}_id is present on a polymorphic belongs to")
 
-            if @_collection_apply_belongs_to
-              if !@_collection.where_values_hash.include?(attribute) && !@_collection.where_values_hash.include?("#{associated}_type")
-                @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
-              end
+            unless @_collection.where_values_hash.include?(attribute) || @_collection.where_values_hash.include?("#{associated}_type")
+              @_collection = @_collection.where(attribute => value).where("#{associated}_type" => associated_type)
             end
 
             columns.delete(associated)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Effective
   module EffectiveDatatable
     module State
@@ -98,7 +100,7 @@ module Effective
           load_cookie_state! if cookie.present? && cookie[:params] == cookie_state_params
           load_filter_params!
         end
-        
+
         fill_empty_filters!
       end
 
@@ -198,7 +200,7 @@ module Effective
       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])
+        Effective::Attribute.new(filter[:as] || filter[:value] || :string).parse(value, name: filter[:name])
       end
 
       def cookie_state_params

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

@@ -0,0 +1,4 @@
+- Array(resource.public_send(column[:name])).each do |file|
+  .col-resource_item
+    - title = [file.content_type, number_to_human_size(file.byte_size)].map(&:presence).compact
+    = link_to(file.filename, url_for(file), title: title, target: '_blank')

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

@@ -1,8 +1,9 @@
 .btn-group.buttons-bulk-actions
   %button.btn.btn-link.btn-sm.dropdown-toggle{'type': 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false, 'disabled': 'disabled'}
-    Bulk Actions
+    = t('effective_datatables.bulk_actions')
   .dropdown-menu
     - if datatable._bulk_actions.present?
       = datatable._bulk_actions.join.html_safe
     - else
-      %a.dropdown-item{href: '#'} No bulk actions
+      %a.dropdown-item{href: '#'}
+        = t('effective_datatables.no_bulk_actions')

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

@@ -0,0 +1,14 @@
+- if datatable._bulk_actions.present?
+  = render('/effective/datatables/bulk_actions_dropdown', datatable: datatable)
+
+- if datatable.searchable?
+  = link_to '#', class: 'btn btn-link btn-sm buttons-reset-search' do
+    %span= t('effective_datatables.reset')
+
+- if datatable.reorder? && EffectiveDatatables.authorized?(self, :update, datatable.collection_class)
+  = link_to '#', class: 'btn btn-link btn-sm buttons-reorder' do
+    %span= t('effective_datatables.reorder')
+
+- if datatable.downloadable?
+  = link_to 'download.csv', class: 'btn btn-link btn-sm buttons-download', 'aria-controls': datatable.to_param do
+    %span= t('effective_datatables.download')

data/config/effective_datatables.rb

@@ -35,8 +35,15 @@ EffectiveDatatables.setup do |config|
   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_max_size = 1500       # 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'
+
+  # Enable the Download button which serves a CSV of your collection
+  config.download = false
 end

data/config/locales/en.yml

@@ -2,11 +2,14 @@
 en:
   effective_datatables:
     apply: Apply
+    download: Download
     reset: Reset
     reorder: Reorder
     new: New
     actions: Actions
     bulk_actions: Bulk Actions
+    no_bulk_actions: No bulk actions
     applying: Applying...
     boolean_true: 'Yes'
-    boolean_false: 'No'
+    boolean_false: 'No'
+    all: All

data/config/locales/es.yml

@@ -2,11 +2,14 @@
 es:
   effective_datatables:
     apply: Filtrar
+    download: Download
     reset: Reiniciar
     reorder: Reordenar
     new: Nuevo
     actions: Acciones
     bulk_actions: Acciones en masa
+    no_bulk_actions: Sin acciones en masa
     applying: Filtrando...
     boolean_true: 'Sí'
-    boolean_false: 'No'
+    boolean_false: 'No'
+    all: Todo

data/config/locales/nl.yml

@@ -2,11 +2,14 @@
 nl:
   effective_datatables:
     apply: Toepassen
+    download: Download
     reset: Reset
     reorder: Opnieuw ordenen
     new: Nieuwe
     actions: Acties
     bulk_actions: Bulkacties
+    no_bulk_actions: Geen bulkacties
     applying: Toepassen...
     boolean_true: 'Ja'
-    boolean_false: 'Nee'
+    boolean_false: 'Nee'
+    all: Te doen

data/config/routes.rb

@@ -2,6 +2,7 @@ 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
+    match 'datatables/:id/download(.:format)', to: 'datatables#download', via: :get, as: :download_datatable
   end
 end
 

data/lib/effective_datatables/engine.rb

@@ -6,11 +6,13 @@ module EffectiveDatatables
 
     # Include Helpers to base application
     initializer 'effective_datatables.action_controller' do |app|
-      ActiveSupport.on_load :action_controller_base do
-        helper EffectiveDatatablesHelper
-        helper EffectiveDatatablesPrivateHelper
+      app.config.to_prepare do
+        ActiveSupport.on_load :action_controller_base do
+          helper EffectiveDatatablesHelper
+          helper EffectiveDatatablesPrivateHelper
 
-        ActionController::Base.send :include, ::EffectiveDatatablesControllerHelper
+          ActionController::Base.send :include, ::EffectiveDatatablesControllerHelper
+        end
       end
     end
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.16'.freeze
+  VERSION = '4.15.1'.freeze
 end

data/lib/effective_datatables.rb

@@ -16,7 +16,12 @@ module EffectiveDatatables
   mattr_accessor :cookie_domain
   mattr_accessor :cookie_tld_length
 
+  mattr_accessor :format_datetime
+  mattr_accessor :format_date
+  mattr_accessor :format_time
+
   mattr_accessor :debug
+  mattr_accessor :download
 
   alias_method :max_cookie_size, :cookie_max_size
   alias_method :max_cookie_size=, :cookie_max_size=

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.7.16
+  version: 4.15.1
 platform: ruby
 authors:
 - Code and Effect
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -111,6 +111,7 @@ files:
 - 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/download.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
@@ -129,11 +130,9 @@ files:
 - app/assets/stylesheets/effective_datatables.scss
 - app/assets/stylesheets/effective_datatables/_overrides.bootstrap4.scss
 - app/controllers/effective/datatables_controller.rb
-- app/datatables/effective_style_guide_datatable.rb
 - app/helpers/effective_datatables_controller_helper.rb
 - app/helpers/effective_datatables_helper.rb
 - app/helpers/effective_datatables_private_helper.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/datatable.rb
 - app/models/effective/datatable_column.rb
 - app/models/effective/datatable_column_tool.rb
@@ -143,6 +142,7 @@ files:
 - app/models/effective/effective_datatable/collection.rb
 - app/models/effective/effective_datatable/compute.rb
 - app/models/effective/effective_datatable/cookie.rb
+- app/models/effective/effective_datatable/csv.rb
 - app/models/effective/effective_datatable/dsl.rb
 - app/models/effective/effective_datatable/dsl/bulk_actions.rb
 - app/models/effective/effective_datatable/dsl/charts.rb
@@ -153,8 +153,10 @@ files:
 - app/models/effective/effective_datatable/params.rb
 - app/models/effective/effective_datatable/resource.rb
 - app/models/effective/effective_datatable/state.rb
+- app/views/effective/datatables/_active_storage_column.html.haml
 - app/views/effective/datatables/_bulk_actions_column.html.haml
 - app/views/effective/datatables/_bulk_actions_dropdown.html.haml
+- app/views/effective/datatables/_buttons.html.haml
 - app/views/effective/datatables/_chart.html.haml
 - app/views/effective/datatables/_datatable.html.haml
 - app/views/effective/datatables/_filters.html.haml
@@ -162,7 +164,6 @@ files:
 - 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
@@ -177,7 +178,7 @@ homepage: https://github.com/code-and-effect/effective_datatables
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -192,8 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+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

data/app/datatables/effective_style_guide_datatable.rb

@@ -1,47 +0,0 @@
-class EffectiveStyleGuideDatatable < Effective::Datatable
-  datatable do
-    length 10
-
-    col :id
-    col :material, search: { collection: ['Stainless Steel', 'Copper', 'Cast Iron', 'Composite'] }
-    col :bowl, search: { collection: ['Single Bowl', 'Double Bowl', 'Triple Bowl'] }
-    col :name
-    col :date, as: :date
-
-    actions_col
-  end
-
-  # Set the permission check to the same as Effective::StyleGuide
-  def collection_class
-    defined?(Effective::StyleGuide) ? Effective::StyleGuide : super
-  end
-
-  collection do
-    now = Time.zone.now
-    [
-      [1, 'Stainless Steel', 'Single Bowl', 'KOHLER Staccato', (now + 1.day)],
-      [2, 'Stainless Steel', 'Double Bowl', 'KOHLER Vault Undercounter', (now + 1.day)],
-      [3, 'Stainless Steel', 'Triple Bowl', 'KRAUS All-In-One', (now + 1.day)],
-      [4, 'Stainless Steel', 'Single Bowl', 'KOHLER Vault Dual Mount', (now + 1.day)],
-      [5, 'Stainless Steel', 'Single Bowl', 'KRAUS All-In-One Undermount', (now + 2.days)],
-      [6, 'Stainless Steel', 'Double Bowl', 'Glacier Bay All-in-One', (now + 2.days)],
-      [7, 'Stainless Steel', 'Single Bowl', 'Elkay Neptune', (now + 2.days)],
-      [8, 'Copper', 'Single Bowl', 'ECOSINKS Apron Front Dual Mount', (now + 2.days)],
-      [9, 'Copper', 'Double Bowl', 'ECOSINKS Dual Mount Front Hammered', (now + 2.days)],
-      [10, 'Copper', 'Triple Bowl', 'Glarier Bay Undermount', (now + 3.days)],
-      [11, 'Copper', 'Single Bowl', 'Whitehaus Undermount', (now + 3.days)],
-      [12, 'Copper', 'Double Bowl', 'Belle Foret Apron Front', (now + 3.days)],
-      [13, 'Copper', 'Double Bowl', 'Pegasus Dual Mount', (now + 3.days)],
-      [14, 'Cast Iron', 'Double Bowl', 'KOHLER Whitehaven', (now + 3.days)],
-      [15, 'Cast Iron', 'Triple Bowl', 'KOHLER Hartland', (now + 3.days)],
-      [16, 'Cast Iron', 'Single Bowl', 'KOHLER Cape Dory Undercounter', (now + 4.days)],
-      [17, 'Cast Iron', 'Double Bowl', 'KOLER Bakersfield', (now + 4.days)],
-      [18, 'Cast Iron', 'Double Bowl', 'American Standard Offset', (now + 4.days)],
-      [19, 'Cast Iron', 'Single Bowl', 'Brookfield Top', (now + 4.days)],
-      [20, 'Composite', 'Single Bowl', 'Blanco Diamond Undermount', (now + 5.days)],
-      [21, 'Composite', 'Double Bowl', 'Mont Blanc Waterbrook', (now + 5.days)],
-      [22, 'Composite', 'Triple Bowl', 'Pegasus Triple Mount', (now + 5.days)],
-      [23, 'Composite', 'Single Bowl', 'Swanstone Dual Mount', (now + 5.days)]
-    ]
-  end
-end

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end

data/app/views/effective/style_guide/_effective_datatables.html.haml

@@ -1 +0,0 @@
-= render_datatable(EffectiveStyleGuideDatatable.new)