actioncable 5.0.0.beta1.1 → 5.0.0.beta2

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

@@ -5,11 +5,16 @@ module Rails
 
       argument :actions, type: :array, default: [], banner: "method method"
 
+      class_option :assets, type: :boolean
+
       check_class_collision suffix: "Channel"
 
       def create_channel_file
         template "channel.rb", File.join('app/channels', class_path, "#{file_name}_channel.rb")
-        template "assets/channel.coffee", File.join('app/assets/javascripts/channels', class_path, "#{file_name}.coffee")
+
+        if options[:assets]
+          template "assets/channel.coffee", File.join('app/assets/javascripts/channels', class_path, "#{file_name}.coffee")
+        end
       end
 
       protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actioncable
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1.1
+  version: 5.0.0.beta2
 platform: ruby
 authors:
 - Pratik Naik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -17,42 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1.1
+        version: 5.0.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta1.1
+        version: 5.0.0.beta2
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: nio4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
-- !ruby/object:Gem::Dependency
-  name: faye-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -67,76 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.2
-- !ruby/object:Gem::Dependency
-  name: em-hiredis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Structure many real-time application concerns into channels over a single
   WebSocket connection.
 email:
@@ -160,16 +76,18 @@ files:
 - lib/action_cable/connection.rb
 - lib/action_cable/connection/authorization.rb
 - lib/action_cable/connection/base.rb
+- lib/action_cable/connection/client_socket.rb
 - lib/action_cable/connection/identification.rb
 - lib/action_cable/connection/internal_channel.rb
 - lib/action_cable/connection/message_buffer.rb
+- lib/action_cable/connection/stream.rb
+- lib/action_cable/connection/stream_event_loop.rb
 - lib/action_cable/connection/subscriptions.rb
 - lib/action_cable/connection/tagged_logger_proxy.rb
 - lib/action_cable/connection/web_socket.rb
 - lib/action_cable/engine.rb
 - lib/action_cable/gem_version.rb
 - lib/action_cable/helpers/action_cable_helper.rb
-- lib/action_cable/process/logging.rb
 - lib/action_cable/remote_connections.rb
 - lib/action_cable/server.rb
 - lib/action_cable/server/base.rb
@@ -178,13 +96,16 @@ files:
 - lib/action_cable/server/connections.rb
 - lib/action_cable/server/worker.rb
 - lib/action_cable/server/worker/active_record_connection_management.rb
+- lib/action_cable/subscription_adapter.rb
+- lib/action_cable/subscription_adapter/async.rb
+- lib/action_cable/subscription_adapter/base.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
+- lib/action_cable/subscription_adapter/subscriber_map.rb
 - lib/action_cable/version.rb
-- lib/assets/javascripts/action_cable.coffee.erb
-- lib/assets/javascripts/action_cable/connection.coffee
-- lib/assets/javascripts/action_cable/connection_monitor.coffee
-- lib/assets/javascripts/action_cable/consumer.coffee
-- lib/assets/javascripts/action_cable/subscription.coffee
-- lib/assets/javascripts/action_cable/subscriptions.coffee
+- lib/assets/compiled/action_cable.js
 - lib/rails/generators/channel/USAGE
 - lib/rails/generators/channel/channel_generator.rb
 - lib/rails/generators/channel/templates/assets/channel.coffee
@@ -209,8 +130,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: WebSocket framework for Rails.
 test_files: []
+has_rdoc: 

data/lib/action_cable/process/logging.rb

@@ -1,10 +0,0 @@
-require 'action_cable/server'
-require 'eventmachine'
-require 'celluloid'
-
-EM.error_handler do |e|
-  puts "Error raised inside the event loop: #{e.message}"
-  puts e.backtrace.join("\n")
-end
-
-Celluloid.logger = ActionCable.server.logger

data/lib/assets/javascripts/action_cable.coffee.erb

@@ -1,23 +0,0 @@
-#= require_self
-#= require action_cable/consumer
-
-@ActionCable =
-  INTERNAL: <%= ActionCable::INTERNAL.to_json %>
-
-  createConsumer: (url = @getConfig("url")) ->
-    new ActionCable.Consumer @createWebSocketURL(url)
-
-  getConfig: (name) ->
-    element = document.head.querySelector("meta[name='action-cable-#{name}']")
-    element?.getAttribute("content")
-
-  createWebSocketURL: (url) ->
-    if url and not /^wss?:/i.test(url)
-      a = document.createElement("a")
-      a.href = url
-      # Fix populating Location properties in IE. Otherwise, protocol will be blank.
-      a.href = a.href
-      a.protocol = a.protocol.replace("http", "ws")
-      a.href
-    else
-      url

data/lib/assets/javascripts/action_cable/connection.coffee

@@ -1,84 +0,0 @@
-# Encapsulate the cable connection held by the consumer. This is an internal class not intended for direct user manipulation.
-
-{message_types} = ActionCable.INTERNAL
-
-class ActionCable.Connection
-  @reopenDelay: 500
-
-  constructor: (@consumer) ->
-    @open()
-
-  send: (data) ->
-    if @isOpen()
-      @webSocket.send(JSON.stringify(data))
-      true
-    else
-      false
-
-  open: =>
-    if @webSocket and not @isState("closed")
-      throw new Error("Existing connection must be closed before opening")
-    else
-      @webSocket = new WebSocket(@consumer.url)
-      @installEventHandlers()
-      true
-
-  close: ->
-    @webSocket?.close()
-
-  reopen: ->
-    if @isState("closed")
-      @open()
-    else
-      try
-        @close()
-      finally
-        setTimeout(@open, @constructor.reopenDelay)
-
-  isOpen: ->
-    @isState("open")
-
-  # Private
-
-  isState: (states...) ->
-    @getState() in states
-
-  getState: ->
-    return state.toLowerCase() for state, value of WebSocket when value is @webSocket?.readyState
-    null
-
-  installEventHandlers: ->
-    for eventName of @events
-      handler = @events[eventName].bind(this)
-      @webSocket["on#{eventName}"] = handler
-    return
-
-  events:
-    message: (event) ->
-      {identifier, message, type} = JSON.parse(event.data)
-
-      switch type
-        when message_types.confirmation
-          @consumer.subscriptions.notify(identifier, "connected")
-        when message_types.rejection
-          @consumer.subscriptions.reject(identifier)
-        else
-          @consumer.subscriptions.notify(identifier, "received", message)
-
-    open: ->
-      @disconnected = false
-      @consumer.subscriptions.reload()
-
-    close: ->
-      @disconnect()
-
-    error: ->
-      @disconnect()
-
-  disconnect: ->
-    return if @disconnected
-    @disconnected = true
-    @consumer.subscriptions.notifyAll("disconnected")
-
-  toJSON: ->
-    state: @getState()

data/lib/assets/javascripts/action_cable/connection_monitor.coffee

@@ -1,84 +0,0 @@
-# Responsible for ensuring the cable connection is in good health by validating the heartbeat pings sent from the server, and attempting
-# revival reconnections if things go astray. Internal class, not intended for direct user manipulation.
-class ActionCable.ConnectionMonitor
-  @pollInterval:
-    min: 3
-    max: 30
-
-  @staleThreshold: 6 # Server::Connections::BEAT_INTERVAL * 2 (missed two pings)
-
-  identifier: ActionCable.INTERNAL.identifiers.ping
-
-  constructor: (@consumer) ->
-    @consumer.subscriptions.add(this)
-    @start()
-
-  connected: ->
-    @reset()
-    @pingedAt = now()
-    delete @disconnectedAt
-
-  disconnected: ->
-    @disconnectedAt = now()
-
-  received: ->
-    @pingedAt = now()
-
-  reset: ->
-    @reconnectAttempts = 0
-
-  start: ->
-    @reset()
-    delete @stoppedAt
-    @startedAt = now()
-    @poll()
-    document.addEventListener("visibilitychange", @visibilityDidChange)
-
-  stop: ->
-    @stoppedAt = now()
-    document.removeEventListener("visibilitychange", @visibilityDidChange)
-
-  poll: ->
-    setTimeout =>
-      unless @stoppedAt
-        @reconnectIfStale()
-        @poll()
-    , @getInterval()
-
-  getInterval: ->
-    {min, max} = @constructor.pollInterval
-    interval = 5 * Math.log(@reconnectAttempts + 1)
-    clamp(interval, min, max) * 1000
-
-  reconnectIfStale: ->
-    if @connectionIsStale()
-      @reconnectAttempts++
-      unless @disconnectedRecently()
-        @consumer.connection.reopen()
-
-  connectionIsStale: ->
-    secondsSince(@pingedAt ? @startedAt) > @constructor.staleThreshold
-
-  disconnectedRecently: ->
-    @disconnectedAt and secondsSince(@disconnectedAt) < @constructor.staleThreshold
-
-  visibilityDidChange: =>
-    if document.visibilityState is "visible"
-      setTimeout =>
-        if @connectionIsStale() or not @consumer.connection.isOpen()
-          @consumer.connection.reopen()
-      , 200
-
-  toJSON: ->
-    interval = @getInterval()
-    connectionIsStale = @connectionIsStale()
-    {@startedAt, @stoppedAt, @pingedAt, @reconnectAttempts, connectionIsStale, interval}
-
-  now = ->
-    new Date().getTime()
-
-  secondsSince = (time) ->
-    (now() - time) / 1000
-
-  clamp = (number, min, max) ->
-    Math.max(min, Math.min(max, number))

data/lib/assets/javascripts/action_cable/consumer.coffee

@@ -1,31 +0,0 @@
-#= require action_cable/connection
-#= require action_cable/connection_monitor
-#= require action_cable/subscriptions
-#= require action_cable/subscription
-
-# The ActionCable.Consumer establishes the connection to a server-side Ruby Connection object. Once established,
-# the ActionCable.ConnectionMonitor will ensure that its properly maintained through heartbeats and checking for stale updates.
-# The Consumer instance is also the gateway to establishing subscriptions to desired channels through the #createSubscription
-# method.
-#
-# The following example shows how this can be setup:
-#
-#   @App = {}
-#   App.cable = ActionCable.createConsumer "ws://example.com/accounts/1"
-#   App.appearance = App.cable.subscriptions.create "AppearanceChannel"
-#
-# For more details on how you'd configure an actual channel subscription, see ActionCable.Subscription.
-class ActionCable.Consumer
-  constructor: (@url) ->
-    @subscriptions = new ActionCable.Subscriptions this
-    @connection = new ActionCable.Connection this
-    @connectionMonitor = new ActionCable.ConnectionMonitor this
-
-  send: (data) ->
-    @connection.send(data)
-
-  inspect: ->
-    JSON.stringify(this, null, 2)
-
-  toJSON: ->
-    {@url, @subscriptions, @connection, @connectionMonitor}