effective_datatables 3.0.14 → 3.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0975bf88ba6ef9dfbd954c6f6bca4955dfd014
-  data.tar.gz: 194336c0e82300fa7b574c259f37e06f6253c7ae
+  metadata.gz: e0a7e266b00b4bc168dbf066d2be5a0b5a3d00a8
+  data.tar.gz: b5b54094cdf557a848a0466c27bdb4efce57d210
 SHA512:
-  metadata.gz: 88050576932338f0dcdeab3a1271aea0319df86e72737329014b3dc5d743e4213f24410316c3f2603d5584fd56b51b2e8dcc0ded5f7f58b0896cf05f8c035a9a
-  data.tar.gz: 84cafb3e33dff08905bce938c00ec8c4f2976349e20f00622b263d99dfedfcf34e0334df6774efb346c742905e62160099b1b9a2a57845aeacde9cf117cc5b55
+  metadata.gz: 680dc369209e29efcdbce860039d2f6f9108c033f182cdcead1e3834df7cd50a6a105f548132decac8049bb16e229a08269f1089814455f04d13d49d9d9f9b90
+  data.tar.gz: baeb9a1a4428b1acf8eb6493fe7e63a54a4c71316177adead6b9513ac78f900c692b4808b617ba0caa89a925e226e41b0df3045091493208918fce17a78075c6

data/app/helpers/effective_datatables_private_helper.rb

@@ -42,7 +42,6 @@ module EffectiveDatatablesPrivateHelper
       value: value,
       title: title,
       pattern: pattern,
-      autocomplete: 'off',
       data: {'column-name' => name, 'column-index' => opts[:index]}
     }.delete_if { |k, v| v.blank? && k != :name }
 
@@ -77,24 +76,13 @@ module EffectiveDatatablesPrivateHelper
         as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_select) ? :effective_select : :select),
         collection: opts[:search][:collection],
         selected: opts[:search][:value],
-        multiple: opts[:search][:multiple] == true,
+        multiple: opts[:search][:multiple],
+        grouped: opts[:search][:grouped],
+        polymorphic: opts[:search][:polymorphic],
         include_blank: include_blank,
         wrapper_html: wrapper_html,
         input_html: input_html,
         input_js: { placeholder: placeholder }
-    when :grouped_select
-      form.input name, label: false, required: false, value: value,
-        as: (ActionView::Helpers::FormBuilder.instance_methods.include?(:effective_select) ? :effective_select : :grouped_select),
-        collection: opts[:search][:collection],
-        selected: opts[:search][:value],
-        multiple: opts[:search][:multiple] == true,
-        grouped: true,
-        polymorphic: opts[:search][:polymorphic] == true,
-        group_label_method: opts[:search][:group_label_method] || :first,
-        group_method: opts[:search][:group_method] || :last,
-        wrapper_html: wrapper_html,
-        input_html: input_html,
-        input_js: { placeholder: placeholder }
     when :bulk_actions
       input_html[:data]['role'] = 'bulk-actions-all'
 

data/app/models/effective/datatable_value_tool.rb

@@ -74,6 +74,7 @@ module Effective
       fuzzy = column[:search][:fuzzy]
       term = Effective::Attribute.new(column[:as]).parse(value, name: column[:name])
       term_downcased = term.downcase if fuzzy && term.kind_of?(String)
+      macros = Effective::Resource.new('').macros
 
       if term == 'nil'
         return (collection.select! { |row| row[index].nil? } || collection)
@@ -102,24 +103,28 @@ module Effective
           else
             row[index] == term
           end
-        when :resource
+        when *macros, :resource
           Array(row[index]).any? do |resource|
+            if column[:as] != :resource
+              resource = resource.send(column[:name])
+            end
+
+            matched = false
+
             if term.kind_of?(Integer) && resource.respond_to?(:id)
-              resource.id == term || resource.to_param == term
+              matched ||= (resource.id == term || resource.to_param == term)
             elsif term.kind_of?(Array) && resource.respond_to?(:id)
-              term.any? { |term| resource.id == term || resource.to_param == term || resource.to_param == value }
-            else
-              fuzzy ? resource.to_s.downcase == term_downcased : resource.to_s == term
+              matched ||= term.any? { |term| resource.id == term || resource.to_param == term || resource.to_param == value }
             end
+
+            matched ||= (fuzzy ? resource.to_s.downcase.include?(term_downcased) : resource.to_s == term)
           end
-        when :string, :text, :email
+        else  # :string, :text, :email
           if fuzzy
             row[index].to_s.downcase.include?(term_downcased)
           else
-            row[index].to_s == term.to_s
+            row[index] == term || (row[index].to_s == term.to_s)
           end
-        else
-          row[index] == term
         end
       end || collection
     end

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

@@ -45,7 +45,7 @@ module Effective
 
         # A val is a computed value that is then sorted/searched after the block is run
         # You can have another block by calling .format afterwards to work on the computed value itself
-        def val(name, action: nil, as: nil, col_class: nil, label: nil, partial: nil, partial_as: nil, responsive: 10000, search: {}, sort: true, sql_column: nil, th: nil, th_append: nil, visible: true, &compute)
+        def val(name, action: nil, as: nil, col_class: nil, label: nil, partial: nil, partial_as: nil, responsive: 10000, search: {}, sort: true, sql_column: false, th: nil, th_append: nil, visible: true, &compute)
           raise 'You cannot use partial: ... with the block syntax' if partial && block_given?
 
           datatable._columns[name.to_sym] = Effective::DatatableColumn.new(

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

@@ -24,12 +24,12 @@ module Effective
             case opts[:as]
             when *resource.macros
               opts[:resource] = Effective::Resource.new(resource.associated(name), namespace: controller_namespace)
-              opts[:sql_column] ||= name
+              (opts[:sql_column] = name) if opts[:sql_column].nil?
             when Class
               if opts[:as].ancestors.include?(ActiveRecord::Base)
                 opts[:resource] = Effective::Resource.new(opts[:as], namespace: controller_namespace)
                 opts[:as] = :resource
-                opts[:sql_column] ||= name
+                (opts[:sql_column] = name) if opts[:sql_column].nil?
               end
             when :effective_addresses
               opts[:resource] = Effective::Resource.new(resource.associated(name), namespace: controller_namespace)

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.0.14'.freeze
+  VERSION = '3.0.15'.freeze
 end

metadata

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