effective_datatables 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c6e56a24c68555820e8fd71b7db4717a01447c7
-  data.tar.gz: 47a3d46c4ceeab5eac8612d37a077ee0aba09082
+  metadata.gz: 89fe9d65ab41811c5fe6f99d2a30178cdd17558e
+  data.tar.gz: 3778600b8979aeb4ec2553e00aef1dbd9d856e58
 SHA512:
-  metadata.gz: b2b1e22237b8cdbff14edb359266f3079af6bfb52b072d590072ffa26382187b25d1f2306314d8e8e84826cb448190c31dde3d1837275f4b9f6a374795056987
-  data.tar.gz: 8a4624ec83c4752f1a29141af17a61f6392c7425eed955753fd028c4afe50271ea00192fb1ea1a3bc296eedecad58d1a334583d74d0e04460972cbb4ebe1757b
+  metadata.gz: d25d50f56c92c86e72c812ff0d58ba59658cbe5856ff42965d5988406c7bca194e36114e6ad0958a135bd1447d7b3ed63bd6f2db7d2562eed02ae596662c0c1e
+  data.tar.gz: e5cf61f381816ab5946f7e5f689f644c522e9181d05940a73535018aae9ea5cc6b21394a8e7976921b53d4fde2a708d2b6458adcee37c59ac4ba775c0af09885

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

@@ -6,8 +6,9 @@ initializeCharts = ->
     type = $chart.data('type') || 'BarChart'
     options = $chart.data('options') || {}
 
-    chart = new google.visualization[type](document.getElementById($chart.attr('id')))
-    chart.draw(google.visualization.arrayToDataTable(data), options)
+    if google
+      chart = new google.visualization[type](document.getElementById($chart.attr('id')))
+      chart.draw(google.visualization.arrayToDataTable(data), options)
 
 $ -> initializeCharts()
 $(document).on 'page:change', -> initializeCharts()

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

@@ -175,6 +175,13 @@ destroyDataTables = ->
     if $.fn.DataTable.fnIsDataTable(this)
       $(this).DataTable().destroy()
 
+anotherDestroy = ->
+  for settings in $.fn.dataTable.settings
+    $(settings.nTableWrapper).unbind('.DT').find(':not(tbody *)').unbind('.DT')
+    $(window).unbind('.DT-'+settings.sInstance)
+
+  $.fn.dataTable.settings.length = 0
+
 $ -> initializeDataTables()
 $(document).on 'page:change', -> initializeDataTables()
 $(document).on 'turbolinks:load', -> initializeDataTables()

data/app/helpers/effective_datatables_private_helper.rb

@@ -43,7 +43,7 @@ module EffectiveDatatablesPrivateHelper
 
     include_blank = opts[:filter].key?(:include_blank) ? opts[:filter][:include_blank] : (opts[:label] || name.titleize)
     pattern = opts[:filter].key?(:pattern) ? opts[:filter][:pattern] : nil
-    placeholder = opts[:filter].key?(:placeholder) ? opts[:filter][:placeholder] : (opts[:label] || name.titleize)
+    placeholder = (opts[:filter][:placeholder] || '')
     title = opts[:filter].key?(:title) ? opts[:filter][:title] : (opts[:label] || name.titleize)
     wrapper_html = { class: 'datatable_filter' }
 
@@ -60,7 +60,7 @@ module EffectiveDatatablesPrivateHelper
 
       form.input name, label: false, required: false, value: value,
         as: :string,
-        placeholder: placeholder,
+        placeholder: placeholder.presence || '###-####-###',
         wrapper_html: wrapper_html,
         input_html: { name: nil, value: value, title: title, pattern: pattern, autocomplete: 'off', data: {'column-name' => opts[:name], 'column-index' => opts[:index]} }
     when :date

data/app/models/effective/datatable.rb

@@ -22,13 +22,10 @@ module Effective
     include Effective::EffectiveDatatable::Rendering
 
     def initialize(*args)
-      if respond_to?(:initialize_scopes) # There was at least one scope defined in the scopes do .. end block
-        initialize_scopes
-      end
-
       initialize_attributes(args)
 
-      if respond_to?(:initialize_scopes)  # There was at least one scope defined in the scopes do .. end block
+      if respond_to?(:initialize_scopes) # There was at least one scope defined in the scopes do .. end block
+        initialize_scopes
         initialize_scope_options
       end
 

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

@@ -27,7 +27,7 @@ module Effective
             (params[:columns][order_by_column_index] || {})[:name]
           elsif @default_order.present?
             @default_order.keys.first
-          end || table_columns.find { |col, opts| opts[:type] != :bulk_actions_column }.first
+          end || table_columns.find { |col, opts| opts[:type] != :bulk_actions_column }.try(:first)
         end
       end
 

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

@@ -29,11 +29,14 @@ module Effective
 
       def _initialize_attributes(args)
         args.compact.each do |arg|
-          arg = arg.to_unsafe_h if arg.respond_to?(:permit) # ActionController::Parameters / Rails 5 hack. TODO.
+          # ActionController::Parameters / Rails 5 hack. TODO.
+          if arg.respond_to?(:permit)
+            arg = (arg.respond_to?(:to_unsafe_h) ? arg.to_unsafe_h : arg.to_h)
+          end
 
           raise "#{self.class.name}.new() can only be initialized with a Hash like arguments" unless arg.kind_of?(Hash)
 
-          arg.each { |k, v| self.attributes[k] = v.presence }
+          arg.each { |k, v| self.attributes[k] = v }
         end
       end
 
@@ -86,7 +89,7 @@ module Effective
         # We set some memoized helper values
         @collection_class = (collection.respond_to?(:klass) ? collection.klass : self.class)
         @active_record_collection = (collection.ancestors.include?(ActiveRecord::Base) rescue false)
-        @array_collection = (collection.kind_of?(Array) && collection.first.kind_of?(Array))
+        @array_collection = (collection.kind_of?(Array) && (collection.length == 0 || collection.first.kind_of?(Array)))
 
         # And then parse all the colums
         sql_table = (collection.table rescue nil)
@@ -118,7 +121,7 @@ module Effective
           end
         end
 
-        table_columns = cols.each_with_index do |(name, _), index|
+        table_columns = (cols || {}).each_with_index do |(name, _), index|
           sql_column = (collection.columns rescue []).find do |column|
             column.name == name.to_s || (belong_tos.key?(name) && column.name == belong_tos[name][:foreign_key])
           end
@@ -239,6 +242,8 @@ module Effective
             collection: (
               if belongs_to[:klass].respond_to?(:datatables_filter)
                 Proc.new { belongs_to[:klass].datatables_filter }
+              elsif belongs_to[:klass].respond_to?(:sorted)
+                Proc.new { belongs_to[:klass].sorted }
               else
                 Proc.new { belongs_to[:klass].all.map { |obj| [obj.to_s, obj.id] }.sort { |x, y| x[0] <=> y[0] } }
               end
@@ -253,6 +258,8 @@ module Effective
             collection: (
               if has_many[:klass].respond_to?(:datatables_filter)
                 Proc.new { has_many[:klass].datatables_filter }
+              elsif has_many[:klass].respond_to?(:sorted)
+                Proc.new { has_many[:klass].sorted }
               else
                 Proc.new { has_many[:klass].all.map { |obj| [obj.to_s, obj.id] }.sort { |x, y| x[0] <=> y[0] } }
               end
@@ -265,6 +272,8 @@ module Effective
             collection: (
               if has_and_belongs_to_manys[:klass].respond_to?(:datatables_filter)
                 Proc.new { has_and_belongs_to_manys[:klass].datatables_filter }
+              elsif has_and_belongs_to_manys[:klass].respond_to?(:sorted)
+                Proc.new { has_and_belongs_to_manys[:klass].sorted }
               else
                 Proc.new { has_and_belongs_to_manys[:klass].all.map { |obj| [obj.to_s, obj.id] }.sort { |x, y| x[0] <=> y[0] } }
               end

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

@@ -23,19 +23,19 @@
     unarchive_action = instance_exec(resource, &unarchive_action)
   end
 
-- if show_action && show_path
+- if show_action && defined?(show_path)
   = show_icon_to show_path.gsub(':to_param', resource.to_param)
 
-- if edit_action && edit_path
+- if edit_action && defined?(edit_path)
   = edit_icon_to edit_path.gsub(':to_param', resource.to_param)
 
-- if destroy_action && destroy_path
+- if destroy_action && defined?(destroy_path)
   - if resource.respond_to?(:archived?) && !resource.archived?
     = archive_icon_to destroy_path.gsub(':to_param', resource.to_param)
   - elsif resource.respond_to?(:archived?) == false
     = destroy_icon_to destroy_path.gsub(':to_param', resource.to_param)
 
-- if unarchive_action && unarchive_path
+- if unarchive_action && defined?(unarchive_path)
   - if resource.respond_to?(:archived?) && resource.archived?
     = unarchive_icon_to unarchive_path.gsub(':to_param', resource.to_param)
 

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

@@ -18,9 +18,21 @@
 
 %table.effective-datatable{effective_datatable_params}
   %thead
-    %tr
-      - datatable.table_columns.each do |name, opts|
-        %th= opts[:label] || name
+    - if datatable.table_columns.any? { |_, opts| opts[:th].present? } == false
+      %tr
+        - datatable.table_columns.each do |name, opts|
+          %th= opts[:label] || name
+    - else
+      - max_depth = datatable.table_columns.map { |_, opts| opts[:th].try(:[], :depth) || 0 }.max
+      - [*0..max_depth].each do |depth|
+        %tr
+          - table_columns = datatable.table_columns.select { |_, opts| (opts[:th].try(:[], :depth) || 0) == depth }
+          - table_columns.each do |name, opts|
+            %th{(opts[:th] || {}).merge(title: (opts[:label] || name))}
+              = opts[:label] || name
+            - (opts[:append_th] || []).each do |faux_col|
+              %th{(faux_col[:th] || {}).merge(title: faux_col[:label])}
+                = faux_col[:label]
 
   %tbody
     - datatable.to_json[:data].each do |row|

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.11.1'.freeze
+  VERSION = '2.11.2'.freeze
 end

metadata

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