diff --git a/.gitignore b/.gitignore
index aaf151b..b312821 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,7 @@ vendor/ruby
Vagrantfile
.vagrant
.idea
+
+# wwtd
+gemfiles/.bundle
+vendor/
diff --git a/.travis.yml b/.travis.yml
index 40d3cb5..c0531a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,26 @@
language: ruby
sudo: false
rvm:
+ - 2.0.0
- 2.1.10
- - 2.2.6
- - 2.3.3
- - 2.4.0
- - jruby-9.0.5.0
- - jruby-9.1.8.0
- - rbx
+ - 2.2.7
+ - 2.3.4
+ - 2.4.1
services: redis
before_script:
- cd test/dummy && RAILS_ENV=test bundle exec rake db:migrate && cd -
+gemfile:
+ - gemfiles/rails40.gemfile
+ - gemfiles/rails41.gemfile
+ - gemfiles/rails42.gemfile
+ - gemfiles/rails50.gemfile
matrix:
- allow_failures:
- - rvm: rbx
+ exclude:
+ - rvm: 2.4.1
+ gemfile: gemfiles/rails40.gemfile
+ - rvm: 2.4.1
+ gemfile: gemfiles/rails41.gemfile
+ - rvm: 2.0.0
+ gemfile: gemfiles/rails50.gemfile
+ - rvm: 2.1.10
+ gemfile: gemfiles/rails50.gemfile
diff --git a/Appraisals b/Appraisals
new file mode 100644
index 0000000..ad8e924
--- /dev/null
+++ b/Appraisals
@@ -0,0 +1,23 @@
+if RUBY_VERSION < "2.4.0"
+ appraise 'rails40' do
+ gem 'rails', '~> 4.0.13'
+ gem 'nokogiri', '~> 1.6.0'
+ end
+
+ appraise 'rails41' do
+ gem 'rails', '~> 4.1.16'
+ gem 'nokogiri', '~> 1.6.0'
+ end
+end
+
+appraise 'rails42' do
+ gem 'rails', '~> 4.2.8'
+ gem 'nokogiri', '~> 1.6.0'
+end
+
+if RUBY_VERSION >= "2.2.0"
+ appraise 'rails50' do
+ gem 'rails', '~> 5.0.2'
+ gem 'rails-controller-testing'
+ end
+end
diff --git a/Gemfile b/Gemfile
index 8005544..12abe60 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,38 +1,12 @@
source 'https://rubygems.org'
gemspec
-gem 'rails', '~> 5.0.0'
-gem 'resque', github: 'resque'
-gem 'sqlite3', :platforms => :ruby
-gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'rails-5', :platforms => :jruby
-
-group :development, :test do
- gem "dotenv-rails"
- gem "rdoc"
- gem 'listen', '~> 3.0.5'
-end
-
-group :test do
- gem 'minitest-spec-rails'
- gem 'coveralls', :require => false
- gem 'redcard'
- gem "mocha", :require => false
- gem 'rails-controller-testing'
-end
-
-
-gem 'uglifier', '>= 1.0.3'
-
-gem 'libv8', '~> 3.16.14.15', :platforms => :ruby
-gem 'therubyracer', '~> 0.12.2', :platforms => :ruby
-gem 'therubyrhino', '2.0.4', :platforms => :jruby
-
-platforms :rbx do
- # These are the ruby standard library
- # dependencies and transitive dependencies.
- gem 'rubysl', '~> 2.0'
- gem 'racc'
- gem 'rubinius-profiler'
- gem 'rubinius-coverage'
-end
+gem 'appraisal'
+gem 'uglifier'
+gem 'sqlite3'
+gem 'dotenv-rails'
+gem 'minitest-spec-rails'
+gem 'coveralls', require: false
+gem 'redcard'
+gem 'mocha', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ee6876..50073f2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,30 +1,9 @@
-GIT
- remote: git://github.com/jruby/activerecord-jdbc-adapter.git
- revision: c3570ce730ae013df6644b2d4d6c68080e09ee6a
- branch: rails-5
- specs:
- activerecord-jdbc-adapter (1.3.20)
- activerecord (>= 2.2)
- activerecord-jdbcsqlite3-adapter (1.3.20)
- activerecord-jdbc-adapter (~> 1.3.20)
- jdbc-sqlite3 (>= 3.7.2, < 3.9)
-
-GIT
- remote: git://github.com/resque/resque.git
- revision: 5338646b6c19ed5f290fbf16a95e80cb4a33155d
- specs:
- resque (1.27.0)
- mono_logger (~> 1.0)
- multi_json (~> 1.0)
- redis-namespace (~> 1.3)
- sinatra (>= 0.9.2)
- vegas (~> 0.1.2)
-
PATH
remote: .
specs:
resque-web (0.0.9)
coffee-rails
+ font-awesome-sass
jquery-rails
resque
sass-rails
@@ -33,45 +12,49 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- actioncable (5.0.0)
- actionpack (= 5.0.0)
- nio4r (~> 1.2)
+ actioncable (5.0.2)
+ actionpack (= 5.0.2)
+ nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
- actionmailer (5.0.0)
- actionpack (= 5.0.0)
- actionview (= 5.0.0)
- activejob (= 5.0.0)
+ actionmailer (5.0.2)
+ actionpack (= 5.0.2)
+ actionview (= 5.0.2)
+ activejob (= 5.0.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.0)
- actionview (= 5.0.0)
- activesupport (= 5.0.0)
+ actionpack (5.0.2)
+ actionview (= 5.0.2)
+ activesupport (= 5.0.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.0)
- activesupport (= 5.0.0)
+ actionview (5.0.2)
+ activesupport (= 5.0.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
- activejob (5.0.0)
- activesupport (= 5.0.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
+ activejob (5.0.2)
+ activesupport (= 5.0.2)
globalid (>= 0.3.6)
- activemodel (5.0.0)
- activesupport (= 5.0.0)
- activerecord (5.0.0)
- activemodel (= 5.0.0)
- activesupport (= 5.0.0)
+ activemodel (5.0.2)
+ activesupport (= 5.0.2)
+ activerecord (5.0.2)
+ activemodel (= 5.0.2)
+ activesupport (= 5.0.2)
arel (~> 7.0)
- activesupport (5.0.0)
+ activesupport (5.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
- arel (7.0.0)
- builder (3.2.2)
+ appraisal (2.1.0)
+ bundler
+ rake
+ thor (>= 0.14.0)
+ arel (7.1.4)
+ builder (3.2.3)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
@@ -80,37 +63,32 @@ GEM
execjs
coffee-script-source (1.12.2)
commonjs (0.2.7)
- concurrent-ruby (1.0.2)
- concurrent-ruby (1.0.2-java)
- coveralls (0.8.1)
- json (~> 1.8)
- rest-client (>= 1.6.8, < 2)
- simplecov (~> 0.10.0)
+ concurrent-ruby (1.0.5)
+ concurrent-ruby (1.0.5-java)
+ coveralls (0.8.19)
+ json (>= 1.8, < 3)
+ simplecov (~> 0.12.0)
term-ansicolor (~> 1.3)
thor (~> 0.19.1)
+ tins (~> 1.6)
docile (1.1.5)
- domain_name (0.5.24)
- unf (>= 0.0.5, < 1.0.0)
- dotenv (2.0.1)
- dotenv-rails (2.0.1)
- dotenv (= 2.0.1)
+ dotenv (2.2.0)
+ dotenv-rails (2.2.0)
+ dotenv (= 2.2.0)
+ railties (>= 3.2, < 5.1)
erubis (2.7.0)
- execjs (2.5.2)
- ffi (1.9.14)
- ffi (1.9.14-java)
- ffi2-generators (0.1.1)
- globalid (0.3.6)
+ execjs (2.7.0)
+ font-awesome-sass (4.7.0)
+ sass (>= 3.2)
+ globalid (0.3.7)
activesupport (>= 4.1.0)
- http-cookie (1.0.2)
- domain_name (~> 0.5)
- i18n (0.7.0)
- jdbc-sqlite3 (3.8.11.2)
- jquery-rails (4.2.2)
+ i18n (0.8.1)
+ jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
- json (1.8.3)
- json (1.8.3-java)
+ json (2.0.3)
+ json (2.0.3-java)
less (2.6.0)
commonjs (~> 0.2.7)
less-rails (2.8.0)
@@ -118,280 +96,66 @@ GEM
less (~> 2.6.0)
sprockets (> 2, < 4)
tilt
- libv8 (3.16.14.15)
- listen (3.0.8)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
metaclass (0.0.4)
method_source (0.8.2)
- mime-types (2.99.2)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
- minitest (5.9.0)
- minitest-spec-rails (5.3.0)
+ minitest (5.10.1)
+ minitest-spec-rails (5.4.0)
minitest (~> 5.0)
rails (>= 4.1)
- mocha (1.1.0)
+ mocha (1.2.1)
metaclass (~> 0.0.1)
mono_logger (1.1.0)
multi_json (1.12.1)
- netrc (0.10.3)
- nio4r (1.2.1)
- nio4r (1.2.1-java)
- nokogiri (1.6.8)
+ nio4r (2.0.0)
+ nio4r (2.0.0-java)
+ nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
- pkg-config (~> 1.1.7)
- nokogiri (1.6.8-java)
- pkg-config (1.1.7)
- racc (1.4.12)
+ nokogiri (1.7.1-java)
rack (2.0.1)
rack-test (0.6.3)
rack (>= 1.0)
- rails (5.0.0)
- actioncable (= 5.0.0)
- actionmailer (= 5.0.0)
- actionpack (= 5.0.0)
- actionview (= 5.0.0)
- activejob (= 5.0.0)
- activemodel (= 5.0.0)
- activerecord (= 5.0.0)
- activesupport (= 5.0.0)
+ rails (5.0.2)
+ actioncable (= 5.0.2)
+ actionmailer (= 5.0.2)
+ actionpack (= 5.0.2)
+ actionview (= 5.0.2)
+ activejob (= 5.0.2)
+ activemodel (= 5.0.2)
+ activerecord (= 5.0.2)
+ activesupport (= 5.0.2)
bundler (>= 1.3.0, < 2.0)
- railties (= 5.0.0)
+ railties (= 5.0.2)
sprockets-rails (>= 2.0.0)
- rails-controller-testing (0.1.1)
- actionpack (~> 5.x)
- actionview (~> 5.x)
- activesupport (~> 5.x)
- rails-dom-testing (2.0.1)
+ rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
- nokogiri (~> 1.6.0)
+ nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- railties (5.0.0)
- actionpack (= 5.0.0)
- activesupport (= 5.0.0)
+ railties (5.0.2)
+ actionpack (= 5.0.2)
+ activesupport (= 5.0.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- rake (11.2.2)
- rb-fsevent (0.9.7)
- rb-inotify (0.9.7)
- ffi (>= 0.5.0)
- rdoc (4.2.0)
+ rake (12.0.0)
redcard (1.1.0)
- redis (3.3.0)
- redis-namespace (1.5.2)
+ redis (3.3.3)
+ redis-namespace (1.5.3)
redis (~> 3.0, >= 3.0.4)
- ref (1.0.5)
- rest-client (1.8.0)
- http-cookie (>= 1.0.2, < 2.0)
- mime-types (>= 1.16, < 3.0)
- netrc (~> 0.7)
- rubinius-coverage (2.0.3)
- rubinius-profiler (2.0.2)
- rubysl (2.1.0)
- rubysl-abbrev (~> 2.0)
- rubysl-base64 (~> 2.0)
- rubysl-benchmark (~> 2.0)
- rubysl-bigdecimal (~> 2.0)
- rubysl-cgi (~> 2.0)
- rubysl-cgi-session (~> 2.0)
- rubysl-cmath (~> 2.0)
- rubysl-complex (~> 2.0)
- rubysl-continuation (~> 2.0)
- rubysl-coverage (~> 2.0)
- rubysl-csv (~> 2.0)
- rubysl-curses (~> 2.0)
- rubysl-date (~> 2.0)
- rubysl-delegate (~> 2.0)
- rubysl-digest (~> 2.0)
- rubysl-drb (~> 2.0)
- rubysl-e2mmap (~> 2.0)
- rubysl-english (~> 2.0)
- rubysl-enumerator (~> 2.0)
- rubysl-erb (~> 2.0)
- rubysl-etc (~> 2.0)
- rubysl-expect (~> 2.0)
- rubysl-fcntl (~> 2.0)
- rubysl-fiber (~> 2.0)
- rubysl-fileutils (~> 2.0)
- rubysl-find (~> 2.0)
- rubysl-forwardable (~> 2.0)
- rubysl-getoptlong (~> 2.0)
- rubysl-gserver (~> 2.0)
- rubysl-io-console (~> 2.0)
- rubysl-io-nonblock (~> 2.0)
- rubysl-io-wait (~> 2.0)
- rubysl-ipaddr (~> 2.0)
- rubysl-irb (~> 2.1)
- rubysl-logger (~> 2.0)
- rubysl-mathn (~> 2.0)
- rubysl-matrix (~> 2.0)
- rubysl-mkmf (~> 2.0)
- rubysl-monitor (~> 2.0)
- rubysl-mutex_m (~> 2.0)
- rubysl-net-ftp (~> 2.0)
- rubysl-net-http (~> 2.0)
- rubysl-net-imap (~> 2.0)
- rubysl-net-pop (~> 2.0)
- rubysl-net-protocol (~> 2.0)
- rubysl-net-smtp (~> 2.0)
- rubysl-net-telnet (~> 2.0)
- rubysl-nkf (~> 2.0)
- rubysl-observer (~> 2.0)
- rubysl-open-uri (~> 2.0)
- rubysl-open3 (~> 2.0)
- rubysl-openssl (~> 2.0)
- rubysl-optparse (~> 2.0)
- rubysl-ostruct (~> 2.0)
- rubysl-pathname (~> 2.0)
- rubysl-prettyprint (~> 2.0)
- rubysl-prime (~> 2.0)
- rubysl-profile (~> 2.0)
- rubysl-profiler (~> 2.0)
- rubysl-pstore (~> 2.0)
- rubysl-pty (~> 2.0)
- rubysl-rational (~> 2.0)
- rubysl-resolv (~> 2.0)
- rubysl-rexml (~> 2.0)
- rubysl-rinda (~> 2.0)
- rubysl-rss (~> 2.0)
- rubysl-scanf (~> 2.0)
- rubysl-securerandom (~> 2.0)
- rubysl-set (~> 2.0)
- rubysl-shellwords (~> 2.0)
- rubysl-singleton (~> 2.0)
- rubysl-socket (~> 2.0)
- rubysl-stringio (~> 2.0)
- rubysl-strscan (~> 2.0)
- rubysl-sync (~> 2.0)
- rubysl-syslog (~> 2.0)
- rubysl-tempfile (~> 2.0)
- rubysl-thread (~> 2.0)
- rubysl-thwait (~> 2.0)
- rubysl-time (~> 2.0)
- rubysl-timeout (~> 2.0)
- rubysl-tmpdir (~> 2.0)
- rubysl-tsort (~> 2.0)
- rubysl-un (~> 2.0)
- rubysl-uri (~> 2.0)
- rubysl-weakref (~> 2.0)
- rubysl-webrick (~> 2.0)
- rubysl-xmlrpc (~> 2.0)
- rubysl-yaml (~> 2.0)
- rubysl-zlib (~> 2.0)
- rubysl-abbrev (2.0.4)
- rubysl-base64 (2.0.0)
- rubysl-benchmark (2.0.1)
- rubysl-bigdecimal (2.0.2)
- rubysl-cgi (2.0.1)
- rubysl-cgi-session (2.0.1)
- rubysl-cmath (2.0.0)
- rubysl-complex (2.0.0)
- rubysl-continuation (2.0.0)
- rubysl-coverage (2.0.3)
- rubysl-csv (2.0.2)
- rubysl-english (~> 2.0)
- rubysl-curses (2.0.1)
- rubysl-date (2.0.9)
- rubysl-delegate (2.0.1)
- rubysl-digest (2.0.8)
- rubysl-drb (2.0.1)
- rubysl-e2mmap (2.0.0)
- rubysl-english (2.0.0)
- rubysl-enumerator (2.0.0)
- rubysl-erb (2.0.2)
- rubysl-etc (2.0.3)
- ffi2-generators (~> 0.1)
- rubysl-expect (2.0.0)
- rubysl-fcntl (2.0.4)
- ffi2-generators (~> 0.1)
- rubysl-fiber (2.0.0)
- rubysl-fileutils (2.0.3)
- rubysl-find (2.0.1)
- rubysl-forwardable (2.0.1)
- rubysl-getoptlong (2.0.0)
- rubysl-gserver (2.0.0)
- rubysl-socket (~> 2.0)
- rubysl-thread (~> 2.0)
- rubysl-io-console (2.0.0)
- rubysl-io-nonblock (2.0.0)
- rubysl-io-wait (2.0.0)
- rubysl-ipaddr (2.0.0)
- rubysl-irb (2.1.1)
- rubysl-e2mmap (~> 2.0)
- rubysl-mathn (~> 2.0)
- rubysl-thread (~> 2.0)
- rubysl-logger (2.1.0)
- rubysl-mathn (2.0.0)
- rubysl-matrix (2.1.0)
- rubysl-e2mmap (~> 2.0)
- rubysl-mkmf (2.0.1)
- rubysl-fileutils (~> 2.0)
- rubysl-shellwords (~> 2.0)
- rubysl-monitor (2.0.0)
- rubysl-mutex_m (2.0.0)
- rubysl-net-ftp (2.0.1)
- rubysl-net-http (2.0.4)
- rubysl-cgi (~> 2.0)
- rubysl-erb (~> 2.0)
- rubysl-singleton (~> 2.0)
- rubysl-net-imap (2.0.1)
- rubysl-net-pop (2.0.1)
- rubysl-net-protocol (2.0.1)
- rubysl-net-smtp (2.0.1)
- rubysl-net-telnet (2.0.0)
- rubysl-nkf (2.0.1)
- rubysl-observer (2.0.0)
- rubysl-open-uri (2.0.0)
- rubysl-open3 (2.0.0)
- rubysl-openssl (2.3.0)
- rubysl-optparse (2.0.1)
- rubysl-shellwords (~> 2.0)
- rubysl-ostruct (2.0.4)
- rubysl-pathname (2.1.0)
- rubysl-prettyprint (2.0.3)
- rubysl-prime (2.0.1)
- rubysl-profile (2.0.0)
- rubysl-profiler (2.0.1)
- rubysl-pstore (2.0.0)
- rubysl-pty (2.0.3)
- rubysl-rational (2.0.1)
- rubysl-resolv (2.1.2)
- rubysl-rexml (2.0.4)
- rubysl-rinda (2.0.1)
- rubysl-rss (2.0.0)
- rubysl-scanf (2.0.0)
- rubysl-securerandom (2.0.0)
- rubysl-set (2.0.1)
- rubysl-shellwords (2.0.0)
- rubysl-singleton (2.0.0)
- rubysl-socket (2.0.1)
- rubysl-stringio (2.0.0)
- rubysl-strscan (2.0.0)
- rubysl-sync (2.0.0)
- rubysl-syslog (2.1.0)
- ffi2-generators (~> 0.1)
- rubysl-tempfile (2.0.1)
- rubysl-thread (2.0.3)
- rubysl-thwait (2.0.0)
- rubysl-time (2.0.3)
- rubysl-timeout (2.0.0)
- rubysl-tmpdir (2.0.1)
- rubysl-tsort (2.0.1)
- rubysl-un (2.0.0)
- rubysl-fileutils (~> 2.0)
- rubysl-optparse (~> 2.0)
- rubysl-uri (2.0.0)
- rubysl-weakref (2.0.0)
- rubysl-webrick (2.0.0)
- rubysl-xmlrpc (2.0.0)
- rubysl-yaml (2.1.0)
- rubysl-zlib (2.0.1)
+ resque (1.27.2)
+ mono_logger (~> 1.0)
+ multi_json (~> 1.0)
+ redis-namespace (~> 1.3)
+ sinatra (>= 0.9.2)
+ vegas (~> 0.1.2)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
@@ -399,53 +163,42 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
- simplecov (0.10.0)
+ simplecov (0.12.0)
docile (~> 1.1.0)
- json (~> 1.8)
+ json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sinatra (1.0)
rack (>= 1.0)
- sprockets (3.6.3)
+ sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.1.1)
+ sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- sqlite3 (1.3.10)
- term-ansicolor (1.3.0)
+ sqlite3 (1.3.13)
+ term-ansicolor (1.4.0)
tins (~> 1.0)
- therubyracer (0.12.2)
- libv8 (~> 3.16.14.0)
- ref
- therubyrhino (2.0.4)
- therubyrhino_jar (>= 1.7.3)
- therubyrhino_jar (1.7.6)
- thor (0.19.1)
- thread_safe (0.3.5)
- thread_safe (0.3.5-java)
- tilt (2.0.6)
- tins (1.5.1)
- twitter-bootstrap-rails (3.2.2)
- actionpack (>= 3.1)
- execjs (>= 2.2.2, >= 2.2)
- less-rails (>= 2.5.0)
- railties (>= 3.1)
- tzinfo (1.2.2)
+ thor (0.19.4)
+ thread_safe (0.3.6)
+ thread_safe (0.3.6-java)
+ tilt (2.0.7)
+ tins (1.13.2)
+ twitter-bootstrap-rails (4.0.0)
+ actionpack (~> 5.0, >= 5.0.1)
+ execjs (~> 2.7)
+ less-rails (~> 2.8, >= 2.8.0)
+ railties (~> 5.0, >= 5.0.1)
+ tzinfo (1.2.3)
thread_safe (~> 0.1)
- uglifier (2.7.1)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
- unf (0.1.4)
- unf_ext
- unf (0.1.4-java)
- unf_ext (0.0.7.1)
+ uglifier (3.1.12)
+ execjs (>= 0.3.0, < 3)
vegas (0.1.11)
rack (>= 1.0.0)
- websocket-driver (0.6.4)
+ websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
- websocket-driver (0.6.4-java)
+ websocket-driver (0.6.5-java)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
@@ -454,27 +207,15 @@ PLATFORMS
ruby
DEPENDENCIES
- activerecord-jdbcsqlite3-adapter!
+ appraisal
coveralls
dotenv-rails
- libv8 (~> 3.16.14.15)
- listen (~> 3.0.5)
minitest-spec-rails
mocha
- racc
- rails (~> 5.0.0)
- rails-controller-testing
- rdoc
redcard
- resque!
resque-web!
- rubinius-coverage
- rubinius-profiler
- rubysl (~> 2.0)
sqlite3
- therubyracer (~> 0.12.2)
- therubyrhino (= 2.0.4)
- uglifier (>= 1.0.3)
+ uglifier
BUNDLED WITH
- 1.14.4
+ 1.14.6
diff --git a/README.md b/README.md
index d50fdde..303eb4b 100644
--- a/README.md
+++ b/README.md
@@ -87,3 +87,22 @@ an engine under a specific namespace. Read more in PLUGINS.md.
## Screenshot
![Screenshot](http://i.imgur.com/LkNgl.png)
+
+## Developing
+
+We use [Appraisal](https://github.com/thoughtbot/appraisal) to test gem across multiple rails version.
+
+To run tests locally you need to install generic dependencies and dependencies for each appraisal version by running:
+
+```
+bundle install
+appraisal install
+```
+
+And then you can use following command for testing lib with latest rails version 5.0:
+
+```
+appraisal rails50 rake test
+```
+
+If you want to run tests for all rails version like Travis do check out this library: (WWTD)[https://github.com/grosser/wwtd].
diff --git a/Rakefile b/Rakefile
index 1991b96..ee19baf 100644
--- a/Rakefile
+++ b/Rakefile
@@ -28,6 +28,7 @@ Rake::TestTask.new(:test) do |t|
t.libs << 'test'
t.pattern = 'test/**/*_test.rb'
t.verbose = false
+ t.warning = false
end
diff --git a/app/controllers/resque_web/stats_controller.rb b/app/controllers/resque_web/stats_controller.rb
index ff527d6..0e62313 100644
--- a/app/controllers/resque_web/stats_controller.rb
+++ b/app/controllers/resque_web/stats_controller.rb
@@ -16,7 +16,7 @@ def resque
def redis
respond_to do |format|
format.html
- format.json { render json: Hash[Resque.redis.info.sort] }
+ format.json { render json: Hash[Resque.redis.redis.info.sort] }
end
end
diff --git a/app/helpers/resque_web/stats_helper.rb b/app/helpers/resque_web/stats_helper.rb
index f58c703..c020d65 100644
--- a/app/helpers/resque_web/stats_helper.rb
+++ b/app/helpers/resque_web/stats_helper.rb
@@ -5,7 +5,7 @@ def resque_info
end
def redis_info
- Resque.redis.info.to_a.sort_by { |i| i[0].to_s }
+ Resque.redis.redis.info.to_a.sort_by { |i| i[0].to_s }
end
def redis_key_type(key)
diff --git a/app/views/resque_web/working/_working.html.erb b/app/views/resque_web/working/_working.html.erb
index 5697a7e..4fb7228 100644
--- a/app/views/resque_web/working/_working.html.erb
+++ b/app/views/resque_web/working/_working.html.erb
@@ -16,7 +16,7 @@
<% sorted_worker_jobs.each do |worker, job| %>
<%= image_tag "resque_web/#{worker.state}.png", :alt => worker.state, :title => worker.state %> |
- <% host, pid, queues = worker.to_s.split(':') %>
+ <% host, pid, _ = worker.to_s.split(':') %>
<%= link_to "#{host}:#{pid}", worker_path(host) %> |
<%= link_to job['queue'], queue_path(job['queue']), :class => 'label label-info' %>
diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile
new file mode 100644
index 0000000..c797c7e
--- /dev/null
+++ b/gemfiles/rails40.gemfile
@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "uglifier"
+gem "sqlite3"
+gem "dotenv-rails"
+gem "minitest-spec-rails"
+gem "coveralls", :require => false
+gem "redcard"
+gem "mocha", :require => false
+gem "pry"
+gem "rails", "~> 4.0.13"
+gem "nokogiri", "~> 1.6.0"
+
+gemspec :path => "../"
diff --git a/gemfiles/rails40.gemfile.lock b/gemfiles/rails40.gemfile.lock
new file mode 100644
index 0000000..95c2887
--- /dev/null
+++ b/gemfiles/rails40.gemfile.lock
@@ -0,0 +1,193 @@
+PATH
+ remote: ..
+ specs:
+ resque-web (0.0.9)
+ coffee-rails
+ font-awesome-sass
+ jquery-rails
+ resque
+ sass-rails
+ twitter-bootstrap-rails
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ actionmailer (4.0.13)
+ actionpack (= 4.0.13)
+ mail (~> 2.5, >= 2.5.4)
+ actionpack (4.0.13)
+ activesupport (= 4.0.13)
+ builder (~> 3.1.0)
+ erubis (~> 2.7.0)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.13)
+ activesupport (= 4.0.13)
+ builder (~> 3.1.0)
+ activerecord (4.0.13)
+ activemodel (= 4.0.13)
+ activerecord-deprecated_finders (~> 1.0.2)
+ activesupport (= 4.0.13)
+ arel (~> 4.0.0)
+ activerecord-deprecated_finders (1.0.4)
+ activesupport (4.0.13)
+ i18n (~> 0.6, >= 0.6.9)
+ minitest (~> 4.2)
+ multi_json (~> 1.3)
+ thread_safe (~> 0.1)
+ tzinfo (~> 0.3.37)
+ appraisal (2.1.0)
+ bundler
+ rake
+ thor (>= 0.14.0)
+ arel (4.0.2)
+ builder (3.1.4)
+ coderay (1.1.1)
+ coffee-rails (4.2.1)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0, < 5.2.x)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.12.2)
+ commonjs (0.2.7)
+ concurrent-ruby (1.0.5)
+ coveralls (0.8.20)
+ json (>= 1.8, < 3)
+ simplecov (~> 0.14.1)
+ term-ansicolor (~> 1.3)
+ thor (~> 0.19.4)
+ tins (~> 1.6)
+ docile (1.1.5)
+ dotenv (2.2.0)
+ dotenv-rails (2.2.0)
+ dotenv (= 2.2.0)
+ railties (>= 3.2, < 5.1)
+ erubis (2.7.0)
+ execjs (2.7.0)
+ font-awesome-sass (4.7.0)
+ sass (>= 3.2)
+ i18n (0.8.1)
+ jquery-rails (3.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (2.0.3)
+ less (2.6.0)
+ commonjs (~> 0.2.7)
+ less-rails (2.8.0)
+ actionpack (>= 4.0)
+ less (~> 2.6.0)
+ sprockets (> 2, < 4)
+ tilt
+ mail (2.6.4)
+ mime-types (>= 1.16, < 4)
+ metaclass (0.0.4)
+ method_source (0.8.2)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.1.0)
+ minitest (4.7.5)
+ minitest-spec-rails (4.7.10)
+ minitest (~> 4.7)
+ rails (>= 3.0, < 4.1)
+ mocha (1.2.1)
+ metaclass (~> 0.0.1)
+ mono_logger (1.1.0)
+ multi_json (1.12.1)
+ nokogiri (1.6.8.1)
+ mini_portile2 (~> 2.1.0)
+ pry (0.10.4)
+ coderay (~> 1.1.0)
+ method_source (~> 0.8.1)
+ slop (~> 3.4)
+ rack (1.5.5)
+ rack-protection (1.5.3)
+ rack
+ rack-test (0.6.3)
+ rack (>= 1.0)
+ rails (4.0.13)
+ actionmailer (= 4.0.13)
+ actionpack (= 4.0.13)
+ activerecord (= 4.0.13)
+ activesupport (= 4.0.13)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.0.13)
+ sprockets-rails (~> 2.0)
+ railties (4.0.13)
+ actionpack (= 4.0.13)
+ activesupport (= 4.0.13)
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rake (12.0.0)
+ redcard (1.1.0)
+ redis (3.3.3)
+ redis-namespace (1.5.3)
+ redis (~> 3.0, >= 3.0.4)
+ resque (1.27.2)
+ mono_logger (~> 1.0)
+ multi_json (~> 1.0)
+ redis-namespace (~> 1.3)
+ sinatra (>= 0.9.2)
+ vegas (~> 0.1.2)
+ sass (3.4.23)
+ sass-rails (5.0.6)
+ railties (>= 4.0.0, < 6)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
+ simplecov (0.14.1)
+ docile (~> 1.1.0)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.0)
+ sinatra (1.4.8)
+ rack (~> 1.5)
+ rack-protection (~> 1.4)
+ tilt (>= 1.3, < 3)
+ slop (3.6.0)
+ sprockets (3.7.1)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (2.3.3)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (>= 2.8, < 4.0)
+ sqlite3 (1.3.13)
+ term-ansicolor (1.5.0)
+ tins (~> 1.0)
+ thor (0.19.4)
+ thread_safe (0.3.6)
+ tilt (2.0.7)
+ tins (1.13.2)
+ twitter-bootstrap-rails (3.2.2)
+ actionpack (>= 3.1)
+ execjs (>= 2.2.2, >= 2.2)
+ less-rails (>= 2.5.0)
+ railties (>= 3.1)
+ tzinfo (0.3.53)
+ uglifier (3.1.12)
+ execjs (>= 0.3.0, < 3)
+ vegas (0.1.11)
+ rack (>= 1.0.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ appraisal
+ coveralls
+ dotenv-rails
+ minitest-spec-rails
+ mocha
+ nokogiri (~> 1.6.0)
+ pry
+ rails (~> 4.0.13)
+ redcard
+ resque-web!
+ sqlite3
+ uglifier
+
+BUNDLED WITH
+ 1.14.6
diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile
new file mode 100644
index 0000000..422b7e9
--- /dev/null
+++ b/gemfiles/rails41.gemfile
@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "uglifier"
+gem "sqlite3"
+gem "dotenv-rails"
+gem "minitest-spec-rails"
+gem "coveralls", :require => false
+gem "redcard"
+gem "mocha", :require => false
+gem "pry"
+gem "rails", "~> 4.1.16"
+gem "nokogiri", "~> 1.6.0"
+
+gemspec :path => "../"
diff --git a/gemfiles/rails41.gemfile.lock b/gemfiles/rails41.gemfile.lock
new file mode 100644
index 0000000..abd0393
--- /dev/null
+++ b/gemfiles/rails41.gemfile.lock
@@ -0,0 +1,198 @@
+PATH
+ remote: ..
+ specs:
+ resque-web (0.0.9)
+ coffee-rails
+ font-awesome-sass
+ jquery-rails
+ resque
+ sass-rails
+ twitter-bootstrap-rails
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ actionmailer (4.1.16)
+ actionpack (= 4.1.16)
+ actionview (= 4.1.16)
+ mail (~> 2.5, >= 2.5.4)
+ actionpack (4.1.16)
+ actionview (= 4.1.16)
+ activesupport (= 4.1.16)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ actionview (4.1.16)
+ activesupport (= 4.1.16)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ activemodel (4.1.16)
+ activesupport (= 4.1.16)
+ builder (~> 3.1)
+ activerecord (4.1.16)
+ activemodel (= 4.1.16)
+ activesupport (= 4.1.16)
+ arel (~> 5.0.0)
+ activesupport (4.1.16)
+ i18n (~> 0.6, >= 0.6.9)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.1)
+ tzinfo (~> 1.1)
+ appraisal (2.1.0)
+ bundler
+ rake
+ thor (>= 0.14.0)
+ arel (5.0.1.20140414130214)
+ builder (3.2.3)
+ coderay (1.1.1)
+ coffee-rails (4.2.1)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0, < 5.2.x)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.12.2)
+ commonjs (0.2.7)
+ concurrent-ruby (1.0.5)
+ coveralls (0.8.20)
+ json (>= 1.8, < 3)
+ simplecov (~> 0.14.1)
+ term-ansicolor (~> 1.3)
+ thor (~> 0.19.4)
+ tins (~> 1.6)
+ docile (1.1.5)
+ dotenv (2.2.0)
+ dotenv-rails (2.2.0)
+ dotenv (= 2.2.0)
+ railties (>= 3.2, < 5.1)
+ erubis (2.7.0)
+ execjs (2.7.0)
+ font-awesome-sass (4.7.0)
+ sass (>= 3.2)
+ i18n (0.8.1)
+ jquery-rails (3.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.8.6)
+ less (2.6.0)
+ commonjs (~> 0.2.7)
+ less-rails (2.8.0)
+ actionpack (>= 4.0)
+ less (~> 2.6.0)
+ sprockets (> 2, < 4)
+ tilt
+ mail (2.6.4)
+ mime-types (>= 1.16, < 4)
+ metaclass (0.0.4)
+ method_source (0.8.2)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.1.0)
+ minitest (5.10.1)
+ minitest-spec-rails (5.4.0)
+ minitest (~> 5.0)
+ rails (>= 4.1)
+ mocha (1.2.1)
+ metaclass (~> 0.0.1)
+ mono_logger (1.1.0)
+ multi_json (1.12.1)
+ nokogiri (1.6.8.1)
+ mini_portile2 (~> 2.1.0)
+ pry (0.10.4)
+ coderay (~> 1.1.0)
+ method_source (~> 0.8.1)
+ slop (~> 3.4)
+ rack (1.5.5)
+ rack-protection (1.5.3)
+ rack
+ rack-test (0.6.3)
+ rack (>= 1.0)
+ rails (4.1.16)
+ actionmailer (= 4.1.16)
+ actionpack (= 4.1.16)
+ actionview (= 4.1.16)
+ activemodel (= 4.1.16)
+ activerecord (= 4.1.16)
+ activesupport (= 4.1.16)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.1.16)
+ sprockets-rails (~> 2.0)
+ railties (4.1.16)
+ actionpack (= 4.1.16)
+ activesupport (= 4.1.16)
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rake (12.0.0)
+ redcard (1.1.0)
+ redis (3.3.3)
+ redis-namespace (1.5.3)
+ redis (~> 3.0, >= 3.0.4)
+ resque (1.27.2)
+ mono_logger (~> 1.0)
+ multi_json (~> 1.0)
+ redis-namespace (~> 1.3)
+ sinatra (>= 0.9.2)
+ vegas (~> 0.1.2)
+ sass (3.4.23)
+ sass-rails (5.0.6)
+ railties (>= 4.0.0, < 6)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
+ simplecov (0.14.1)
+ docile (~> 1.1.0)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.0)
+ sinatra (1.4.8)
+ rack (~> 1.5)
+ rack-protection (~> 1.4)
+ tilt (>= 1.3, < 3)
+ slop (3.6.0)
+ sprockets (3.7.1)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (2.3.3)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (>= 2.8, < 4.0)
+ sqlite3 (1.3.13)
+ term-ansicolor (1.5.0)
+ tins (~> 1.0)
+ thor (0.19.4)
+ thread_safe (0.3.6)
+ tilt (2.0.7)
+ tins (1.13.2)
+ twitter-bootstrap-rails (3.2.2)
+ actionpack (>= 3.1)
+ execjs (>= 2.2.2, >= 2.2)
+ less-rails (>= 2.5.0)
+ railties (>= 3.1)
+ tzinfo (1.2.3)
+ thread_safe (~> 0.1)
+ uglifier (3.1.12)
+ execjs (>= 0.3.0, < 3)
+ vegas (0.1.11)
+ rack (>= 1.0.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ appraisal
+ coveralls
+ dotenv-rails
+ minitest-spec-rails
+ mocha
+ nokogiri (~> 1.6.0)
+ pry
+ rails (~> 4.1.16)
+ redcard
+ resque-web!
+ sqlite3
+ uglifier
+
+BUNDLED WITH
+ 1.14.6
diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile
new file mode 100644
index 0000000..2ba496f
--- /dev/null
+++ b/gemfiles/rails42.gemfile
@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "uglifier"
+gem "sqlite3"
+gem "dotenv-rails"
+gem "minitest-spec-rails"
+gem "coveralls", :require => false
+gem "redcard"
+gem "mocha", :require => false
+gem "rails", "~> 4.2.8"
+gem "nokogiri", "~> 1.6.0"
+
+gemspec :path => "../"
diff --git a/gemfiles/rails42.gemfile.lock b/gemfiles/rails42.gemfile.lock
new file mode 100644
index 0000000..818678d
--- /dev/null
+++ b/gemfiles/rails42.gemfile.lock
@@ -0,0 +1,212 @@
+PATH
+ remote: ..
+ specs:
+ resque-web (0.0.9)
+ coffee-rails
+ font-awesome-sass
+ jquery-rails
+ resque
+ sass-rails
+ twitter-bootstrap-rails
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ actionmailer (4.2.8)
+ actionpack (= 4.2.8)
+ actionview (= 4.2.8)
+ activejob (= 4.2.8)
+ mail (~> 2.5, >= 2.5.4)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ actionpack (4.2.8)
+ actionview (= 4.2.8)
+ activesupport (= 4.2.8)
+ 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.8)
+ activesupport (= 4.2.8)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ rails-dom-testing (~> 1.0, >= 1.0.5)
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
+ activejob (4.2.8)
+ activesupport (= 4.2.8)
+ globalid (>= 0.3.0)
+ activemodel (4.2.8)
+ activesupport (= 4.2.8)
+ builder (~> 3.1)
+ activerecord (4.2.8)
+ activemodel (= 4.2.8)
+ activesupport (= 4.2.8)
+ arel (~> 6.0)
+ activesupport (4.2.8)
+ i18n (~> 0.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
+ tzinfo (~> 1.1)
+ appraisal (2.1.0)
+ bundler
+ rake
+ thor (>= 0.14.0)
+ arel (6.0.4)
+ builder (3.2.3)
+ coffee-rails (4.2.1)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0, < 5.2.x)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.12.2)
+ commonjs (0.2.7)
+ concurrent-ruby (1.0.5)
+ coveralls (0.8.20)
+ json (>= 1.8, < 3)
+ simplecov (~> 0.14.1)
+ term-ansicolor (~> 1.3)
+ thor (~> 0.19.4)
+ tins (~> 1.6)
+ docile (1.1.5)
+ dotenv (2.2.0)
+ dotenv-rails (2.2.0)
+ dotenv (= 2.2.0)
+ railties (>= 3.2, < 5.1)
+ erubis (2.7.0)
+ execjs (2.7.0)
+ font-awesome-sass (4.7.0)
+ sass (>= 3.2)
+ globalid (0.3.7)
+ activesupport (>= 4.1.0)
+ i18n (0.8.1)
+ jquery-rails (4.3.1)
+ rails-dom-testing (>= 1, < 3)
+ railties (>= 4.2.0)
+ thor (>= 0.14, < 2.0)
+ json (2.0.3)
+ less (2.6.0)
+ commonjs (~> 0.2.7)
+ less-rails (2.8.0)
+ actionpack (>= 4.0)
+ less (~> 2.6.0)
+ sprockets (> 2, < 4)
+ tilt
+ loofah (2.0.3)
+ nokogiri (>= 1.5.9)
+ mail (2.6.4)
+ mime-types (>= 1.16, < 4)
+ metaclass (0.0.4)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.1.0)
+ minitest (5.10.1)
+ minitest-spec-rails (5.4.0)
+ minitest (~> 5.0)
+ rails (>= 4.1)
+ mocha (1.2.1)
+ metaclass (~> 0.0.1)
+ mono_logger (1.1.0)
+ multi_json (1.12.1)
+ nokogiri (1.6.8.1)
+ mini_portile2 (~> 2.1.0)
+ rack (1.6.5)
+ rack-protection (1.5.3)
+ rack
+ rack-test (0.6.3)
+ rack (>= 1.0)
+ rails (4.2.8)
+ actionmailer (= 4.2.8)
+ actionpack (= 4.2.8)
+ actionview (= 4.2.8)
+ activejob (= 4.2.8)
+ activemodel (= 4.2.8)
+ activerecord (= 4.2.8)
+ activesupport (= 4.2.8)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.2.8)
+ sprockets-rails
+ rails-deprecated_sanitizer (1.0.3)
+ activesupport (>= 4.2.0.alpha)
+ rails-dom-testing (1.0.8)
+ activesupport (>= 4.2.0.beta, < 5.0)
+ nokogiri (~> 1.6)
+ rails-deprecated_sanitizer (>= 1.0.1)
+ rails-html-sanitizer (1.0.3)
+ loofah (~> 2.0)
+ railties (4.2.8)
+ actionpack (= 4.2.8)
+ activesupport (= 4.2.8)
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rake (12.0.0)
+ redcard (1.1.0)
+ redis (3.3.3)
+ redis-namespace (1.5.3)
+ redis (~> 3.0, >= 3.0.4)
+ resque (1.27.2)
+ mono_logger (~> 1.0)
+ multi_json (~> 1.0)
+ redis-namespace (~> 1.3)
+ sinatra (>= 0.9.2)
+ vegas (~> 0.1.2)
+ sass (3.4.23)
+ sass-rails (5.0.6)
+ railties (>= 4.0.0, < 6)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
+ simplecov (0.14.1)
+ docile (~> 1.1.0)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.0)
+ sinatra (1.4.8)
+ rack (~> 1.5)
+ rack-protection (~> 1.4)
+ tilt (>= 1.3, < 3)
+ sprockets (3.7.1)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.2.0)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
+ sqlite3 (1.3.13)
+ term-ansicolor (1.5.0)
+ tins (~> 1.0)
+ thor (0.19.4)
+ thread_safe (0.3.6)
+ tilt (2.0.7)
+ tins (1.13.2)
+ twitter-bootstrap-rails (3.2.2)
+ actionpack (>= 3.1)
+ execjs (>= 2.2.2, >= 2.2)
+ less-rails (>= 2.5.0)
+ railties (>= 3.1)
+ tzinfo (1.2.3)
+ thread_safe (~> 0.1)
+ uglifier (3.1.12)
+ execjs (>= 0.3.0, < 3)
+ vegas (0.1.11)
+ rack (>= 1.0.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ appraisal
+ coveralls
+ dotenv-rails
+ minitest-spec-rails
+ mocha
+ nokogiri (~> 1.6.0)
+ rails (~> 4.2.8)
+ redcard
+ resque-web!
+ sqlite3
+ uglifier
+
+BUNDLED WITH
+ 1.14.6
diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile
new file mode 100644
index 0000000..23be4d4
--- /dev/null
+++ b/gemfiles/rails50.gemfile
@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "uglifier"
+gem "sqlite3"
+gem "dotenv-rails"
+gem "minitest-spec-rails"
+gem "coveralls", :require => false
+gem "redcard"
+gem "mocha", :require => false
+gem "rails", "~> 5.0.2"
+gem "rails-controller-testing"
+
+gemspec :path => "../"
diff --git a/gemfiles/rails50.gemfile.lock b/gemfiles/rails50.gemfile.lock
new file mode 100644
index 0000000..2fce605
--- /dev/null
+++ b/gemfiles/rails50.gemfile.lock
@@ -0,0 +1,219 @@
+PATH
+ remote: ..
+ specs:
+ resque-web (0.0.9)
+ coffee-rails
+ font-awesome-sass
+ jquery-rails
+ resque
+ sass-rails
+ twitter-bootstrap-rails
+
+GEM
+ remote: https://rubygems.org/
+ specs:
+ actioncable (5.0.2)
+ actionpack (= 5.0.2)
+ nio4r (>= 1.2, < 3.0)
+ websocket-driver (~> 0.6.1)
+ actionmailer (5.0.2)
+ actionpack (= 5.0.2)
+ actionview (= 5.0.2)
+ activejob (= 5.0.2)
+ mail (~> 2.5, >= 2.5.4)
+ rails-dom-testing (~> 2.0)
+ actionpack (5.0.2)
+ actionview (= 5.0.2)
+ activesupport (= 5.0.2)
+ rack (~> 2.0)
+ rack-test (~> 0.6.3)
+ rails-dom-testing (~> 2.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
+ actionview (5.0.2)
+ activesupport (= 5.0.2)
+ builder (~> 3.1)
+ erubis (~> 2.7.0)
+ rails-dom-testing (~> 2.0)
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
+ activejob (5.0.2)
+ activesupport (= 5.0.2)
+ globalid (>= 0.3.6)
+ activemodel (5.0.2)
+ activesupport (= 5.0.2)
+ activerecord (5.0.2)
+ activemodel (= 5.0.2)
+ activesupport (= 5.0.2)
+ arel (~> 7.0)
+ activesupport (5.0.2)
+ concurrent-ruby (~> 1.0, >= 1.0.2)
+ i18n (~> 0.7)
+ minitest (~> 5.1)
+ tzinfo (~> 1.1)
+ appraisal (2.1.0)
+ bundler
+ rake
+ thor (>= 0.14.0)
+ arel (7.1.4)
+ builder (3.2.3)
+ coffee-rails (4.2.1)
+ coffee-script (>= 2.2.0)
+ railties (>= 4.0.0, < 5.2.x)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.12.2)
+ commonjs (0.2.7)
+ concurrent-ruby (1.0.5)
+ coveralls (0.8.20)
+ json (>= 1.8, < 3)
+ simplecov (~> 0.14.1)
+ term-ansicolor (~> 1.3)
+ thor (~> 0.19.4)
+ tins (~> 1.6)
+ docile (1.1.5)
+ dotenv (2.2.0)
+ dotenv-rails (2.2.0)
+ dotenv (= 2.2.0)
+ railties (>= 3.2, < 5.1)
+ erubis (2.7.0)
+ execjs (2.7.0)
+ font-awesome-sass (4.7.0)
+ sass (>= 3.2)
+ globalid (0.3.7)
+ activesupport (>= 4.1.0)
+ i18n (0.8.1)
+ jquery-rails (4.3.1)
+ rails-dom-testing (>= 1, < 3)
+ railties (>= 4.2.0)
+ thor (>= 0.14, < 2.0)
+ json (2.0.3)
+ less (2.6.0)
+ commonjs (~> 0.2.7)
+ less-rails (2.8.0)
+ actionpack (>= 4.0)
+ less (~> 2.6.0)
+ sprockets (> 2, < 4)
+ tilt
+ loofah (2.0.3)
+ nokogiri (>= 1.5.9)
+ mail (2.6.4)
+ mime-types (>= 1.16, < 4)
+ metaclass (0.0.4)
+ method_source (0.8.2)
+ mime-types (3.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2016.0521)
+ mini_portile2 (2.1.0)
+ minitest (5.10.1)
+ minitest-spec-rails (5.4.0)
+ minitest (~> 5.0)
+ rails (>= 4.1)
+ mocha (1.2.1)
+ metaclass (~> 0.0.1)
+ mono_logger (1.1.0)
+ multi_json (1.12.1)
+ nio4r (2.0.0)
+ nokogiri (1.7.1)
+ mini_portile2 (~> 2.1.0)
+ rack (2.0.1)
+ rack-test (0.6.3)
+ rack (>= 1.0)
+ rails (5.0.2)
+ actioncable (= 5.0.2)
+ actionmailer (= 5.0.2)
+ actionpack (= 5.0.2)
+ actionview (= 5.0.2)
+ activejob (= 5.0.2)
+ activemodel (= 5.0.2)
+ activerecord (= 5.0.2)
+ activesupport (= 5.0.2)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 5.0.2)
+ sprockets-rails (>= 2.0.0)
+ rails-controller-testing (1.0.1)
+ actionpack (~> 5.x)
+ actionview (~> 5.x)
+ activesupport (~> 5.x)
+ rails-dom-testing (2.0.2)
+ activesupport (>= 4.2.0, < 6.0)
+ nokogiri (~> 1.6)
+ rails-html-sanitizer (1.0.3)
+ loofah (~> 2.0)
+ railties (5.0.2)
+ actionpack (= 5.0.2)
+ activesupport (= 5.0.2)
+ method_source
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rake (12.0.0)
+ redcard (1.1.0)
+ redis (3.3.3)
+ redis-namespace (1.5.3)
+ redis (~> 3.0, >= 3.0.4)
+ resque (1.27.2)
+ mono_logger (~> 1.0)
+ multi_json (~> 1.0)
+ redis-namespace (~> 1.3)
+ sinatra (>= 0.9.2)
+ vegas (~> 0.1.2)
+ sass (3.4.23)
+ sass-rails (5.0.6)
+ railties (>= 4.0.0, < 6)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (>= 1.1, < 3)
+ simplecov (0.14.1)
+ docile (~> 1.1.0)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.0)
+ sinatra (1.0)
+ rack (>= 1.0)
+ sprockets (3.7.1)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
+ sprockets-rails (3.2.0)
+ actionpack (>= 4.0)
+ activesupport (>= 4.0)
+ sprockets (>= 3.0.0)
+ sqlite3 (1.3.13)
+ term-ansicolor (1.5.0)
+ tins (~> 1.0)
+ thor (0.19.4)
+ thread_safe (0.3.6)
+ tilt (2.0.7)
+ tins (1.13.2)
+ twitter-bootstrap-rails (4.0.0)
+ actionpack (~> 5.0, >= 5.0.1)
+ execjs (~> 2.7)
+ less-rails (~> 2.8, >= 2.8.0)
+ railties (~> 5.0, >= 5.0.1)
+ tzinfo (1.2.3)
+ thread_safe (~> 0.1)
+ uglifier (3.1.12)
+ execjs (>= 0.3.0, < 3)
+ vegas (0.1.11)
+ rack (>= 1.0.0)
+ websocket-driver (0.6.5)
+ websocket-extensions (>= 0.1.0)
+ websocket-extensions (0.1.2)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ appraisal
+ coveralls
+ dotenv-rails
+ minitest-spec-rails
+ mocha
+ rails (~> 5.0.2)
+ rails-controller-testing
+ redcard
+ resque-web!
+ sqlite3
+ uglifier
+
+BUNDLED WITH
+ 1.14.6
diff --git a/lib/resque_web/engine.rb b/lib/resque_web/engine.rb
index 03d975c..318d863 100644
--- a/lib/resque_web/engine.rb
+++ b/lib/resque_web/engine.rb
@@ -1,4 +1,5 @@
require 'twitter-bootstrap-rails'
+require 'font-awesome-sass'
require 'jquery-rails'
module ResqueWeb
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
index f907604..e3ddce8 100644
--- a/test/dummy/config/environments/test.rb
+++ b/test/dummy/config/environments/test.rb
@@ -13,8 +13,19 @@
config.eager_load = false
# Configure static asset server for tests with Cache-Control for performance.
- config.serve_static_assets = true
- config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+ if Rails.version >= '5.0.0'
+ config.public_file_server.enabled = true
+ elsif Rails.version >= '4.2.0'
+ config.serve_static_files = true
+ else
+ config.serve_static_assets = true
+ end
+
+ if Rails.version >= '5.0.0'
+ config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+ else
+ config.static_cache_control = "public, max-age=3600"
+ end
# Show full error reports and disable caching.
config.consider_all_requests_local = true
@@ -33,4 +44,8 @@
# Print deprecation notices to the stderr.
config.active_support.deprecation = :stderr
+
+ if Rails.version >= '4.2.0'
+ config.active_support.test_order = :random
+ end
end
diff --git a/test/functional/stats_controller_test.rb b/test/functional/stats_controller_test.rb
index bbfafdb..3f1da8f 100644
--- a/test/functional/stats_controller_test.rb
+++ b/test/functional/stats_controller_test.rb
@@ -38,8 +38,8 @@ class StatsControllerTest < ActionController::TestCase
describe "GET /redis.json" do
it "renders the redis page" do
- expected = Resque.redis.info
- Resque.redis.stubs(:info).returns(expected)
+ expected = Resque.redis.redis.info
+ Resque.redis.redis.stubs(:info).returns(expected)
visit(:redis, format: 'json')
assert_equal response.body, Hash[expected.sort].to_json
end
diff --git a/test/integration/plugin_integration_test.rb b/test/integration/plugin_integration_test.rb
index 08f0d4c..ff29534 100644
--- a/test/integration/plugin_integration_test.rb
+++ b/test/integration/plugin_integration_test.rb
@@ -9,7 +9,11 @@ class Engine < ::Rails::Engine
end
class PlugintestController < ApplicationController
def index
- render html: "hello from test plugin", layout: true
+ if Rails.version >= '4.1.0'
+ render html: "hello from test plugin", layout: true
+ else
+ render text: "hello from test plugin", layout: true
+ end
end
end
@@ -41,7 +45,11 @@ def visit(action, params = {}, options = {})
) unless options[:auth] == false
end
- send(method, action, params: params, env: env)
+ if Rails.version >= '5.0.0'
+ send(method, action, params: params, env: env)
+ else
+ send(method, action, params, env)
+ end
ENV["RESQUE_WEB_HTTP_BASIC_AUTH_USER"] = user
ENV["RESQUE_WEB_HTTP_BASIC_AUTH_PASSWORD"] = password
diff --git a/test/support/controller_test_helpers.rb b/test/support/controller_test_helpers.rb
index 8dcd869..c2f6294 100644
--- a/test/support/controller_test_helpers.rb
+++ b/test/support/controller_test_helpers.rb
@@ -14,7 +14,11 @@ def visit(action, params = {}, options = {})
) unless options[:auth] == false
end
- send(method, action, params: params)
+ if Rails.version >= '5.0.0'
+ send(method, action, params: params)
+ else
+ send(method, action, params)
+ end
ENV["RESQUE_WEB_HTTP_BASIC_AUTH_USER"] = user
ENV["RESQUE_WEB_HTTP_BASIC_AUTH_PASSWORD"] = password
diff --git a/test/test_helper.rb b/test/test_helper.rb
index a9edf17..16816b5 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,7 +2,6 @@
Dotenv.load!
require 'redcard'
-require 'profiler' if RedCard.check :rubinius
require 'coveralls'
Coveralls.wear! 'rails'
|