Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't rely on the global server as a receiver. | Kasper Timm Hansen | 2016-02-14 | 3 | -10/+4 |
| | | | | | | | | | | | | | | | | The `WorkerTest`'s `Receiver` is imporsonating an `ActionCable::Connection::Base`, but just delegates the logger to `ActionCable.logger`. This creates a mismatch as the connection requires the logger to be a `TaggedLoggerProxy`'ied logger, while the server doesn't. Thus to ensure an exception isn't raised when the worker tries to call `tag` other tests have to assign a proxied logger to their test server. Instead of forcing change on other tests, have Receiver adhere to the connection contract and use a `TaggedLoggerProxy`. As a consequence remove more setup from the tests. | ||||
* | Default connection class to ActionCable::Connection::Base. | Kasper Timm Hansen | 2016-02-14 | 2 | -16/+0 |
| | | | | | | | Instead of depending on ApplicationCable::Connection being defined at initialize we should inject it in the Railtie. Thus we can kill more setup in the tests too. | ||||
* | Inject Rails' channel paths in engine. | Kasper Timm Hansen | 2016-02-14 | 2 | -17/+1 |
| | | | | | | | | | | | | | We were explicitly referencing Rails.root in ActionCable::Server::Configuration.initialize, thereby coupling ourselves to Rails. Instead add `app/channels` to Rails' app paths and assign the existent files to `channel_paths`. Users can still append to those load paths with `<<` and `push` in `config/application.rb`. This means we can remove the custom `Dir` lookup in `channel_paths` and the Rails and root definitions in the tests. | ||||
* | Cant run on an out-of-the-box OSX installation without running out of TOO ↵ | David Heinemeier Hansson | 2016-02-05 | 1 | -1/+1 |
| | | | | MANY FILES OPEN | ||||
* | Merge pull request #23381 from matthewd/uneventful-redis | Matthew Draper | 2016-02-02 | 2 | -1/+17 |
|\ | | | | | Redis sans EventMachine | ||||
| * | Switch the default redis adapter to a single-stream model | Matthew Draper | 2016-02-01 | 2 | -1/+17 |
| | | | | | | | | | | | | This new adapter does get a little more intimate with the redis-rb gem's implementation than I would like, but it's the least bad of the approaches I've come up with. | ||||
* | | Merge pull request #23370 from maclover7/actioncable-main-travis-build | Guillermo Iguaran | 2016-01-31 | 1 | -9/+0 |
|\ \ | | | | | | | Move Action Cable back to the main build | ||||
| * | | Remove unused method | Jon Moss | 2016-01-31 | 1 | -9/+0 |
| |/ | |||||
* / | Wait for EventMachine to finish starting | Matthew Draper | 2016-02-01 | 1 | -0/+1 |
|/ | |||||
* | Use a gentler disconnect | Matthew Draper | 2016-01-30 | 1 | -2/+2 |
| | | | | The detach used by close! seems to be making EM very sad on Travis. | ||||
* | Don't bother stopping EM between tests | Matthew Draper | 2016-01-30 | 1 | -38/+3 |
| | | | | | It's not strictly necessary, and maybe this will help with the current test failure. | ||||
* | Keep the socket reference after close | Matthew Draper | 2016-01-30 | 1 | -3/+2 |
| | | | | We may still try to send to it. | ||||
* | Reduce the client count, in hope of a more consistent test | Matthew Draper | 2016-01-30 | 1 | -3/+3 |
| | |||||
* | Be more patient while gathering the expected responses | Matthew Draper | 2016-01-30 | 1 | -4/+3 |
| | |||||
* | Handle more IO errors (especially, ECONNRESET) | Matthew Draper | 2016-01-30 | 2 | -0/+31 |
| | | | | | | Also, address the possibility of the listen thread dying and needing to be respawned. As a bonus, we now defer construction of the thread until we are first given something to monitor. | ||||
* | Add a couple of tests that connect with a WS client | Matthew Draper | 2016-01-30 | 2 | -0/+251 |
| | |||||
* | Revert "Revert "Eliminate the EventMachine dependency"" | Matthew Draper | 2016-01-30 | 8 | -51/+32 |
| | |||||
* | Revert "Eliminate the EventMachine dependency" | David Heinemeier Hansson | 2016-01-27 | 8 | -32/+51 |
| | |||||
* | Ditch the EM error logging helper | Matthew Draper | 2016-01-24 | 1 | -1/+0 |
| | | | | | | We're no longer doing our work in the EM event loop, so errors are quite unlikely, and if they do occur, they're not really our responsibility to handle. | ||||
* | Import the relevant portions of faye-websocket | Matthew Draper | 2016-01-24 | 4 | -8/+9 |
| | | | | (as adapted to use concurrent-ruby / nio4r instead of eventmachine) | ||||
* | Using a hacked faye-websocket, drop EventMachine | Matthew Draper | 2016-01-24 | 5 | -42/+23 |
| | |||||
* | Add tests for the ActionCable adapters | Matthew Draper | 2016-01-24 | 7 | -0/+227 |
| | |||||
* | Fix code review comments | Jon Moss | 2016-01-18 | 4 | -9/+9 |
| | | | | | | | - adapter -> pubsub (re)rename internally - Change variable names to match method names - Add EventMachine `~> 1.0` as a runtime dependency of ActionCable - Refactor dependency loading for adapters | ||||
* | ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapter | Jon Moss | 2016-01-18 | 3 | -6/+6 |
| | |||||
* | All Redis deps are now optional, Postgres --> PostgreSQL adapter | Jon Moss | 2016-01-18 | 2 | -2/+0 |
| | |||||
* | Tests passing and small refactoring | Jon Moss | 2016-01-18 | 6 | -36/+64 |
| | |||||
* | Adapterize ActionCable storage and extract behavior | Jon Moss | 2016-01-18 | 1 | -0/+64 |
| | |||||
* | Revert "Merge pull request #22977 from rails/revert-22934-master" | David Heinemeier Hansson | 2016-01-16 | 7 | -12/+0 |
| | | | | | This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25. | ||||
* | Revert "Move async execution from celluloid to concurrent-ruby" | David Heinemeier Hansson | 2016-01-08 | 7 | -0/+12 |
| | |||||
* | Remove celluloid references | Mike Perham | 2016-01-05 | 5 | -5/+0 |
| | |||||
* | Move async execution from celluloid to concurrent-ruby | Mike Perham | 2016-01-05 | 2 | -7/+0 |
| | | | | | | | | | | | | | | This removes 8 runtime gem dependencies from Rails: ``` Using hitimes 1.2.3 Using timers 4.1.1 Using celluloid-essentials 0.20.5 Using celluloid-extras 0.20.5 Using celluloid-fsm 0.20.5 Using celluloid-pool 0.20.5 Using celluloid-supervision 0.20.5 Using celluloid 0.17.2 ``` | ||||
* | [ActionCable] declare asset_logged private | Akshay Vishnoi | 2015-12-19 | 1 | -14/+14 |
| | |||||
* | Merge pull request #22668 from ryohashimoto/151219_receive | Kasper Timm Hansen | 2015-12-18 | 1 | -1/+1 |
|\ | | | | | Fix `receive` spelling | ||||
| * | Fix `receive` spelling | Ryo Hashimoto | 2015-12-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #22667 from akshay-vishnoi/base_test_case | Rafael França | 2015-12-18 | 1 | -0/+22 |
|\ \ | |/ |/| | [ActionCable] Test invalid action on channel | ||||
| * | [ActionCable] Test invalid action on channel | Akshay Vishnoi | 2015-12-18 | 1 | -0/+22 |
| | | |||||
* | | Fix `receive` spelling and add whitespace | Kasper Timm Hansen | 2015-12-18 | 1 | -3/+3 |
|/ | | | | | Found `recieve` next to the correctly spelled method name, fixed it. Also we prefer a one space padding within hashes, add that. | ||||
* | [ActionCable] test perform action with default action | Akshay Vishnoi | 2015-12-18 | 1 | -1/+11 |
| | |||||
* | [ActionCable] Test available actions on Channel | Akshay Vishnoi | 2015-12-18 | 1 | -0/+4 |
| | |||||
* | Remove warnings from actioncable | Arun Agrawal | 2015-12-17 | 2 | -2/+2 |
| | | | | Warnings coming from code and test are removed | ||||
* | Quiet warnings | David Heinemeier Hansson | 2015-12-16 | 1 | -2/+2 |
| | |||||
* | Initial stab at adding Action Cable to rails/master | David Heinemeier Hansson | 2015-12-14 | 1 | -10/+5 |
| | |||||
* | Get ready to merge into Rails | David Heinemeier Hansson | 2015-12-14 | 20 | -0/+1013 |