grape-listing 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebde4f181db7c89e1def2eeb1af0fe820da5f89b0921dc88080d0b793f3d01ac
-  data.tar.gz: 5f077bb264dcf16c617be8a22c78e0769a1270af387ee2f171b78be398a35baa
+  metadata.gz: 8718471a29bc7aa2abcb3b58465ace6e5dd453962e7f54422fd3e3e311e323c0
+  data.tar.gz: 3d0cc9a56ce90c53464f021944bdfc37f3112d56d009cfe3815ab85e770c4b03
 SHA512:
-  metadata.gz: 0cc783b3c30a87083033d825a7d80624af8d513c55989b6cd572a9dea1786caa72bc1306f50bf1a5f6ca6f136e9008b4c08a6b93713d4e5da58b12e06684500d
-  data.tar.gz: dde882747da769a523f0c31b4862327d8b959f667a14e5b151b92dca8de9b609204467c2b9bfbfc79e19b75a2b27b49243184ac434bb7ee858a496371b6c6c78
+  metadata.gz: 38777a8933a68a07e18b5f47f2ae45a831d6c18d164cdc0e1679c33204964da94446ec95ae83ca10646e52d656d01588f81e9f2e651e8a787c61040fbd4b38f5
+  data.tar.gz: 6c43aca8751cbf6582ab838360c8aed7ed5e239e82dab5ae910e56be71ee8d007fd1aa44729b42e7d5983a44ebf66137c7d2a4b73c749731a68a2913b1e1ff26

data/lib/grape/dsl.rb

@@ -53,7 +53,7 @@ module Grape
           end
 
         header['Access-Control-Expose-Headers'] = 'Content-Disposition'
-        header['Content-Disposition'] = "attachment; filename=#{Addressable::URI.escape(filename)}"
+        header['Content-Disposition'] = "attachment; filename*=UTF-8''#{Addressable::URI.escape(filename).force_encoding('utf-8')}"
         env['api.format'] = :binary
       end
 

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/spreadsheet.rb

@@ -23,7 +23,7 @@ module GrapeListing
     private
 
     def generate_spreadsheet(objects)
-      filepath = "#{@tempdir}/#{Time.now.strftime('%Y%m%d_%H%M%S')}.xlsx"
+      filepath = "#{@tempdir}/#{spreadsheet_filename}"
 
       # создание таблицы и ее конфигурация
       workbook = FastExcel.open(filepath, constant_memory: true)
@@ -55,6 +55,17 @@ module GrapeListing
       filepath
     end
 
+    def spreadsheet_filename
+      model_desc =
+        ActiveRecord::Base.connection.execute(
+          "SELECT obj_description('public.#{@model.table_name}'::regclass) as comment"
+        )[0]['comment']&.force_encoding(Encoding::BINARY)
+
+      desc = model_desc.present? ? model_desc.gsub(' ', '_') : @model.table_name
+
+      "#{desc}_#{Time.now.strftime('%Y%m%d_%H%M%S')}.xlsx"
+    end
+
     def grape_entity_columns
       @grape_entity.root_exposures.map do |exposure|
         unless exposure.key == :deleted_at

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: grape-listing
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - Павел Бабин
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 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