ember-appkit-rails 0.1.2 → 0.2.0

data/test/generators/resource_generator_test.rb

@@ -6,38 +6,39 @@ class ResourceGeneratorTest < Rails::Generators::TestCase
 
   tests Ember::Generators::ResourceGenerator
   destination File.join(Rails.root, "tmp")
-  setup :prepare_destination
-
+  setup :prepare_destination, :copy_router
 
   test "create template" do
     run_generator ["post"]
-    assert_file "app/assets/javascripts/templates/post.hbs"
+    assert_file "#{app_path}/templates/post.hbs"
   end
 
   test "create controller" do
     run_generator ["post"]
-    assert_file "app/assets/javascripts/controllers/post.js.es6"
+    assert_file "#{app_path}/controllers/post.js.es6"
   end
 
   test "create route" do
     run_generator ["post"]
-    assert_file "app/assets/javascripts/routes/post.js.es6"
+    assert_file "#{app_path}/routes/post.js.es6"
+    assert_file "#{config_path}/router.js.es6" do |content|
+      assert_match(%r{this.resource\('posts'\);}, content)
+    end
   end
 
   test "skip route" do
     run_generator ["post", "--skip-route"]
-    assert_no_file "app/assets/javascripts/routes/post.js.es6"
+    assert_no_file "#{app_path}/routes/post.js.es6"
   end
 
-  test "Uses config.ember.ember_path" do
-    custom_path = ember_path("custom")
+  test "Uses config.ember.appkit.paths.app" do
+    custom_path = app_path("custom")
+    copy_router(custom_path)
 
-    with_config ember_path: custom_path do
+    with_config paths: {app: custom_path} do
       run_generator ["post"]
       assert_file "#{custom_path}/controllers/post.js.es6"
       assert_file "#{custom_path}/routes/post.js.es6"
     end
   end
 end
-
-

data/test/generators/resource_override_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+require 'ember/appkit/rails/resource_override'
+
+class ResourceOverrideTest < Rails::Generators::TestCase
+  include GeneratorTestSupport
+
+  tests Rails::Generators::ResourceGenerator
+  destination File.join(Rails.root, "tmp")
+  setup :prepare_destination, :copy_routes
+
+  test "create template without ember" do
+    run_generator ["post"]
+    assert_no_file "#{app_path}/templates/post.hbs"
+  end
+
+  test "create template with ember" do
+    run_generator ["post", '--ember']
+    assert_file "#{app_path}/templates/post.hbs"
+  end
+
+  private
+
+  def copy_routes
+    routes = File.expand_path("../../dummy/config/routes.rb", __FILE__)
+    destination = File.expand_path('../../dummy/tmp/config', __FILE__)
+    FileUtils.mkdir_p(destination)
+    FileUtils.cp routes, destination
+  end
+end

data/test/generators/route_generator_test.rb

@@ -12,14 +12,6 @@ class RouteGeneratorTest < Rails::Generators::TestCase
   test "Assert files are properly created" do
     run_generator %w(index)
 
-    assert_file "#{ember_path}/routes/index.js.es6"
-  end
-
-  test "Assert files are properly created with custom path" do
-    custom_path = ember_path("custom")
-    run_generator [ "index", "-d", custom_path ]
-
-    assert_file "#{custom_path}/routes/index.js.es6"
+    assert_file "#{app_path}/routes/index.js.es6"
   end
 end
-

data/test/generators/scaffold_generator_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+require 'generators/ember/scaffold_generator'
+
+class ScaffoldGeneratorTest < Rails::Generators::TestCase
+  include GeneratorTestSupport
+
+  tests Ember::Generators::ScaffoldGenerator
+  destination File.join(Rails.root, "tmp", "generator_test_output")
+  setup :prepare_destination, :copy_router
+
+  test "create template" do
+    run_generator ["post"]
+
+    assert_files
+    assert_inject_into_router
+  end
+
+  private
+
+  def assert_files
+    assert_file "#{app_path}/models/post.js.es6"
+
+    assert_file "#{app_path}/routes/posts/edit.js.es6"
+    assert_file "#{app_path}/routes/posts/index.js.es6"
+    assert_file "#{app_path}/routes/posts/new.js.es6"
+    assert_file "#{app_path}/routes/posts/show.js.es6"
+
+    assert_file "#{app_path}/templates/posts.hbs"
+    assert_file "#{app_path}/templates/posts/edit.hbs"
+    assert_file "#{app_path}/templates/posts/form.hbs"
+    assert_file "#{app_path}/templates/posts/index.hbs"
+    assert_file "#{app_path}/templates/posts/new.hbs"
+    assert_file "#{app_path}/templates/posts/show.hbs"
+  end
+
+  def assert_inject_into_router
+    js = <<-JS
+  this.resource('posts', function() {
+    this.route('new');
+    this.route('show', {path: ':post_id'});
+    this.route('edit', {path: ':post_id/edit'});
+  });
+JS
+    assert_file "#{config_path}/router.js.es6" do |content|
+      assert_match(/#{Regexp.escape(js.rstrip)}/m, content)
+    end
+  end
+end

data/test/generators/template_generator_test.rb

@@ -11,19 +11,13 @@ class TemplateGeneratorTest < Rails::Generators::TestCase
 
   test "generates template" do
     run_generator ["post"]
-    assert_file "app/assets/javascripts/templates/post.hbs"
+    assert_file "#{app_path}/templates/post.hbs"
   end
 
-  test "Assert files are properly created with custom path" do
-    custom_path = ember_path("custom")
-    run_generator [ "post", "-d", custom_path ]
-    assert_file "#{custom_path}/templates/post.hbs"
-  end
-
-  test "Uses config.ember.ember_path" do
-    custom_path = ember_path("custom")
+  test "Uses config.ember.appkit.paths.app" do
+    custom_path = app_path("custom")
 
-    with_config ember_path: custom_path do
+    with_config paths: {app: custom_path} do
       run_generator ["post"]
       assert_file "#{custom_path}/templates/post.hbs"
     end

data/test/generators/view_generator_test.rb

@@ -11,45 +11,38 @@ class ViewGeneratorTest < Rails::Generators::TestCase
 
   test "create view with template by default" do
     run_generator ["post"]
-    assert_file "app/assets/javascripts/views/post.js.es6"
-    assert_file "app/assets/javascripts/templates/post.hbs"
+    assert_file "#{app_path}/views/post.js.es6"
+    assert_file "#{app_path}/templates/post.hbs"
   end
 
   test "create view without a template" do
     run_generator ["post", "--without-template"]
-    assert_file "app/assets/javascripts/views/post.js.es6"
-    assert_no_file "app/assets/javascripts/templates/post.hbs"
+    assert_file "#{app_path}/views/post.js.es6"
+    assert_no_file "#{app_path}/templates/post.hbs"
   end
 
   test "create view and template (using ember-rails flags)" do
     run_generator ["post", "--with-template"]
-    assert_file "app/assets/javascripts/views/post.js.es6"
-    assert_file "app/assets/javascripts/templates/post.hbs"
+    assert_file "#{app_path}/views/post.js.es6"
+    assert_file "#{app_path}/templates/post.hbs"
   end
 
   test "create namespaced view" do
     run_generator ["post/index"]
-    assert_file "app/assets/javascripts/views/post/index.js.es6"
+    assert_file "#{app_path}/views/post/index.js.es6"
   end
 
   test "Assert files are properly created" do
     run_generator %w(ember)
-    assert_file "#{ember_path}/views/ember.js.es6"
+    assert_file "#{app_path}/views/ember.js.es6"
   end
 
-  test "Assert files are properly created with custom path" do
-    custom_path = ember_path("custom")
-    run_generator [ "ember", "-d", custom_path ]
-    assert_file "#{custom_path}/views/ember.js.es6"
-  end
-
-  test "Uses config.ember.ember_path" do
-    custom_path = ember_path("custom")
+  test "Uses config.ember.appkit.paths.app" do
+    custom_path = app_path("custom")
 
-    with_config ember_path: custom_path do
+    with_config paths: {app: custom_path} do
       run_generator [ "ember"]
       assert_file "#{custom_path}/views/ember.js.es6"
     end
   end
 end
-

data/test/integration/navigation_test.rb

@@ -1,9 +1,17 @@
 require 'test_helper'
 
 class NavigationTest < ActionDispatch::IntegrationTest
-  test 'can render home page' do
-    visit root_path
-    assert page.has_text? 'Joe Doe'
+  include IntegrationTestSupport
+
+  test 'can render default landing page' do
+    visit '/'
+    assert page.has_text? "That was easy, wasn't it?"
+  end
+
+  test 'can using simple "ember magic"' do
+    visit '/'
+    fill_in 'sampleInput', with: 'EMBER ROCKS!'
+    assert page.has_text? "EMBER ROCKS!"
   end
 end
 

data/test/support/generator_test_support.rb

@@ -1,47 +1,88 @@
+require 'pathname'
+
 module GeneratorTestSupport
+  # def run_generator(args=self.default_arguments, config={})
+    # # capture(:stdout) do
+      # args += ['--skip-bundle'] unless args.include? '--dev'
+      # self.generator_class.start(args, config.reverse_merge(destination_root: destination_root))
+    # # end
+  # end
+
   def prepare_destination
     super
 
-    dir = 'app/assets/javascripts'
-    dest = Rails.root.join("tmp", "generator_test_output", dir)
+    tmp_destination = Pathname.new(destination_root)
+    javascript_destination = tmp_destination.join('app','assets','javascripts')
+
+    FileUtils.mkdir_p javascript_destination
+    FileUtils.cp "test/fixtures/rails_4-0-0_application.js", javascript_destination.join('application.js')
+
+    FileUtils.mkdir_p tmp_destination.join(app_path)
+    FileUtils.mkdir_p tmp_destination.join(config_path)
 
-    FileUtils.mkdir_p dest
-    File.write(dest.join('application.js'), "")
+    FileUtils.mkdir_p javascript_destination.join('custom')
+    FileUtils.cp "test/fixtures/rails_4-0-0_application.js", javascript_destination.join('custom', 'application.js')
 
-    FileUtils.mkdir_p dest.join('custom')
-    File.write(dest.join('custom/application.js'), "")
+    FileUtils.cp 'test/fixtures/rails_4-0-0_Gemfile', tmp_destination.join('Gemfile')
+
+    FileUtils.mkdir_p tmp_destination.join('app','views', 'layouts')
+    FileUtils.cp 'test/fixtures/rails_4-0-0_application_layout', tmp_destination.join('app','views','layouts', 'application.html.erb')
   end
 
   def with_config(options = {})
-    original_values = ::Rails.configuration.ember.to_h
+    original_values = ::Rails.configuration.ember.appkit.clone
+    original_values.paths = original_values.paths.clone
+    original_values.paths.app = original_values.paths.app.clone
+    original_values.paths.config = original_values.paths.config.clone
 
-    options.each do |(key, value)|
-      ::Rails.configuration.ember[key] = value
+    options.each do |key, value|
+      if Hash === value
+        value.each do |k, v|
+          ::Rails.configuration.ember.appkit[key][k] = v
+        end
+      else
+        ::Rails.configuration.ember.appkit[key] = value
+      end
     end
 
     yield
   ensure
-    ::Rails.configuration.ember.clear
-    original_values.each do |(key, value)|
-      ::Rails.configuration.ember[key] = value
-    end
+    ::Rails.configuration.ember.appkit.clear
+    ::Rails.configuration.ember.appkit = original_values
   end
 
   def assert_new_dirs(options = {})
-    path = options[:in_path] || ember_path
+    path = options[:in_path] || app_path
 
-    %W{models controllers views helpers components templates templates/components routes}.each do |dir|
+    %W{components templates templates/components routes}.each do |dir|
       assert_directory "#{path}/#{dir}"
       assert_file "#{path}/#{dir}/.gitkeep"
     end
-
   end
 
   def application_name
     "App"
   end
 
-  def ember_path(custom_path = nil)
-   "app/assets/javascripts/#{custom_path}".chomp('/')
+  def app_path(path = 'app')
+    path 
+  end
+
+  def config_path(path = 'config')
+    path
+  end
+
+  def copy_router(path = config_path)
+    source = File.expand_path("../../../lib/generators/templates/router.js.es6", __FILE__)
+    destination = File.join(destination_root, path)
+    FileUtils.mkdir_p(destination)
+    FileUtils.cp source, File.join(destination, 'router.js.es6')
+  end
+
+  def copy_application(path = config_path)
+    source = File.expand_path("../../dummy/config/application.rb", __FILE__)
+    destination = File.join(destination_root, path)
+    FileUtils.mkdir_p(destination)
+    copy_file source, File.join(destination, 'application.rb')
   end
 end

data/test/support/integration_test_support.rb

@@ -0,0 +1,12 @@
+require 'pathname'
+require 'generators/ember/bootstrap_generator'
+
+module IntegrationTestSupport
+  def setup
+    Dir.chdir 'test/dummy' do
+      silence_stream(STDOUT) do
+        Ember::Generators::BootstrapGenerator.start
+      end
+    end
+  end
+end

data/vendor/assets/javascripts/app.js.es6.erb

@@ -0,0 +1,27 @@
+<% config = Rails.application.config.ember.appkit %>
+import Resolver from 'resolver';
+
+if (typeof Turbolinks !== 'undefined') {
+  throw new Error("Turbolinks has been detected. Ember Appkit Rails will not function properly alongside Turbolinks.");
+}
+
+<% unless config.enable_logging %>
+  Ember.LOG_VERSION = false;
+<% end %>
+
+var App = Ember.Application.extend({
+
+<% if config.enable_logging %>
+  LOG_ACTIVE_GENERATION: true,
+  LOG_MODULE_RESOLVER: true,
+  LOG_TRANSITIONS: true,
+  LOG_TRANSITIONS_INTERNAL: true,
+  LOG_VIEW_LOOKUPS: true,
+<% end %>
+
+  modulePrefix: '<%= config.namespaces.app %>',
+  configPrefix: '<%= config.namespaces.config %>',
+  Resolver: Resolver
+});
+
+export default App;

data/vendor/assets/javascripts/ember-appkit/index.js

@@ -3,3 +3,4 @@
 //= require ./almond
 //= require ./resolver
 //= require app
+//= require templates/application

data/vendor/assets/javascripts/ember-appkit/resolver.js

@@ -1,5 +1,5 @@
 // Fetched from: https://raw.github.com/stefanpenner/ember-jj-abrams-resolver/master/dist/ember-resolver.js
-// Fetched on: 2013-10-31T03:00:41Z
+// Fetched on: 2013-11-27T08:26:18
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: Copyright 2013 Stefan Penner and Ember App Kit Contributors
@@ -14,8 +14,8 @@
 /*globals define registry requirejs */
 
 define("resolver",
-  ["exports"],
-  function(__exports__) {
+  [],
+  function() {
     "use strict";
   /*
    * This module defines a subclass of Ember.DefaultResolver that adds two
@@ -83,14 +83,14 @@ define("resolver",
   function resolveRouter(parsedName) {
     /*jshint validthis:true */
 
-    var prefix = this.namespace.modulePrefix,
+    var prefix = this.namespace.configPrefix,
         routerModule;
 
     if (parsedName.fullName === 'router:main') {
       // for now, lets keep the router at app/router.js
       if (requirejs._eak_seen[prefix + '/router']) {
         routerModule = require(prefix + '/router');
-        if (routerModule.default) { routerModule = routerModule.default; }
+        if (routerModule['default']) { routerModule = routerModule['default']; }
 
         return routerModule;
       }
@@ -115,7 +115,7 @@ define("resolver",
     if (requirejs._eak_seen[normalizedModuleName]) {
       var module = require(normalizedModuleName, null, null, true /* force sync */);
 
-      if (module.default) { module = module.default };
+      if (module['default']) { module = module['default']; }
 
       if (module === undefined) {
         throw new Error(" Expected to find: '" + parsedName.fullName + "' within '" + normalizedModuleName + "' but got 'undefined'. Did you forget to `export default` within '" + normalizedModuleName + "'?");
@@ -126,13 +126,13 @@ define("resolver",
       }
 
       if (Ember.ENV.LOG_MODULE_RESOLVER) {
-        Ember.Logger.info('hit', moduleName);
+        Ember.Logger.info('[✓]', parsedName.fullName, new Array(40 - parsedName.fullName.length).join('.'), moduleName);
       }
 
       return module;
     } else {
       if (Ember.ENV.LOG_MODULE_RESOLVER) {
-        Ember.Logger.info('miss', moduleName);
+        Ember.Logger.info('[ ]', parsedName.fullName, new Array(40 - parsedName.fullName.length).join('.'), moduleName);
       }
       return this._super(parsedName);
     }
@@ -143,6 +143,9 @@ define("resolver",
     resolveTemplate: resolveOther,
     resolveOther: resolveOther,
     resolveRouter: resolveRouter,
+    makeToString: function(factory, fullName) {
+      return '' + this.namespace.modulePrefix + '@' + fullName + ':';
+    },
     parseName: parseName,
     shouldWrapInClassFactory: function(module, parsedName){
       return false;
@@ -156,7 +159,8 @@ define("resolver",
     }
   });
 
-  __exports__.default = Resolver;
+  Resolver['default'] = Resolver;
+  return Resolver;
 });
 
 })();