aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--.travis.yml13
-rw-r--r--Gemfile6
-rw-r--r--Gemfile.lock93
-rw-r--r--gemfiles/rails_42.gemfile5
-rw-r--r--lib/action_cable/connection/base.rb2
6 files changed, 84 insertions, 38 deletions
diff --git a/.gitignore b/.gitignore
index 1918a1b0ee..cb2bc5e743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-test/tests.log \ No newline at end of file
+/gemfiles/*.lock
+/test/tests.log
diff --git a/.travis.yml b/.travis.yml
index 99a95ae240..5e156e2b77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,19 @@
-sudo: false
+language: ruby
cache: bundler
+sudo: false
+
rvm:
- 2.2
- ruby-head
+
+gemfile:
+ - Gemfile
+ - gemfiles/rails_4-2-stable.gemfile
+
matrix:
fast_finish: true
+ allow_failures: ruby-head
+
notifications:
email: false
irc:
@@ -16,4 +25,4 @@ notifications:
on_success: change
on_failure: always
rooms:
- - secure: "EZmqsgjEQbWouCx6xL/30jslug7xcq+Dl09twDGjBs369GB5LiUm17/I7d6H1YQFY0Vu2LpiQ/zs+6ihlBjslRV/2RYM3AgAA9OOC3pn7uENFVTXaECi/io1wjvlbMNrf1YJSc3aUyiWKykRsdZnZSFszkDs4DMnZG1s/Oxf1JTYEGNWW3WcOFfYkzcS7NWlOW9OBf4RuzjtLYF05IO4t4FZI1aTWrNV3NNMZ+tqmiQHHNrQE/CzQE3ujqFiea2vVZ7PwvmjVWJgC29UZqS7HcNuq6cCMtMZZuubCZmyT85GjJ/SKTShxFqfV1oCpY3y6kyWcTAQsUoLtPEX0OxLeX+CgWNIJK0rY5+5/v5pZP1uwRsMfLerfp2a9g4fAnlcAKaZjalOc39rOkJl8FdvLQtqFIGWxpjWdJbMrCt3SrnnOccpDqDWpAL798LVBONcOuor71rEeNj1dZ6fCoHTKhLVy6UVm9eUI8zt1APM0xzHgTBI1KBVZi0ikqPcaW604rrNUSk8g/AFQk0pIKyDzV9qYMJD2wnr42cyPKg0gfk1tc9KRCNeH+My1HdZS6Zogpjkc3plAzJQ1DAPY0EBWUlEKghpkyCunjpxN3cw390iKgZUN52phtmGMRkyNnwI8+ELnT4I+Jata1mFyWiETM85q8Rqx+FeA0W/BBsEAp8=" \ No newline at end of file
+ - secure: "EZmqsgjEQbWouCx6xL/30jslug7xcq+Dl09twDGjBs369GB5LiUm17/I7d6H1YQFY0Vu2LpiQ/zs+6ihlBjslRV/2RYM3AgAA9OOC3pn7uENFVTXaECi/io1wjvlbMNrf1YJSc3aUyiWKykRsdZnZSFszkDs4DMnZG1s/Oxf1JTYEGNWW3WcOFfYkzcS7NWlOW9OBf4RuzjtLYF05IO4t4FZI1aTWrNV3NNMZ+tqmiQHHNrQE/CzQE3ujqFiea2vVZ7PwvmjVWJgC29UZqS7HcNuq6cCMtMZZuubCZmyT85GjJ/SKTShxFqfV1oCpY3y6kyWcTAQsUoLtPEX0OxLeX+CgWNIJK0rY5+5/v5pZP1uwRsMfLerfp2a9g4fAnlcAKaZjalOc39rOkJl8FdvLQtqFIGWxpjWdJbMrCt3SrnnOccpDqDWpAL798LVBONcOuor71rEeNj1dZ6fCoHTKhLVy6UVm9eUI8zt1APM0xzHgTBI1KBVZi0ikqPcaW604rrNUSk8g/AFQk0pIKyDzV9qYMJD2wnr42cyPKg0gfk1tc9KRCNeH+My1HdZS6Zogpjkc3plAzJQ1DAPY0EBWUlEKghpkyCunjpxN3cw390iKgZUN52phtmGMRkyNnwI8+ELnT4I+Jata1mFyWiETM85q8Rqx+FeA0W/BBsEAp8="
diff --git a/Gemfile b/Gemfile
index 851fabc21d..d2eaf07c80 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,8 @@
source 'https://rubygems.org'
+
+gem 'activesupport', github: 'rails/rails'
+gem 'actionpack', github: 'rails/rails'
+gem 'arel', github: 'rails/arel'
+gem 'rack', github: 'rack/rack'
+
gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 5548531abe..7f128bbdd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,47 @@
+GIT
+ remote: git://github.com/rack/rack.git
+ revision: 6216a3f8a3560639ee1ddadc1e0d6bf9e5f31830
+ specs:
+ rack (2.0.0.alpha)
+ json
+
+GIT
+ remote: git://github.com/rails/arel.git
+ revision: 3c429c5d86e9e2201c2a35d934ca6a8911c18e69
+ specs:
+ arel (7.0.0.alpha)
+
+GIT
+ remote: git://github.com/rails/rails.git
+ revision: 960de47f0eef79d234eb3cfc47fabb470fef1529
+ specs:
+ actionpack (5.0.0.alpha)
+ actionview (= 5.0.0.alpha)
+ activesupport (= 5.0.0.alpha)
+ rack (~> 2.x)
+ rack-test (~> 0.6.3)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ actionview (5.0.0.alpha)
+ activesupport (= 5.0.0.alpha)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ activesupport (5.0.0.alpha)
+ concurrent-ruby (~> 1.0.0.pre3, < 2.0.0)
+ i18n (~> 0.7)
+ json (~> 1.7, >= 1.7.7)
+ method_source
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ railties (5.0.0.alpha)
+ actionpack (= 5.0.0.alpha)
+ activesupport (= 5.0.0.alpha)
+ method_source
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+
PATH
remote: .
specs:
@@ -14,27 +58,8 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- actionpack (4.2.3)
- actionview (= 4.2.3)
- activesupport (= 4.2.3)
- rack (~> 1.6)
- rack-test (~> 0.6.2)
- rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.3)
- activesupport (= 4.2.3)
- builder (~> 3.1)
- erubis (~> 2.7.0)
- rails-dom-testing (~> 1.0, >= 1.0.5)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activesupport (4.2.3)
- i18n (~> 0.7)
- json (~> 1.7, >= 1.7.7)
- minitest (~> 5.1)
- thread_safe (~> 0.3, >= 0.3.4)
- tzinfo (~> 1.1)
builder (3.2.2)
- celluloid (0.16.0)
+ celluloid (0.16.1)
timers (~> 4.0.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
@@ -43,50 +68,46 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
+ concurrent-ruby (1.0.0.pre4)
em-hiredis (0.3.0)
eventmachine (~> 1.0)
hiredis (~> 0.5.0)
erubis (2.7.0)
- eventmachine (1.0.7)
- execjs (2.5.2)
+ eventmachine (1.0.8)
+ execjs (2.6.0)
faye-websocket (0.10.0)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
hiredis (0.5.2)
- hitimes (1.2.2)
+ hitimes (1.2.3)
i18n (0.7.0)
json (1.8.3)
- loofah (2.0.2)
+ loofah (2.0.3)
nokogiri (>= 1.5.9)
metaclass (0.0.4)
+ method_source (0.8.2)
mini_portile (0.6.2)
- minitest (5.7.0)
+ minitest (5.8.1)
mocha (1.1.0)
metaclass (~> 0.0.1)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
puma (2.12.2)
- rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
- rails-dom-testing (1.0.6)
+ rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
- railties (4.2.3)
- actionpack (= 4.2.3)
- activesupport (= 4.2.3)
- rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
rake (10.4.2)
redis (3.2.1)
thor (0.19.1)
thread_safe (0.3.5)
- timers (4.0.1)
+ timers (4.0.4)
hitimes
tzinfo (1.2.2)
thread_safe (~> 0.1)
@@ -99,9 +120,13 @@ PLATFORMS
DEPENDENCIES
actioncable!
+ actionpack!
+ activesupport!
+ arel!
mocha
puma
+ rack!
rake
BUNDLED WITH
- 1.10.5
+ 1.10.6
diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile
new file mode 100644
index 0000000000..8ca60d69db
--- /dev/null
+++ b/gemfiles/rails_42.gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.2.4'
+
+gemspec path: '..'
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index bc07f5c51f..de27628d7d 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -1,4 +1,4 @@
-require 'action_dispatch/http/request'
+require 'action_dispatch'
module ActionCable
module Connection
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 23:56:23 +0000