lib/ember-cli/engine.rb in ember-cli-rails-0.4.3 vs lib/ember-cli/engine.rb in ember-cli-rails-0.5.0

@@ -1,13 +1,24 @@
 module EmberCli
   class Engine < Rails::Engine
+    initializer "ember-cli-rails.rendering" do
+      require "ember-cli/ember_controller"
+      require "ember-cli/route_helpers"
+    end
+
     initializer "ember-cli-rails.enable" do
       EmberCli.enable! unless EmberCli.skip?
     end
 
-    initializer "ember-cli-rails.helpers" do
-      config.to_prepare do
-        ActionController::Base.helper EmberRailsHelper
+    config.to_prepare do
+      ActionController::Base.helper EmberRailsHelper
+    end
+
+    config.after_initialize do
+      if defined?(ApplicationController)
+        require "ember-cli/controller_extension"
+
+        ApplicationController.include(EmberCli::ControllerExtension)
       end
     end
   end
 end