ember-appkit-rails 0.3.2 → 0.4.0

data/test/integration/engine_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class EngineTest < ActionDispatch::IntegrationTest
+  test 'app/assets/javascripts is not in asset load path' do
+    refute Rails.application.config.assets.paths.include?(File.join(Rails.root, 'app/assets/javascripts'))
+  end
+
+  test 'app is in the asset load path' do
+    assert Rails.application.config.assets.paths.include?(File.join(Rails.root, 'app'))
+  end
+
+  test 'config is in the asset load path' do
+    assert Rails.application.config.assets.paths.include?(File.join(Rails.root, 'config'))
+  end
+
+  test 'lib is in the asset load path' do
+    assert Rails.application.config.assets.paths.include?(File.join(Rails.root, 'lib'))
+  end
+
+  test 'lib/assets/javascripts is not in the asset load path' do
+    refute Rails.application.config.assets.paths.include?(File.join(Rails.root, 'lib/assets/javascripts'))
+  end
+
+  test 'ember source assets come after vendor/assets/javascripts' do
+    vendor_index = Rails.application.config.assets.paths.index(File.join(Rails.root, 'vendor/assets/javascripts'))
+    ember_source_index = Rails.application.config.assets.paths.index { |path| path =~ /ember-source/ }
+    ember_data_source_index = Rails.application.config.assets.paths.index { |path| path =~ /ember-data-source/ }
+    handlebars_source_index = Rails.application.config.assets.paths.index { |path| path =~ /handlebars-source/ }
+
+    assert vendor_index < ember_source_index
+    assert vendor_index < ember_data_source_index
+    assert vendor_index < handlebars_source_index
+  end
+end

data/test/support/generator_test_support.rb

@@ -83,4 +83,15 @@ module GeneratorTestSupport
     FileUtils.mkdir_p(destination)
     copy_file source, File.join(destination, 'application.rb')
   end
+
+  def copy_routes
+    copy_routes_file("../../dummy/config/routes.rb")
+  end
+
+  def copy_routes_file(routes_destination)
+    routes = File.expand_path(routes_destination, __FILE__)
+    destination = File.join(destination_root, 'config')
+    FileUtils.mkdir_p(destination)
+    FileUtils.cp routes, File.join(destination, 'routes.rb')
+  end
 end

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

@@ -5,23 +5,8 @@ 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
-});
+}, window.config);
 
 export default App;

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

@@ -1,4 +1,5 @@
 //= require ./loader
 //= require ./resolver
+//= require ./resolver_ext
 //= 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-11-27T08:26:18
+// Fetched on: 2014-01-11T18:12:01
 // ==========================================================================
 // Project:   Ember - JavaScript Application Framework
 // Copyright: Copyright 2013 Stefan Penner and Ember App Kit Contributors
@@ -22,7 +22,7 @@ define("resolver",
    * important features:
    *
    *  1) The resolver makes the container aware of es6 modules via the AMD
-   *     output. The loader's _seen is consulted so that classes can be 
+   *     output. The loader's _seen is consulted so that classes can be
    *     resolved directly via the module loader, without needing a manual
    *     `import`.
    *  2) is able provide injections to classes that implement `extend`
@@ -33,7 +33,7 @@ define("resolver",
     return {
       create: function (injections) {
         if (typeof klass.extend === 'function') {
-          return klass.extend(injections);  
+          return klass.extend(injections);
         } else {
           return klass;
         }
@@ -68,7 +68,7 @@ define("resolver",
     var underscoredModuleName = Ember.String.underscore(moduleName);
 
     if (moduleName !== underscoredModuleName && seen[moduleName] && seen[underscoredModuleName]) {
-      throw new TypeError("Ambigous module names: `" + moduleName + "` and `" + underscoredModuleName + "`");
+      throw new TypeError("Ambiguous module names: `" + moduleName + "` and `" + underscoredModuleName + "`");
     }
 
     if (seen[moduleName]) {
@@ -83,7 +83,7 @@ define("resolver",
   function resolveRouter(parsedName) {
     /*jshint validthis:true */
 
-    var prefix = this.namespace.configPrefix,
+    var prefix = this.namespace.modulePrefix,
         routerModule;
 
     if (parsedName.fullName === 'router:main') {
@@ -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 && 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 + "'?");
@@ -155,7 +155,12 @@ define("resolver",
       // 1. `needs: ['posts/post']`
       // 2. `{{render "posts/post"}}`
       // 3. `this.render('posts/post')` from Route
-      return Ember.String.dasherize(fullName.replace(/\./g, '/'));
+      var split = fullName.split(':');
+      if (split.length > 1) {
+        return split[0] + ':' + Ember.String.dasherize(split[1].replace(/\./g, '/'));
+      } else {
+        return fullName;
+      }
     }
   });
 

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

@@ -0,0 +1,40 @@
+(function() {
+  var Resolver = require('resolver').default;
+  var originalResolveOther = Resolver
+
+  function resolveCustomPrefix(parsedName) {
+    /*jshint validthis:true */
+
+    var prefix = this.namespace.modulePrefix,
+        type = parsedName.type,
+        name = parsedName.fullNameWithoutType,
+        tmpModuleName, moduleName, module;
+
+    if (this.namespace[type + 'Prefix']) {
+      prefix = this.namespace[type + 'Prefix'];
+    }
+
+    tmpModuleName = prefix + '/' + type;
+    if (name === 'main' && requirejs._eak_seen[tmpModuleName]) {
+      moduleName = tmpModuleName;
+    } else {
+    }
+
+    if (!moduleName) { moduleName = prefix + '/' + type + 's/' + name; }
+
+    if (requirejs._eak_seen[moduleName]) {
+      module = require(moduleName);
+      if (module['default']) { module = module['default']; }
+
+      return module;
+    } else {
+      return this.resolveOther(parsedName);
+    }
+  }
+
+  Resolver.reopen({
+    resolveRouter: resolveCustomPrefix,
+    resolveAdapter: resolveCustomPrefix,
+    resolveSerializer: resolveCustomPrefix
+  });
+})();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-appkit-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: es6_module_transpiler-rails
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +136,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -206,10 +206,10 @@ files:
 - lib/generators/templates/component.template.hbs
 - lib/generators/templates/controller.js.es6
 - lib/generators/templates/csrf.js
-- lib/generators/templates/environment.js
-- lib/generators/templates/environments/development.js
-- lib/generators/templates/environments/production.js
-- lib/generators/templates/environments/test.js
+- lib/generators/templates/environment.js.erb
+- lib/generators/templates/environments/development.js.erb
+- lib/generators/templates/environments/production.js.erb
+- lib/generators/templates/environments/test.js.erb
 - lib/generators/templates/helper.js
 - lib/generators/templates/model.js.es6
 - lib/generators/templates/object_controller.js.es6
@@ -232,6 +232,7 @@ files:
 - vendor/assets/javascripts/ember-appkit/index.js
 - vendor/assets/javascripts/ember-appkit/loader.js
 - vendor/assets/javascripts/ember-appkit/resolver.js
+- vendor/assets/javascripts/ember-appkit/resolver_ext.js
 - MIT-LICENSE
 - Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -243,17 +244,17 @@ files:
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
-- test/dummy/config/adapter.js.erb
+- test/dummy/config/adapters/application.js.es6.erb
 - test/dummy/config/application.js
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
-- test/dummy/config/environment.js
+- test/dummy/config/environment.js.erb
 - test/dummy/config/environment.rb
-- test/dummy/config/environments/development.js
+- test/dummy/config/environments/development.js.erb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.js
+- test/dummy/config/environments/production.js.erb
 - test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.js
+- test/dummy/config/environments/test.js.erb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/csrf.js
@@ -282,10 +283,12 @@ files:
 - test/dummy/tmp/app/assets/javascripts/custom/application.js
 - test/dummy/tmp/app/templates/post.hbs
 - test/dummy/tmp/app/views/layouts/application.html.erb
-- test/dummy/tmp/cache/assets/test/sprockets/07afa5d8ceda557642e2330ab45eb203
+- test/dummy/tmp/cache/assets/test/sprockets/10fe949cc641775f5630b5dad6deb5fc
+- test/dummy/tmp/cache/assets/test/sprockets/129b422236f443119233cdb0a4525a06
 - test/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
 - test/dummy/tmp/cache/assets/test/sprockets/1d5975f28925835fe6077b200f4f150f
 - test/dummy/tmp/cache/assets/test/sprockets/1f15c49a05b13c3a7ee50d2ac3900f38
+- test/dummy/tmp/cache/assets/test/sprockets/25b8b60341168a02f48dabd2b0aa82ad
 - test/dummy/tmp/cache/assets/test/sprockets/2ad53936554864466b852e4eae6d6803
 - test/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
 - test/dummy/tmp/cache/assets/test/sprockets/47fb03bce147145961cb3deeafca54d7
@@ -297,25 +300,25 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/67afcba9807cd5e57b80b5fdf9f26758
 - test/dummy/tmp/cache/assets/test/sprockets/7ca4966e0a480430a858a7ab74518c75
 - test/dummy/tmp/cache/assets/test/sprockets/827fafc13575b345cc572fd041ef1fba
+- test/dummy/tmp/cache/assets/test/sprockets/83030d43d9bff738a1a01366d61d7691
+- test/dummy/tmp/cache/assets/test/sprockets/83a9a7d15d681a382363d2bccb9528bb
 - test/dummy/tmp/cache/assets/test/sprockets/83af35bb6b852de883a26a9458fd4e3a
 - test/dummy/tmp/cache/assets/test/sprockets/889c68982dadf8d222309363924fe44b
+- test/dummy/tmp/cache/assets/test/sprockets/8adfb5e646dca2c629e5d3dc88e2c2e9
 - test/dummy/tmp/cache/assets/test/sprockets/9160f792acb62d1f7721c714681fcfe6
-- test/dummy/tmp/cache/assets/test/sprockets/ae884a1acda0e6f9bb27a856a22bb08d
+- test/dummy/tmp/cache/assets/test/sprockets/a6a0d79927cb0ec286aa0afb9812685c
 - test/dummy/tmp/cache/assets/test/sprockets/bb4a2293175928af3e23c47488077098
 - test/dummy/tmp/cache/assets/test/sprockets/bf689240392e7355c0de5cfd47272146
+- test/dummy/tmp/cache/assets/test/sprockets/cdbe9110f011148cc7a1f172dc18a883
 - test/dummy/tmp/cache/assets/test/sprockets/ce7582379ff02bb25cee3ac0486fe1f2
 - test/dummy/tmp/cache/assets/test/sprockets/d4cb455bee790d041fb3111fb1636531
 - test/dummy/tmp/cache/assets/test/sprockets/d5a48c6656341c56cac8a8e42bb925a5
 - test/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - test/dummy/tmp/cache/assets/test/sprockets/de0932670a6c856bc6eda1586fd29061
 - test/dummy/tmp/cache/assets/test/sprockets/de94a60b438eb5bf57653f3a220acd80
-- test/dummy/tmp/cache/assets/test/sprockets/e15ec26dd7914851e352c6f2c73c4284
 - test/dummy/tmp/cache/assets/test/sprockets/e36a853a1349d7f33f6c0083c05f897b
-- test/dummy/tmp/cache/assets/test/sprockets/e3ddb4a07e99c5bbf5f9cd9db3cdb82a
 - test/dummy/tmp/cache/assets/test/sprockets/e9abb671d48f6ff2be6ffb463ea652bf
 - test/dummy/tmp/cache/assets/test/sprockets/eeb5bd38d1dad0d908461fd114f702bc
-- test/dummy/tmp/cache/assets/test/sprockets/fde9e78f8d55a70f4ef757638fc6cde0
-- test/dummy/tmp/cache/assets/test/sprockets/fdfac6623944c5a23737724cbd90e58e
 - test/dummy/tmp/Gemfile
 - test/dummy/tmp/generator_test_output/app/assets/javascripts/application.js
 - test/dummy/tmp/generator_test_output/app/assets/javascripts/custom/application.js
@@ -327,6 +330,8 @@ files:
 - test/fixtures/rails_4-0-0_Gemfile
 - test/fixtures/routes_with_api_and_version_namespaces.rb
 - test/fixtures/routes_with_api_namespace.rb
+- test/fixtures/routes_with_api_version_namespaces_and_route.rb
+- test/fixtures/walker.rb
 - test/generators/bootstrap_generator_test.rb
 - test/generators/component_generator_test.rb
 - test/generators/controller_generator_test.rb
@@ -340,6 +345,7 @@ files:
 - test/generators/template_generator_test.rb
 - test/generators/view_generator_test.rb
 - test/integration/autoload_modules_test.rb
+- test/integration/engine_test.rb
 - test/integration/navigation_test.rb
 - test/support/generator_test_support.rb
 - test/support/integration_test_support.rb
@@ -377,17 +383,17 @@ test_files:
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
-- test/dummy/config/adapter.js.erb
+- test/dummy/config/adapters/application.js.es6.erb
 - test/dummy/config/application.js
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
-- test/dummy/config/environment.js
+- test/dummy/config/environment.js.erb
 - test/dummy/config/environment.rb
-- test/dummy/config/environments/development.js
+- test/dummy/config/environments/development.js.erb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.js
+- test/dummy/config/environments/production.js.erb
 - test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.js
+- test/dummy/config/environments/test.js.erb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/csrf.js
@@ -416,10 +422,12 @@ test_files:
 - test/dummy/tmp/app/assets/javascripts/custom/application.js
 - test/dummy/tmp/app/templates/post.hbs
 - test/dummy/tmp/app/views/layouts/application.html.erb
-- test/dummy/tmp/cache/assets/test/sprockets/07afa5d8ceda557642e2330ab45eb203
+- test/dummy/tmp/cache/assets/test/sprockets/10fe949cc641775f5630b5dad6deb5fc
+- test/dummy/tmp/cache/assets/test/sprockets/129b422236f443119233cdb0a4525a06
 - test/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
 - test/dummy/tmp/cache/assets/test/sprockets/1d5975f28925835fe6077b200f4f150f
 - test/dummy/tmp/cache/assets/test/sprockets/1f15c49a05b13c3a7ee50d2ac3900f38
+- test/dummy/tmp/cache/assets/test/sprockets/25b8b60341168a02f48dabd2b0aa82ad
 - test/dummy/tmp/cache/assets/test/sprockets/2ad53936554864466b852e4eae6d6803
 - test/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
 - test/dummy/tmp/cache/assets/test/sprockets/47fb03bce147145961cb3deeafca54d7
@@ -431,25 +439,25 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/67afcba9807cd5e57b80b5fdf9f26758
 - test/dummy/tmp/cache/assets/test/sprockets/7ca4966e0a480430a858a7ab74518c75
 - test/dummy/tmp/cache/assets/test/sprockets/827fafc13575b345cc572fd041ef1fba
+- test/dummy/tmp/cache/assets/test/sprockets/83030d43d9bff738a1a01366d61d7691
+- test/dummy/tmp/cache/assets/test/sprockets/83a9a7d15d681a382363d2bccb9528bb
 - test/dummy/tmp/cache/assets/test/sprockets/83af35bb6b852de883a26a9458fd4e3a
 - test/dummy/tmp/cache/assets/test/sprockets/889c68982dadf8d222309363924fe44b
+- test/dummy/tmp/cache/assets/test/sprockets/8adfb5e646dca2c629e5d3dc88e2c2e9
 - test/dummy/tmp/cache/assets/test/sprockets/9160f792acb62d1f7721c714681fcfe6
-- test/dummy/tmp/cache/assets/test/sprockets/ae884a1acda0e6f9bb27a856a22bb08d
+- test/dummy/tmp/cache/assets/test/sprockets/a6a0d79927cb0ec286aa0afb9812685c
 - test/dummy/tmp/cache/assets/test/sprockets/bb4a2293175928af3e23c47488077098
 - test/dummy/tmp/cache/assets/test/sprockets/bf689240392e7355c0de5cfd47272146
+- test/dummy/tmp/cache/assets/test/sprockets/cdbe9110f011148cc7a1f172dc18a883
 - test/dummy/tmp/cache/assets/test/sprockets/ce7582379ff02bb25cee3ac0486fe1f2
 - test/dummy/tmp/cache/assets/test/sprockets/d4cb455bee790d041fb3111fb1636531
 - test/dummy/tmp/cache/assets/test/sprockets/d5a48c6656341c56cac8a8e42bb925a5
 - test/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
 - test/dummy/tmp/cache/assets/test/sprockets/de0932670a6c856bc6eda1586fd29061
 - test/dummy/tmp/cache/assets/test/sprockets/de94a60b438eb5bf57653f3a220acd80
-- test/dummy/tmp/cache/assets/test/sprockets/e15ec26dd7914851e352c6f2c73c4284
 - test/dummy/tmp/cache/assets/test/sprockets/e36a853a1349d7f33f6c0083c05f897b
-- test/dummy/tmp/cache/assets/test/sprockets/e3ddb4a07e99c5bbf5f9cd9db3cdb82a
 - test/dummy/tmp/cache/assets/test/sprockets/e9abb671d48f6ff2be6ffb463ea652bf
 - test/dummy/tmp/cache/assets/test/sprockets/eeb5bd38d1dad0d908461fd114f702bc
-- test/dummy/tmp/cache/assets/test/sprockets/fde9e78f8d55a70f4ef757638fc6cde0
-- test/dummy/tmp/cache/assets/test/sprockets/fdfac6623944c5a23737724cbd90e58e
 - test/dummy/tmp/Gemfile
 - test/dummy/tmp/generator_test_output/app/assets/javascripts/application.js
 - test/dummy/tmp/generator_test_output/app/assets/javascripts/custom/application.js
@@ -461,6 +469,8 @@ test_files:
 - test/fixtures/rails_4-0-0_Gemfile
 - test/fixtures/routes_with_api_and_version_namespaces.rb
 - test/fixtures/routes_with_api_namespace.rb
+- test/fixtures/routes_with_api_version_namespaces_and_route.rb
+- test/fixtures/walker.rb
 - test/generators/bootstrap_generator_test.rb
 - test/generators/component_generator_test.rb
 - test/generators/controller_generator_test.rb
@@ -474,6 +484,7 @@ test_files:
 - test/generators/template_generator_test.rb
 - test/generators/view_generator_test.rb
 - test/integration/autoload_modules_test.rb
+- test/integration/engine_test.rb
 - test/integration/navigation_test.rb
 - test/support/generator_test_support.rb
 - test/support/integration_test_support.rb

data/lib/generators/templates/environment.js

@@ -1,12 +0,0 @@
-//= require_self
-//= require_environment_from ./environments
-/*
- This is useful when using canary versions of Ember to enable
- feature flags before Ember itself is loaded.
-
- See the feature flags guide for details:
-
- http://emberjs.com/guides/configuring-ember/feature-flags/
-*/
-
-window.ENV = {};