effective_datatables 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7efc5c4ebe5adbadcf46a1368c3034601e32ba38
-  data.tar.gz: c167f47e82261487b9fa1574c75dc116216314c5
+  metadata.gz: d2e589bf3b121ec3ec0286dc8c1e94169a26edd9
+  data.tar.gz: f35b96216db08d011c858c3876b4e94cefbafada
 SHA512:
-  metadata.gz: 6aaa13c5b1b4e90d3b3c7d00090c44482753541a0fdd8feb02bab110223e6e7222bab2bef886900f5fa222292f6ec767634e87d94b0ac37855f60b3f765293ee
-  data.tar.gz: 6f1dcd266204fca3f546c5dfcbf43e56e3ece6f089dc8efa8ae12b63e237951d0d3cd1dd1ea162818b43499b834b8b059343c38087a456a86e106bb42c66f0ef
+  metadata.gz: 4181de92a46520e05f875cd0b2d650a7f9cd304f44605e72d858fecf1688578a85f53d93f9a5597a99dd2b950c482201cfa848ff248ad4e32a1d65c7755dce83
+  data.tar.gz: 142a507377e8340ae1a9f1bee1881c351295f4f05e53748750a8ab216cda05682c5bf6bbc9b13482a9ee0961e367afd48f202c08ff9141a908352271fd1631b8

data/app/models/effective/datatable.rb

@@ -55,6 +55,7 @@ module Effective
       raise 'expected view to respond to params' unless @view.respond_to?(:params)
 
       load_cookie!
+      assert_cookie!
       load_attributes!
 
       # We need early access to filter and scope, to define defaults from the model first

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

@@ -11,13 +11,8 @@ module Effective
 
       def load_attributes!
         if datatables_ajax_request? || datatables_inline_request?
-          raise 'expected cookie to be present' unless cookie
-          raise 'expected attributes cookie to be present' unless cookie[:attributes]
-
           @attributes = cookie.delete(:attributes)
-        end
-
-        unless datatables_ajax_request? || datatables_inline_request?
+        else
           @attributes[:_n] ||= view.controller_path.split('/')[0...-1].join('/').presence
         end
       end

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

@@ -48,15 +48,27 @@ module Effective
         end
       end
 
+      def assert_cookie!
+        if datatables_ajax_request? || datatables_inline_request?
+          raise 'expected cookie to be present' unless cookie
+          raise 'expected attributes cookie to be present' unless cookie[:attributes]
+        end
+      end
+
       def save_cookie!
         @dt_cookie ||= []
         @dt_cookie << [cookie_key, cookie_payload]
 
-        while @dt_cookie.to_s.size > EffectiveDatatables.max_cookie_size.to_i
+        while @dt_cookie.to_s.size > EffectiveDatatables.cookie_max_size.to_i
           @dt_cookie.shift((@dt_cookie.length / 3) + 1)
         end
 
-        view.cookies.signed['_effective_dt'] = { value: Base64.encode64(Marshal.dump(@dt_cookie)), domain: :all, tld_length: 2 }
+        # Generate cookie
+        domain = EffectiveDatatables.cookie_domain || :all
+        tld_length = EffectiveDatatables.cookie_tld_length
+        tld_length ||= (view.request.host == 'localhost' ? nil : view.request.host.to_s.split('.').count)
+
+        view.cookies.signed['_effective_dt'] = { value: Base64.encode64(Marshal.dump(@dt_cookie)), domain: domain, tld_length: tld_length }.compact
       end
 
       def cookie_payload

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

@@ -7,8 +7,7 @@ module Effective
       def datatables_ajax_request?
         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
+        @_datatables_ajax_request = (view.present? && view.params.key?(:draw) && view.params.key?(:columns) && view.params.key?(:cookie))
       end
 
       def datatables_inline_request?

data/config/effective_datatables.rb

@@ -35,7 +35,9 @@ EffectiveDatatables.setup do |config|
   # Irregardless of this setting, effective_datatables still uses a cookie to function
   config.save_state = true
 
-  # String size. Final byte size is about 1.5 times bigger, after rails signs it
-  config.max_cookie_size = 2000
+  # 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
 
 end

data/lib/effective_datatables.rb

@@ -9,10 +9,16 @@ module EffectiveDatatables
   mattr_accessor :default_length
   mattr_accessor :html_class
   mattr_accessor :save_state
-  mattr_accessor :max_cookie_size
+
+  mattr_accessor :cookie_max_size
+  mattr_accessor :cookie_domain
+  mattr_accessor :cookie_tld_length
 
   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

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.4.1'.freeze
+  VERSION = '4.4.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails