effective_datatables 3.0.9 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58e4a1ee916c1766e2d3d2be61ffe2607d92c0d4
-  data.tar.gz: b796116f649e7ca0711d7436f50b587d12c47576
+  metadata.gz: 16759c0e5f1a13f16ea9ebd7b227826a059d6d41
+  data.tar.gz: 566fb03358fb13f1f16fe43fd17b317fb2f960e1
 SHA512:
-  metadata.gz: 1bcd2435e64b3576f7568f126791a77e6c5da1de4a26244b8f290ce4f9d03f43037d23075b7f932e21a3c288a8049c4a0fd9b3b4ec314f1c0498f37edd7f4734
-  data.tar.gz: 5286e5530da18eaea928e8fae7311be484778b6be2694e1d0855c69c61cda7ba74efaa4b62e3fd79e8c7f44d2dbdf50d1b5bd6278ba202052403b3526dc6b518
+  metadata.gz: 03025955a600bc23c5a208a28f94ce65efb65a84cc68e9fedc9083c96c230e6f08ee42d20c2daa32c0d0b23bd922f24e2817b2ab9b4ac3badeec1996e28395ee
+  data.tar.gz: ff418748517d4133b1d6a0ccf595332d883ea439f43ef880d1d6bb877b8537bf821d40c3ebde5a231fa1799a15683406150d4e80f00f392b9c89e8f7df1fc412

data/README.md

@@ -41,6 +41,7 @@ A lot has changed. See below for full details.
 # Getting Started
 
 ```ruby
+gem 'haml-rails'            # or try using gem 'hamlit-rails'
 gem 'effective_datatables'
 ```
 
@@ -313,6 +314,8 @@ As well, a datatable can be initialized with `attributes`.
 
 When initialized with a Hash, that hash is available throughout the entire datatable as `attributes`.
 
+You can call the attributes from within the datatable as `attributes` or within a partial/view as `@datatable.attributes`.
+
 These attributes are serialized and stored in an encrypted cookie. Objects won't work. Keep it simple.
 
 Attributes cannot be changed by search, filter, or state in any way. They're guaranteed to be the same as when first initialized.

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

@@ -3,7 +3,7 @@ initializeDataTables = ->
     return if $.fn.DataTable.fnIsDataTable(this)
 
     datatable = $(this)
-    simple = (datatable.data('simple') == true)
+    simple = ('' + datatable.data('simple') == 'true')
     input_js_options = datatable.data('input-js-options') || {}
     buttons_export_columns = input_js_options['buttons_export_columns'] || ':not(.col-actions)'
 

data/app/helpers/effective_datatables_helper.rb

@@ -17,7 +17,7 @@ module EffectiveDatatablesHelper
 
     effective_datatable_params = {
       id: datatable.to_param,
-      class: datatable.table_html_class,
+      class: Array(datatable.table_html_class).join(' '),
       data: {
         'effective-form-inputs' => defined?(EffectiveFormInputs),
         'bulk-actions' => datatable_bulk_actions(datatable),
@@ -29,7 +29,7 @@ module EffectiveDatatablesHelper
         'display-start' => datatable.display_start,
         'input-js-options' => (input_js || {}).to_json.html_safe,
         'reset' => datatable_reset(datatable),
-        'simple' => datatable.simple?.to_s,
+        'simple' => simple.to_s,
         'source' => effective_datatables.datatable_path(datatable, {format: 'json'}),
         'total-records' => datatable.to_json[:recordsTotal]
       }

data/app/models/effective/datatable.rb

@@ -127,7 +127,7 @@ module Effective
     end
 
     def table_html_class
-      attributes[:class] || 'table table-bordered table-striped'
+      attributes[:class] || EffectiveDatatables.html_class
     end
 
     def to_param

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

@@ -83,6 +83,10 @@ module Effective
             opts[:search] = { as: opts[:search] }
           when Array, ActiveRecord::Relation
             opts[:search] = { collection: opts[:search] }
+          when Hash
+            # Nothing
+          else
+            raise "column #{name} unexpected search value"
           end
 
           search = opts[:search]
@@ -93,6 +97,8 @@ module Effective
             search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.to_param] }
           elsif search[:collection].kind_of?(Array)
             search[:collection].each { |obj| obj[1] = 'nil' if obj[1] == nil }
+          elsif search[:collection].kind_of?(Hash)
+            search[:collection].each { |k, v| search[:collection][k] = 'nil' if v == nil }
           end
 
           search[:value] ||= search.delete(:selected) if search.key?(:selected)

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

@@ -150,7 +150,8 @@ module Effective
 
         if state[:search].blank? && !datatables_ajax_request?
           columns.each do |name, opts|
-            state[:search][name] = opts[:search][:value] if (opts[:search] || {}).key?(:value)
+            next unless opts[:search].kind_of?(Hash) && opts[:search].key?(:value)
+            state[:search][name] = opts[:search][:value]
           end
         end
 

data/config/effective_datatables.rb

@@ -24,6 +24,9 @@ EffectiveDatatables.setup do |config|
   # Valid options are: 5, 10, 25, 50, 100, 250, 1000, :all
   config.default_length = 25
 
+  # Default class used on the <table> tag
+  config.html_class = 'table table-bordered table-striped'
+
   # When using the actions_column DSL method, apply the following behavior
   # Valid values for each action are:
   # true - display this action if authorized?(:show, Post)

data/lib/effective_datatables.rb

@@ -7,6 +7,8 @@ module EffectiveDatatables
   mattr_accessor :authorization_method
 
   mattr_accessor :default_length
+  mattr_accessor :html_class
+
   mattr_accessor :actions_column # A Hash
   mattr_accessor :debug
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.0.9'.freeze
+  VERSION = '3.0.10'.freeze
 end

metadata

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