effective_datatables 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 756f3e374ce0dcbc877f0c29406af8392e461334
-  data.tar.gz: 780bc128c0eefd39b17bbb8b163fb4ce92578b4c
+  metadata.gz: c8dcd63f38f80e7f59a6dbd33b2f7c2238e954ed
+  data.tar.gz: a932b089090e3a23c9a0a041a78d544925010a59
 SHA512:
-  metadata.gz: 05b80f00a90149f1acfe007bce5a75c52030c1121e09fda0467aa148f7d389791f302be20cd6930fde4f6ed403e198ab9471d7b897d2261e2aa2660a21ce0af2
-  data.tar.gz: 69421f676f951392bd0002a4287aea8fb73127b436abb4d55efdad301d0fb9f2759c0c570e45eb148a75946b6a07a99b9cfced0649e81fcd77044082ac00d360
+  metadata.gz: 2e2aa904aa6a0f8f348f85de650da46157e6bf0f8de3585abd83f623a4cd6868010f6408654843f7ff035ec371c5d0f0cf60b9958a45e9bd6bcd24338e450694
+  data.tar.gz: 92bcad95fb86bb381b52cd36c874ad462f7e1b97ee35f1e4fcaf3c12597c2602c182c393264f0e7930272e3cbda5f01ef4421c78b5bc890d1f72be98998abe68

data/app/controllers/effective/datatables_controller.rb

@@ -22,7 +22,7 @@ module Effective
     private
 
     def find_datatable(id)
-      id = id.gsub('-', '/')
+      id = id.to_s.gsub(/-\d{12}\z/, '').gsub('-', '/')
       id.classify.safe_constantize || id.classify.pluralize.safe_constantize
     end
 

data/app/helpers/effective_datatables_helper.rb

@@ -1,7 +1,7 @@
 # These are expected to be called by a developer.  They are part of the datatables DSL.
 module EffectiveDatatablesHelper
 
-  def render_datatable(datatable, input_js: {}, charts: true, filters: true, simple: false)
+  def render_datatable(datatable, input_js: {}, charts: true, filters: true, simple: false, buttons: true)
     raise 'expected datatable to be present' unless datatable
 
     datatable.view ||= self
@@ -14,6 +14,7 @@ module EffectiveDatatablesHelper
 
     charts = charts && datatable._charts.present?
     filters = filters && (datatable._scopes.present? || datatable._filters.present?)
+    input_js[:buttons] = false unless buttons
 
     effective_datatable_params = {
       id: datatable.to_param,
@@ -22,7 +23,7 @@ module EffectiveDatatablesHelper
         'effective-form-inputs' => defined?(EffectiveFormInputs),
         'bulk-actions' => datatable_bulk_actions(datatable),
         'columns' => datatable_columns(datatable),
-        'cookie' => datatable.cookie_name,
+        'cookie' => datatable.cookie_key,
         'display-length' => datatable.display_length,
         'display-order' => [datatable.order_index, datatable.order_direction].to_json().html_safe,
         'display-records' => datatable.to_json[:recordsFiltered],

data/app/models/effective/datatable.rb

@@ -134,7 +134,7 @@ module Effective
     end
 
     def to_param
-      @to_param ||= self.class.name.underscore.parameterize
+      @to_param ||= "#{self.class.name.underscore.parameterize}-#{cookie_param}"
     end
 
     def columns

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

@@ -7,14 +7,17 @@ module Effective
         @cookie
       end
 
-      def cookie_name
-        @cookie_name ||= (
-          if datatables_ajax_request?
-            view.params[:cookie]
-          else
-            [self.class, attributes].hash.to_s.last(12)
-          end
-        )
+      def cookie_key
+        @cookie_key ||= (datatables_ajax_request? ? view.params[:cookie] : cookie_param)
+      end
+
+      # All possible dt cookie keys.  Used to make sure the datatable has a cookie set for this session.
+      def cookie_keys
+        @cookie_keys ||= Array(@dt_cookie).compact.map(&:first)
+      end
+
+      def cookie_param
+        [self.class, attributes].hash.to_s.last(12)
       end
 
       private
@@ -28,7 +31,7 @@ module Effective
           raise 'invalid datatables cookie' unless @dt_cookie.kind_of?(Array)
 
           # Assign individual cookie
-          index = @dt_cookie.rindex { |name, _| name == cookie_name }
+          index = @dt_cookie.rindex { |key, _| key == cookie_key }
           @cookie = @dt_cookie.delete_at(index) if index
         end
 
@@ -40,7 +43,7 @@ module Effective
 
       def save_cookie!
         @dt_cookie ||= []
-        @dt_cookie << [cookie_name, cookie_payload]
+        @dt_cookie << [cookie_key, cookie_payload]
 
         while @dt_cookie.to_s.size > MAX_COOKIE_SIZE
           @dt_cookie.shift((@dt_cookie.length / 3) + 1)

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

@@ -5,7 +5,10 @@ module Effective
       private
 
       def datatables_ajax_request?
-        view && view.params[:draw] && view.params[:columns] && view.params[:id] == to_param
+        return @_datatables_ajax_request unless @_datatables_ajax_request.nil?
+
+        @_datatables_ajax_request =
+          (view && view.params[:draw] && view.params[:columns] && cookie_keys.include?(view.params[:cookie])) == true
       end
 
       def params

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.2.1'.freeze
+  VERSION = '3.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails