data_tables-responder 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 499aade7583b2148751f39d6004c1b3bea164620
-  data.tar.gz: 502c2d8e2aa857390f3e55c8139204d375670032
+  metadata.gz: 0798fa16c1404198a97647a9bfc2f4514f3a21e4
+  data.tar.gz: 04e1541db4c718874ecbf131613569b34ebadf30
 SHA512:
-  metadata.gz: 71c654d1f58279888be4541f919e4ce8b51f1c7da354b4d4b9a04ee5eacb6be6844cd87e6857711e7b8c9a7341ba94f0cc4910afdcd57e428f40897a8878117b
-  data.tar.gz: d938cf9b87575b5d2a18dbf0dacb315e1fa7e286bf1f5cc37bbb228bbe1e0f7da89f59d653d730bd0f5d87ec3da49878b367dfeb506946558aacb449353a30df
+  metadata.gz: 030493b51f5b002e10b36561b9ec9dbd900c457ab3159f000c19091caccd757cc506e79901d61d321f546422e40eb160b24ea0c0ff00a28fc61e76538e049957
+  data.tar.gz: 08eb69d5a37e099868c9869f2a66e1959cf3fd02fa19f86b94a3e05bd5ca2dcba472272456a980d27c5459fcefa733bb4f70bb172d5983e493f0090fa9052652

data/lib/data_tables/modules/search.rb

@@ -26,35 +26,39 @@ module DataTables
 
         searches = DataTables.flat_keys_to_nested columns
 
-        or_clause = nil
-        search_by = searches.collect do |k, query|
-          if query.is_a? Hash
-            assoc = model.reflect_on_association(k)
-            assoc_klass = assoc.klass
-            assoc_arel_table = assoc_klass.arel_table
+        search_by = build_search(model, searches)
 
-            if model.respond_to? :left_outer_join
-              @collection = @collection.left_outer_join(k)
-            else
-              @collection = @collection.includes(k).references(k)
-            end
+        @collection.where(search_by.reduce(:or))
+      end
 
-            assoc_arel_table[query.first.first].matches(query.first.last)
+      def build_search(model, searches)
+        queries = []
+        searches.inject(queries) do |query, junk|
+          column, search = junk
+          case search
+          when Hash
+            assoc = model.reflect_on_association(column)
+            assoc_klass = assoc.klass
+
+            outer_join = Arel::Nodes::OuterJoin.new(assoc_klass.arel_table,
+              Arel::Nodes::On.new(
+                model.arel_table[assoc.active_record_primary_key].eq(assoc_klass.arel_table[assoc.foreign_key])
+            ))
+            @collection.joins(outer_join)
+            query << build_search(assoc_klass, search).reduce(:or)
           else
-            if (column = model.columns.find { |c| c.name == k.to_s })
-              case column.type
-              when :string
-                model.arel_table[k].matches("%#{query}%")
-              when :integer
-                model.arel_table[k].eq(query)
-              else
-                nil
-              end
+            col_s = column.to_s
+            case (k = model.columns.find(nil) { |c| c.name == col_s })&.type
+            when :string
+              query << model.arel_table[k.name].matches("%#{search}%")
+            when :integer
+              query << model.arel_table[k.name].eq(search)
+            else
+              query
             end
           end
-        end.compact
-
-        @collection.where(search_by.reduce(:or))
+        end
+        queries
       end
 
       protected

data/lib/data_tables/responder/version.rb

@@ -1,5 +1,5 @@
 module DataTables
   module Responder
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_tables-responder
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dale Stevens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers