grape-listing 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45e458a8f8256d37914e7844b87ab5ca89a828649e7de41743495dafa2122bbd
-  data.tar.gz: 6fc8dd5d2f6ae95c8122c74f895129282835bf42c45d8fd8f553d6df69102f16
+  metadata.gz: 44f1d43a25f9fdf1f78ebca77acca29913d00b5c3f1ee74f909e121569a6255d
+  data.tar.gz: 466b6e2e8d755285a9b2208a4998555b14bd6d9a69f9a9b06a2ac1ba97dfef94
 SHA512:
-  metadata.gz: 87a26725a413209783864fb440ea285aaae589b80597f4ae23217dd135e1c380fd3ba8d6e3e74640bb2890d4a947ac1c41a6c75ba2560c862c3f56cf4ff0f44d
-  data.tar.gz: 470b431dbb7f26af609bfe09de5ad38ddb3cf7d004880c276ed8c77acade62107a88f57dc6a936b0a385fa349f5908be55a58b8e6c62f241f61e612dde1e1641
+  metadata.gz: 9d562cd66687f45f68096a83d9f84d8be5b3cd2e69a15409acb7f8179077a83eaef81dd636d245428be8e07602bcbd1b7774b5f03eb3756a96cbc4eb900d229b
+  data.tar.gz: c9ab0900cac1168df94db626a6fd09d845babef14ff0e9d49efa091b52f6b2ed206e538fa7d8983674ffc5ae636a397ef057c95165c873ac79784783f6b5aa4c

data/lib/grape/dsl.rb

@@ -3,7 +3,12 @@ module Grape
     module InsideRoute
 
       def listing(model:, entity:, scopes: nil, search: nil, paginate: true, caching: false)
-        opts = listing_opts(model, entity, scopes, search, caching)
+        # параметры запроса API
+        request_method = request.env['REQUEST_METHOD']
+        request_uri = request.env['REQUEST_URI']
+
+        # опции для сервиса
+        opts = listing_opts(model, entity, scopes, search, caching, request_method, request_uri)
 
         if params[:spreadsheet]
           listing_spreadsheet(**opts)
@@ -16,9 +21,9 @@ module Grape
 
       private
 
-      def listing_opts(model, entity, scopes, search, caching)
+      def listing_opts(model, entity, scopes, search, caching, request_method, request_uri)
         # стандартные опции
-        opts = { model:, entity:, scopes:, search:, params:, current_user:, caching: }
+        opts = { model:, entity:, scopes:, search:, params:, current_user:, caching:, request_method:, request_uri: }
 
         # требуемый список полей (+стандартные) для фильтрации в Grape Entity
         if params[:columns]

data/lib/grape_listing.rb

@@ -5,7 +5,7 @@ require 'grape_listing_service'
 module GrapeListing
 
   def self.cache
-    @cache ||= ActiveSupport::Cache.lookup_store(:mem_cache_store)
+    @cache ||= ActionController::Base.cache_store
   end
 
 end

data/lib/listing_service/args_handling.rb

@@ -7,6 +7,10 @@ module GrapeListing
       # обрабатываемая модель
       @model = args[:model]
 
+      # параметры адреса запроса API
+      @request_method = args[:request_method]
+      @request_uri = args[:request_uri]
+
       # параметры запроса и текущий пользователь
       @params = args[:params].stringify_keys
       @current_user = args[:current_user]
@@ -49,8 +53,8 @@ module GrapeListing
 
     def records_count
       # получение кол-ва записей из кеша
-      cache_key = "#{@model}_records_count"
-      cached = GrapeListing.cache.read(cache_key)
+      key = count_cache_key
+      cached = GrapeListing.cache.read(key)
       return cached if cached
 
       # получение кол-ва записей из запроса к БД
@@ -58,11 +62,19 @@ module GrapeListing
 
       # кеширование кол-ва записей при превышении порогового значения
       if count >= 1_000
-        GrapeListing.cache.write(cache_key, count, expires_in: 30.minutes)
+        GrapeListing.cache.write(key, count, expires_in: 30.minutes)
       end
 
       count
     end
 
+    def count_cache_key
+      # пример: "GET api/v1/users?active=true"
+      body = "#{@request_method} #{@request_uri}"
+
+      enc = Digest::MD5.hexdigest(body)
+      "listing_cached_count_#{enc}"
+    end
+
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: grape-listing
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Павел Бабин
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: dalli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: fast_excel
   requirement: !ruby/object:Gem::Requirement