effective_datatables 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90399cec3e58ad388ef53897df0de9214f11e24
-  data.tar.gz: 56416c9fb6eced1b452c7869aeb4797b632821cd
+  metadata.gz: 76b12d9c51e6dd4d3e040161ea88d8cc04d9f451
+  data.tar.gz: 45787258cc49d4b0b87f459b16d99fc9e2b420eb
 SHA512:
-  metadata.gz: e53be870c6c149c8751be8e6b7bbb6ad67051bfc484eb815a79391ecc4384bee46bd4b10bc26d2227532826f1b9a04d04ca42042a26deb304514c669830207b0
-  data.tar.gz: 0ede3718f43448110ea4df5638859cee01dde70e137faae5f35f194934d0baab4fc0ef57349d4ab525d1e52aba6650dd9913cad980af345fa734ca74f802b4e8
+  metadata.gz: 843709309dc8d2bf2047d4fb0dff94ee369f48c3de8852b53d498fc07a9dd783b074dcdd9f22051db35b82413aa955764c46bc15d2215dcb1f4be6358f302916
+  data.tar.gz: 93d36172ba1e8b0b4e435bb90dc88fb1ef7dc1b4fb3544419532c2a17dee1bc786c85488481286c1ea3bf34d77e981ec34c4c6bcddaf0472ac8a3f31e75c00b6

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -62,6 +62,8 @@ initializeDataTables = ->
         $table = $(api.table().node())
         $form = $(".effective-datatable-filters[aria-controls='#{$table.attr('id')}']").first()
 
+        params['cookie'] = $table.data('cookie')
+
         if $form.length > 0
           params['scope'] = $form.find("input[id^='filters_scope']:checked").val() || ''
           params['filter'] = {}

data/app/assets/javascripts/effective_datatables/reset.js.coffee

@@ -3,5 +3,5 @@ $(document).on 'click', 'a.buttons-reset-cookie', (event) ->
 
   $obj = $(event.currentTarget)
   $obj.find('span').text('Resetting...')
-  document.cookie = "#{$obj.data('cookie-name')}=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/"
+  document.cookie = "_effective_dt=; expires=Thu, 01-Jan-70 00:00:01 GMT; path=/"
   location.reload()

data/app/helpers/effective_datatables_helper.rb

@@ -22,6 +22,7 @@ module EffectiveDatatablesHelper
         'effective-form-inputs' => defined?(EffectiveFormInputs),
         'bulk-actions' => datatable_bulk_actions(datatable),
         'columns' => datatable_columns(datatable),
+        'cookie' => datatable.cookie_name,
         'display-length' => datatable.display_length,
         'display-order' => [datatable.order_index, datatable.order_direction].to_json(),
         'display-records' => datatable.to_json[:recordsFiltered],

data/app/models/effective/datatable.rb

@@ -16,8 +16,7 @@ module Effective
     # The collection itself. Only evaluated once.
     attr_accessor :_collection
 
-    # The view, and the ajax/cookie/default state
-    attr_reader :cookie
+    # The view
     attr_reader :view
 
     extend Effective::EffectiveDatatable::Dsl

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

@@ -11,12 +11,14 @@ module Effective
 
       def load_attributes!
         if datatables_ajax_request?
-          raise 'Expected attributes cookie to be present' unless cookie
-          @attributes = cookie[:attributes]
+          raise 'Expected attributes cookie to be present' unless cookie && cookie[:attributes]
+          # Cookie will still be just values here.  Attributes is the first value.
+
+          @attributes = cookie.delete(:attributes)
         end
 
         unless datatables_ajax_request?
-          @attributes[:controller_namespace] ||= view.controller_path.split('/')[0...-1].join('/').presence
+          @attributes[:_n] ||= view.controller_path.split('/')[0...-1].join('/').presence
         end
       end
 

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

@@ -1,30 +1,66 @@
 module Effective
   module EffectiveDatatable
     module Cookie
+      MAX_COOKIE_SIZE = 2500  # String size. Real byte size is about 1.5 times bigger.
+
+      def cookie
+        @cookie
+      end
 
       def cookie_name
-        @cookie_name ||= "datatable-#{URI(datatables_ajax_request? ? view.request.referer : view.request.url).path}-#{to_param}".parameterize
+        @cookie_name ||= (
+          if datatables_ajax_request?
+            view.params[:cookie]
+          else
+            [self.class, attributes].hash.to_s.last(12)
+          end
+        )
       end
 
       private
 
       def load_cookie!
-        @cookie ||= (
-          cookie = view.cookies.signed[cookie_name]
+        @dt_cookie = view.cookies.signed['_effective_dt']
 
-          if cookie.present?
-            data = Marshal.load(Base64.decode64(cookie))
-            raise 'invalid cookie' unless [data, data[:attributes], data[:state]].all? { |obj| obj.kind_of?(Hash) }
-            data
-          end
-        )
+        # Load global datatables cookie
+        if @dt_cookie.present?
+          @dt_cookie = Marshal.load(Base64.decode64(@dt_cookie))
+          raise 'invalid datatables cookie' unless @dt_cookie.kind_of?(Array)
+
+          # Assign individual cookie
+          index = @dt_cookie.rindex { |name, _| name == cookie_name }
+          @cookie = @dt_cookie.delete_at(index)
+        end
+
+        # Load my individual cookie
+        if @cookie.kind_of?(Array)
+          @cookie = initial_state.keys.zip(@cookie.second).to_h
+        end
       end
 
       def save_cookie!
-        todelete = view.cookies.map { |name, value| name if (name.start_with?('datatable-') && name != cookie_name) }.compact
-        todelete.each { |name| view.cookies.delete(name) }
+        @dt_cookie ||= []
+        @dt_cookie << [cookie_name, cookie_payload]
+
+        while @dt_cookie.to_s.size > MAX_COOKIE_SIZE
+          @dt_cookie.shift((@dt_cookie.length / 3) + 1)
+        end
+
+        view.cookies.signed['_effective_dt'] = Base64.encode64(Marshal.dump(@dt_cookie))
+      end
+
+      def cookie_payload
+        payload = state.except(:attributes)
+
+        # Turn visible into a bitmask.  This is undone in load_columns!
+        payload[:visible] = (
+          if columns.keys.length < 63 # 64-bit integer
+            columns.keys.map { |name| (2 ** columns[name][:index]) if state[:visible][name] }.compact.sum
+          end
+        )
 
-        view.cookies.signed[cookie_name] = Base64.encode64(Marshal.dump(attributes: attributes, state: state))
+        # Just store the values
+        [attributes.delete_if { |k, v| v.nil? }] + payload.values
       end
 
     end

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

@@ -7,7 +7,7 @@ module Effective
       end
 
       def controller_namespace
-        @attributes[:controller_namespace]
+        @attributes[:_n]
       end
 
       private

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

@@ -50,6 +50,7 @@ module Effective
       # This is called first.  Our initial state is set.
       def initial_state
         {
+          attributes: {},
           filter: {},
           length: nil,
           order_name: nil,
@@ -84,7 +85,7 @@ module Effective
         if datatables_ajax_request?
           load_filter_params!
           load_ajax_state!
-        elsif cookie.present? && cookie[:state][:params] == params.length
+        elsif cookie.present? && cookie[:params] == params.length
           load_cookie_state!
         else
           # Nothing to do for default state
@@ -123,11 +124,11 @@ module Effective
           state[:filter][name] = parse_filter_value(_filters[name], value)
         end
 
-        state[:params] = cookie[:state][:params]
+        state[:params] = cookie[:params]
       end
 
       def load_cookie_state!
-        @state = cookie[:state]
+        @state = cookie
       end
 
       def load_columns!
@@ -153,8 +154,14 @@ module Effective
           end
         end
 
-        columns.each do |name, opts|
-          state[:visible][name] = opts[:visible] unless state[:visible].key?(name)
+        # Load cookie bitmask
+        if state[:visible].kind_of?(Integer)
+          visible_mask = state[:visible] # bitmask
+          state[:visible] = {}
+          columns.each { |name, opts| state[:visible][name] = (visible_mask & (2 ** opts[:index])) != 0 }
+        else
+          state[:visible] = {} unless state[:visible].kind_of?(Hash)
+          columns.each { |name, opts| state[:visible][name] = opts[:visible] unless state[:visible].key?(name) }
         end
 
         unless datatables_ajax_request?

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

@@ -1,2 +1,2 @@
-%a.btn.btn-default.buttons-reset-cookie{'href' => '#', 'data-cookie-name' => datatable.cookie_name}
+%a.btn.btn-default.buttons-reset-cookie{href: '#'}
   %span Reset

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.2'.freeze
 end

metadata

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