Include helper & extra modules when using API.

.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.beta3" do
+  gem "rails", "5.0.0.beta3"
+end
+
+appraise "master" do
+  gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
+end

CHANGELOG.md

@@ -1,6 +1,10 @@
 master
 ------
 
+* `EmberCli::EmberController` now inherits from `ActionController::Base` instead
+  of `ApplicationController`. [#400]
+* Remove support for Ruby 2.1.x. [#400]
+
 0.7.3
 -----
 
@@ -22,6 +26,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
 

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

@@ -1,12 +1,18 @@
 module EmberCli
   class EmberController < ::ApplicationController
+    unless ancestors.include? ActionController::Base
+      (
+        ::ActionController::Base::MODULES -
+        ::ActionController::API::MODULES
+      ).each do |mod|
+        include mod
+      end
+
+      helper EmberRailsHelper
+    end
+    #
     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 %>

bin/setup

@@ -13,21 +13,6 @@ if ! command -v bower > /dev/null; then
   npm install -g bower
 fi
 
-if ! [ -d spec/dummy/my-app ]; then
-  git clone https://github.com/kellyselden/ember-cli-output.git spec/dummy/my-app
+bin/setup_ember spec/dummy/my-app
 
-  bin/setup_ember
-fi
-
-# Only if this isn't CI
-if [ -z "$CI" ]; then
-  bin/appraisal install
-fi
-
-root="$(pwd)"
-
-cd ${root}/spec/dummy/my-app &&
-  npm install --save-dev ember-cli-rails-addon@rondale-sc/ember-cli-rails-addon
-  bower install
-
-cd ${root}/spec/dummy && bundle exec rake ember:install
+cd spec/dummy && bundle exec rake ember:install

bin/setup_ember

@@ -2,10 +2,24 @@
 
 set -e
 
-# make router catchall routes
-sed -i -e 's/auto/hash/' spec/dummy/my-app/config/environment.js
+setup_ember() {
+  local target="${1-spec/dummy/my-app}"
 
-# add an image to a template
-echo '<img src="assets/logo.png">' >> spec/dummy/my-app/app/templates/application.hbs
-mkdir -p spec/dummy/my-app/public/assets
-cp spec/fixtures/logo.png spec/dummy/my-app/public/assets
+  if ! [ -d $target ]; then
+    git clone https://github.com/kellyselden/ember-cli-output.git $target
+
+    # make router catchall routes
+    sed -i -e 's/auto/hash/' $target/config/environment.js
+
+    # add an image to a template
+    echo '<img src="assets/logo.png">' >> $target/app/templates/application.hbs
+    mkdir -p $target/public/assets
+    cp spec/fixtures/logo.png $target/public/assets
+
+    cd $target &&
+      npm install --save-dev ember-cli-rails-addon@rondale-sc/ember-cli-rails-addon
+      bower install
+  fi
+}
+
+setup_ember

ember-cli-rails.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.1.0"
 
   spec.add_dependency "ember-cli-rails-assets", "~> 0.6.2"
-  spec.add_dependency "railties", ">= 3.2", "< 5"
+  spec.add_dependency "railties", ">= 3.2", "< 5.1"
   spec.add_dependency "cocaine", "~> 0.5.8"
   spec.add_dependency "html_page", "~> 0.1.0"
 end

gemfiles/5.0.0.beta3.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "5.0.0.beta3"
+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 => "../"

spec/lib/ember_cli/app_spec.rb

@@ -27,15 +27,15 @@
 
   describe "#compile" do
     it "exits with exit status of 0" do
-      passed = silence_stdout { EmberCli["my-app"].compile }
+      passed = EmberCli["my-app"].compile
 
       expect(passed).to be true
     end
   end
 
   describe "#test" do
     it "exits with exit status of 0" do
-      passed = silence_stdout { EmberCli["my-app"].test }
+      passed = EmberCli["my-app"].test
 
       expect(passed).to be true
     end
@@ -65,12 +65,6 @@
     end
   end
 
-  def silence_stdout
-    silence_stream($stdout) do
-      yield
-    end
-  end
-
   def stub_paths(method_to_value)
     allow_any_instance_of(EmberCli::PathSet).
       to receive(method_to_value.keys.first).