grape-listing 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44f1d43a25f9fdf1f78ebca77acca29913d00b5c3f1ee74f909e121569a6255d
-  data.tar.gz: 466b6e2e8d755285a9b2208a4998555b14bd6d9a69f9a9b06a2ac1ba97dfef94
+  metadata.gz: b47ec8a91643cdf3b1ab90b6f2f6f3ede8ee0c0ab069b9f79b9b5c3bca7339d7
+  data.tar.gz: 0d69408736e14c1839167cb33ec0ee8e6b335046f5989b041668c6497c0d205a
 SHA512:
-  metadata.gz: 9d562cd66687f45f68096a83d9f84d8be5b3cd2e69a15409acb7f8179077a83eaef81dd636d245428be8e07602bcbd1b7774b5f03eb3756a96cbc4eb900d229b
-  data.tar.gz: c9ab0900cac1168df94db626a6fd09d845babef14ff0e9d49efa091b52f6b2ed206e538fa7d8983674ffc5ae636a397ef057c95165c873ac79784783f6b5aa4c
+  metadata.gz: 541f2e90aa6ec5f9c6778259da1d58037ece13a5e7238765ac0641c9aac2ac7eaa8bb2c60fb9f44a4b04854220f4bdaed32ed569f8a2b5a82a6669a67df154ea
+  data.tar.gz: 18599c3bfbedf62aa12d653b8cb052d67d5646998a1cf9a02c15bbc91b21332878a832b004809e4dc53ce2301463613792fcd17abad857cd3b60e95e71b7e90c

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

@@ -25,7 +25,7 @@ module GrapeListing
         end
 
         # форматирование кавычек
-        if operator != 'IN' && !@model.defined_enums.key?(field)
+        if operator != 'IN'
           value = quotations_formatting(value)
         end
 
@@ -57,7 +57,7 @@ module GrapeListing
       # проверка мульти-поиска по параметру с массивом
       if operator == 'multi' && !value.blank?
         operator = 'IN'
-        value = "(#{value.join(', ')})"
+        value = "(#{value.map { |i| "'#{i}'" }.join(', ')})"
       end
 
       # проверка диапазона (MIN/MAX)

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-listing
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - Павел Бабин
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-18 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack