upgraded to ember-cli 0.1.1, added unit tests for store

.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
+}

Brocfile.js

@@ -1,9 +1,22 @@
 /* global require, module */
 
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+var pickFiles = require('broccoli-static-compiler');
 
 var app = new EmberAddon();
 
+var sinon = pickFiles('bower_components/sinonjs', {
+    srcDir: '/',
+    files: ['sinon.js'],
+    destDir: '/assets'
+});
+
+var sinonQunit = pickFiles('bower_components/sinon-qunit/lib', {
+    srcDir: '/',
+    files: ['sinon-qunit.js'],
+    destDir: '/assets'
+});
+
 // Use `app.import` to add additional libraries to the generated
 // output files.
 //
@@ -17,4 +30,4 @@ var app = new EmberAddon();
 // please specify an object with the list of modules as keys
 // along with the exports of each module as its value.
 
-module.exports = app.toTree();
+module.exports = app.toTree( sinon, sinonQunit );

addon/adapters/localstorage.js

@@ -171,7 +171,7 @@ var LocalStorageAdapter = Adapter.extend({
     save: function( url, content ) {
         var promise;
 
-        Ember.assert('A url is required to delete a model', url);
+        Ember.assert('A url is required to save a model', url);
 
         promise = new Ember.RSVP.Promise( function( resolve ){
             var db,
@@ -218,7 +218,7 @@ var LocalStorageAdapter = Adapter.extend({
      * @return {object}         localStorage or mockup
      */
     _getLocalStorage: function(){
-        return this.get( 'localStorageMockup' ) || window.localStorage;
+        return window.localStorage;
     },
 
     /**

addon/cache.js

@@ -189,8 +189,7 @@ export default Ember.Object.extend({
     },
 
     fetchOne: function( type ){
-        var self = this,
-            record,
+        var record,
             promise = this._getPromises( type ).get( 'ids.0' );
 
         if( promise ){
@@ -204,9 +203,7 @@ export default Ember.Object.extend({
         }
 
         return Ember.ObjectProxy.createWithMixins( Ember.PromiseProxyMixin )
-            .set( 'promise', new Ember.RSVP.Promise( function( resolve, reject ){
-                resolve( record );
-            }));
+            .set( 'promise', new Ember.RSVP.Promise.resolve( record ) );
 
     },
 
@@ -219,8 +216,7 @@ export default Ember.Object.extend({
      * @return {Object}
      */
     fetchById: function( type, id ) {
-        var self = this,
-            record,
+        var record,
             promise = this._getPromiseById( type, id );
 
         if( promise ){
@@ -234,9 +230,7 @@ export default Ember.Object.extend({
         }
 
         return Ember.ObjectProxy.createWithMixins( Ember.PromiseProxyMixin )
-            .set( 'promise', new Ember.RSVP.Promise( function( resolve, reject ){
-                resolve( record );
-            }));
+            .set( 'promise', new Ember.RSVP.Promise.resolve( record ) );
     },
 
     /**
@@ -262,9 +256,7 @@ export default Ember.Object.extend({
         }
 
         return Ember.ArrayProxy.createWithMixins( Ember.PromiseProxyMixin )
-            .set( 'promise', new Ember.RSVP.Promise( function( resolve, reject){
-                resolve( records );
-            }));
+            .set( 'promise', new Ember.RSVP.Promise.resolve( records ) );
     },
 
     /**

addon/initializers/sl-model.js

@@ -21,4 +21,4 @@ export default function ( container, application ) {
 
     application.inject('adapter', 'store', 'store:main');
 
-};
+}

blueprints/localstorage-initializer/files/app/initializers/localstorage.js

@@ -8,7 +8,7 @@ export default {
         var localStorageAdapter = SlModelLocalstorageAdapter.extend();
 
         localStorageAdapter.reopenClass({
-            namspace: '<%= namespace %>'
+            namespace: '<%= namespace %>'
         });
 
         container.register('adapter:localstorage', localStorageAdapter );

bower.json

@@ -1,16 +1,21 @@
 {
-  "name": "dummy",
+  "name": "sl-model",
   "dependencies": {
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
     "ember": "1.7.0",
     "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"
+    "qunit": "~1.15.0",
+    "pretender": "0.1.0"
+  },
+  "devDependencies": {
+    "sinonjs": "~1.10.2",
+    "sinon-qunit": "~2.0.0"
   }
-}
+}

config/environment.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function(/* environment, appConfig */) {
+  return { };
+};

package.json

@@ -1,9 +1,9 @@
 {
   "name": "sl-model",
-  "version": "0.0.0",
+  "version": "0.1.7",
   "directories": {
     "doc": "doc",
-    "test": "test"
+    "test": "tests"
   },
   "scripts": {
     "start": "ember server",
@@ -14,27 +14,30 @@
   "engines": {
     "node": ">= 0.10.0"
   },
-  "keywords": [
-    "ember-addon"
-  ],
-  "ember-addon": {
-    "configPath": "tests/dummy/config"
-  },
   "author": "",
   "license": "MIT",
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.0.17",
+    "broccoli-asset-rev": "0.3.0",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
+    "broccoli-static-compiler": "^0.2.0",
     "connect-restreamer": "^1.0.0",
-    "ember-cli": "0.0.44",
-    "ember-cli-ember-data": "0.1.0",
+    "ember-cli": "0.1.1",
+    "ember-cli-content-security-policy": "0.2.0",
     "ember-cli-ic-ajax": "0.1.1",
-    "ember-cli-qunit": "0.0.5",
+    "ember-cli-inject-live-reload": "^1.2.2",
+    "ember-cli-pretender": "^0.3.1",
+    "ember-cli-qunit": "0.1.0",
     "express": "^4.8.5",
     "glob": "^4.0.5"
   },
+  "keywords": [
+    "ember-addon"
+  ],
+  "ember-addon": {
+    "configPath": "tests/dummy/config"
+  },
   "dependencies": {
-    "sl-modelize": "git+ssh://[email protected]:interface/sl-modelize.git#addon"
+    "sl-modelize": "git+ssh://[email protected]:interface/sl-modelize.git#v0.0.2"
   }
 }

server/mocks/bar.js

@@ -0,0 +1,13 @@
+module.exports = function(app) {
+  var express = require('express');
+  var barApiRouter = express.Router();
+  barApiRouter.get('/', function(req, res) {
+    res.send({"bar":[
+        {
+            id: 1,
+            name: 'cheers'
+        }
+    ]});
+  });
+  app.use('/api/bar', barApiRouter);
+};

server/mocks/car.js

@@ -0,0 +1,21 @@
+module.exports = function(app) {
+  var express = require('express');
+  var carApiRouter = express.Router();
+  carApiRouter.get('/', function(req, res) {
+    res.send({"car":[
+        {
+            id: 1,
+            name: 'ford'
+        },
+        {
+            id: 2,
+            name: 'chevy'
+        },
+        {
+            id: 3,
+            name: 'lambo'
+        }
+    ]});
+  });
+  app.use('/api/car', carApiRouter);
+};

server/mocks/foo.js

@@ -0,0 +1,17 @@
+module.exports = function(app) {
+  var express = require('express');
+  var fooApiRouter = express.Router();
+  fooApiRouter.get('/', function(req, res) {
+    res.send({"foo":[
+        {
+            id: 1,
+            name: 'fighters',
+            bar: {
+                id: 2,
+                name: 'cheers2'
+            }
+        }
+    ]});
+  });
+  app.use('/api/foo', fooApiRouter);
+};

tests/.jshintrc

@@ -39,13 +39,14 @@
     "findWithAssert",
     "wait",
     "DS",
-    "keyEvent",
     "isolatedContainer",
     "startApp",
     "andThen",
     "currentURL",
     "currentPath",
-    "currentRouteName"
+    "currentRouteName",
+    "propEqual",
+    "sinon"
   ],
   "node": false,
   "browser": false,

tests/dummy/.jshintrc

@@ -2,8 +2,7 @@
   "predef": {
     "document": true,
     "window": true,
-    "-Promise": true,
-    "DummyENV": true
+    "-Promise": true
   },
   "browser" : true,
   "boss" : true,

tests/dummy/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: 'dummy', // TODO: loaded via config
+  modulePrefix: config.modulePrefix,
+  podModulePrefix: config.podModulePrefix,
   Resolver: Resolver
 });
 
-loadInitializers(App, 'dummy');
+loadInitializers(App, config.modulePrefix);
 
 export default App;

tests/dummy/app/index.html

@@ -7,20 +7,13 @@
     <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/dummy.css">
   </head>
   <body>
-    <script>
-      window.DummyENV = {{ENV}};
-      window.EmberENV = window.DummyENV.EmberENV;
-    </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/dummy.js"></script>
-    <script>
-      window.Dummy = require('dummy/app')['default'].create(DummyENV.APP);
-    </script>
   </body>
 </html>

tests/dummy/app/models/bar.js

@@ -0,0 +1,14 @@
+import SlModel from 'sl-model/model';
+
+var Bar = SlModel.extend({
+});
+
+Bar.reopenClass({
+    adapter: 'localstorage',
+    url: '/api/bar',
+    serializer: function( result ){
+        return result.bar;
+    }
+});
+
+export default Bar;

tests/dummy/app/models/car.js

@@ -0,0 +1,13 @@
+import SlModel from 'sl-model/model';
+
+var Car = SlModel.extend({
+});
+
+Car.reopenClass({
+    url: '/api/car',
+    serializer: function( result ){
+        return result.car;
+    }
+});
+
+export default Car;

tests/dummy/app/models/foo.js

@@ -0,0 +1,13 @@
+import SlModel from 'sl-model/model';
+
+var Foo = SlModel.extend({
+});
+
+Foo.reopenClass({
+    url: '/api/foo',
+    serializer: function( result ){
+        return result.foo;
+    }
+});
+
+export default Foo;