updated ember cli and libraries

mainmatter · Nov 14, 2014 · dcbf0d4 · dcbf0d4
1 parent 8bcb474
commit dcbf0d4
Show file tree

Hide file tree

Showing 15 changed files with 109 additions and 67 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/.gitignore b/.gitignore
@@ -6,7 +6,7 @@
 
 # dependencies
 /node_modules
-/bower_components/*
+/bower_components
 
 # misc
 /.sass-cache

diff --git a/.jshintrc b/.jshintrc
@@ -1,10 +1,9 @@
 {
-  "predef": {
-    "document": true,
-    "window": true,
-    "-Promise": true,
-    "EmberSimpleAuthSampleENV": true
-  },
+  "predef": [
+    "document",
+    "window",
+    "-Promise"
+  ],
   "browser" : true,
   "boss" : true,
   "curly": true,

diff --git a/README.md b/README.md
@@ -1,19 +1,51 @@
-# Ember CLI Ember Simple Auth example
+# Ember-simple-auth-sample
 
-Example project that shows how to use Ember Simple Auth with Ember CLI.
+This README outlines the details of collaborating on this Ember application.
+
+A short introduction of this app could easily go here.
+
+## Prerequisites
+
+You will need the following things properly installed on your computer.
+
+* [Git](http://git-scm.com/)
+* [Node.js](http://nodejs.org/) (with NPM) and [Bower](http://bower.io/)
 
 ## Installation
 
-* `git clone` this repository
+* `git clone <repository-url>` this repository
+* change into the new directory
 * `npm install`
 * `bower install`
 
-## Running
+## Running / Development
+
+* `ember server`
+* Visit your app at http://localhost:4200.
+
+### Code Generators
+
+Make use of the many generators for code, try `ember help generate` for more details
+
+### Running Tests
+
+* `ember test`
+* `ember test --server`
+
+### Building
+
+* `ember build` (development)
+* `ember build --environment production` (production)
+
+### Deploying
+
+Specify what it takes to deploy your app.
 
-* `ember serve`
-* open http://localhost:4200
+## Further Reading / Useful Links
 
-## Running the tests
+* ember: http://emberjs.com/
+* ember-cli: http://www.ember-cli.com/
+* Development Browser Extensions
+  * [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
+  * [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
 
-* `ember test` for running on the console
-* `ember test --server` for running in the browser
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: 'ember-simple-auth-sample', // TODO: loaded via config
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
 });
 
-loadInitializers(App, 'ember-simple-auth-sample');
+loadInitializers(App, config.modulePrefix);
 
 export default App;
diff --git a/app/index.html b/app/index.html
@@ -7,20 +7,15 @@
     <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/ember-simple-auth-sample.css">
   </head>
   <body>
-    <script>
-      window.EmberSimpleAuthSampleENV = {{ENV}};
-      window.EmberENV = window.EmberSimpleAuthSampleENV.EmberENV;
-    </script>
+    {{content-for 'body'}}
+
     <script src="assets/vendor.js"></script>
     <script src="assets/ember-simple-auth-sample.js"></script>
-    <script>
-      window.EmberSimpleAuthSample = require('ember-simple-auth-sample/app')['default'].create(EmberSimpleAuthSampleENV.APP);
-    </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: EmberSimpleAuthSampleENV.locationType
+  location: config.locationType
 });
 
 Router.map(function() {

diff --git a/bower.json b/bower.json
@@ -4,15 +4,16 @@
     "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",
     "ember-qunit": "0.1.8",
     "ember-qunit-notifications": "0.0.4",
     "qunit": "~1.15.0",
-    "ember-simple-auth": "0.6.7",
+    "ember-simple-auth": "0.7.1",
     "pretender": "0.1.0"
   }
 }
diff --git a/config/environment.js b/config/environment.js
@@ -2,6 +2,7 @@
 
 module.exports = function(environment) {
   var ENV = {
+    modulePrefix: 'ember-simple-auth-sample',
     environment: environment,
     baseURL: '/',
     locationType: 'auto',
@@ -21,22 +22,31 @@ module.exports = function(environment) {
   ENV['simple-auth-oauth2'] = {
     serverTokenRevocationEndpoint: '/revoke'
   };
-
-  if (environment === 'test') {
-    ENV['simple-auth'] = {
-      store: 'simple-auth-session-store:ephemeral'
-    };
-  }
-
+
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
-
     ENV.APP.LOG_ACTIVE_GENERATION = true;
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     ENV.APP.LOG_VIEW_LOOKUPS = true;
   }
 
+  if (environment === 'test') {
+    // 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';
+
+    ENV['simple-auth'] = {
+      store: 'simple-auth-session-store:ephemeral'
+    };
+  }
+
   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,17 +19,19 @@
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.0.17",
+    "broccoli-asset-rev": "0.3.1",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "0.0.44",
-    "ember-cli-ember-data": "0.1.0",
+    "ember-cli": "0.1.2",
+    "ember-cli-content-security-policy": "0.3.0",
+    "ember-export-application-global": "^1.0.0",
     "ember-cli-ic-ajax": "0.1.1",
-    "ember-cli-inject-live-reload": "^1.0.2",
+    "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.1.0",
+    "ember-data": "1.0.0-beta.10",
     "express": "^4.8.5",
     "glob": "^4.0.5",
     "ember-cli-pretender": "*",
-    "ember-cli-simple-auth-oauth2": "0.6.7",
-    "ember-cli-simple-auth-testing": "0.6.7"
+    "ember-cli-simple-auth-oauth2": "0.7.1",
+    "ember-cli-simple-auth-testing": "0.7.1"
   }
 }
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: 'ember-simple-auth-sample'
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix
 };
 
 export default resolver;
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,18 +1,15 @@
 import Ember from 'ember';
-import Application from 'ember-simple-auth-sample/app';
-import Router from 'ember-simple-auth-sample/router';
+import Application from '../../app';
+import Router from '../../router';
+import config from '../../config/environment';
 
 import 'simple-auth-testing/test-helpers';
 
 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,8 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{BASE_TAG}}
+    {{content-for 'head'}}
+    {{content-for 'test-head'}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/ember-simple-auth-sample.css">
@@ -33,17 +34,12 @@
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
 
-    <script>
-      window.EmberSimpleAuthSampleENV = {{ENV}};
-      window.EmberENV = window.EmberSimpleAuthSampleENV.EmberENV;
-    </script>
+    {{content-for 'body'}}
+    {{content-for 'test-body'}}
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/ember-simple-auth-sample.js"></script>
     <script src="testem.js"></script>
-    <script>
-      require('ember-simple-auth-sample/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;