actioncable 5.0.0.rc1 → 5.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09ca86b01cffaa07735637d919a21948f661b818
-  data.tar.gz: f6b7fb38210c814dcf40d48ec7c27b88faa3eba5
+  metadata.gz: c6b94adefd33df52bd3071fc352f3e02005f5f3d
+  data.tar.gz: a92b0ef36b341b4c69e886c74aca629187ba6237
 SHA512:
-  metadata.gz: fbba1cf208048a75ac161e122f9fbb718d41d86141f33ec015101696914d15cb3468515cc2f35458aeb760cc5b2d3b2f37c6e4016cfaa12c44df8452cd06aeec
-  data.tar.gz: 69576050fbc1a908d31ae9f31d19ea2858a7df51fb8f45828e02ebd56929b720e8541013fda65b03af36cee01c76042845463829f0ccfd510a7499bd16d4460c
+  metadata.gz: af38e63777c21351f22aa57d2f5599a6bc39fffb2ba39950c57c46c93f23ebbef390b8290bc9cf68e464004d2aab1b9d47f447cf33fb3527250fbb3e58175759
+  data.tar.gz: 771f3def063419544f25963795cb3c972467a7de86d5f002be0147922399ed353ad602c924aaeb299174df7734aace7a22d1811d05460e0cbc419989f9837ad8

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 5.0.0.rc2 (June 22, 2016) ##
+
+
+*  Fix development reloading support: new cable connections are now correctly
+   dispatched to the reloaded channel class, instead of using a cached reference
+   to the originally-loaded version.
+
+   *Matthew Draper*
+
+
 ## Rails 5.0.0.rc1 (May 06, 2016) ##
 
 *   No changes.

data/lib/action_cable/connection/subscriptions.rb

@@ -26,12 +26,12 @@ module ActionCable
         id_key = data['identifier']
         id_options = ActiveSupport::JSON.decode(id_key).with_indifferent_access
 
-        subscription_klass = connection.server.channel_classes[id_options[:channel]]
+        subscription_klass = id_options[:channel].safe_constantize
 
-        if subscription_klass
+        if subscription_klass && ActionCable::Channel::Base >= subscription_klass
           subscriptions[id_key] ||= subscription_klass.new(connection, id_key, id_options)
         else
-          logger.error "Subscription class not found (#{data.inspect})"
+          logger.error "Subscription class not found: #{id_options[:channel].inspect}"
         end
       end
 

data/lib/action_cable/engine.rb

@@ -31,11 +31,8 @@ module ActionCable
           self.cable = Rails.application.config_for(config_path).with_indifferent_access
         end
 
-        if 'ApplicationCable::Connection'.safe_constantize
-          self.connection_class = ApplicationCable::Connection
-        end
-
-        self.channel_paths = Rails.application.paths['app/channels'].existent
+        previous_connection_class = self.connection_class
+        self.connection_class = -> { 'ApplicationCable::Connection'.safe_constantize || previous_connection_class.call }
 
         options.each { |k,v| send("#{k}=", v) }
       end

data/lib/action_cable/gem_version.rb

@@ -8,7 +8,7 @@ module ActionCable
     MAJOR = 5
     MINOR = 0
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_cable/server/base.rb

@@ -19,13 +19,13 @@ module ActionCable
 
       def initialize
         @mutex = Monitor.new
-        @remote_connections = @event_loop = @worker_pool = @channel_classes = @pubsub = nil
+        @remote_connections = @event_loop = @worker_pool = @pubsub = nil
       end
 
       # Called by Rack to setup the server.
       def call(env)
         setup_heartbeat_timer
-        config.connection_class.new(self, env).process
+        config.connection_class.call.new(self, env).process
       end
 
       # Disconnect all the connections identified by `identifiers` on this server or any others via RemoteConnections.
@@ -67,16 +67,6 @@ module ActionCable
         @worker_pool || @mutex.synchronize { @worker_pool ||= ActionCable::Server::Worker.new(max_size: config.worker_pool_size) }
       end
 
-      # Requires and returns a hash of all of the channel class constants, which are keyed by name.
-      def channel_classes
-        @channel_classes || @mutex.synchronize do
-          @channel_classes ||= begin
-            config.channel_paths.each { |channel_path| require channel_path }
-            config.channel_class_names.each_with_object({}) { |name, hash| hash[name] = name.constantize }
-          end
-        end
-      end
-
       # Adapter used for all streams/broadcasting.
       def pubsub
         @pubsub || @mutex.synchronize { @pubsub ||= config.pubsub_adapter.new(self) }
@@ -84,7 +74,7 @@ module ActionCable
 
       # All of the identifiers applied to the connection class associated with this server.
       def connection_identifiers
-        config.connection_class.identifiers
+        config.connection_class.call.identifiers
       end
     end
 

data/lib/action_cable/server/configuration.rb

@@ -8,23 +8,15 @@ module ActionCable
       attr_accessor :disable_request_forgery_protection, :allowed_request_origins
       attr_accessor :cable, :url, :mount_path
 
-      attr_accessor :channel_paths # :nodoc:
-
       def initialize
         @log_tags = []
 
-        @connection_class = ActionCable::Connection::Base
+        @connection_class = -> { ActionCable::Connection::Base }
         @worker_pool_size = 4
 
         @disable_request_forgery_protection = false
       end
 
-      def channel_class_names
-        @channel_class_names ||= channel_paths.collect do |channel_path|
-          Pathname.new(channel_path).basename.to_s.split('.').first.camelize
-        end
-      end
-
       # Returns constant of subscription adapter specified in config/cable.yml.
       # If the adapter cannot be found, this will default to the Redis adapter.
       # Also makes sure proper dependencies are required.

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

@@ -16,7 +16,8 @@ module Rails
           if self.behavior == :invoke
             template "assets/cable.js", "app/assets/javascripts/cable.js"
           end
-          template "assets/channel.coffee", File.join('app/assets/javascripts/channels', class_path, "#{file_name}.coffee")
+
+          js_template "assets/channel", File.join('app/assets/javascripts/channels', class_path, "#{file_name}")
         end
 
         generate_application_cable_files

data/lib/rails/generators/channel/templates/assets/channel.js

@@ -0,0 +1,18 @@
+App.<%= class_name.underscore %> = App.cable.subscriptions.create("<%= class_name %>Channel", {
+  connected: function() {
+    // Called when the subscription is ready for use on the server
+  },
+
+  disconnected: function() {
+    // Called when the subscription has been terminated by the server
+  },
+
+  received: function(data) {
+    // Called when there's incoming data on the websocket for this channel
+  }<%= actions.any? ? ",\n" : '' %>
+<% actions.each do |action| -%>
+  <%=action %>: function() {
+    return this.perform('<%= action %>');
+  }<%= action == actions[-1] ? '' : ",\n" %>
+<% end -%>
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc1
+  version: 5.0.0.rc2
 platform: ruby
 authors:
 - Pratik Naik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.rc1
+        version: 5.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: nio4r
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: blade
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 description: Structure many real-time application concerns into channels over a single
   WebSocket connection.
 email:
@@ -114,6 +128,7 @@ files:
 - 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
 homepage: http://rubyonrails.org
 licenses:
@@ -135,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: WebSocket framework for Rails.