anycable-rails 1.3.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37be6474db2d3efc3493ec6fdf5b3826fbdfd84f9c4bc5f4574f1e0497457ec1
-  data.tar.gz: bafe87b642e1aaf15c5b09650ed271081d0ba53738507077ed1075b2de5e0ef2
+  metadata.gz: 249493f023d0c0b2e8f85bba263132f7b8bb440073184f68949e83b5911b191a
+  data.tar.gz: 055c60c21507d7307f73121948e134087d624f907d4435ad1ac0526337158464
 SHA512:
-  metadata.gz: b656f5a17009a19aacef7c1aac587299b5bdca24079e3e6a1ce2c9e652e26a7d65f08e34f0022e1ed4a9e42d8783af9d7d9e85a9059577ec224a523b7c12378e
-  data.tar.gz: 383c128d5404a7ed42bba43a426cb68bd10be23607557bce7a8ef46cd1ea1cf2777c918e44a4c71f307a0f973ff863aef36f547290ce821d65251e7f9a62a3fd
+  metadata.gz: 2aee411822afddc35aeecbf85490f413e2c6b899107b3a849e25a449cf19baf13885cad9e52bbc25ab85b08316b865ff60f0fc0f558f0ebffc0a175e5d983f30
+  data.tar.gz: e5933e165ca975e9ce32ec867b177583cc8e0718a9aa8f1f9435bbb515500a4f0de9e7cd82b34e7e0f9d1cf8db40114f0fedb49923ef63bfce418a9dd1cd7a76

data/CHANGELOG.md

@@ -2,13 +2,29 @@
 
 ## master
 
-## 1.3.0 (2021-02-21)
+## 1.3.3 (2022-04-20)
+
+- Added `sid` (unique connection identifier) field to the `welcome` message if present. ([@palkan][])
+
+- Fixed handling Ruby Logger incompatible loggers. ([@palkan][])
+
+## 1.3.2 (2022-03-04)
+
+- Allow Ruby 2.6.
+
+## 1.3.1 (2022-02-28)
+
+- Fix Action Cable Channel patch to not change methods signatures. ([@palkan][])
+
+Otherwise it could lead to conflicts with other patches.
+
+## 1.3.0 (2022-02-21)
 
 - Introduce `AnyCable::Rails.extend_adapter!` to make any pubsub adapter AnyCable-compatible. ([@palkan][])
 
 - Refactored Action Cable patching to preserve original functionality and avoid monkey-patching collisions. ([@palkan][])
 
-## 1.2.1 (2021-01-31)
+## 1.2.1 (2022-01-31)
 
 - Add a temporary fix to be compatible with `sentry-rails`. ([@palkan][])
 

data/lib/anycable/rails/action_cable_ext/channel.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require "action_cable/channel"
+require "action_cable"
 
 ActionCable::Channel::Base.prepend(Module.new do
-  def subscribe_to_channel(force: false)
-    return if anycabled? && !force
-    super()
+  def subscribe_to_channel
+    super unless anycabled? && !@__anycable_subscribing__
   end
 
   def handle_subscribe
-    subscribe_to_channel(force: true)
+    @__anycable_subscribing__ = true
+    subscribe_to_channel
+  ensure
+    @__anycable_subscribing__ = false
   end
 
   def start_periodic_timers

data/lib/anycable/rails/action_cable_ext/connection.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "action_cable/connection"
+require "action_cable"
 require "anycable/rails/connections/serializable_identification"
 
 ActionCable::Connection::Base.include(AnyCable::Rails::Connections::SerializableIdentification)

data/lib/anycable/rails/connection.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require "action_cable/connection"
-require "action_cable/channel"
+require "action_cable"
 
 module AnyCable
   module Rails
@@ -13,8 +12,11 @@ module AnyCable
           :anycable_socket
 
         # Using public :send_welcome_message causes stack level too deep 🤷🏻‍♂️
-        def public_send_welcome_message
-          send_welcome_message
+        def send_welcome_message
+          transmit({
+            type: ActionCable::INTERNAL[:message_types][:welcome],
+            sid: env["anycable.sid"]
+          }.compact)
         end
 
         def public_request
@@ -92,7 +94,7 @@ module AnyCable
 
         socket.cstate.write(LOG_TAGS_IDENTIFIER, logger.tags.to_json) unless logger.tags.empty?
 
-        conn.public_send_welcome_message
+        conn.send_welcome_message
       rescue ::ActionCable::Connection::Authorization::UnauthorizedError
         reject_request(
           ActionCable::INTERNAL[:disconnect_reasons]&.[](:unauthorized) || "unauthorized"

data/lib/anycable/rails/railtie.rb

@@ -20,13 +20,14 @@ module AnyCable
         AnyCable.logger = ::ActionCable.server.config.logger
 
         AnyCable.configure_server do
-          AnyCable.logger = ActiveSupport::TaggedLogging.new(::ActionCable.server.config.logger)
+          server_logger = AnyCable.logger = ::ActionCable.server.config.logger
+          AnyCable.logger = ActiveSupport::TaggedLogging.new(server_logger) if server_logger.is_a?(::Logger)
           # Broadcast server logs to STDOUT in development
           if ::Rails.env.development? &&
               !ActiveSupport::Logger.logger_outputs_to?(::Rails.logger, $stdout)
             console = ActiveSupport::Logger.new($stdout)
-            console.formatter = ::Rails.logger.formatter
-            console.level = ::Rails.logger.level
+            console.formatter = ::Rails.logger.formatter if ::Rails.logger.respond_to?(:formatter)
+            console.level = ::Rails.logger.level if ::Rails.logger.respond_to?(:level)
             AnyCable.logger.extend(ActiveSupport::Logger.broadcast(console))
           end
         end

data/lib/anycable/rails/version.rb

@@ -2,6 +2,6 @@
 
 module AnyCable
   module Rails
-    VERSION = "1.3.0"
+    VERSION = "1.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anycable-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.3
 platform: ruby
 authors:
 - palkan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anycable
@@ -198,14 +198,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Rails adapter for AnyCable