Upgrade to ember-cli 0.1.1

towerhe · towerhe · commit d5f252363676 · 2014-10-10T11:04:47.000+08:00
diff --git a/.ember-cli b/.ember-cli
@@ -1,8 +1,9 @@
 {
-  "port": 4200,
-  "host": "0.0.0.0",
-  "live-reload": true,
-  "environment": "development",
-  "newestVersion": "0.0.37",
-  "lastVersionCheck": 1403917005978
-}
+  /**
+    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
@@ -3,7 +3,6 @@
     "document": true,
     "window": true,
     "-Promise": true,
-    "GloitAppENV": true,
     "moment": true,
     "Bootstrap": true,
     "Notifier": true,
diff --git a/app/adapters/application.coffee b/app/adapters/application.coffee
@@ -1,7 +1,8 @@
 `import DS from 'ember-data'`
+`import config from '../config/environment'`
 
 ApplicationAdapter = DS.ActiveModelAdapter.extend
-  host: GloitAppENV.APP.api.host
-  namespace: GloitAppENV.APP.api.namespace
+  host: config.APP.api.host
+  namespace: config.APP.api.namespace
 
 `export default ApplicationAdapter`
diff --git a/app/app.coffee b/app/app.coffee
@@ -1,6 +1,7 @@
 `import Ember from 'ember'`
 `import Resolver from 'ember/resolver'`
 `import loadInitializers from 'ember/load-initializers'`
+`import config from './config/environment'`
 
 # Register helpers
 `import ptHelper from './helpers/pt'`
@@ -34,9 +35,10 @@ Ember.Route.reopen
     parent
 
 App = Ember.Application.extend
-  modulePrefix: 'gloit-app'   # TODO: loaded via config
+  modulePrefix: config.modulePrefix
+  podModulePrefix: config.podModulePrefix
   Resolver: Resolver
 
-loadInitializers(App, 'gloit-app')
+loadInitializers(App, config.modulePrefix)
 
 `export default App`
diff --git a/app/controllers/login.coffee b/app/controllers/login.coffee
@@ -1,5 +1,6 @@
 `import Ember from 'ember'`
 `import LoginControllerMixin from 'simple-auth/mixins/login-controller-mixin'`
+`import config from '../config/environment'`
 
 LoginController  = Ember.Controller.extend LoginControllerMixin,
   authenticator: "authenticator:gloit-app"
@@ -10,10 +11,10 @@ LoginController  = Ember.Controller.extend LoginControllerMixin,
   copyright: '&copy; 2014'
 
   supportedBrowers: [
-    { name: 'Chrome', url: 'http://www.google.com/chrome', icon: GloitAppENV.baseURL + '/images/chrome.png' }
-    { name: 'Firefox', url: 'http://www.mozilla.org/en-US/firefox/new/', icon: GloitAppENV.baseURL + '/images/firefox.png' }
-    { name: 'Safari', url: 'http://www.apple.com/sg/safari/', icon: GloitAppENV.baseURL + '/images/safari.png' }
-    { name: 'IE 10+', url: 'http://windows.microsoft.com/en-sg/internet-explorer/ie-10-worldwide-languages', icon: GloitAppENV.baseURL + '/images/ie.png' }
+    { name: 'Chrome', url: 'http://www.google.com/chrome', icon: config.baseURL + 'images/chrome.png' }
+    { name: 'Firefox', url: 'http://www.mozilla.org/en-US/firefox/new/', icon: config.baseURL + 'images/firefox.png' }
+    { name: 'Safari', url: 'http://www.apple.com/sg/safari/', icon: config.baseURL + 'images/safari.png' }
+    { name: 'IE 10+', url: 'http://windows.microsoft.com/en-sg/internet-explorer/ie-10-worldwide-languages', icon: config.baseURL + 'images/ie.png' }
   ]
 
 `export default LoginController`
diff --git a/app/controllers/registrations/new.coffee b/app/controllers/registrations/new.coffee
@@ -1,4 +1,5 @@
 `import Ember from 'ember'`
+`import config from '../../config/environment'`
 
 NewController = Ember.ObjectController.extend
   username: null
@@ -10,7 +11,7 @@ NewController = Ember.ObjectController.extend
   actions:
     save: ->
       Ember.$.ajax(
-        url: "#{GloitAppENV.APP.api.baseUrl}/users"
+        url: "#{config.APP.api.baseUrl}/users"
         type: 'POST'
         data:
           user:
diff --git a/app/index.html b/app/index.html
@@ -7,15 +7,15 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
+    {{content-for 'head'}}
+
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
       <script src="assets/html5shiv.js"></script>
       <script src="assets/respond.min.js"></script>
     <![endif]-->
 
-    {{BASE_TAG}}
-
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/gloit-app.css">
   </head>
@@ -25,14 +25,8 @@
       window.Ember = { ENV: { STUB_OBJECT_CREATE: true } };
     </script>
     <![endif]-->
-    <script>
-      window.ENV = window.GloitAppENV = {{ENV}};
-      window.EmberENV = window.GloitAppENV.EmberENV;
-    </script>
+
     <script src="assets/vendor.js"></script>
     <script src="assets/gloit-app.js"></script>
-    <script>
-      window.GloitApp = require('gloit-app/app')['default'].create(GloitAppENV.APP);
-    </script>
   </body>
 </html>
diff --git a/app/initializers/authentication.coffee b/app/initializers/authentication.coffee
@@ -2,9 +2,9 @@
 `import DeviseAuthenticator from 'simple-auth-devise/authenticators/devise'`
 `import DeviseAuthorizer from 'simple-auth-devise/authorizers/devise'`
 `import Session from 'simple-auth/session'`
+`import config from '../config/environment'`
 
 GloitAppAuthenticator = DeviseAuthenticator.extend
-  serverTokenEndpoint: "#{GloitAppENV.APP.api.host}/users/sign_in"
   authenticate: (credentials) ->
     new Ember.RSVP.Promise (resolve, reject) =>
       data = {}
diff --git a/app/models/user.coffee b/app/models/user.coffee
@@ -1,5 +1,6 @@
 `import Ember from 'ember'`
 `import DS from 'ember-data'`
+`import config from '../config/environment'`
 
 User = DS.Model.extend Ember.Validations.Mixin,
   username: DS.attr()
@@ -18,7 +19,7 @@ User = DS.Model.extend Ember.Validations.Mixin,
       return reject('您两次输入的新密码不匹配') if newPwd != pwdConfirmation
 
       Ember.$.ajax(
-        url: "#{GloitAppENV.APP.api.baseUrl}/password"
+        url: "#{config.APP.api.baseUrl}/password"
         type: "PUT"
         data:
           password:
@@ -32,11 +33,11 @@ User = DS.Model.extend Ember.Validations.Mixin,
         reject(jqXHR.responseJSON.errors.password)
 
   lock: ->
-    Ember.$.post("#{GloitAppENV.APP.api.baseUrl}/users/#{@get('id')}/lock").then (user) =>
+    Ember.$.post("#{config.APP.api.baseUrl}/users/#{@get('id')}/lock").then (user) =>
       @get('store').pushPayload('user', user)
 
   unlock: ->
-    Ember.$.post("#{GloitAppENV.APP.api.baseUrl}/users/#{@get('id')}/unlock").then (user) =>
+    Ember.$.post("#{config.APP.api.baseUrl}/users/#{@get('id')}/unlock").then (user) =>
       @get('store').pushPayload('user', user)
 
   hasRole: (roles, matchMode) ->
diff --git a/app/router.coffee b/app/router.coffee
@@ -1,7 +1,8 @@
 `import Ember from 'ember'`
+`import config from './config/environment'`
 
 Router = Ember.Router.extend
-  location: GloitAppENV.locationType
+  location: config.locationType
 
   storeURL: (->
     currentURL = @get('url')
diff --git a/bower.json b/bower.json
@@ -4,8 +4,9 @@
     "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",
+    "loader.js": "stefanpenner/loader.js#1.0.1",
     "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
     "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
@@ -20,7 +21,7 @@
     "ember-forms": "*",
     "ember-validations": "http://builds.dockyard.com.s3.amazonaws.com/ember-validations/release/ember-validations.js",
     "ember-addons.bs_for_ember": "~0.7.0",
-    "ember-simple-auth": "0.6.6",
+    "ember-simple-auth": "0.6.7",
     "ic-styled": "~2.0.0",
     "ember-utils": "~0.1.0",
     "ember-components": "~0.2.0"
diff --git a/config/environment.js b/config/environment.js
@@ -2,6 +2,7 @@
 
 module.exports = function(environment) {
   var ENV = {
+    modulePrefix: 'gloit-app',
     environment: environment,
     baseURL: '/',
     locationType: 'auto',
@@ -11,6 +12,15 @@ module.exports = function(environment) {
         // e.g. 'with-controller': true
       }
     },
+    contentSecurityPolicy: {
+      'default-src': "'none'",
+      'script-src': "'self' 'unsafe-eval'",
+      'font-src': "'self'",
+      'connect-src': "'self' http://localhost:3000", // Allow data (ajax/websocket) from http://localhost:3000
+      'img-src': "'self' http://localhost:4200",
+      'style-src': "'self' 'unsafe-inline'",
+      'media-src': "'self'"
+  },
 
     APP: {
       // Here you can pass flags/options to your application instance
@@ -43,7 +53,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') {
@@ -56,6 +74,7 @@ module.exports = function(environment) {
     };
 
     ENV['simple-auth']['crossOriginWhitelist'] = ["http://ffers-webapi.gloit.cn"];
+    ENV['simple-auth-devise']['serverTokenEndpoint'] = "http://ffers-webapi.gloit.cn/users/sign_in";
   }
 
   return ENV;
diff --git a/package.json b/package.json
@@ -19,24 +19,25 @@
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.0.17",
+    "broccoli-asset-rev": "0.3.0",
     "broccoli-coffee": "^0.1.0",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
     "broccoli-emblem-compiler": "^0.3.16",
     "broccoli-less-single": "^0.1.4",
     "broccoli-merge-trees": "^0.1.4",
     "broccoli-static-compiler": "^0.1.4",
-    "ember-cli": "0.0.44",
+    "ember-cli": "0.1.1",
+    "ember-cli-content-security-policy": "0.2.0",
     "ember-cli-coffeescript": "0.0.4",
     "ember-cli-components": "git://github.com/towerhe/ember-cli-components.git",
     "ember-cli-divshot": "^0.1.4",
-    "ember-cli-ember-data": "0.1.0",
     "ember-cli-ic-ajax": "0.1.1",
-    "ember-cli-inject-live-reload": "^1.0.2",
+    "ember-cli-inject-live-reload": "^1.2.2",
     "ember-cli-loading-slider": "^1.0.2",
     "ember-cli-qunit": "0.1.0",
     "ember-cli-simple-auth": "git://github.com/simplabs/ember-cli-simple-auth.git",
     "ember-cli-simple-auth-devise": "git://github.com/simplabs/ember-cli-simple-auth-devise.git",
+    "ember-data": "1.0.0-beta.10",
     "express": "^4.8.5",
     "glob": "^4.0.5",
     "grunt": "^0.4.5",
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -39,7 +39,6 @@
     "findWithAssert",
     "wait",
     "DS",
-    "keyEvent",
     "isolatedContainer",
     "startApp",
     "andThen",
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: 'gloit-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 'gloit-app/app';
-import Router from 'gloit-app/router';
+import Application from '../../app';
+import Router from '../../router';
+import config from '../../config/environment';
 
 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
@@ -7,7 +7,7 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{BASE_TAG}}
+    {{content-for 'head'}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/gloit-app.css">
@@ -33,17 +33,10 @@
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
 
-    <script>
-      window.GloitAppENV = {{ENV}};
-      window.EmberENV = window.GloitAppENV.EmberENV;
-    </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/gloit-app.js"></script>
     <script src="testem.js"></script>
-    <script>
-      require('gloit-app/tests/test-helper');
-    </script>
     <script src="assets/test-loader.js"></script>
   </body>
 </html>
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -8,8 +8,5 @@ setResolver(resolver);
 document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
 
 QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container'});
-if (QUnit.urlParams.nocontainer) {
-  document.getElementById('ember-testing-container').style.visibility = 'hidden';
-} else {
-  document.getElementById('ember-testing-container').style.visibility = 'visible';
-}
+var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible';
+document.getElementById('ember-testing-container').style.visibility = containerVisibility;
