Add Rails 5 support

Closes [#376].

Required changes
----------------

Run test suite against the latest `5.0.0.betaX` and `master` branches of
[`rails/rails`][rails].

Since `EmberController` extends `ApplicationController`, which can now
extend from either `ActionController::Base` (which implements
`helper_method`) and `ActionController::API` (which doesn't implement
`helper_method`), we can't depend on that API existing.

Remove call to `helper_method` from `EmberController`, as it is no
longer supported.

Support changes
---------------

Rails 5 depends on `[email protected]`, which **requires** Ruby `2.2.2` or
greater.

In order to support Rails 5, we will no longer support versions of Ruby
prior to `2.2.2`.

[#376]: #376
[rails]: https://github.com/rails/rails

Author: seanpdoyle

.travis.yml

@@ -5,8 +5,7 @@ notifications:
   email: false
 rvm:
 - 2.3.0
-- 2.2
-- 2.1
+- 2.2.2
 - jruby-9.0.3.0
 before_install:
 - echo '--colour' > ~/.rspec
@@ -20,3 +19,5 @@ gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
+  - gemfiles/5.0.0.beta2.gemfile
+  - gemfiles/master.gemfile

Appraisals

@@ -9,3 +9,11 @@ end
 appraise "4.2" do
   gem "rails", "~> 4.2.1"
 end
+
+appraise "5.0.0.beta2" do
+  gem "rails", "5.0.0.beta2"
+end
+
+appraise "master" do
+  gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
+end

CHANGELOG.md

@@ -1,10 +1,12 @@
 master
 ------
 
+* Remove support for Ruby 2.1.x. [#400]
 * Enhance `rake ember:install` to fully reinstall if necessary. [#396]
 * `EmberCli::Deploy::File` serves assets with Rails' `static_cache_control`
   value. [#403]
 
+[#400]: https://github.com/thoughtbot/ember-cli-rails/pull/400
 [#396]: https://github.com/thoughtbot/ember-cli-rails/pull/396
 [#403]: https://github.com/thoughtbot/ember-cli-rails/pull/403
 

README.md

@@ -591,7 +591,7 @@ This project supports:
 
 This project supports:
 
-* Ruby versions `>= 2.1.0`
+* Ruby versions `>= 2.2.0`
 * Rails versions `>=4.1.x`.
 
 To learn more about supported versions and upgrades, read the [upgrading guide].

UPGRADING.md

@@ -8,6 +8,12 @@ Additionally, this codebase makes use of [(required) keyword arguments][kwargs].
 From `[email protected]` and on, we will no longer support versions of Ruby
 prior to `2.1.0`.
 
+`[email protected]` adds support for Rails 5, which depends on `[email protected]`,
+which **requires** Ruby `2.2.2` or greater.
+
+From `[email protected]` and on, we will no longer support versions of Ruby
+prior to `2.2.2`.
+
 To use `ember-cli-rails` with older versions of Ruby, try the `0.3.x` series.
 
 [kwargs]: https://robots.thoughtbot.com/ruby-2-keyword-arguments

app/controller/ember_cli/ember_controller.rb

@@ -3,10 +3,5 @@ class EmberController < ::ApplicationController
     def index
       render layout: false
     end
-
-    def ember_app
-      params[:ember_app]
-    end
-    helper_method :ember_app
   end
 end

app/views/ember_cli/ember/index.html.erb

@@ -1,4 +1,4 @@
-<%= render_ember_app ember_app do |head| %>
+<%= render_ember_app params[:ember_app] do |head| %>
   <% head.append do %>
     <%= csrf_meta_tags %>
   <% end %>

gemfiles/5.0.0.beta2.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "5.0.0.beta2"
+gem "pry"
+
+group :development, :test do
+  gem "high_voltage", github: "thoughtbot/high_voltage"
+  gem "rspec-core", github: "rspec/rspec-core"
+  gem "rspec-support", github: "rspec/rspec-support"
+  gem "rspec-expectations", github: "rspec/rspec-expectations"
+  gem "rspec-mocks", github: "rspec/rspec-mocks"
+  gem "rspec-rails", github: "rspec/rspec-rails"
+end
+
+group :test do
+  gem "poltergeist", "~> 1.8.0"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

gemfiles/master.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", :git => "https://github.com/rails/rails.git", :branch => "master"
+gem "pry"
+
+group :development, :test do
+  gem "high_voltage", github: "thoughtbot/high_voltage"
+  gem "rspec-core", github: "rspec/rspec-core"
+  gem "rspec-support", github: "rspec/rspec-support"
+  gem "rspec-expectations", github: "rspec/rspec-expectations"
+  gem "rspec-mocks", github: "rspec/rspec-mocks"
+  gem "rspec-rails", github: "rspec/rspec-rails"
+end
+
+group :test do
+  gem "poltergeist", "~> 1.8.0"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"