effective_datatables 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5bf96a1360216798ef20643a5bcef4e8afd745
-  data.tar.gz: beb7fff4b3ac339a6c1ef0957458a25daae091bd
+  metadata.gz: a4081fbe7767fc0dc7e6142ee15630d12f50b237
+  data.tar.gz: ba5f35b8180b134ce4b567f41acb689f119d3402
 SHA512:
-  metadata.gz: 8165fee817a1bfbda1bdeb090a1821633b4808e376b5dc84ec899b64d2082a9dfd19026039dc8adfeef2444a1fa160c5510404f3ff9a96b5aab3bd196eb16244
-  data.tar.gz: 9c3b609594be2ffd2002fb498a9731f357f170ef87ea18a7822be3675c060a872fcf8b3433c22c4600b5d7bbee170e5c37a15654a8fb88d17227086d89700c65
+  metadata.gz: d1c9af4a05da6623271d70a10cbcdc45580b889f345fc0896c51fdbaaba7506755b4043228d956cf3673e29b45a7f9aaa80ec4e3c0d4043f18441b9140df50b5
+  data.tar.gz: f9436b7939c2a844b792214f4aa95d447445253fcba4b3354ae92957a1149324a8a0fc36381dac68a0422760cb800fd199c47d839ce9fac9043fca91a91628a6

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

@@ -38,6 +38,7 @@ initializeDataTables = ->
         },
         {
           extend: 'print',
+          footer: true,
           exportOptions:
             format:
               header: (str) -> $("<div>#{str}</div>").children('.search-label').first().text()

data/app/helpers/effective_datatables_private_helper.rb

@@ -79,6 +79,7 @@ module EffectiveDatatablesPrivateHelper
         multiple: opts[:search][:multiple],
         grouped: opts[:search][:grouped],
         polymorphic: opts[:search][:polymorphic],
+        template: opts[:search][:template],
         include_blank: include_blank,
         wrapper_html: wrapper_html,
         input_html: input_html,

data/app/models/effective/datatable_value_tool.rb

@@ -41,11 +41,17 @@ module Effective
 
       if direction == :asc
         collection.sort! do |x, y|
-          x[index] <=> y[index] || x[index].to_s <=> y[index].to_s || 0
+          x = obj_to_value(x[index], column)
+          y = obj_to_value(y[index], column)
+
+          x <=> y || x.to_s <=> y.to_s || 0
         end
       else
         collection.sort! do |x, y|
-          y[index] <=> x[index] || y[index].to_s <=> x[index].to_s || 0
+          x = obj_to_value(x[index], column)
+          y = obj_to_value(y[index], column)
+
+          y <=> x || y.to_s <=> x.to_s || 0
         end
       end
 
@@ -71,44 +77,64 @@ module Effective
     def search_column(collection, value, column, index)
       Rails.logger.info "VALUE TOOL: search_column #{column.to_s} #{value} #{index}" if EffectiveDatatables.debug
 
+      macros = Effective::Resource.new('').macros
       fuzzy = column[:search][:fuzzy]
+
       term = Effective::Attribute.new(column[:as]).parse(value, name: column[:name])
       term_downcased = term.to_s.downcase
-      macros = Effective::Resource.new('').macros
 
-      if term == 'nil'
-        return (collection.select! { |row| row[index].nil? } || collection)
+      # term == 'nil' rescue false is a Rails 4.1 fix, where you can't compare a TimeWithZone to 'nil'
+      if (term == 'nil' rescue false)
+        return collection.select! { |row| obj_to_value(row[index], column) == nil } || collection
       end
 
       # See effective_resources gem search() method # relation.rb
       collection.select! do |row|
+        obj = obj_to_value(row[index], column)
+
         case column[:as]
-        when :duration
-          if fuzzy && (term % 60 == 0) && value.to_s.include?('m') == false
+        when :boolean
+          if fuzzy
+            term ? (obj == true) : (obj != true)
+          else
+            obj == term
+          end
+        when :datetime, :date
+          end_at = (
+            case (value.to_s.scan(/(\d+)/).flatten).length
+            when 1 ; term.end_of_year     # Year
+            when 2 ; term.end_of_month    # Year-Month
+            when 3 ; term.end_of_day      # Year-Month-Day
+            when 4 ; term.end_of_hour     # Year-Month-Day Hour
+            when 5 ; term.end_of_minute   # Year-Month-Day Hour-Minute
+            when 6 ; term + 1.second      # Year-Month-Day Hour-Minute-Second
+            else term
+            end
+          )
+          obj >= term && obj <= end_at
+        when :decimal, :currency
+          if fuzzy && (term.round(0) == term) && value.to_s.include?('.') == false
             if term < 0
-              row[index] <= term && row[index] > (term - 60)
+              obj <= term && obj > (term - 1.0)
             else
-              row[index] >= term && row[index] < (term + 60)
+              obj >= term && obj < (term + 1.0)
             end
           else
-            row[index] == term
+            obj == term
           end
-        when :decimal, :currency
-          if fuzzy && (term.round(0) == term) && value.to_s.include?('.') == false
+        when :duration
+          if fuzzy && (term % 60 == 0) && value.to_s.include?('m') == false
             if term < 0
-              row[index] <= term && row[index] > (term - 1.0)
+              obj <= term && obj > (term - 60)
             else
-              row[index] >= term && row[index] < (term + 1.0)
+              obj >= term && obj < (term + 60)
             end
           else
-            row[index] == term
+            obj == term
           end
         when *macros, :resource
-          resources = Array(column[:as] == :resource ? row[index] : row[index].send(column[:name]))
-          terms = Array(term)
-
-          resources.any? do |resource|
-            terms.any? do |term|
+          Array(obj).any? do |resource|
+            Array(terms).any? do |term|
               matched = false
 
               if term.kind_of?(Integer) && resource.respond_to?(:to_param)
@@ -118,12 +144,11 @@ module Effective
               matched ||= (fuzzy ? resource.to_s.downcase.include?(term.to_s.downcase) : resource.to_s == term)
             end
           end
-
         else  # :string, :text, :email
           if fuzzy
-            row[index].to_s.downcase.include?(term_downcased)
+            obj.to_s.downcase.include?(term_downcased)
           else
-            row[index] == term || (row[index].to_s == term.to_s)
+            obj == term || (obj.to_s == term.to_s)
           end
         end
       end || collection
@@ -140,6 +165,10 @@ module Effective
       collection.size
     end
 
+    def obj_to_value(obj, column)
+      ((column[:partial] || column[:format]) && !column[:compute]) ? obj.send(column[:name]) : obj
+    end
+
   end
 end
 

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

@@ -60,11 +60,9 @@ module Effective
           columns.map do |name, opts|
             if state[:visible][name] == false && (name != order_name)  # Sort by invisible array column
               BLANK
-            elsif opts[:partial]
-              active_record_collection? ? obj : obj[opts[:index]]
             elsif opts[:compute]
               dsl_tool.instance_exec(obj, (active_record_collection? ? collection : obj[opts[:index]]), &opts[:compute])
-            elsif opts[:format]
+            elsif (opts[:partial] || opts[:format])
               active_record_collection? ? obj : obj[opts[:index]]
             elsif opts[:resource]
               resource = active_record_collection? ? obj : obj[opts[:index]]

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

@@ -137,7 +137,7 @@ module Effective
 
           search[:as] ||= :select if (search.key?(:collection) && opts[:as] != :belongs_to_polymorphic)
 
-          search[:fuzzy] = (opts[:sql_as_column] != true) unless search.key?(:fuzzy)
+          search[:fuzzy] = true unless search.key?(:fuzzy)
 
           if array_collection? && opts[:resource].present?
             search.reverse_merge!(resource.search_form_field(name, collection.first[opts[:index]]))

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.1.2'.freeze
+  VERSION = '3.1.3'.freeze
 end

metadata

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