grape-listing 1.1.11 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42151a397fe1355931f6dcd0c63fb939c3243946fd74d740917a7baade052cc3
-  data.tar.gz: a05d65e9c19e8e6a842b4e6de0d35beababfab88199542a1f1c91c0bc4fddf60
+  metadata.gz: bb778ae3f53f8f3703261e1eb87f7c35ff443841630966a81ce6d30a85927101
+  data.tar.gz: a20c1c499e21021c1b4947f7e4cc2a44bb966ee498d3231503dcedb6e378a1bd
 SHA512:
-  metadata.gz: 1aff012b41a15c19efe96e9256901cfd865184f7db29bf39b1e28bbac9aa3b9a631f636d1fb5c14820a3e6dd599422c4060b662bd63b977f092fd3a4d482af06
-  data.tar.gz: 1d958d8fdbfc3035f7518cb560262ff04a0dea151f42dd160af7c1c88dd1d029060c9711f73f16f16092b73bf189ad865b5e77d0f6a889bd5ab2f9b84d5e50af
+  metadata.gz: '084ce80e719db7ea9e9f0d583f47777e0ec830f490b209f989aa2ff9ac23ea7827dd5a0e077f89fdb10192f2978fbbbafef037ee806a2808ae30eff62f5f648c'
+  data.tar.gz: 34ceba64869852554488007521cb94fc171180b28e2da1aaea6f0cb0febafe5a2a87a47d05c8aa4958ee44b42f2f584d0e547585ee2820bd13e4104c6ff18839

data/lib/listing_service/search.rb

@@ -55,7 +55,7 @@ module GrapeListing
       value = "%#{value}%" if operator == 'ilike' && value.present?
 
       # проверка мульти-поиска по параметру с массивом
-      if operator == 'multi' && !value.blank?
+      if value.is_a?(Array)
         operator = 'IN'
         value = "(#{value.map { |i| "'#{i}'" }.join(', ')})"
       end
@@ -67,12 +67,6 @@ module GrapeListing
         operator = operator == 'min' ? '>=' : '<='
       end
 
-      # check array operator
-      if operator == 'array' && value.present?
-        operator = '='
-        value = "{#{value}}"
-      end
-
       [operator, value]
     end
 

data/lib/listing_service/serialization.rb

@@ -46,9 +46,20 @@ module GrapeListing
     end
 
     def caching_entity_representation(record)
-      key = "#{@grape_entity}:#{record.id}"
+      # формирование ключа кеширования с параметрами
+      params_string = Rack::Utils.build_query(@params.except('offset', 'page'))
+      key = "#{@grape_entity}:#{record.id}:#{params_string}"
+      enc_key = Digest::MD5.hexdigest(key)
 
-      GrapeListing.cache.fetch(key) do
+      # опции кеширования
+      opts =
+        if @caching.is_a?(ActiveSupport::Duration)
+          { expires_in: @caching }
+        else
+          {}
+        end
+
+      GrapeListing.cache.fetch(enc_key, opts) do
         @grape_entity.represent(record, @entity_opts).as_json
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-listing
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.2.0
 platform: ruby
 authors:
 - Павел Бабин
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack