kadmin 0.8.0 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9951931ba6b660b218da8b52c56273e7892ae8028877a0a9dfd892b76cc7a34
-  data.tar.gz: 86c58851ca2dc31823bdd0f371de9cc3785855581c6cff87d6c4cd1f7104debf
+  metadata.gz: fe93b6bebb3211e1154d0740928d46babcea9a5b8274d5143bc1d05045258582
+  data.tar.gz: ebc7620ec9474cd3f90d527847385b799293982d4a2744607d9b1ad1e7c5259e
 SHA512:
-  metadata.gz: 45dcc66e5ad58f7c67dfbbc14bf3e83de99916eca5e7579ab38df855f7e40c8f0adec45c4c21562308bf4ab6e702e7286504288ed916b8dd747a86da5b75050c
-  data.tar.gz: be94feb91612b7d396e248b96c0329d4c24e6bc4f6ffe15b635121dc4a680336900eed6dcd79bc7fb582677311e49ad4c86286e74f250c0d58e6676e2691cf77
+  metadata.gz: cdd30f1c442519fcd778cfa3a8068e80372e8ade3e7e11d5fa3ce43ed72e53743c2e8f895cb1b126a6d7dd1265ab1dd04a543a14e1671a89b3191370e91aaa26
+  data.tar.gz: 7d30719111ee40319e908c70d3f8204830babcc98c9a31989a4bed0b37c96e3d1ef8742488c41bb1ab3950007a1109f6cbf017f79ff955c216e5548289954587

data/app/controllers/kadmin/concerns/resources.rb

@@ -37,18 +37,27 @@ module Kadmin
 
       private
 
-      # DEPRECATED
-      def resources_deprecated_parse_filter(hash)
-        filter_scope = lambda do |scope, value|
-          search_value = quote(fuzz(value))
-          conditions = Array.wrap(hash[:column]).map do |column_name|
-            %(#{scope.quoted_table_name}.`#{column_name}` LIKE #{search_value})
+      # Takes in a column or array of column names, and returns a proc
+      # ready to be used by this class.
+      # Columns can contain either symbols, strings, or directly an Arel::Node,
+      # allowing you to reference joined tables as well.
+      def resources_filter_matches(columns)
+        return lambda do |v|
+          pattern = "%#{v}%"
+          conditions = Array.wrap(columns).reduce(nil) do |acc, column|
+            column = arel_table[column] unless column.is_a?(Arel::Attributes::Attribute)
+            matcher = column.matches(pattern)
+            acc.nil? ? matcher : acc.or(matcher)
           end
 
-          scope.where(conditions.join(' OR '))
+          where(conditions)
         end
+      end
 
-        Finder::Filter.new(name: name, scope: filter_scope)
+      # DEPRECATED
+      def resources_deprecated_parse_filter(hash)
+        filter_scope = resources_filter_matches(hash[:column])
+        Finder::Filter.new(hash[:name], filter_scope)
       end
     end
   end

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.9.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.4
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails