effective_datatables 4.7.9 → 4.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04dc4193bfa7df74ea293e09a5d58c2960353eef458b7b35592a8d28c5414f32
-  data.tar.gz: fa69c2c429d134996db63c99ef21f726aeedd51c73b2d827ce0c90072b4817d2
+  metadata.gz: d7466c3941269d0062b5b2f920ae7371343f341bc8f09c8672d3a57217a80d57
+  data.tar.gz: 3338eb6cdc80824533d228d14aa9414ff19b3947b849ba466b348a5448ba6c18
 SHA512:
-  metadata.gz: 387e3b27d26e4f6587543cde926a487450b4a339ec72c34f04d2e9fe310bf0443ff8c7d4471ac83e403bc1fb9e89e39ca787fa49ca914ae0d960d07b0e82a69d
-  data.tar.gz: b9ef2b83820e368394d3a31e572cd4dd6faec3b883a2d9c5b37b469db31baee35eef705e950c9d82e46f403565c327bc4ffa5e602394013c3fd74c692660cdb0
+  metadata.gz: 5e4ef7ef9d01e2f192dfe051c09fbbe1f9fdc4fd2979ca3cfd2b86ab8bc6a5fb31708e8e1531c882db9fc3b08cdd60580440e25613f0bf6ebc41d98f29cfac29
+  data.tar.gz: e6a9170763f485ad3cddc04d5502b7fca657c28aa9cd04c509c91975e68b9139489f8b2e1bc0ac10ed707b621286330aab06f82c1fce1221d121b7b4241ae152

data/app/models/effective/datatable_value_tool.rb

@@ -74,12 +74,12 @@ module Effective
       collection
     end
 
-    def search_column(collection, value, column, index)
-      Rails.logger.info "VALUE TOOL: search_column #{column.to_s} #{value} #{index}" if EffectiveDatatables.debug
+    def search_column(collection, original, column, index)
+      Rails.logger.info "VALUE TOOL: search_column #{column.to_s} #{original} #{index}" if EffectiveDatatables.debug
 
       fuzzy = column[:search][:fuzzy]
 
-      term = Effective::Attribute.new(column[:as]).parse(value, name: column[:name])
+      term = Effective::Attribute.new(column[:as]).parse(original, name: column[:name])
       term_downcased = term.to_s.downcase
 
       # term == 'nil' rescue false is a Rails 4.1 fix, where you can't compare a TimeWithZone to 'nil'
@@ -89,7 +89,8 @@ module Effective
 
       # See effective_resources gem search() method # relation.rb
       collection.select! do |row|
-        obj = obj_to_value(row[index], column, row)
+        obj = row[index]
+        value = obj_to_value(row[index], column, row)
 
         case column[:as]
         when :boolean
@@ -100,7 +101,7 @@ module Effective
           end
         when :datetime, :date
           end_at = (
-            case (value.to_s.scan(/(\d+)/).flatten).length
+            case (original.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
@@ -110,35 +111,35 @@ module Effective
             else term
             end
           )
-          obj >= term && obj <= end_at
+          value >= term && value <= end_at
         when :time
-          (obj.hour == term.hour) && (term.min == 0 ? true : (obj.min == term.min))
+          (value.hour == term.hour) && (term.min == 0 ? true : (value.min == term.min))
         when :decimal, :currency
-          if fuzzy && (term.round(0) == term) && value.to_s.include?('.') == false
+          if fuzzy && (term.round(0) == term) && original.to_s.include?('.') == false
             if term < 0
-              obj <= term && obj > (term - 1.0)
+              value <= term && value > (term - 1.0)
             else
-              obj >= term && obj < (term + 1.0)
+              value >= term && value < (term + 1.0)
             end
           else
-            obj == term
+            value == term
           end
         when :duration
-          if fuzzy && (term % 60 == 0) && value.to_s.include?('m') == false
+          if fuzzy && (term % 60 == 0) && original.to_s.include?('m') == false
             if term < 0
-              obj <= term && obj > (term - 60)
+              value <= term && value > (term - 60)
             else
-              obj >= term && obj < (term + 60)
+              value >= term && value < (term + 60)
             end
           else
-            obj == term
+            value == term
           end
         when *datatable.association_macros, :resource
           Array(obj).any? do |resource|
             Array(term).any? do |term|
               matched = false
 
-              if term.kind_of?(Integer) && resource.respond_to?(:to_param)
+              if term.kind_of?(Integer) && resource.respond_to?(:id) && resource.respond_to?(:to_param)
                 matched = (resource.id == term || resource.to_param == term)
               end
 
@@ -147,9 +148,9 @@ module Effective
           end
         else  # :string, :text, :email
           if fuzzy
-            obj.to_s.downcase.include?(term_downcased)
+            value.to_s.downcase.include?(term_downcased)
           else
-            obj == term || (obj.to_s == term.to_s)
+            value == term || (value.to_s == term.to_s)
           end
         end
       end || collection

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.7.9'.freeze
+  VERSION = '4.7.10'.freeze
 end

metadata

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