grape-listing 2.0.0.pre.beta.11 → 2.0.0.pre.beta.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0542abc140bd6936b962517da4c0650550f7a3f3624940b606f541ec2233d190
-  data.tar.gz: a6764a6a57d82189558fe2b04426a3a0c961c2e580f5f2c6f28696f3ac8cce40
+  metadata.gz: 2728296b805a8877461c3696a08b7f604301b04911dc23690c38e4662d49e4e4
+  data.tar.gz: 8621fc8d53b6c608c85fab5a5231ce8a5e95446a0b424c3f2d4154b609f1a142
 SHA512:
-  metadata.gz: 9c795d32967d973bad49a50450431df75f7ab6c416a88362d4ecd6eaa554acef1b2116feb6f3c77b44694fa5115e3a855b756f7c1b15068558c6a20d69e03fc5
-  data.tar.gz: 9ae96a0514bfd032b39570cbd088e8286ffca3b8a8943e486eddc1a25a7f91f206b4b173da709b4f8061cc173ec79ebabac6d00e608691e8ae761ec1ee6f53ce
+  metadata.gz: b5faf00132b016257f6bf72790f17e3f8a6ce986a75b5d335569ba6335e1a6cbdf80dd344ce348be1fe9c559e1c5074df665b3b6f2acebf18bdf6b4a953d2766
+  data.tar.gz: 91d2b3865e241d629e3377dd5e9770389f6f37f676b4947ee30c19becbbdba1949de59152b6eafb12a2ee1ee3eec0950d87228447c41896d7a7796561fa58bbf

data/lib/grape_listing/version.rb

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

data/lib/listing_service/pagination.rb

@@ -10,8 +10,8 @@ module GrapeListing
 
       # результат с пагинацией
       {
-        sort_by: @sort_by,
-        sort_order: @sort_order,
+        sort_by: @params['sort_by'] || 'id',
+        sort_order: @params['sort_order'] || 'desc',
         count: @objects_count,
         objects: @objects
       }

data/lib/listing_service/search.rb

@@ -91,6 +91,8 @@ module GrapeListing
         string_start(subject, condition, value)
       when END_WITH
         string_end(subject, condition, value)
+      when IN
+        string_in(subject, condition, value)
       end
     end
 
@@ -199,6 +201,17 @@ module GrapeListing
       end
     end
 
+    def string_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
+
     def number_present(subject, condition)
       case condition
       when IS

data/lib/listing_service/sorting.rb

@@ -4,15 +4,15 @@ module GrapeListing
     private
 
     def sort_proc
-      @sort_by = @params['sort_by'] || 'id'
-      @sort_order = @params['sort_order'] || 'desc'
-      custom_scope = @custom_sort[@sort_by] if @custom_sort
+      sort_by = @params['sort_by'] || 'id'
+      sort_order = @params['sort_order'] || 'desc'
+      custom_scope = @custom_sort[sort_by] if @custom_sort
 
       if custom_scope
-        proc { send(custom_scope, @sort_order) }
+        proc { send(custom_scope, sort_order) }
       else
-        nulls_order = @sort_order.to_s.downcase == 'desc' ? 'LAST' : 'FIRST'
-        query = Arel.sql("#{@model.table_name}.#{@sort_by} #{@sort_order} NULLS #{nulls_order}")
+        nulls_order = sort_order.to_s.downcase == 'desc' ? 'LAST' : 'FIRST'
+        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.11
+  version: 2.0.0.pre.beta.13
 platform: ruby
 authors:
 - Павел Бабин
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-06-18 00:00:00.000000000 Z
+date: 2025-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack