effective_datatables 2.2.8 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2af972536144f8c3940510fc6811d59f30393aec
-  data.tar.gz: 3003738442753405ea9d6dcaa6c662214dd76acc
+  metadata.gz: 99a0e48de4d1453860a82b74815a0e47193b8de9
+  data.tar.gz: 892fab84eb5edc1523446d657847ac73db8f7eb2
 SHA512:
-  metadata.gz: 1f91d80262d5e37a287a2cb9dad39f99ae4fd54a2f07d46cd051bf2c5ab9f626603ecc82e27fc1e6ae1a2e94db6f31374bc90b8c6f3fca752a7ca663b264d37e
-  data.tar.gz: 1a5ebaa445aba77f54120bcf866c0bf8d780879df6ddebefd0e77a43a1c1974568330f51bf23294787ea7d66109c2a14867687bae75a65b79d4d9e1eafe1f66e
+  metadata.gz: 457be0de8ea476c17861eeab5c55779f2fbb8ee36f265b60b51b302093acfa05a8b448789507d2b57a01380c3ab625ab3a76f2a9bf123b34c30912e0e4c44788
+  data.tar.gz: ebcecde45ee471804a00bd459860ac88763a0c34f22f2748e1e144fc972256acf9f2d1232308920b6b8159b5f5438cedc847aef024f6842ec45a0398bc9b881d

data/app/helpers/effective_datatables_helper.rb

@@ -47,21 +47,21 @@ module EffectiveDatatablesHelper
         input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
     when :date
       form.input name, label: false, required: false, value: value,
-        as: (defined?(EffectiveFormInputs) ? :effective_date_picker : :string),
+        as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_date_picker) ? :effective_date_picker : :string),
         placeholder: (opts[:label] || name),
         input_group: false,
         input_html: { name: nil, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { useStrict: true, keepInvalid: true }
     when :datetime
       form.input name, label: false, required: false, value: value,
-        as: (defined?(EffectiveFormInputs) ? :effective_date_time_picker : :string),
+        as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_date_time_picker) ? :effective_date_time_picker : :string),
         placeholder: (opts[:label] || name),
         input_group: false,
         input_html: { name: nil, value: value, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} },
         input_js: { useStrict: true, keepInvalid: true } # Keep invalid format like "2015-11" so we can still filter by year, month or day
     when :select, :boolean
       form.input name, label: false, required: false, value: value,
-        as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
+        as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_select) ? :effective_select : :select),
         collection: opts[:filter][:values],
         selected: opts[:filter][:selected],
         multiple: opts[:filter][:multiple] == true,
@@ -70,7 +70,7 @@ module EffectiveDatatablesHelper
         input_js: { placeholder: (opts[:label] || name.titleize) }
     when :grouped_select
       form.input name, label: false, required: false, value: value,
-        as: (defined?(EffectiveFormInputs) ? :effective_select : :grouped_select),
+        as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_select) ? :effective_select : :grouped_select),
         collection: opts[:filter][:values],
         selected: opts[:filter][:selected],
         multiple: opts[:filter][:multiple] == true,

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

@@ -112,10 +112,17 @@ module Effective
 
         # After everything is initialized
         # Compute any col[:if] and assign an index
-        table_columns.select do |_, col|
-          col[:if] == nil || (col[:if].respond_to?(:call) ? (view || self).instance_exec(&col[:if]) : col[:if])
-        end.each_with_index { |(_, col), index| col[:index] = index }
-
+        count = 0
+        table_columns.each do |name, col|
+          if display_column?(col)
+            col[:index] = count
+            count += 1
+          else
+            # deleting rather than using `table_columns.select` above in order to maintain
+            # this hash as a type of HashWithIndifferentAccess
+            table_columns.delete(name)
+          end
+        end
       end
 
       def initialize_table_column_filter(column, belongs_to, has_many)
@@ -193,7 +200,15 @@ module Effective
         end.merge(filter.symbolize_keys)
       end
 
+      private
 
+      def display_column?(col)
+        if col[:if].respond_to?(:call)
+          (view || self).instance_exec(&col[:if])
+        else
+          col.fetch(:if, true)
+        end
+      end
     end
   end
 end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.2.8'.freeze
+  VERSION = '2.2.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails