diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2016-03-11 16:32:02 -0700 |
---|---|---|
committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-03-31 07:08:16 -0700 |
commit | b168eb5819fa5fea940c9865d5c9a3ec5ba2a7ec (patch) | |
tree | e6225bc33dcc1dcefdfefca4537bde07bc8df94a /actioncable/test/subscription_adapter | |
parent | 903f447e436a7c909c3afc552f27bbbc1b4770c8 (diff) | |
download | rails-b168eb5819fa5fea940c9865d5c9a3ec5ba2a7ec.tar.gz rails-b168eb5819fa5fea940c9865d5c9a3ec5ba2a7ec.tar.bz2 rails-b168eb5819fa5fea940c9865d5c9a3ec5ba2a7ec.zip |
Cable message encoding
* Introduce a connection coder responsible for encoding Cable messages
as WebSocket messages, defaulting to `ActiveSupport::JSON` and duck-
typing to any object responding to `#encode` and `#decode`.
* Consolidate encoding responsibility to the connection. No longer
explicitly JSON-encode from channels or other sources. Pass Cable
messages as Hashes to `#transmit` and rely on it to encode.
* Introduce stream encoders responsible for decoding pubsub messages.
Preserve the currently raw encoding, but make it easy to use JSON.
Same duck type as the connection encoder.
* Revert recent data normalization/quoting (#23649) which treated
`identifier` and `data` values as nested JSON objects rather than as
opaque JSON-encoded strings. That dealt us an awkward hand where we'd
decode JSON stringsā¦ or not, but always encode as JSON. Embedding
JSON object values directly is preferably, no extra JSON encoding,
but that should be a purposeful protocol version change rather than
ambiguously, inadvertently supporting multiple message formats.
Diffstat (limited to 'actioncable/test/subscription_adapter')
-rw-r--r-- | actioncable/test/subscription_adapter/common.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb index 82f0abbbf3..285c690df0 100644 --- a/actioncable/test/subscription_adapter/common.rb +++ b/actioncable/test/subscription_adapter/common.rb @@ -20,8 +20,7 @@ module CommonSubscriptionAdapterTest end def teardown - @tx_adapter.shutdown if @tx_adapter && @tx_adapter != @rx_adapter - @rx_adapter.shutdown if @rx_adapter + [@rx_adapter, @tx_adapter].uniq.each(&:shutdown) end |