incline 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f80a4684c30ac694722071ae774bf990844c5c
-  data.tar.gz: 840e9f021e47c41512ac3e956acf19f6cfec1fe4
+  metadata.gz: c22bc5c7a677ebd8b11734e83967760151242c3a
+  data.tar.gz: dfa99ed217bc6931202db255241e20c0246e0c85
 SHA512:
-  metadata.gz: c7da4a8f9c25f06e661f087da00f7e573315ecf8d9f59f3a96ef569602e463c4ad9a92e19a59065550b3fecadd282337b29a686544ed679686af4f304addeb36
-  data.tar.gz: 12690886ff01de202d58b6614881e89d1570b635566b68e0493ecfe2daed03a9769b22269dbe649f8cb9c387fa9d85200795bb61182e2d5eba642440c4c51fbf
+  metadata.gz: d8452a81918b8646b7a15c56655f2f40462e58821544be1d8a8e5c9a24c8e0e4a3840e4c5c1e53d47d9bb640fbd9bbb2e3c259b55ee2b57579e9cfa515d48819
+  data.tar.gz: c6bc08bb42fe75c4817c851cdf86f993568cfbba90f0e6ec83c239f5aedfdb8394d6e298bf66c7f12c6ff54d914f0d2b2c03341ca2405d493b55a1c8c09ea915

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    incline (0.3.5)
+    incline (0.3.6)
       ansi (~> 1.5.0)
       bcrypt
       bootstrap-sass
@@ -83,7 +83,7 @@ GEM
     execjs (2.7.0)
     faker (1.7.3)
       i18n (~> 0.5)
-    ffi (1.9.22)
+    ffi (1.9.23)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     i18n (0.9.3)

data/lib/incline/data_tables_request.rb

@@ -209,10 +209,10 @@ module Incline
 
       dataset = load_records(relation, false)
       return -1 if dataset.blank?
-      
+
       first_item = dataset.first
       klass = first_item.class
-      
+
       id_field = klass.respond_to?('primary_key')       ? klass.primary_key   : nil
       id_field ||= first_item.respond_to?('id')         ? 'id'                : nil
 
@@ -223,7 +223,7 @@ module Incline
         loc_id = locate_id.to_s.downcase
         dataset.index{|item| item.send(id_field).to_s.downcase == loc_id} || -1
       end
-      
+
     end
 
     ##
@@ -246,14 +246,14 @@ module Incline
         # store the unfiltered count.
         @config[:records_total] = relation.count
 
-        # If we have search parameters and any of the search parameters is a regular expression or 
+        # If we have search parameters and any of the search parameters is a regular expression or
         # one or more columns being searched is not a database column, then filtering must be done
         # locally.
         filter_local =
             !(search.blank? && columns.reject{|c| c[:search].blank? }.blank?) &&
                 (
                     # main search is a regex.
-                    search.is_a?(::Regexp) ||
+                search.is_a?(::Regexp) ||
                     # one or more column searches is a regex.
                     columns.select{|c| c[:search].is_a?(::Regexp)}.any? ||
                     # one or more searchable columns is not in the database model
@@ -308,10 +308,10 @@ module Incline
             srch = col[:search]
             relation =
                 if srch.is_a?(::Regexp)
-                  relation.select { |item| item.respond_to?(name) && item.send(name) =~ srch }
+                  relation.select { |item| get_value(item, name) =~ srch }
                 else
                   srch = srch.to_s.upcase
-                  relation.select { |item| item.respond_to?(name) && item.send(name).to_s.upcase.include?(srch) }
+                  relation.select { |item| get_value(item, name).to_s.upcase.include?(srch) }
                 end
           end
 
@@ -320,10 +320,10 @@ module Incline
             cols = columns.select{|c| c[:searchable]}.map{|c| c[:name].to_s }.reject{|c| c.blank?}
             relation =
                 if search.is_a?(::Regexp)
-                  relation.select{|item| cols.find{|col| item.respond_to?(col) && item.send(col) =~ search} }
+                  relation.select{|item| cols.find{|col| get_value(item,col) =~ search} }
                 else
                   srch = search.to_s.upcase
-                  relation.select{|item| cols.find{|col| item.respond_to?(col) && item.send(col).to_s.upcase.include?(srch) }}
+                  relation.select{|item| cols.find{|col| get_value(item,col).to_s.upcase.include?(srch) }}
                 end
           end
 
@@ -360,13 +360,27 @@ module Incline
 
     private
 
+    def get_value(item, name)
+      val = item
+      while item && name.to_s.strip != ''
+        top,_,name = name.to_s.partition('.')
+        begin
+          val = val.respond_to?(top) ? val.send(top) : nil
+        rescue =>e
+          ::Incline::Log::warn e
+          val = nil
+        end
+      end
+      val
+    end
+
     def local_sort(a, b, attribs, index = 0)
       if index >= attribs.count
         0
       else
         attr, dir = attribs[index]
-        val_a = a.send(attr)
-        val_b = b.send(attr)
+        val_a = get_value(a, attr)
+        val_b = get_value(b, attr)
         if val_a == val_b
           local_sort a, b, attribs, index + 1
         else

data/lib/incline/version.rb

@@ -1,3 +1,3 @@
 module Incline
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incline
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Beau Barker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-24 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -610,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A gem designed to get off to an even quicker start with Rails.