livechat 0.6.7 → 0.6.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1d79d2656f03388a1c60b6ae02e3135e592eda11b654bc55a48c1ed4326ff587
4
- data.tar.gz: dc11d8cbe564080e185583a52e5ad2865654b2194224c6868e6453a4fb441126
3
+ metadata.gz: a2ad48b9206502c979af98f3733631b26075e08efe04c9044e0e5969d21bc7f3
4
+ data.tar.gz: b40e4efc2e6a014c34104abd860bafc41a330eebd863ad6f8e4663a41bc280fa
5
5
  SHA512:
6
- metadata.gz: 10291e2d99e5250f9bc94967556870f159c3ca44d6b2f1e20f42f0b638b700f0ec0939e1c4d984abcff214881c7d817c1e3e975c8b23314e912fbe39d6d30f35
7
- data.tar.gz: f34aa3e46605a7c431d62bae5355b8465f22d8d28ba1b32b6c21026f4c8b6ab7637dc622b0a7e3ab07f9b495c97a0fde7728219426c6a152e4352a4635adb6af
6
+ metadata.gz: 19c4dc8d3f683af308f34df8341d5e8221d434bad217e0291a34a1da799afe8029e1e423dbf549d48c341cf7114c7fb14336fef47c7049cd087992d9d0492138
7
+ data.tar.gz: 4459c416ea3a0ed27422847f41bbef950f11420d448c44ac5b02af0e5cca257eae0ec42e33d7cb5e7cd5f9d6c2d84ba35c6b94b92eb18c68f90cc132375da258
data/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.6.8
4
+
5
+ - Fixed Rails 7.1 compatibility for attachment configuration by avoiding the
6
+ dynamic Active Storage `service:` lambda on versions that only accept a
7
+ concrete service name.
8
+
3
9
  ## 0.6.7
4
10
 
5
11
  - Added `config.agent_layout`, letting host apps render the Livechat inbox
@@ -124,9 +124,26 @@ module Livechat
124
124
  return unless Livechat.attachments_enabled?
125
125
 
126
126
  uploads = Array(files).select { |file| file.respond_to?(:read) }
127
+ uploads = uploads.map { |file| attachment_upload(file) } if Livechat.config.storage_service
127
128
  message.files.attach(uploads) if uploads.any?
128
129
  end
129
130
 
131
+ def attachment_upload(file)
132
+ {
133
+ io: file,
134
+ filename: upload_filename(file),
135
+ content_type: (file.content_type if file.respond_to?(:content_type)),
136
+ service_name: Livechat.config.storage_service
137
+ }.compact
138
+ end
139
+
140
+ def upload_filename(file)
141
+ return file.original_filename if file.respond_to?(:original_filename)
142
+ return File.basename(file.path) if file.respond_to?(:path) && file.path
143
+
144
+ 'attachment'
145
+ end
146
+
130
147
  # Every conversation belongs to someone — a signed-in user or at least a
131
148
  # guest cookie. An unattributable thread could never be shown to its
132
149
  # visitor again.
@@ -17,7 +17,7 @@ module Livechat
17
17
  def self.attachments_supported? = ATTACHMENTS_SUPPORTED
18
18
 
19
19
  belongs_to :conversation
20
- has_many_attached :files, service: ->(_message) { Livechat.config.storage_service } if ATTACHMENTS_SUPPORTED
20
+ has_many_attached :files if ATTACHMENTS_SUPPORTED
21
21
 
22
22
  validates :author_type, inclusion: { in: AUTHOR_TYPES }
23
23
  validates :body, length: { maximum: MAX_BODY_LENGTH }, allow_blank: true
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Livechat
4
- VERSION = '0.6.7'
4
+ VERSION = '0.6.8'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: livechat
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.7
4
+ version: 0.6.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yaroslav Shmarov