grape-listing 2.0.0.pre.beta.4 → 2.0.0.pre.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad235bb148c378a4de82efee7fd0bec721702eaa88410c4ae9169cd627e49269
-  data.tar.gz: a4527257218d09dd016170a761784e4f43581121c07be843350dba0a01da143f
+  metadata.gz: 89493646689c48db0dd475f3b6a636f6486e79fa1db434c8ae8e0be66dc1f398
+  data.tar.gz: f169ecbe681e88a9383f44ebe1563e7001fa248596ab879664a574c8d55afd46
 SHA512:
-  metadata.gz: a7caf71761d95963a2dd16dea5b476b1659d047a0153552b2188c690b6439e97336a5353af9b9a6a5fd07a54ebf25c8c006ad04bcec03784f40181c50a8a8d03
-  data.tar.gz: ba501abb3d5d1375755543bb1bf15e1293df080d8db99fc3045994f498ec0dc4a380f44c262a9f6b0b7845a43acc097986c71008bf3fdb887ea42fcd85707223
+  metadata.gz: 25944b29420f5317fe8d24c300bdbe47594bcc3d637e149a760c4835f4eecc29420548a7ce580b51c868d230cc0a4bc51c96da298fc6244d13289b585f257398
+  data.tar.gz: 3942a2042bb8c5ae1529a3a5b27c99afa84333463554cf91cdcbb4dd651048f37c907635aa3f2377378b9295ce2f4a2148a8bacb0776e93f254996b52058fa35

data/lib/grape_listing/version.rb

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

data/lib/listing_service/search.rb

@@ -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
@@ -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

data/lib/listing_service/sorting.rb

@@ -12,7 +12,7 @@ module GrapeListing
         proc { send(custom_scope, @sort_order) }
       else
         nulls_order = @sort_order.to_s.downcase == 'desc' ? 'LAST' : 'FIRST'
-        query = Arel.sql("#{@sort_by} #{@sort_order} NULLS #{nulls_order}")
+        query = Arel.sql("#{@model.table_name}.#{@sort_by} #{@sort_order} NULLS #{nulls_order}")
         proc { order(query) }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-listing
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.4
+  version: 2.0.0.pre.beta.6
 platform: ruby
 authors:
 - Павел Бабин
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-06-04 00:00:00.000000000 Z
+date: 2025-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack