From f9f1777c6be96af1710b74e36d8464f737d65bb9 Mon Sep 17 00:00:00 2001
From: "Patrick B. Gibson" <patrick@fadeover.org>
Date: Fri, 4 May 2012 16:54:54 -0700
Subject: [PATCH] Not using the /ember subpath anymore.

---
 lib/generators/ember/controller_generator.rb | 2 +-
 lib/generators/ember/model_generator.rb      | 2 +-
 lib/generators/ember/view_generator.rb       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/generators/ember/controller_generator.rb b/lib/generators/ember/controller_generator.rb
index df01959a..c44f78db 100644
--- a/lib/generators/ember/controller_generator.rb
+++ b/lib/generators/ember/controller_generator.rb
@@ -9,7 +9,7 @@ class ControllerGenerator < ::Rails::Generators::NamedBase
       class_option :array, :type => :boolean, :default => false, :desc => "Create an Ember.ArrayController to represent multiple objects"
 
       def create_controller_files
-        file_path = File.join('app/assets/javascripts/ember/controllers', class_path, "#{file_name}_controller.js")
+        file_path = File.join('app/assets/javascripts/controllers', class_path, "#{file_name}_controller.js")
         if options.array?
           template 'array_controller.js', file_path
         else
diff --git a/lib/generators/ember/model_generator.rb b/lib/generators/ember/model_generator.rb
index d6fb7004..169d2ac5 100644
--- a/lib/generators/ember/model_generator.rb
+++ b/lib/generators/ember/model_generator.rb
@@ -9,7 +9,7 @@ class ModelGenerator < ::Rails::Generators::NamedBase
       desc "Creates a new Ember.js model"
       
       def create_model_files
-        template 'model.js', File.join('app/assets/javascripts/ember/models', class_path, "#{file_name}.js")
+        template 'model.js', File.join('app/assets/javascripts/models', class_path, "#{file_name}.js")
       end
       
       private 
diff --git a/lib/generators/ember/view_generator.rb b/lib/generators/ember/view_generator.rb
index f4dab1d5..d18a7ded 100644
--- a/lib/generators/ember/view_generator.rb
+++ b/lib/generators/ember/view_generator.rb
@@ -9,8 +9,8 @@ class ViewGenerator < ::Rails::Generators::NamedBase
       desc "Creates a new Ember.js view and associated Handlebars template"
       
       def create_model_files
-        template 'view.js', File.join('app/assets/javascripts/ember/views/' + controller_name, class_path, "#{file_name}_view.js")
-        template 'view.handlebars', File.join('app/assets/javascripts/ember/templates/' + controller_name, class_path, "#{file_name}.handlebars")
+        template 'view.js', File.join('app/assets/javascripts/views/' + controller_name, class_path, "#{file_name}_view.js")
+        template 'view.handlebars', File.join('app/assets/javascripts/templates/' + controller_name, class_path, "#{file_name}.handlebars")
       end
       
     end