livechat 0.6.6 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a69e5d589f17c732b4c31e2573167f337953219ef85e4cada2b0bb4167e3eab
-  data.tar.gz: 574dec08ba995fb9eb316cd8d2746f37cb09183044a835e4865220d57bf73661
+  metadata.gz: a2ad48b9206502c979af98f3733631b26075e08efe04c9044e0e5969d21bc7f3
+  data.tar.gz: b40e4efc2e6a014c34104abd860bafc41a330eebd863ad6f8e4663a41bc280fa
 SHA512:
-  metadata.gz: 2ab3f33529a53f00312ba82d2e6aeef89e7b6f29903ec124e6f931f16871b34a35bd075a723db2eb7cf78e742bb9fec6bfc19dbaf7785dfa2750584e44ab082b
-  data.tar.gz: e5c98f7e43ad6d7628e1ad2b78e5cd3fbefdcb09a4bec1b040db901ef594c17446ccfe9c920989730069e745a182bf3bc5d305da8c097e734a037de5b913378c
+  metadata.gz: 19c4dc8d3f683af308f34df8341d5e8221d434bad217e0291a34a1da799afe8029e1e423dbf549d48c341cf7114c7fb14336fef47c7049cd087992d9d0492138
+  data.tar.gz: 4459c416ea3a0ed27422847f41bbef950f11420d448c44ac5b02af0e5cca257eae0ec42e33d7cb5e7cd5f9d6c2d84ba35c6b94b92eb18c68f90cc132375da258

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.6.8
+
+- Fixed Rails 7.1 compatibility for attachment configuration by avoiding the
+  dynamic Active Storage `service:` lambda on versions that only accept a
+  concrete service name.
+
+## 0.6.7
+
+- Added `config.agent_layout`, letting host apps render the Livechat inbox
+  inside their own admin layout while keeping the standalone gem layout as the
+  default.
+
 ## 0.6.6
 
 - Expanded the desktop visitor widget into a taller, wider panel with equal

data/app/controllers/livechat/application_controller.rb

@@ -6,6 +6,10 @@ module Livechat
 
     private
 
+    def livechat_agent_layout
+      Livechat.config.agent_layout
+    end
+
     def current_visitor
       return @current_visitor if defined?(@current_visitor)
 

data/app/controllers/livechat/conversations_controller.rb

@@ -7,7 +7,7 @@ module Livechat
   class ConversationsController < ApplicationController
     before_action :require_agent
     before_action :set_conversation, except: %i[index index_poll]
-    layout 'livechat/application'
+    layout :livechat_agent_layout
 
     PER_PAGE = 50
 

data/app/models/livechat/conversation.rb

@@ -124,9 +124,26 @@ module Livechat
       return unless Livechat.attachments_enabled?
 
       uploads = Array(files).select { |file| file.respond_to?(:read) }
+      uploads = uploads.map { |file| attachment_upload(file) } if Livechat.config.storage_service
       message.files.attach(uploads) if uploads.any?
     end
 
+    def attachment_upload(file)
+      {
+        io: file,
+        filename: upload_filename(file),
+        content_type: (file.content_type if file.respond_to?(:content_type)),
+        service_name: Livechat.config.storage_service
+      }.compact
+    end
+
+    def upload_filename(file)
+      return file.original_filename if file.respond_to?(:original_filename)
+      return File.basename(file.path) if file.respond_to?(:path) && file.path
+
+      'attachment'
+    end
+
     # Every conversation belongs to someone — a signed-in user or at least a
     # guest cookie. An unattributable thread could never be shown to its
     # visitor again.

data/app/models/livechat/message.rb

@@ -17,7 +17,7 @@ module Livechat
     def self.attachments_supported? = ATTACHMENTS_SUPPORTED
 
     belongs_to :conversation
-    has_many_attached :files, service: ->(_message) { Livechat.config.storage_service } if ATTACHMENTS_SUPPORTED
+    has_many_attached :files if ATTACHMENTS_SUPPORTED
 
     validates :author_type, inclusion: { in: AUTHOR_TYPES }
     validates :body, length: { maximum: MAX_BODY_LENGTH }, allow_blank: true

data/lib/generators/livechat/install/templates/initializer.rb

@@ -12,6 +12,10 @@ Livechat.configure do |config|
   # Who can answer at the mount path. Defaults to development only — override
   # before deploying.
   # config.authorize_agent = ->(request) { request.env["warden"]&.user&.admin? }
+  #
+  # Render the inbox inside your app's admin layout. Default: the gem's
+  # standalone inbox layout.
+  # config.agent_layout = "admin/application"
 
   # Resolve the current user (optional). Return an object responding to #id,
   # or nil. Signed-in visitors keep one conversation across devices; guests

data/lib/livechat/configuration.rb

@@ -18,6 +18,10 @@ module Livechat
     # so your team can answer from production even where the widget is off.
     attr_accessor :authorize_agent
 
+    # Layout used by the built-in inbox. Override this to render Livechat
+    # inside your app's admin shell, e.g. "admin/application".
+    attr_accessor :agent_layout
+
     # Resolve the current user (optional). Return an object responding to
     # #id, or nil. Receives the request. Signed-in users keep one conversation
     # across devices; guests are tracked with a cookie.
@@ -100,6 +104,7 @@ module Livechat
       @app_name = nil
       @enabled = ->(_request) { true }
       @authorize_agent = ->(_request) { Rails.env.development? }
+      @agent_layout = 'livechat/application'
       @current_user = ->(_request) {}
       @visitor_label = ->(user) { user.try(:name).presence || user.try(:email).presence || user.to_s }
       @agent_label = ->(user) { user.try(:name).presence || user.try(:email).presence || user.to_s }

data/lib/livechat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Livechat
-  VERSION = '0.6.6'
+  VERSION = '0.6.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: livechat
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Yaroslav Shmarov