effective_datatables 3.2 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2fd403395ba41023758912f2316bd3550ce87b0
-  data.tar.gz: da929e087db2cdf263b1c5f85c1e9304b834acfa
+  metadata.gz: 756f3e374ce0dcbc877f0c29406af8392e461334
+  data.tar.gz: 780bc128c0eefd39b17bbb8b163fb4ce92578b4c
 SHA512:
-  metadata.gz: 398b32bf5d7d09c1fe70f60b2cc7a808ba9d0e3d3203027503b3c88d292e1ef35c3941393055f87b74e1f25cedf3be2aa9b733af90a782209a0227daf33efd3b
-  data.tar.gz: 2ceb4c659055f4de79ce573078f7a0bc054fdb67533d560bc44ea75c59cec4ebff4fefb2902b4000dc50f810a59243d2a944ac05f17128d487da0f0782f1fa70
+  metadata.gz: 05b80f00a90149f1acfe007bce5a75c52030c1121e09fda0467aa148f7d389791f302be20cd6930fde4f6ed403e198ab9471d7b897d2261e2aa2660a21ce0af2
+  data.tar.gz: 69421f676f951392bd0002a4287aea8fb73127b436abb4d55efdad301d0fb9f2759c0c570e45eb148a75946b6a07a99b9cfced0649e81fcd77044082ac00d360

data/app/models/effective/datatable_dsl_tool.rb

@@ -4,6 +4,8 @@ module Effective
     attr_reader :datatable
     attr_reader :view
 
+    attr_accessor :in_datatables_do_block
+
     include Effective::EffectiveDatatable::Dsl::BulkActions
     include Effective::EffectiveDatatable::Dsl::Charts
     include Effective::EffectiveDatatable::Dsl::Datatable
@@ -15,6 +17,11 @@ module Effective
     end
 
     def method_missing(method, *args)
+      # Catch a common error
+      if [:bulk_actions, :charts, :collection, :filters].include?(method) && in_datatables_do_block
+        raise "#{method} block must be declared outside the datatable do ... end block"
+      end
+
       if datatable.respond_to?(method)
         datatable.send(method, *args)
       elsif view.respond_to?(method)

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

@@ -50,10 +50,10 @@ module Effective
       end
 
       def cookie_payload
-        payload = state.except(:attributes)
+        payload = state.except(:attributes, :visible)
 
         # Turn visible into a bitmask.  This is undone in load_columns!
-        payload[:visible] = (
+        payload[:vismask] = (
           if columns.keys.length < 63 # 64-bit integer
             columns.keys.map { |name| (2 ** columns[name][:index]) if state[:visible][name] }.compact.sum
           end

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

@@ -15,7 +15,11 @@ module Effective
       end
 
       def datatable(&block)
-        define_method('initialize_datatable') { dsl_tool.instance_exec(&block) }
+        define_method('initialize_datatable') do
+          dsl_tool.in_datatables_do_block = true
+          dsl_tool.instance_exec(&block)
+          dsl_tool.in_datatables_do_block = false
+        end
       end
 
       def filters(&block)

data/app/models/effective/effective_datatable/dsl/datatable.rb

@@ -30,7 +30,7 @@ module Effective
             compute: nil,
             col_class: col_class,
             format: (format if block_given?),
-            index: datatable.columns.length,
+            index: nil,
             label: label || name.to_s.split('.').last.titleize,
             name: name,
             partial: partial,
@@ -58,7 +58,7 @@ module Effective
             compute: (compute if block_given?),
             col_class: col_class,
             format: nil,
-            index: datatable.columns.length,
+            index: nil,
             label: label || name.to_s.split('.').last.titleize,
             name: name,
             partial: partial,
@@ -82,7 +82,7 @@ module Effective
             compute: nil,
             col_class: col_class,
             format: nil,
-            index: datatable.columns.length,
+            index: nil,
             label: '',
             name: :bulk_actions,
             partial: partial || '/effective/datatables/bulk_actions_column',
@@ -106,7 +106,7 @@ module Effective
             compute: nil,
             col_class: col_class,
             format: (format if block_given?),
-            index: datatable.columns.length,
+            index: nil,
             label: '',
             name: :actions,
             partial: partial || '/effective/datatables/actions_column',

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

@@ -161,7 +161,7 @@ module Effective
           columns.delete(associated)
         end
 
-        columns.each_with_index { |(_, column), index| column[:index] = index } if changed
+        load_columns! if changed
       end
 
     end

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

@@ -52,7 +52,7 @@ module Effective
 
       private
 
-      # This is called first.  Our initial state is set.
+      # This is called first. Our initial state is set.
       def initial_state
         {
           attributes: {},
@@ -65,7 +65,8 @@ module Effective
           scope: nil,
           start: 0,
           search: {},
-          visible: {}
+          vismask: nil,
+          visible: {},
         }
       end
 
@@ -140,6 +141,8 @@ module Effective
         state[:length] ||= EffectiveDatatables.default_length
 
         if columns.present?
+          columns.each_with_index { |(_, column), index| column[:index] = index }
+
           if order_index.present?
             state[:order_name] = columns.keys[order_index]
           end
@@ -161,10 +164,11 @@ module Effective
         end
 
         # Load cookie bitmask
-        if state[:visible].kind_of?(Integer)
-          visible_mask = state[:visible] # bitmask
+        if datatables_ajax_request?
+          # Nothing to do
+        elsif state[:vismask].kind_of?(Integer) # bitmask
           state[:visible] = {}
-          columns.each { |name, opts| state[:visible][name] = (visible_mask & (2 ** opts[:index])) != 0 }
+          columns.each { |name, opts| state[:visible][name] = (state[:vismask] & (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) }

data/lib/effective_datatables/version.rb

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

metadata

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