actioncable 5.1.7 → 5.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 55650fcf9d6b19dc5233504a8e07d9439208190100672db6c7776142cd807e15
-  data.tar.gz: 7653a1421420d545bd92012acbbe55182b56d62eddc0c3095d7b4660da47a7a4
+SHA1:
+  metadata.gz: ed48c1e1ecb731be5c0e82e9fb43dbc570691fac
+  data.tar.gz: 8970db0c55b8101b5d3c59e540539452e00bf253
 SHA512:
-  metadata.gz: 5e48dcd6762bce6425a2df18ddc9578d2930fa07eca5ae7078f7c7572132ea589d8c6c1311ea90fad0cbcf675771595309d88136c7015d0e293d4cefe23c167c
-  data.tar.gz: 1a636b5b05b1e4607977158e0b15c10855159007d35f18d3b02320b41aad251b6db4bafa68f5dac7525e1ec08755350bead9553da3bf320a40bc55664700ccda
+  metadata.gz: dbd9ca9c8f42675eced47398b225c439a824e73a922dce9859e501521b03ddb24245f7e98caae78ebfc04ddf8e3700e9d6bcae13140e31385f6f9a94dcc23984
+  data.tar.gz: c2dfa7939e3fbbb343db1e23016bc2ee1f7c52ef076c60034dd07f225f1daa0cd2746593d429de857444e35602e9526f66bf45c86dc2f243f1d22c76ca85030d

data/CHANGELOG.md

@@ -1,118 +1,29 @@
-## Rails 5.1.7 (March 27, 2019) ##
+## Rails 5.2.0.beta1 (November 27, 2017) ##
 
-*   No changes.
+*   Removed deprecated evented redis adapter.
 
-
-## Rails 5.1.6.2 (March 11, 2019) ##
-
-*   No changes.
-
-
-## Rails 5.1.6.1 (November 27, 2018) ##
-
-*   No changes.
-
-
-## Rails 5.1.6 (March 29, 2018) ##
-
-*   No changes.
-
-
-## Rails 5.1.5 (February 14, 2018) ##
+    *Rafael Mendonça França*
 
 *   Support redis-rb 4.0.
 
     *Jeremy Daer*
 
+*   Hash long stream identifiers when using PostgreSQL adapter.
 
-## Rails 5.1.4 (September 07, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.4.rc1 (August 24, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3 (August 03, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc3 (July 31, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc2 (July 25, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.3.rc1 (July 19, 2017) ##
-
-*   No changes.
+    PostgreSQL has a limit on identifiers length (63 chars, [docs](https://www.postgresql.org/docs/current/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS)).
+    Provided fix minifies identifiers longer than 63 chars by hashing them with SHA1.
 
-
-## Rails 5.1.2 (June 26, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.1 (May 12, 2017) ##
-
-*   No changes.
-
-
-## Rails 5.1.0 (April 27, 2017) ##
-
-*   ActionCable socket errors are now logged to the console
-
-    Previously any socket errors were ignored and this made it hard to diagnose socket issues (e.g. as discussed in #28362).
-
-    *Edward Poot*
-
-*   Redis subscription adapters now support `channel_prefix` option in `cable.yml`
-
-    Avoids channel name collisions when multiple apps use the same Redis server.
-
-    *Chad Ingram*
-
-*   Permit same-origin connections by default.
-
-    Added new option `config.action_cable.allow_same_origin_as_host = false`
-    to disable this behaviour.
-
-    *Dávid Halász*, *Matthew Draper*
-
-*   Prevent race where the client could receive and act upon a
-    subscription confirmation before the channel's `subscribed` method
-    completed.
-
-    Fixes #25381.
+    Fixes #28751.
 
     *Vladimir Dementyev*
 
-*   Buffer now writes to WebSocket connections, to avoid blocking threads
-    that could be doing more useful things.
-
-    *Matthew Draper*, *Tinco Andringa*
-
-*   Protect against concurrent writes to a WebSocket connection from
-    multiple threads; the underlying OS write is not always threadsafe.
-
-    *Tinco Andringa*
-
-*   Add `ActiveSupport::Notifications` hook to `Broadcaster#broadcast`.
-
-    *Matthew Wear*
-
-*   Close hijacked socket when connection is shut down.
-
-    Fixes #25613.
+*   Action Cable's `redis` adapter allows for other common redis-rb options (`host`, `port`, `db`, `password`) in cable.yml.
 
-    *Tinco Andringa*
+    Previously, it accepts only a [redis:// url](https://www.iana.org/assignments/uri-schemes/prov/redis) as an option.
+    While we can add all of these options to the `url` itself, it is not explicitly documented. This alternative setup
+    is shown as the first example in the [Redis rubygem](https://github.com/redis/redis-rb#getting-started), which
+    makes this set of options as sensible as using just the `url`.
 
+    *Marc Rendl Ignacio*
 
-Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actioncable/CHANGELOG.md) for previous changes.
+Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/actioncable/CHANGELOG.md) for previous changes.

data/README.md

@@ -53,7 +53,7 @@ module ApplicationCable
 
     private
       def find_verified_user
-        if verified_user = User.find_by(id: cookies.signed[:user_id])
+        if verified_user = User.find_by(id: cookies.encrypted[:user_id])
           verified_user
         else
           reject_unauthorized_connection
@@ -409,7 +409,7 @@ application. The recommended basic setup is as follows:
 
 ```ruby
 # cable/config.ru
-require ::File.expand_path('../../config/environment', __FILE__)
+require_relative '../config/environment'
 Rails.application.eager_load!
 
 run ActionCable.server
@@ -446,7 +446,7 @@ The WebSocket server doesn't have access to the session, but it has access to th
 
 ## Dependencies
 
-Action Cable provides a subscription adapter interface to process its pubsub internals. By default, asynchronous, inline, PostgreSQL, evented Redis, and non-evented Redis adapters are included. The default adapter in new Rails applications is the asynchronous (`async`) adapter. To create your own adapter, you can look at `ActionCable::SubscriptionAdapter::Base` for all methods that must be implemented, and any of the adapters included within Action Cable as example implementations.
+Action Cable provides a subscription adapter interface to process its pubsub internals. By default, asynchronous, inline, PostgreSQL, and Redis adapters are included. The default adapter in new Rails applications is the asynchronous (`async`) adapter. To create your own adapter, you can look at `ActionCable::SubscriptionAdapter::Base` for all methods that must be implemented, and any of the adapters included within Action Cable as example implementations.
 
 The Ruby side of things is built on top of [websocket-driver](https://github.com/faye/websocket-driver-ruby), [nio4r](https://github.com/celluloid/nio4r), and [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby).
 
@@ -454,9 +454,9 @@ The Ruby side of things is built on top of [websocket-driver](https://github.com
 ## Deployment
 
 Action Cable is powered by a combination of WebSockets and threads. All of the
-connection management is handled internally by utilizing Ruby’s native thread
+connection management is handled internally by utilizing Ruby's native thread
 support, which means you can use all your regular Rails models with no problems
-as long as you haven’t committed any thread-safety sins.
+as long as you haven't committed any thread-safety sins.
 
 The Action Cable server does _not_ need to be a multi-threaded application server.
 This is because Action Cable uses the [Rack socket hijacking API](http://www.rubydoc.info/github/rack/rack/file/SPEC#Hijacking)
@@ -549,7 +549,7 @@ Source code can be downloaded as part of the Rails project on GitHub
 
 Action Cable is released under the MIT license:
 
-* http://www.opensource.org/licenses/MIT
+* https://opensource.org/licenses/MIT
 
 
 ## Support

data/lib/action_cable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (c) 2015-2017 Basecamp, LLC
 #

data/lib/action_cable/channel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Channel
     extend ActiveSupport::Autoload

data/lib/action_cable/channel/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 
 module ActionCable
@@ -205,7 +207,9 @@ module ActionCable
         # Transmit a hash of data to the subscriber. The hash will automatically be wrapped in a JSON envelope with
         # the proper channel identifier marked as the recipient.
         def transmit(data, via: nil) # :doc:
-          logger.debug "#{self.class.name} transmitting #{data.inspect.truncate(300)}".tap { |m| m << " (via #{via})" if via }
+          status = "#{self.class.name} transmitting #{data.inspect.truncate(300)}"
+          status += " (via #{via})" if via
+          logger.debug(status)
 
           payload = { channel_class: self.class.name, data: data, via: via }
           ActiveSupport::Notifications.instrument("transmit.action_cable", payload) do
@@ -266,7 +270,7 @@ module ActionCable
         end
 
         def action_signature(action, data)
-          "#{self.class.name}##{action}".tap do |signature|
+          "#{self.class.name}##{action}".dup.tap do |signature|
             if (arguments = data.except("action")).any?
               signature << "(#{arguments.inspect})"
             end

data/lib/action_cable/channel/broadcasting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/object/to_param"
 
 module ActionCable

data/lib/action_cable/channel/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/callbacks"
 
 module ActionCable

data/lib/action_cable/channel/naming.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Channel
     module Naming

data/lib/action_cable/channel/periodic_timers.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Channel
     module PeriodicTimers
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :periodic_timers, instance_reader: false
-        self.periodic_timers = []
+        class_attribute :periodic_timers, instance_reader: false, default: []
 
         after_subscribe   :start_periodic_timers
         after_unsubscribe :stop_periodic_timers

data/lib/action_cable/channel/streams.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Channel
     # Streams allow channels to route broadcastings to the subscriber. A broadcasting is, as discussed elsewhere, a pubsub queue where any data

data/lib/action_cable/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Connection
     extend ActiveSupport::Autoload

data/lib/action_cable/connection/authorization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Connection
     module Authorization

data/lib/action_cable/connection/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "action_dispatch"
 
 module ActionCable
@@ -24,7 +26,7 @@ module ActionCable
     #
     #       private
     #         def find_verified_user
-    #           User.find_by_identity(cookies.signed[:identity_id]) ||
+    #           User.find_by_identity(cookies.encrypted[:identity_id]) ||
     #             reject_unauthorized_connection
     #         end
     #     end

data/lib/action_cable/connection/client_socket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "websocket/driver"
 
 module ActionCable
@@ -19,7 +21,7 @@ module ActionCable
         return true if env["HTTP_X_FORWARDED_PROTO"] == "https"
         return true if env["rack.url_scheme"] == "https"
 
-        return false
+        false
       end
 
       CONNECTING = 0

data/lib/action_cable/connection/identification.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 
 module ActionCable
@@ -6,8 +8,7 @@ module ActionCable
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :identifiers
-        self.identifiers = Set.new
+        class_attribute :identifiers, default: Set.new
       end
 
       class_methods do

data/lib/action_cable/connection/internal_channel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Connection
     # Makes it possible for the RemoteConnection to disconnect a specific connection.

data/lib/action_cable/connection/message_buffer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Connection
     # Allows us to buffer messages received from the WebSocket before the Connection has been fully initialized, and is ready to receive them.

data/lib/action_cable/connection/stream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 
 module ActionCable

data/lib/action_cable/connection/stream_event_loop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "nio"
 require "thread"
 

data/lib/action_cable/connection/subscriptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/hash/indifferent_access"
 
 module ActionCable
@@ -41,7 +43,7 @@ module ActionCable
 
       def remove(data)
         logger.info "Unsubscribing from channel: #{data['identifier']}"
-        remove_subscription subscriptions[data["identifier"]]
+        remove_subscription find(data)
       end
 
       def remove_subscription(subscription)

data/lib/action_cable/connection/tagged_logger_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Connection
     # Allows the use of per-connection tags against the server logger. This wouldn't work using the traditional

data/lib/action_cable/connection/web_socket.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "websocket/driver"
 
 module ActionCable
   module Connection
     # Wrap the real socket to minimize the externally-presented API
-    class WebSocket
+    class WebSocket # :nodoc:
       def initialize(env, event_target, event_loop, protocols: ActionCable::INTERNAL[:protocols])
         @websocket = ::WebSocket::Driver.websocket?(env) ? ClientSocket.new(env, event_target, event_loop, protocols) : nil
       end

data/lib/action_cable/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails"
 require "action_cable"
 require "action_cable/helpers/action_cable_helper"

data/lib/action_cable/gem_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   # Returns the version of the currently loaded Action Cable as a <tt>Gem::Version</tt>.
   def self.gem_version
@@ -6,9 +8,9 @@ module ActionCable
 
   module VERSION
     MAJOR = 5
-    MINOR = 1
-    TINY  = 7
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_cable/helpers/action_cable_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Helpers
     module ActionCableHelper

data/lib/action_cable/remote_connections.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/module/redefine_method"
+
 module ActionCable
   # If you need to disconnect a given connection, you can go through the
   # RemoteConnections. You can find the connections you're looking for by
@@ -45,13 +49,14 @@ module ActionCable
         end
 
         # Returns all the identifiers that were applied to this connection.
-        def identifiers
+        redefine_method :identifiers do
           server.connection_identifiers
         end
 
-        private
+        protected
           attr_reader :server
 
+        private
           def set_identifier_instance_vars(ids)
             raise InvalidIdentifiersError unless valid_identifiers?(ids)
             ids.each { |k, v| instance_variable_set("@#{k}", v) }

data/lib/action_cable/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Server
     extend ActiveSupport::Autoload

data/lib/action_cable/server/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "monitor"
 
 module ActionCable
@@ -10,7 +12,7 @@ module ActionCable
       include ActionCable::Server::Broadcasting
       include ActionCable::Server::Connections
 
-      cattr_accessor(:config, instance_accessor: true) { ActionCable::Server::Configuration.new }
+      cattr_accessor :config, instance_accessor: true, default: ActionCable::Server::Configuration.new
 
       def self.logger; config.logger; end
       delegate :logger, to: :config
@@ -28,7 +30,7 @@ module ActionCable
         config.connection_class.call.new(self, env).process
       end
 
-      # Disconnect all the connections identified by `identifiers` on this server or any others via RemoteConnections.
+      # Disconnect all the connections identified by +identifiers+ on this server or any others via RemoteConnections.
       def disconnect(identifiers)
         remote_connections.where(identifiers).disconnect
       end

data/lib/action_cable/server/broadcasting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Server
     # Broadcasting is how other parts of your application can send messages to a channel's subscribers. As explained in Channel, most of the time, these

data/lib/action_cable/server/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Server
     # An instance of this configuration object is available via ActionCable.server.config, which allows you to tweak Action Cable configuration
@@ -23,13 +25,26 @@ module ActionCable
       # Also makes sure proper dependencies are required.
       def pubsub_adapter
         adapter = (cable.fetch("adapter") { "redis" })
+
+        # Require the adapter itself and give useful feedback about
+        #   1. Missing adapter gems and
+        #   2. Adapter gems' missing dependencies.
         path_to_adapter = "action_cable/subscription_adapter/#{adapter}"
         begin
           require path_to_adapter
-        rescue Gem::LoadError => e
-          raise Gem::LoadError, "Specified '#{adapter}' for Action Cable pubsub adapter, but the gem is not loaded. Add `gem '#{e.name}'` to your Gemfile (and ensure its version is at the minimum required by Action Cable)."
         rescue LoadError => e
-          raise LoadError, "Could not load '#{path_to_adapter}'. Make sure that the adapter in config/cable.yml is valid. If you use an adapter other than 'postgresql' or 'redis' add the necessary adapter gem to the Gemfile.", e.backtrace
+          # We couldn't require the adapter itself. Raise an exception that
+          # points out config typos and missing gems.
+          if e.path == path_to_adapter
+            # We can assume that a non-builtin adapter was specified, so it's
+            # either misspelled or missing from Gemfile.
+            raise e.class, "Could not load the '#{adapter}' Action Cable pubsub adapter. Ensure that the adapter is spelled correctly in config/cable.yml and that you've added the necessary adapter gem to your Gemfile.", e.backtrace
+
+          # Bubbled up from the adapter require. Prefix the exception message
+          # with some guidance about how to address it and reraise.
+          else
+            raise e.class, "Error loading the '#{adapter}' Action Cable pubsub adapter. Missing a gem it depends on? #{e.message}", e.backtrace
+          end
         end
 
         adapter = adapter.camelize

data/lib/action_cable/server/connections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Server
     # Collection class for all the connections that have been established on this specific server. Remember, usually you'll run many Action Cable servers, so

data/lib/action_cable/server/worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/callbacks"
 require "active_support/core_ext/module/attribute_accessors_per_thread"
 require "concurrent"

data/lib/action_cable/server/worker/active_record_connection_management.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module Server
     class Worker

data/lib/action_cable/subscription_adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module SubscriptionAdapter
     extend ActiveSupport::Autoload

data/lib/action_cable/subscription_adapter/async.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "action_cable/subscription_adapter/inline"
 
 module ActionCable

data/lib/action_cable/subscription_adapter/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module SubscriptionAdapter
     class Base

data/lib/action_cable/subscription_adapter/channel_prefix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module SubscriptionAdapter
     module ChannelPrefix # :nodoc:

data/lib/action_cable/subscription_adapter/inline.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module SubscriptionAdapter
     class Inline < Base # :nodoc:

data/lib/action_cable/subscription_adapter/postgresql.rb

@@ -1,6 +1,9 @@
-gem "pg", ">= 0.18", "< 2.0"
+# frozen_string_literal: true
+
+gem "pg", "~> 0.18"
 require "pg"
 require "thread"
+require "digest/sha1"
 
 module ActionCable
   module SubscriptionAdapter
@@ -12,16 +15,16 @@ module ActionCable
 
       def broadcast(channel, payload)
         with_connection do |pg_conn|
-          pg_conn.exec("NOTIFY #{pg_conn.escape_identifier(channel)}, '#{pg_conn.escape_string(payload)}'")
+          pg_conn.exec("NOTIFY #{pg_conn.escape_identifier(channel_identifier(channel))}, '#{pg_conn.escape_string(payload)}'")
         end
       end
 
       def subscribe(channel, callback, success_callback = nil)
-        listener.add_subscriber(channel, callback, success_callback)
+        listener.add_subscriber(channel_identifier(channel), callback, success_callback)
       end
 
       def unsubscribe(channel, callback)
-        listener.remove_subscriber(channel, callback)
+        listener.remove_subscriber(channel_identifier(channel), callback)
       end
 
       def shutdown
@@ -41,6 +44,10 @@ module ActionCable
       end
 
       private
+        def channel_identifier(channel)
+          channel.size > 63 ? Digest::SHA1.hexdigest(channel) : channel
+        end
+
         def listener
           @listener || @server.mutex.synchronize { @listener ||= Listener.new(self, @server.event_loop) }
         end

data/lib/action_cable/subscription_adapter/redis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thread"
 
 gem "redis", ">= 3", "< 5"
@@ -8,9 +10,11 @@ module ActionCable
     class Redis < Base # :nodoc:
       prepend ChannelPrefix
 
-      # Overwrite this factory method for redis connections if you want to use a different Redis library than Redis.
+      # Overwrite this factory method for Redis connections if you want to use a different Redis library than the redis gem.
       # This is needed, for example, when using Makara proxies for distributed Redis.
-      cattr_accessor(:redis_connector) { ->(config) { ::Redis.new(url: config[:url]) } }
+      cattr_accessor :redis_connector, default: ->(config) do
+        ::Redis.new(config.slice(:url, :host, :port, :db, :password))
+      end
 
       def initialize(*)
         super

data/lib/action_cable/subscription_adapter/subscriber_map.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionCable
   module SubscriptionAdapter
     class SubscriberMap

data/lib/action_cable/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "gem_version"
 
 module ActionCable

data/lib/rails/generators/channel/channel_generator.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Rails
   module Generators
     class ChannelGenerator < NamedBase
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       argument :actions, type: :array, default: [], banner: "method method"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.2.0.beta1
 platform: ruby
 authors:
 - Pratik Naik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.7
+        version: 5.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,6 @@ files:
 - lib/action_cable/subscription_adapter/async.rb
 - lib/action_cable/subscription_adapter/base.rb
 - lib/action_cable/subscription_adapter/channel_prefix.rb
-- lib/action_cable/subscription_adapter/evented_redis.rb
 - lib/action_cable/subscription_adapter/inline.rb
 - lib/action_cable/subscription_adapter/postgresql.rb
 - lib/action_cable/subscription_adapter/redis.rb
@@ -109,18 +108,18 @@ files:
 - lib/assets/compiled/action_cable.js
 - lib/rails/generators/channel/USAGE
 - lib/rails/generators/channel/channel_generator.rb
-- lib/rails/generators/channel/templates/application_cable/channel.rb
-- lib/rails/generators/channel/templates/application_cable/connection.rb
-- lib/rails/generators/channel/templates/assets/cable.js
-- lib/rails/generators/channel/templates/assets/channel.coffee
-- lib/rails/generators/channel/templates/assets/channel.js
-- lib/rails/generators/channel/templates/channel.rb
+- lib/rails/generators/channel/templates/application_cable/channel.rb.tt
+- lib/rails/generators/channel/templates/application_cable/connection.rb.tt
+- lib/rails/generators/channel/templates/assets/cable.js.tt
+- lib/rails/generators/channel/templates/assets/channel.coffee.tt
+- lib/rails/generators/channel/templates/assets/channel.js.tt
+- lib/rails/generators/channel/templates/channel.rb.tt
 homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.1.7/actioncable
-  changelog_uri: https://github.com/rails/rails/blob/v5.1.7/actioncable/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.0.beta1/actioncable
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.0.beta1/actioncable/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -132,11 +131,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: WebSocket framework for Rails.

data/lib/action_cable/subscription_adapter/evented_redis.rb

@@ -1,87 +0,0 @@
-require "thread"
-
-gem "em-hiredis", "~> 0.3.0"
-gem "redis", ">= 3", "< 5"
-require "em-hiredis"
-require "redis"
-
-EventMachine.epoll  if EventMachine.epoll?
-EventMachine.kqueue if EventMachine.kqueue?
-
-module ActionCable
-  module SubscriptionAdapter
-    class EventedRedis < Base # :nodoc:
-      prepend ChannelPrefix
-
-      @@mutex = Mutex.new
-
-      # Overwrite this factory method for EventMachine Redis connections if you want to use a different Redis connection library than EM::Hiredis.
-      # This is needed, for example, when using Makara proxies for distributed Redis.
-      cattr_accessor(:em_redis_connector) { ->(config) { EM::Hiredis.connect(config[:url]) } }
-
-      # Overwrite this factory method for Redis connections if you want to use a different Redis connection library than Redis.
-      # This is needed, for example, when using Makara proxies for distributed Redis.
-      cattr_accessor(:redis_connector) { ->(config) { ::Redis.new(url: config[:url]) } }
-
-      def initialize(*)
-        ActiveSupport::Deprecation.warn(<<-MSG.squish)
-          The "evented_redis" subscription adapter is deprecated and
-          will be removed in Rails 5.2. Please use the "redis" adapter
-          instead.
-        MSG
-
-        super
-        @redis_connection_for_broadcasts = @redis_connection_for_subscriptions = nil
-      end
-
-      def broadcast(channel, payload)
-        redis_connection_for_broadcasts.publish(channel, payload)
-      end
-
-      def subscribe(channel, message_callback, success_callback = nil)
-        redis_connection_for_subscriptions.pubsub.subscribe(channel, &message_callback).tap do |result|
-          result.callback { |reply| success_callback.call } if success_callback
-        end
-      end
-
-      def unsubscribe(channel, message_callback)
-        redis_connection_for_subscriptions.pubsub.unsubscribe_proc(channel, message_callback)
-      end
-
-      def shutdown
-        redis_connection_for_subscriptions.pubsub.close_connection
-        @redis_connection_for_subscriptions = nil
-      end
-
-      private
-        def redis_connection_for_subscriptions
-          ensure_reactor_running
-          @redis_connection_for_subscriptions || @server.mutex.synchronize do
-            @redis_connection_for_subscriptions ||= self.class.em_redis_connector.call(@server.config.cable).tap do |redis|
-              redis.on(:reconnect_failed) do
-                @logger.error "[ActionCable] Redis reconnect failed."
-              end
-
-              redis.on(:failed) do
-                @logger.error "[ActionCable] Redis connection has failed."
-              end
-            end
-          end
-        end
-
-        def redis_connection_for_broadcasts
-          @redis_connection_for_broadcasts || @server.mutex.synchronize do
-            @redis_connection_for_broadcasts ||= self.class.redis_connector.call(@server.config.cable)
-          end
-        end
-
-        def ensure_reactor_running
-          return if EventMachine.reactor_running? && EventMachine.reactor_thread
-          @@mutex.synchronize do
-            Thread.new { EventMachine.run } unless EventMachine.reactor_running?
-            Thread.pass until EventMachine.reactor_running? && EventMachine.reactor_thread
-          end
-        end
-    end
-  end
-end