grape-listing 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f1d43a25f9fdf1f78ebca77acca29913d00b5c3f1ee74f909e121569a6255d
-  data.tar.gz: 466b6e2e8d755285a9b2208a4998555b14bd6d9a69f9a9b06a2ac1ba97dfef94
+  metadata.gz: 8718471a29bc7aa2abcb3b58465ace6e5dd453962e7f54422fd3e3e311e323c0
+  data.tar.gz: 3d0cc9a56ce90c53464f021944bdfc37f3112d56d009cfe3815ab85e770c4b03
 SHA512:
-  metadata.gz: 9d562cd66687f45f68096a83d9f84d8be5b3cd2e69a15409acb7f8179077a83eaef81dd636d245428be8e07602bcbd1b7774b5f03eb3756a96cbc4eb900d229b
-  data.tar.gz: c9ab0900cac1168df94db626a6fd09d845babef14ff0e9d49efa091b52f6b2ed206e538fa7d8983674ffc5ae636a397ef057c95165c873ac79784783f6b5aa4c
+  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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape-listing
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Павел Бабин