0.0.45

ember-cli · Dec 13, 2014 · 02106d8 · 02106d8
1 parent d2bf0aa
commit 02106d8
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 24 deletions.
diff --git a/.ember-cli b/.ember-cli
@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}
diff --git a/.jshintrc b/.jshintrc
@@ -2,8 +2,7 @@
   "predef": {
     "document": true,
     "window": true,
-    "-Promise": true,
-    "MyAppENV": true
+    "-Promise": true
   },
   "browser" : true,
   "boss" : true,

diff --git a/app/app.js b/app/app.js
@@ -1,14 +1,16 @@
 import Ember from 'ember';
 import Resolver from 'ember/resolver';
 import loadInitializers from 'ember/load-initializers';
+import config from './config/environment';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 var App = Ember.Application.extend({
-  modulePrefix: 'my-app', // TODO: loaded via config
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
 });
 
-loadInitializers(App, 'my-app');
+loadInitializers(App, config.modulePrefix);
 
 export default App;
diff --git a/app/index.html b/app/index.html
@@ -14,13 +14,12 @@
   </head>
   <body>
     <script>
-      window.MyAppENV = {{ENV}};
-      window.EmberENV = window.MyAppENV.EmberENV;
+      window.EmberENV = {{EMBER_ENV}};
     </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/my-app.js"></script>
     <script>
-      window.MyApp = require('my-app/app')['default'].create(MyAppENV.APP);
+      window.MyApp = require('my-app/app')['default'].create({{APP_CONFIG}});
     </script>
   </body>
 </html>
diff --git a/app/router.js b/app/router.js
@@ -1,7 +1,8 @@
 import Ember from 'ember';
+import config from './config/environment';
 
 var Router = Ember.Router.extend({
-  location: MyAppENV.locationType
+  location: config.locationType
 });
 
 Router.map(function() {

diff --git a/bower.json b/bower.json
@@ -4,6 +4,7 @@
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
     "ember": "1.7.0",
+    "ember-data": "1.0.0-beta.10",
     "ember-resolver": "~0.1.7",
     "loader": "stefanpenner/loader.js#1.0.1",
     "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",

diff --git a/config/environment.js b/config/environment.js
@@ -2,6 +2,7 @@
 
 module.exports = function(environment) {
   var ENV = {
+    modulePrefix: 'my-app',
     environment: environment,
     baseURL: '/',
     locationType: 'auto',
@@ -27,7 +28,15 @@ module.exports = function(environment) {
   }
 
   if (environment === 'test') {
-    ENV.baseURL = '/'; // Testem prefers this...
+    // Testem prefers this...
+    ENV.baseURL = '/';
+    ENV.locationType = 'auto';
+
+    // keep test console output quieter
+    ENV.APP.LOG_ACTIVE_GENERATION = false;
+    ENV.APP.LOG_VIEW_LOOKUPS = false;
+
+    ENV.APP.rootElement = '#ember-testing';
   }
 
   if (environment === 'production') {

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "directories": {
     "doc": "doc",
-    "test": "test"
+    "test": "tests"
   },
   "scripts": {
     "start": "ember server",
@@ -19,13 +19,13 @@
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.0.17",
+    "broccoli-asset-rev": "0.1.1",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "0.0.44",
-    "ember-cli-ember-data": "0.1.0",
+    "ember-cli": "0.0.45",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.0.2",
     "ember-cli-qunit": "0.1.0",
+    "ember-data": "1.0.0-beta.10",
     "express": "^4.8.5",
     "glob": "^4.0.5"
   }

diff --git a/tests/helpers/resolver.js b/tests/helpers/resolver.js
@@ -1,9 +1,11 @@
 import Resolver from 'ember/resolver';
+import config from '../../config/environment';
 
 var resolver = Resolver.create();
 
 resolver.namespace = {
-  modulePrefix: 'my-app'
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix
 };
 
 export default resolver;
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,16 +1,13 @@
 import Ember from 'ember';
-import Application from 'my-app/app';
-import Router from 'my-app/router';
+import Application from '../../app';
+import Router from '../../router';
+import config from '../../config/environments/test';
 
 export default function startApp(attrs) {
   var App;
 
-  var attributes = Ember.merge({
-    // useful Test defaults
-    rootElement: '#ember-testing',
-    LOG_ACTIVE_GENERATION: false,
-    LOG_VIEW_LOOKUPS: false
-  }, attrs); // but you can override;
+  var attributes = Ember.merge({}, config.APP);
+  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
   Router.reopen({
     location: 'none'

diff --git a/tests/index.html b/tests/index.html
@@ -34,8 +34,7 @@
     <div id="qunit-fixture"></div>
 
     <script>
-      window.MyAppENV = {{ENV}};
-      window.EmberENV = window.MyAppENV.EmberENV;
+      window.EmberENV = {{EMBER_ENV}};
     </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>