Skip to content

Commit 8ecc5ab

Browse files
committed
Start Rails 5.1 development 🎉
1 parent 943b96c commit 8ecc5ab

File tree

24 files changed

+101
-5268
lines changed

24 files changed

+101
-5268
lines changed

Gemfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gem 'mocha', '~> 0.14', require: false
1111

1212
gem 'rack-cache', '~> 1.2'
1313
gem 'jquery-rails'
14-
gem 'coffee-rails', '~> 4.1.0'
14+
gem 'coffee-rails', github: 'rails/coffee-rails'
1515
gem 'turbolinks', github: 'turbolinks/turbolinks-rails'
1616

1717
# require: false so bcrypt is loaded only when has_secure_password is used.
@@ -43,14 +43,15 @@ group :job do
4343
gem 'resque-scheduler', require: false
4444
gem 'sidekiq', require: false
4545
gem 'sucker_punch', require: false
46-
gem 'delayed_job', require: false
46+
gem 'delayed_job', require: false, github: 'collectiveidea/delayed_job'
4747
gem 'queue_classic', github: "QueueClassic/queue_classic", branch: 'master', require: false, platforms: :ruby
4848
gem 'sneakers', require: false
4949
gem 'que', require: false
5050
gem 'backburner', require: false
51-
gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
51+
#TODO: add qu after it support Rails 5.1
52+
# gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
5253
gem 'qu-redis', require: false
53-
gem 'delayed_job_active_record', require: false
54+
gem 'delayed_job_active_record', require: false, github: 'collectiveidea/delayed_job_active_record'
5455
gem 'sequel', require: false
5556
end
5657

Gemfile.lock

+63-55
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,31 @@ GIT
77
pg (>= 0.17, < 0.19)
88

99
GIT
10-
remote: git://github.com/bkeepers/qu.git
11-
revision: d098e2657c92e89a6413bebd9c033930759c061f
12-
branch: master
10+
remote: git://github.com/collectiveidea/delayed_job.git
11+
revision: 71f1d5faf934d3057abca942f0d410327bc69087
1312
specs:
14-
qu (0.2.0)
15-
qu-rails (0.2.0)
16-
qu (= 0.2.0)
17-
railties (>= 3.2, < 5)
18-
qu-redis (0.2.0)
19-
qu (= 0.2.0)
20-
redis-namespace
13+
delayed_job (4.1.1)
14+
activesupport (>= 3.0, < 5.1)
15+
16+
GIT
17+
remote: git://github.com/collectiveidea/delayed_job_active_record.git
18+
revision: 61e688e03b2ef4004b08de6d1e0a123fda8fffad
19+
specs:
20+
delayed_job_active_record (4.1.0)
21+
activerecord (>= 3.0, < 5.1)
22+
delayed_job (>= 3.0, < 5)
23+
24+
GIT
25+
remote: git://github.com/rails/coffee-rails.git
26+
revision: aa2e623cbda4f3c789a0a15d1f707239e68f5736
27+
specs:
28+
coffee-rails (4.1.1)
29+
coffee-script (>= 2.2.0)
30+
railties (>= 4.0.0, < 5.2.x)
2131

2232
GIT
2333
remote: git://github.com/sass/sass.git
24-
revision: 6e8a053f3f1b3c58d3c7db057d7df80e8fee3752
34+
revision: 3fda1cbe70d615e7ef96e28db4fd1f8a3ebb5505
2535
branch: stable
2636
specs:
2737
sass (3.4.22)
@@ -36,58 +46,58 @@ GIT
3646
PATH
3747
remote: .
3848
specs:
39-
actioncable (5.0.0.rc1)
40-
actionpack (= 5.0.0.rc1)
49+
actioncable (5.1.0.alpha)
50+
actionpack (= 5.1.0.alpha)
4151
nio4r (~> 1.2)
4252
websocket-driver (~> 0.6.1)
43-
actionmailer (5.0.0.rc1)
44-
actionpack (= 5.0.0.rc1)
45-
actionview (= 5.0.0.rc1)
46-
activejob (= 5.0.0.rc1)
53+
actionmailer (5.1.0.alpha)
54+
actionpack (= 5.1.0.alpha)
55+
actionview (= 5.1.0.alpha)
56+
activejob (= 5.1.0.alpha)
4757
mail (~> 2.5, >= 2.5.4)
4858
rails-dom-testing (~> 2.0)
49-
actionpack (5.0.0.rc1)
50-
actionview (= 5.0.0.rc1)
51-
activesupport (= 5.0.0.rc1)
59+
actionpack (5.1.0.alpha)
60+
actionview (= 5.1.0.alpha)
61+
activesupport (= 5.1.0.alpha)
5262
rack (~> 2.x)
5363
rack-test (~> 0.6.3)
5464
rails-dom-testing (~> 2.0)
5565
rails-html-sanitizer (~> 1.0, >= 1.0.2)
56-
actionview (5.0.0.rc1)
57-
activesupport (= 5.0.0.rc1)
66+
actionview (5.1.0.alpha)
67+
activesupport (= 5.1.0.alpha)
5868
builder (~> 3.1)
5969
erubis (~> 2.7.0)
6070
rails-dom-testing (~> 2.0)
6171
rails-html-sanitizer (~> 1.0, >= 1.0.2)
62-
activejob (5.0.0.rc1)
63-
activesupport (= 5.0.0.rc1)
72+
activejob (5.1.0.alpha)
73+
activesupport (= 5.1.0.alpha)
6474
globalid (>= 0.3.6)
65-
activemodel (5.0.0.rc1)
66-
activesupport (= 5.0.0.rc1)
67-
activerecord (5.0.0.rc1)
68-
activemodel (= 5.0.0.rc1)
69-
activesupport (= 5.0.0.rc1)
75+
activemodel (5.1.0.alpha)
76+
activesupport (= 5.1.0.alpha)
77+
activerecord (5.1.0.alpha)
78+
activemodel (= 5.1.0.alpha)
79+
activesupport (= 5.1.0.alpha)
7080
arel (~> 7.0)
71-
activesupport (5.0.0.rc1)
81+
activesupport (5.1.0.alpha)
7282
concurrent-ruby (~> 1.0, >= 1.0.2)
7383
i18n (~> 0.7)
7484
minitest (~> 5.1)
7585
tzinfo (~> 1.1)
76-
rails (5.0.0.rc1)
77-
actioncable (= 5.0.0.rc1)
78-
actionmailer (= 5.0.0.rc1)
79-
actionpack (= 5.0.0.rc1)
80-
actionview (= 5.0.0.rc1)
81-
activejob (= 5.0.0.rc1)
82-
activemodel (= 5.0.0.rc1)
83-
activerecord (= 5.0.0.rc1)
84-
activesupport (= 5.0.0.rc1)
86+
rails (5.1.0.alpha)
87+
actioncable (= 5.1.0.alpha)
88+
actionmailer (= 5.1.0.alpha)
89+
actionpack (= 5.1.0.alpha)
90+
actionview (= 5.1.0.alpha)
91+
activejob (= 5.1.0.alpha)
92+
activemodel (= 5.1.0.alpha)
93+
activerecord (= 5.1.0.alpha)
94+
activesupport (= 5.1.0.alpha)
8595
bundler (>= 1.3.0, < 2.0)
86-
railties (= 5.0.0.rc1)
96+
railties (= 5.1.0.alpha)
8797
sprockets-rails (>= 2.0.0)
88-
railties (5.0.0.rc1)
89-
actionpack (= 5.0.0.rc1)
90-
activesupport (= 5.0.0.rc1)
98+
railties (5.1.0.alpha)
99+
actionpack (= 5.1.0.alpha)
100+
activesupport (= 5.1.0.alpha)
91101
method_source
92102
rake (>= 0.8.7)
93103
thor (>= 0.18.1, < 2.0)
@@ -109,9 +119,6 @@ GEM
109119
bunny (2.2.2)
110120
amq-protocol (>= 2.0.1)
111121
byebug (8.2.5)
112-
coffee-rails (4.1.1)
113-
coffee-script (>= 2.2.0)
114-
railties (>= 4.0.0, < 5.1.x)
115122
coffee-script (2.4.1)
116123
coffee-script-source
117124
execjs
@@ -120,11 +127,6 @@ GEM
120127
connection_pool (2.2.0)
121128
dalli (2.7.6)
122129
dante (0.2.0)
123-
delayed_job (4.1.1)
124-
activesupport (>= 3.0, < 5.0)
125-
delayed_job_active_record (4.1.0)
126-
activerecord (>= 3.0, < 5)
127-
delayed_job (>= 3.0, < 5)
128130
em-hiredis (0.3.1)
129131
eventmachine (~> 1.0)
130132
hiredis (~> 0.6.0)
@@ -185,6 +187,12 @@ GEM
185187
pg (0.18.4-x86-mingw32)
186188
psych (2.0.17)
187189
puma (3.4.0)
190+
qu (0.2.0)
191+
multi_json
192+
qu-redis (0.2.0)
193+
qu (= 0.2.0)
194+
redis-namespace
195+
simple_uuid
188196
que (0.11.4)
189197
racc (1.4.14)
190198
rack (2.0.0.rc1)
@@ -231,6 +239,7 @@ GEM
231239
connection_pool (~> 2.2, >= 2.2.0)
232240
redis (~> 3.2, >= 3.2.1)
233241
sigdump (0.2.4)
242+
simple_uuid (0.4.0)
234243
sinatra (1.0)
235244
rack (>= 1.0)
236245
sneakers (2.3.5)
@@ -284,10 +293,10 @@ DEPENDENCIES
284293
bcrypt (~> 3.1.11)
285294
benchmark-ips
286295
byebug
287-
coffee-rails (~> 4.1.0)
296+
coffee-rails!
288297
dalli (>= 2.2.1)
289-
delayed_job
290-
delayed_job_active_record
298+
delayed_job!
299+
delayed_job_active_record!
291300
em-hiredis
292301
faye-websocket
293302
hiredis
@@ -301,7 +310,6 @@ DEPENDENCIES
301310
pg (>= 0.18.0)
302311
psych (~> 2.0)
303312
puma
304-
qu-rails!
305313
qu-redis
306314
que
307315
queue_classic!

RAILS_VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.0.0.rc1
1+
5.1.0.alpha

actioncable/CHANGELOG.md

+1-87
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,2 @@
1-
## Rails 5.0.0.rc1 (May 06, 2016) ##
21

3-
* No changes.
4-
5-
6-
## Rails 5.0.0.beta4 (April 27, 2016) ##
7-
8-
* WebSocket protocol negotiation.
9-
10-
Introduces an Action Cable protocol version that moves independently
11-
of and, hopefully, more slowly than Action Cable itself. Client sockets
12-
negotiate a protocol with the Cable server using WebSockets' native
13-
subprotocol support:
14-
* https://tools.ietf.org/html/rfc6455#section-1.9
15-
* https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_servers#Subprotocols
16-
17-
If they can't negotiate a compatible protocol (usually due to upgrading
18-
the Cable server with a browser still running old JavaScript) then the
19-
client knows to disconnect, cease retrying, and tell the app that it hit
20-
a protocol mismatch.
21-
22-
This allows us to evolve the Action Cable message format, handshaking,
23-
pings, acknowledgements, and more without breaking older clients'
24-
expectations of server behavior.
25-
26-
*Daniel Rhodes*
27-
28-
* Pubsub: automatic stream decoding.
29-
30-
stream_for @room, coder: ActiveSupport::JSON do |message|
31-
# `message` is a Ruby hash here instead of a JSON string
32-
33-
The `coder` must respond to `#decode`. Defaults to `coder: nil`
34-
which skips decoding entirely.
35-
36-
*Jeremy Daer*
37-
38-
* Add ActiveSupport::Notifications to ActionCable::Channel.
39-
40-
*Matthew Wear*
41-
42-
* Safely support autoloading and class unloading, by preventing concurrent
43-
loads, and disconnecting all cables during reload.
44-
45-
*Matthew Draper*
46-
47-
* Ensure ActionCable behaves correctly for non-string queue names.
48-
49-
*Jay Hayes*
50-
51-
## Rails 5.0.0.beta3 (February 24, 2016) ##
52-
53-
* Added `em_redis_connector` and `redis_connector` to
54-
`ActionCable::SubscriptionAdapter::EventedRedis` and added `redis_connector`
55-
to `ActionCable::SubscriptionAdapter::Redis`, so you can overwrite with your
56-
own initializers. This is used when you want to use different-than-standard
57-
Redis adapters, like for Makara distributed Redis.
58-
59-
*DHH*
60-
61-
## Rails 5.0.0.beta2 (February 01, 2016) ##
62-
63-
* Support PostgreSQL pubsub adapter.
64-
65-
*Jon Moss*
66-
67-
* Remove EventMachine dependency.
68-
69-
*Matthew Draper*
70-
71-
* Remove Celluloid dependency.
72-
73-
*Mike Perham*
74-
75-
* Create notion of an `ActionCable::SubscriptionAdapter`.
76-
Separate out Redis functionality into
77-
`ActionCable::SubscriptionAdapter::Redis`, and add a
78-
PostgreSQL adapter as well. Configuration file for
79-
ActionCable was changed from`config/redis/cable.yml` to
80-
`config/cable.yml`.
81-
82-
*Jon Moss*
83-
84-
## Rails 5.0.0.beta1 (December 18, 2015) ##
85-
86-
* Added to Rails!
87-
88-
*DHH*
2+
Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actioncable/CHANGELOG.md) for previous changes.

actioncable/lib/action_cable/gem_version.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ def self.gem_version
66

77
module VERSION
88
MAJOR = 5
9-
MINOR = 0
9+
MINOR = 1
1010
TINY = 0
11-
PRE = "rc1"
11+
PRE = "alpha"
1212

1313
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
1414
end

0 commit comments

Comments
 (0)