From 8c4038f4ac5836453a9049b4263ca6cd65ccbd42 Mon Sep 17 00:00:00 2001 From: Sergei Zinin Date: Thu, 18 Aug 2016 19:11:55 +0700 Subject: [PATCH 1/3] Add Rails 5 to Travis, fix deprecation warnings --- .travis.yml | 7 +++++++ gemfiles/5.0.gemfile | 4 ++++ lib/transloadit/rails/params_decoder.rb | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gemfiles/5.0.gemfile diff --git a/.travis.yml b/.travis.yml index d7cb3a4..51544aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,3 +18,10 @@ gemfile: - gemfiles/4.0.gemfile - gemfiles/4.1.gemfile - gemfiles/4.2.gemfile + +matrix: + include: + - rvm: 2.2.2 + gemfile: gemfiles/5.0.gemfile + - rvm: 2.3.0 + gemfile: gemfiles/5.0.gemfile diff --git a/gemfiles/5.0.gemfile b/gemfiles/5.0.gemfile new file mode 100644 index 0000000..e9fef15 --- /dev/null +++ b/gemfiles/5.0.gemfile @@ -0,0 +1,4 @@ +source "http://rubygems.org" + +gem 'railties', '~> 5.0.0' +gemspec :path => '../' diff --git a/lib/transloadit/rails/params_decoder.rb b/lib/transloadit/rails/params_decoder.rb index 88dca60..d170a62 100644 --- a/lib/transloadit/rails/params_decoder.rb +++ b/lib/transloadit/rails/params_decoder.rb @@ -4,7 +4,11 @@ module Transloadit::Rails::ParamsDecoder extend ActiveSupport::Concern included do - before_filter :decode_transloadit_json + if Rails.version.to_i >= 5 + before_action :decode_transloadit_json + else + before_filter :decode_transloadit_json + end end def decode_transloadit_json From 4b820db824fd6fd7c520b5c4e065a2a9fdfd7718 Mon Sep 17 00:00:00 2001 From: Sergei Zinin Date: Fri, 19 Aug 2016 15:56:08 +0700 Subject: [PATCH 2/3] Fix Ruby 1.9.3 dependencies --- .travis.yml | 26 +++++++++++++++++++++++-- gemfiles/1.9.3/3.0.gemfile | 5 +++++ gemfiles/1.9.3/3.1.gemfile | 5 +++++ gemfiles/1.9.3/3.2.gemfile | 5 +++++ gemfiles/1.9.3/4.0.gemfile | 5 +++++ gemfiles/1.9.3/4.1.gemfile | 5 +++++ gemfiles/1.9.3/4.2.gemfile | 5 +++++ lib/transloadit/rails/params_decoder.rb | 2 +- 8 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 gemfiles/1.9.3/3.0.gemfile create mode 100644 gemfiles/1.9.3/3.1.gemfile create mode 100644 gemfiles/1.9.3/3.2.gemfile create mode 100644 gemfiles/1.9.3/4.0.gemfile create mode 100644 gemfiles/1.9.3/4.1.gemfile create mode 100644 gemfiles/1.9.3/4.2.gemfile diff --git a/.travis.yml b/.travis.yml index 51544aa..78aec7a 100644 --- 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 new file mode 100644 index 0000000..fd8f4a6 --- /dev/null +++ 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 new file mode 100644 index 0000000..f9280cf --- /dev/null +++ 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 new file mode 100644 index 0000000..13e0271 --- /dev/null +++ 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 new file mode 100644 index 0000000..2e87b45 --- /dev/null +++ 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 new file mode 100644 index 0000000..12859c6 --- /dev/null +++ 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 new file mode 100644 index 0000000..6790f01 --- /dev/null +++ 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 index d170a62..a4e4074 100644 --- 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 From 4bf2ad1b778a5d4e2c58d4303056248c8dfdeca5 Mon Sep 17 00:00:00 2001 From: Sergei Zinin Date: Thu, 6 Oct 2016 11:12:03 +0200 Subject: [PATCH 3/3] Remove ruby < 2.1.0 specs and support --- .travis.yml | 27 ++------------------------- CHANGELOG.md | 6 ++++++ README.md | 13 +++++++++++-- gemfiles/1.9.3/3.0.gemfile | 5 ----- gemfiles/1.9.3/3.1.gemfile | 5 ----- gemfiles/1.9.3/3.2.gemfile | 5 ----- gemfiles/1.9.3/4.0.gemfile | 5 ----- gemfiles/1.9.3/4.1.gemfile | 5 ----- gemfiles/1.9.3/4.2.gemfile | 5 ----- transloadit-rails.gemspec | 5 +++-- 10 files changed, 22 insertions(+), 59 deletions(-) delete mode 100644 gemfiles/1.9.3/3.0.gemfile delete mode 100644 gemfiles/1.9.3/3.1.gemfile delete mode 100644 gemfiles/1.9.3/3.2.gemfile delete mode 100644 gemfiles/1.9.3/4.0.gemfile delete mode 100644 gemfiles/1.9.3/4.1.gemfile delete mode 100644 gemfiles/1.9.3/4.2.gemfile diff --git a/.travis.yml b/.travis.yml index 78aec7a..67c4422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: ruby rvm: - - 2.0.0 - 2.1.0 - 2.2.0 - 2.3.0 @@ -18,31 +17,9 @@ gemfile: - gemfiles/4.2.gemfile matrix: + allow_failures: + - rvm: rbx-2 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/CHANGELOG.md b/CHANGELOG.md index c84c7a6..ea92a51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### 2.0.0 / 2016-10-06 ### + +* Drop support for EOL'd Ruby 1.9.x and Ruby 2.0, please use version 1.2.0 if you need support for older + Ruby versions. +* Fix compatibility to Ruby >=2.1 and Rails 5 (thanks @einzige) + ### 1.2.0 / 2016-03-27 ### * Allow to pass `max_size` to the helper (thanks @avokhmin) diff --git a/README.md b/README.md index c18a45a..43ad87d 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This is the official Rails gem for [Transloadit](http://transloadit.com). It all you to automate uploading files through the Transloadit REST API. This gem provides browser integration. If you're looking to do video transcoding / image resizing -initiated from your own serverside Ruby code, please use the [ruby-sdk](https://github.com/transloadit/ruby-sdk) +initiated from your own serverside Ruby code, please use the [ruby-sdk](https://github.com/transloadit/ruby-sdk) instead. ## Install @@ -51,7 +51,7 @@ auth: templates: # template identified by template_id s3_store: '4d2e...' - + # template defined inline image_resize: steps: @@ -289,6 +289,15 @@ def example_json end ``` +## Compatibility + +At a minimum, this gem should work on MRI 2.3.0, 2.2.0, 2.1.0, Rubinius, and JRuby. +It may also work on older ruby versions, but support for those Rubies is not guaranteed. +If it doesn't work on one of the officially supported Rubies, please file a bug report. +Compatibility patches for other Rubies are welcome. + +Testing against these versions is performed automatically by [Travis CI](https://travis-ci.org/transloadit/rails-sdk). + ## License MIT, see [LICENSE](LICENSE) diff --git a/gemfiles/1.9.3/3.0.gemfile b/gemfiles/1.9.3/3.0.gemfile deleted file mode 100644 index fd8f4a6..0000000 --- a/gemfiles/1.9.3/3.0.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index f9280cf..0000000 --- a/gemfiles/1.9.3/3.1.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 13e0271..0000000 --- a/gemfiles/1.9.3/3.2.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 2e87b45..0000000 --- a/gemfiles/1.9.3/4.0.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 12859c6..0000000 --- a/gemfiles/1.9.3/4.1.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 6790f01..0000000 --- a/gemfiles/1.9.3/4.2.gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source "http://rubygems.org" - -gem 'rest-client', '~> 1.8.0' -gem 'railties', '~> 4.2.0' -gemspec :path => '../..' diff --git a/transloadit-rails.gemspec b/transloadit-rails.gemspec index 57f516a..a8d6fbd 100644 --- a/transloadit-rails.gemspec +++ b/transloadit-rails.gemspec @@ -15,7 +15,8 @@ Gem::Specification.new do |gem| gem.summary = 'Official Rails gem for Transloadit' gem.description = 'The transloadit-rails gem allows you to automate uploading files through the Transloadit REST API' - gem.required_rubygems_version = '>= 1.3.6' + gem.required_rubygems_version = '>= 2.1.0' + gem.required_ruby_version = '>= 2.1.0' gem.rubyforge_project = 'transloadit-rails' gem.files = `git ls-files`.split("\n") @@ -26,7 +27,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'transloadit', '>= 1.1.1' gem.add_dependency 'railties', '>= 3' - gem.add_dependency 'mime-types', '~> 2.99' + gem.add_dependency 'mime-types' gem.add_development_dependency 'rake' gem.add_development_dependency 'test-unit'