effective_datatables 4.4.4 → 4.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a976fdcb95a6a0fa08a6f7cb3f22f33590a4d68c
-  data.tar.gz: 2dbd5417952dd9ac41471422e176595b8cf1dc49
+  metadata.gz: 158ddf59a09940c2dee6187aa2e206104f8552e8
+  data.tar.gz: ea19c893a0e184003d5f60007a171efd07417003
 SHA512:
-  metadata.gz: f1df233ae2302a519c4a308d271ae5c4fe20983f035a03667cea30152d87f6a6f001d2468d259c8c0dbe7d9e7a3dbf39477b840564e75b4e64f72bd15a52db41
-  data.tar.gz: cb9397af7b7082c4c28386cf265027aabea7472c07b7d1623cb7929f2699f5e9935632fed7684edb7eb5aefe38f174d1bbed889cae0e9a73e1d526cc1afffe76
+  metadata.gz: 86fe5b9307c518671509dce63bdc6e4b9e99c9a6af22fb992aca3eeee61fba645f3028f1d89702ae0578ae0961dab091b15758e8f81c61c29a9b611ba4b2f86f
+  data.tar.gz: c775b5445a7a328e04b48c24ca6bf9fc2da86c6fdc7cf0860d6dd69d75379e200f5d104085a7a6c9256ba96041e9c322971e1669db61315c86691efd9c9db94e

data/README.md

@@ -15,6 +15,12 @@ This gem includes the jQuery DataTables assets.
 
 Works with postgres, mysql, sqlite3 and arrays.
 
+## Live Demo
+
+Click here for a [Live Demo](https://effective-datatables-demo.herokuapp.com/).
+
+See [effective_datatables_demo](https://github.com/code-and-effect/effective_datatables_demo) for a working rails website example.
+
 ## effective_datatables 4.0
 
 This is the 4.0 series of effective_datatables.
@@ -744,7 +750,7 @@ parse: -> { |term| term.to_i }  # Parse the incoming term (string) into whatever
 required: true|false            # Passed to form
 ```
 
-Any other option given will be yielded to SimpleForm as `input_html` options.
+Any other option given will be yielded to EffectiveBootstrap as options.
 
 ## bulk_actions
 
@@ -999,9 +1005,11 @@ datatable do
     duration = (hours.to_i * 60) + minutes.to_i
 
     collection.select! { |row| row[index] == duration }  # Must return an Array of Arrays
-  end.sort do |collection, term, column, index|
-    collection.sort! do |x, y|
-      x[index] <=> y[index]
+  end.sort do |collection, direction, column, index|
+    if direction == :asc
+      collection.sort! { |a, b| a[index] <=> b[index] }
+    else
+      collection.sort! { |a, b| b[index] <=> a[index] }
     end
   end
 end

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

@@ -89,7 +89,7 @@ module Effective
             if opts[:as].kind_of?(Class) && opts[:as].ancestors.include?(ActiveRecord::Base)
               opts[:resource] = Effective::Resource.new(opts[:as], namespace: controller_namespace)
               opts[:as] = :resource
-            elsif opts[:as] == nil
+            elsif opts[:as] == nil && row.present?
               if (value = Array(row[opts[:index]]).first).kind_of?(ActiveRecord::Base)
                 opts[:resource] = Effective::Resource.new(value, namespace: controller_namespace)
                 opts[:as] = :resource

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.4.4'.freeze
+  VERSION = '4.4.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.4.4
+  version: 4.4.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails