Fix Ruby 1.9.3 dependencies

transloadit · Oct 6, 2016 · 4b820db · 4b820db
1 parent 8c4038f
commit 4b820db
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,11 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.0
   - 2.3.0
   - rbx-2
-  - jruby-19mode
   - jruby-9.0.0.0
 script: "bundle exec rake test"
 
@@ -21,6 +19,30 @@ gemfile:
 
 matrix:
   include:
+    - rvm: 1.9.3
+      gemfile: gemfiles/1.9.3/3.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/1.9.3/3.1.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/1.9.3/3.2.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/1.9.3/4.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/1.9.3/4.1.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/1.9.3/4.2.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/1.9.3/3.0.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/1.9.3/3.1.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/1.9.3/3.2.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/1.9.3/4.0.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/1.9.3/4.1.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/1.9.3/4.2.gemfile
     - rvm: 2.2.2
       gemfile: gemfiles/5.0.gemfile
     - rvm: 2.3.0

diff --git a/gemfiles/1.9.3/3.0.gemfile b/gemfiles/1.9.3/3.0.gemfile
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem 'rest-client', '~> 1.8.0'
+gem 'railties', '~> 3.0.0'
+gemspec :path => '../..'
diff --git a/gemfiles/1.9.3/3.1.gemfile b/gemfiles/1.9.3/3.1.gemfile
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem 'rest-client', '~> 1.8.0'
+gem 'railties', '~> 3.1.0'
+gemspec :path => '../..'
diff --git a/gemfiles/1.9.3/3.2.gemfile b/gemfiles/1.9.3/3.2.gemfile
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem 'rest-client', '~> 1.8.0'
+gem 'railties', '~> 3.2.0'
+gemspec :path => '../..'
diff --git a/gemfiles/1.9.3/4.0.gemfile b/gemfiles/1.9.3/4.0.gemfile
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem 'rest-client', '~> 1.8.0'
+gem 'railties', '~> 4.0.0'
+gemspec :path => '../..'
diff --git a/gemfiles/1.9.3/4.1.gemfile b/gemfiles/1.9.3/4.1.gemfile
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem 'rest-client', '~> 1.8.0'
+gem 'railties', '~> 4.1.0'
+gemspec :path => '../..'
diff --git a/gemfiles/1.9.3/4.2.gemfile b/gemfiles/1.9.3/4.2.gemfile
@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gem 'rest-client', '~> 1.8.0'
+gem 'railties', '~> 4.2.0'
+gemspec :path => '../..'
diff --git a/lib/transloadit/rails/params_decoder.rb b/lib/transloadit/rails/params_decoder.rb
@@ -4,7 +4,7 @@ module Transloadit::Rails::ParamsDecoder
   extend ActiveSupport::Concern
 
   included do
-    if Rails.version.to_i >= 5
+    if respond_to?(:before_action)
       before_action :decode_transloadit_json
     else
       before_filter :decode_transloadit_json