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.

**Allow JRuby failures in CI**

**Improve `setup_ember` script**

* Don't overwrite `gemfiles/` changes with `appraisal install`
* Localize Ember setup to `bin/setup_ember`
* Always invoke, let `bin/setup_ember` decide whether or not to no-op

**Fix `EmberCli::EmberController` inheritance**

The `EmberCli::EmberController` used to inherit from
`ApplicationController` in order to reap the benefits of
application-wide configurations and behavior (such as
authentication-based `before_action` calls and other macros).

Unfortunately, with the introduction of Rails 5's `rails new --api`,
applications' `ApplicationController` can now inherit from
[`ActionController::API`][api], which doesn't serve HTML by default.

To support Rails 5's default `--api` behavior,
`EmberCli::EmberController` must inherit from `ActionController::Base`,
forcing the controller to forfeit all the benefits of sharing behavior
with `ApplicationController`.

[api]: http://edgeapi.rubyonrails.org/classes/ActionController/API.html

**Depend on `test-unit`**

```
Ruby 2.2+ has removed test/unit from the core library. Rails requires
this as a dependency. Please add test-unit gem to your Gemfile:
`gem 'test-unit', '~> 3.0'` (cannot load such file -- test/unit)"
```

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

@@ -4,13 +4,12 @@ cache: bundler
 notifications:
   email: false
 rvm:
-- 2.3.0
-- 2.2
-- 2.1
-- jruby-9.0.3.0
+  - 2.3.0
+  - 2.2.2
+  - jruby-9.0.3.0
 before_install:
-- echo '--colour' > ~/.rspec
-- 'echo ''gem: --no-document'' > ~/.gemrc'
+  - echo '--colour' > ~/.rspec
+  - 'echo ''gem: --no-document'' > ~/.gemrc'
 before_script: bin/setup
 script: bin/rake
 env:
@@ -19,3 +18,8 @@ env:
 gemfile:
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
+  - gemfiles/5.0.0.gemfile
+  - gemfiles/master.gemfile
+matrix:
+  allow_failures:
+    - rvm: jruby-9.0.3.0

Appraisals

@@ -1,11 +1,15 @@
-appraise "3.2" do
-  gem "rails", git: "https://github.com/rails/rails.git", branch: "3-2-stable"
-end
-
 appraise "4.1" do
   gem "rails", "~> 4.1.1"
 end
 
 appraise "4.2" do
   gem "rails", "~> 4.2.1"
 end
+
+appraise "5.0.0" do
+  gem "rails", "5.0.0"
+end
+
+appraise "master" do
+  gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
+end

CHANGELOG.md

@@ -1,6 +1,9 @@
 master
 ------
 
+* `EmberCli::EmberController` now inherits from `ActionController::Base` instead
+  of `ApplicationController`. [#400]
+* Remove support for Ruby 2.1.x. [#400]
 * Don't route requests to `/rails/info` through the mounted Ember application.
 
 0.7.4
@@ -33,6 +36,7 @@ master
 * `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
 

Gemfile

@@ -7,8 +7,8 @@ gem "rails", "4.2.4"
 gem "pry"
 
 group :development, :test do
-  gem "high_voltage", "~> 2.4.0"
-  gem "rspec-rails", "~> 3.3.0"
+  gem "high_voltage", "~> 3.0.0"
+  gem "rspec-rails", "~> 3.5.0"
 end
 
 group :test do

README.md

@@ -630,7 +630,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/helpers/ember_rails_helper.rb

@@ -8,6 +8,6 @@ def render_ember_app(name, &block)
 
     head, body = markup_capturer.capture
 
-    render html: EmberCli[name].index_html(head: head, body: body).html_safe
+    render text: EmberCli[name].index_html(head: head, body: body).html_safe
   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 %>

bin/clean

@@ -2,4 +2,4 @@
 
 set -e
 
-rm -rf spec/dummy/my-app
+rm -rf spec/dummy/{my-app,tmp}