grape-listing 2.0.0.pre.beta.3 → 2.0.0.pre.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8702c1ee3c13602564dfa28f3f51e20415eef4c986a7085c4f5410d01312dfc7
-  data.tar.gz: a8d18a73fbb154071d4b4dfb3b3ff602a129bdae91509d23ac5060f3636fc84e
+  metadata.gz: 77d58fbe9510c3ff0cbf2f70b4f4b87a8988259d698b6bebb5af37a04aa298f2
+  data.tar.gz: de6a723a92e0247428961bd914c003f4b32decc9079652edf6dd3559957161d7
 SHA512:
-  metadata.gz: d580b02ecce9100131d2fde0305c19ff37bd2c823c744503507d1f92a396928b084620e3b9c708bc0421dd7ea5acc9747ee2117a997cb1c0504af27cbdd9060f
-  data.tar.gz: fc93cef01e0a5238a740c8eaf0964c203fd012ffa1a9cce0f91eea4e8efeb31b5c0ed9bd9902e490aa068745c7d95e0f6958c3752e5faf3b0a4ee85e662c9ee3
+  metadata.gz: 3f8c09ef3ff82bc903f9c0ae198ecdf50cd229b42d2edb1244b49c166ec093e1434c6bfcc8279dccd92a8bbf6d27cf1d5dba082709cdca508ffcdcc656f4ddf5
+  data.tar.gz: 7b68865cd1ab76d04b8d33b4a94bc14dafc0ed82dd35d4eda459f05550356f980d323366359679febda0470b48f2c30d39491d71f363a0c45f03d0370ce43fa5

data/lib/grape_listing/version.rb

@@ -1,3 +1,3 @@
 module GrapeListing
-  VERSION = '2.0.0-beta.3'.freeze
+  VERSION = '2.0.0-beta.5'.freeze
 end

data/lib/listing_service/search.rb

@@ -30,7 +30,7 @@ module GrapeListing
         next unless [column, condition, operator].all?
 
         # применение кастомного скоупа (при наличии)
-        custom_scope = @custom_search[column]
+        custom_scope = @custom_search[column] if @custom_search
         if custom_scope
           @objects = list.send(custom_scope, value)
           next
@@ -49,6 +49,8 @@ module GrapeListing
           date_clause(subject, condition, operator, value)
         when :boolean
           boolean_clause(subject, condition, operator, value)
+        when :enum
+          enum_clause(subject, condition, operator, value)
         end
 
          # применение запроса для фильтрации
@@ -120,6 +122,15 @@ module GrapeListing
       end
     end
 
+    def enum_clause(subject, condition, operator, value)
+      case operator
+      when EQUAL
+        enum_equal(subject, condition, value)
+      when IN
+        enum_in(subject, condition, value)
+      end
+    end
+
     def string_present(subject, condition)
       case condition
       when IS
@@ -132,9 +143,9 @@ module GrapeListing
     def string_contain(subject, condition, value)
       case condition
       when IS
-        "#{subject} ILIKE %#{value}%"
+        "#{subject} ILIKE '%#{value}%'"
       when NOT
-        "#{subject} NOT ILIKE %#{value}%"
+        "#{subject} NOT ILIKE '%#{value}%'"
       end
     end
 
@@ -150,18 +161,18 @@ module GrapeListing
     def string_start(subject, condition, value)
       case condition
       when IS
-        "#{subject} ILIKE #{value}%"
+        "#{subject} ILIKE '#{value}%'"
       when NOT
-        "#{subject} NOT ILIKE #{value}%"
+        "#{subject} NOT ILIKE '#{value}%'"
       end
     end
 
     def string_end(subject, condition, value)
       case condition
       when IS
-        "#{subject} ILIKE %#{value}"
+        "#{subject} ILIKE '%#{value}'"
       when NOT
-        "#{subject} NOT ILIKE %#{value}"
+        "#{subject} NOT ILIKE '%#{value}'"
       end
     end
 
@@ -312,5 +323,25 @@ module GrapeListing
       end
     end
 
+    def enum_equal(subject, condition, value)
+      case condition
+      when IS
+        "#{subject} = '#{value}'"
+      when NOT
+        "#{subject} != '#{value}'"
+      end
+    end
+
+    def enum_in(subject, condition, value)
+      opts = value.map { |i| "'#{i}'" }.join(',')
+
+      case condition
+      when IS
+        "#{subject} IN (#{opts})"
+      when NOT
+        "#{subject} NOT IN (#{opts})"
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-listing
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.3
+  version: 2.0.0.pre.beta.5
 platform: ruby
 authors:
 - Павел Бабин