Support Rails 5 and Sprockets 4

.travis.yml

@@ -10,22 +10,15 @@ cache:
 before_install:
   - gem update bundler # To use bundler 1.10 or later
 gemfile:
-  - gemfiles/rails32_ember_113.gemfile
-  - gemfiles/rails40_ember_113.gemfile
-  - gemfiles/rails41_ember_113.gemfile
   - gemfiles/rails42_ember_113.gemfile
   - gemfiles/rails50_ember_113.gemfile
-  - gemfiles/rails32_ember_18.gemfile
-  - gemfiles/rails40_ember_18.gemfile
-  - gemfiles/rails41_ember_18.gemfile
   - gemfiles/rails42_ember_18.gemfile
   - gemfiles/rails50_ember_18.gemfile
-  - gemfiles/rails32_ember_latest.gemfile
-  - gemfiles/rails40_ember_latest.gemfile
-  - gemfiles/rails41_ember_latest.gemfile
   - gemfiles/rails42_ember_latest.gemfile
   - gemfiles/rails50_ember_latest.gemfile
+  - gemfiles/rails51_ember_latest.gemfile
   - gemfiles/sprockets_3.gemfile
+  - gemfiles/sprockets_4.gemfile
   - gemfiles/sprockets_rails_3.gemfile
 matrix:
   exclude:
@@ -35,17 +28,19 @@ matrix:
       gemfile: gemfiles/rails50_ember_18.gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails50_ember_latest.gemfile
-    - rvm: jruby-9.1.0.0
-      gemfile: gemfiles/rails40_ember_113.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails51_ember_latest.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/sprockets_4.gemfile
     - rvm: jruby-9.1.0.0
       gemfile: gemfiles/rails50_ember_113.gemfile
-    - rvm: jruby-9.1.0.0
-      gemfile: gemfiles/rails40_ember_18.gemfile
     - rvm: jruby-9.1.0.0
       gemfile: gemfiles/rails50_ember_18.gemfile
-    - rvm: jruby-9.1.0.0
-      gemfile: gemfiles/rails40_ember_latest.gemfile
     - rvm: jruby-9.1.0.0
       gemfile: gemfiles/rails50_ember_latest.gemfile
+    - rvm: jruby-9.1.0.0
+      gemfile: gemfiles/rails51_ember_latest.gemfile
+    - rvm: jruby-9.1.0.0
+      gemfile: gemfiles/sprockets_4.gemfile
 env:
   - JRUBY_OPTS="--server -J-Xms1500m -J-Xmx1500m -J-XX:+UseConcMarkSweepGC -J-XX:-UseGCOverheadLimit -J-XX:+CMSClassUnloadingEnabled" # see: https://github.com/jruby/jruby/issues/1320

ember-rails.gemspec

@@ -12,15 +12,15 @@ Gem::Specification.new do |s|
   s.summary     = "Ember for Rails 3.1+"
   s.license     = "MIT"
 
-  s.add_dependency "railties", [">= 3.1"]
+  s.add_dependency "railties", [">= 4.2"]
   s.add_dependency "active_model_serializers"
 
   s.add_dependency "jquery-rails", ">= 1.0.17"
   s.add_dependency "ember-source", ">= 1.8.0"
   s.add_dependency "ember-data-source", '>= 1.13.0'
   s.add_dependency "active-model-adapter-source", ">= 1.13.0"
   s.add_dependency "ember-handlebars-template", ">= 0.1.1", "< 1.0"
-  s.add_dependency "ember-es6_template", "~> 0.4.0"
+  s.add_dependency "ember-es6_template", ">= 0.4.0", "< 0.7"
   s.add_dependency "ember-cli-assets", "~> 0.0.1"
 
   s.add_development_dependency "bundler", [">= 1.2.2"]

gemfiles/rails51_ember_latest.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.1.0.rc1'
+gem 'ember-source', '~> 2.0'
+
+gemspec path: '../'

gemfiles/sprockets_4.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.0'
+gem 'ember-source', '~> 2.0'
+gem 'sprockets', '~> 4.0.0.beta4'
+
+gemspec path: '../'

lib/ember/rails/engine.rb

@@ -18,10 +18,6 @@ class Engine < ::Rails::Engine
         config.handlebars.ember_template = Ember::VERSION =~ /\A1.[0-9]\./ ? 'Handlebars' : 'HTMLBars'
       end
 
-      config.before_initialize do |app|
-        Sprockets::Engines #force autoloading
-      end
-
       config.before_initialize do |app|
         Ember::ES6Template.configure do |ember_config|
           ember_config.module_prefix = config.ember.module_prefix

lib/ember_rails.rb

@@ -100,7 +100,7 @@ def configure_assets(app)
 
       initializer "ember_rails.setup_ember_template_compiler", :after => "ember_rails.setup_vendor", :group => :all do |app|
         configure_assets app do |env|
-          Ember::Handlebars::Template.setup_ember_template_compiler(env.resolve('ember-template-compiler.js'))
+          Ember::Handlebars::Template.setup_ember_template_compiler(env.find_asset('ember-template-compiler.js').filename)
         end
       end
 

test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

test/dummy/config/environments/test.rb

@@ -9,13 +9,16 @@
 
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance
-  if Rails.version >= '4.2.0'
-    config.serve_static_files = true
+  if Rails::VERSION::MAJOR >= 5
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = {
+      'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
+    }
   else
-    config.serve_static_assets = true
+    # Configure static asset server for tests with Cache-Control for performance
+    config.serve_static_files = true
+    config.static_cache_control = "public, max-age=3600"
   end
-  config.static_cache_control = "public, max-age=3600"
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true unless Rails.version >= '4.0.0'