Merge pull request #11 from 90TechSAS/feature/inheritence

add inheritence
90TechSAS · Nov 24, 2016 · 42f457f · 42f457f
2 parents aff97ed + c343724
commit 42f457f
Show file tree

Hide file tree

Showing 18 changed files with 626 additions and 21 deletions.
diff --git a/build/app.js b/build/app.js
diff --git a/dest/temp/ActiveRecord.js b/dest/temp/ActiveRecord.js
@@ -17,6 +17,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
 
+var _Discriminator = require('./Discriminator');
+
+var _Discriminator2 = _interopRequireDefault(_Discriminator);
+
 var _ServiceLocator = require('./ServiceLocator');
 
 var _ServiceLocator2 = _interopRequireDefault(_ServiceLocator);

diff --git a/dest/temp/DaoHelper.js b/dest/temp/DaoHelper.js
@@ -49,6 +49,15 @@ var DaoHelper = (function () {
                     value: function setRootUrl(url) {
                         this.dao.url = url;
                     }
+                }, {
+                    key: 'setDiscriminatorUrl',
+                    value: function setDiscriminatorUrl(type, url) {
+                        _.each(this.dao.discriminators, function (discriminator) {
+                            if (discriminator.type === type) {
+                                discriminator.discriminatorUrl = url;
+                            }
+                        });
+                    }
                 }, {
                     key: '$get',
                     value: function $get() {

diff --git a/dest/temp/Discriminator.js b/dest/temp/Discriminator.js
@@ -0,0 +1,60 @@
+//_ = require('lodash');
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+// istanbul ignore next
+
+var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
+
+// istanbul ignore next
+
+var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
+
+exports['default'] = Discriminator;
+// istanbul ignore next
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+// istanbul ignore next
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
+
+// istanbul ignore next
+
+function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var _ServiceLocator = require('./ServiceLocator');
+
+var _ServiceLocator2 = _interopRequireDefault(_ServiceLocator);
+
+var _SessionManager = require('./SessionManager');
+
+var _SessionManager2 = _interopRequireDefault(_SessionManager);
+
+function Discriminator(Model, type) {
+
+  var Discriminator = (function (_Model) {
+    _inherits(Discriminator, _Model);
+
+    function Discriminator() {
+      _classCallCheck(this, Discriminator);
+
+      _get(Object.getPrototypeOf(Discriminator.prototype), 'constructor', this).apply(this, arguments);
+    }
+
+    _createClass(Discriminator, null, [{
+      key: 'type',
+      get: function get() {
+        return type;
+      }
+    }]);
+
+    return Discriminator;
+  })(Model);
+
+  return Discriminator;
+}
+
+module.exports = exports['default'];
diff --git a/dest/temp/GenericDao.js b/dest/temp/GenericDao.js
@@ -24,7 +24,7 @@ var _QueryBuilder = require('./QueryBuilder');
 
 var _QueryBuilder2 = _interopRequireDefault(_QueryBuilder);
 
-function GenericDao(model, qb) {
+function GenericDao(model, qb, discriminators) {
     var sl = _ServiceLocator2['default'].instance;
     sl.registerModel(model.getName(), model);
     var myClass = (function () {
@@ -35,6 +35,7 @@ function GenericDao(model, qb) {
             //   this.$http     = $injector.get('$http');
             this.url = url;
             this.model = model;
+            this.discriminators = discriminators;
         }
 
         _createClass(myClass, [{
@@ -94,6 +95,12 @@ function GenericDao(model, qb) {
                 if (Array.isArray(data)) {
                     return data.map(this.build, this);
                 }
+                if (this.discriminators && data.__t) {
+                    var disc = _.find(this.discriminators, { type: data.__t });
+                    if (disc) {
+                        return new disc(this.$injector, disc.discriminatorUrl, data);
+                    }
+                }
                 return new model(this.$injector, this.url, data);
             }
         }, {
@@ -129,8 +136,18 @@ function GenericDao(model, qb) {
         }, {
             key: 'create',
             value: function create(params) {
+                if (this.discriminators && params.__t) {
+                    var disc = _.find(this.discriminators, { type: params.__t });
+                    if (disc) {
+                        return new disc(this.$injector, disc.discriminatorUrl, params);
+                    }
+                }
                 return new this.model(this.$injector, this.url, params);
             }
+
+            // get discriminators(){
+            //   return discriminators
+            // }
         }, {
             key: '$http',
             get: function get() {

diff --git a/dest/temp/app.js b/dest/temp/app.js
@@ -20,8 +20,13 @@ var _managersTstManager3 = require('./managers/tstManager3');
 
 var _managersTstManager32 = _interopRequireDefault(_managersTstManager3);
 
+var _managersTstManager4 = require('./managers/tstManager4');
+
+var _managersTstManager42 = _interopRequireDefault(_managersTstManager4);
+
 var _module = angular.module('tstModule', []);
 
 _DaoHelper2['default'].registerService(_module, 'ModelManager', _managersTstManager12['default']);
 _DaoHelper2['default'].registerService(_module, 'ModelManager2', _managersTstManager22['default']);
-_DaoHelper2['default'].registerService(_module, 'ModelManager3', _managersTstManager32['default']);
+_DaoHelper2['default'].registerService(_module, 'ModelManager3', _managersTstManager32['default']);
+_DaoHelper2['default'].registerService(_module, 'ModelManager4', _managersTstManager42['default']);
diff --git a/dest/temp/managers/tstManager4.js b/dest/temp/managers/tstManager4.js
@@ -0,0 +1,53 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+// istanbul ignore next
+
+var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
+
+// istanbul ignore next
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+// istanbul ignore next
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
+
+// istanbul ignore next
+
+function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var _modelsTstModel4Js = require('./../models/tstModel4.js');
+
+var _modelsTstModel4Js2 = _interopRequireDefault(_modelsTstModel4Js);
+
+var _GenericDao = require('../GenericDao');
+
+var _GenericDao2 = _interopRequireDefault(_GenericDao);
+
+var _Discriminator = require('../Discriminator');
+
+var _Discriminator2 = _interopRequireDefault(_Discriminator);
+
+var D1 = (0, _Discriminator2['default'])(_modelsTstModel4Js2['default'], 'Type1');
+var D2 = (0, _Discriminator2['default'])(_modelsTstModel4Js2['default'], 'Type2');
+
+var DAO = (0, _GenericDao2['default'])(_modelsTstModel4Js2['default'], undefined, [D1, D2]);
+
+var ModelManager4 = (function (_DAO) {
+  _inherits(ModelManager4, _DAO);
+
+  function ModelManager4() {
+    _classCallCheck(this, ModelManager4);
+
+    _get(Object.getPrototypeOf(ModelManager4.prototype), 'constructor', this).apply(this, arguments);
+  }
+
+  return ModelManager4;
+})(DAO);
+
+exports['default'] = ModelManager4;
+;
+module.exports = exports['default'];
diff --git a/dest/temp/models/tstModel4.js b/dest/temp/models/tstModel4.js
@@ -0,0 +1,54 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});
+// istanbul ignore next
+
+var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; desc = parent = undefined; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
+
+// istanbul ignore next
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+// istanbul ignore next
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
+
+// istanbul ignore next
+
+function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var _ActiveRecord = require('../ActiveRecord');
+
+var _ActiveRecord2 = _interopRequireDefault(_ActiveRecord);
+
+var model = {
+
+    _id: {
+        type: String,
+        unique: true
+    },
+
+    //private: true
+    name: String,
+
+    __t: String
+};
+
+var AR = (0, _ActiveRecord2['default'])(model, 'Model4');
+
+var Model4 = (function (_AR) {
+    _inherits(Model4, _AR);
+
+    function Model4() {
+        _classCallCheck(this, Model4);
+
+        _get(Object.getPrototypeOf(Model4.prototype), 'constructor', this).apply(this, arguments);
+    }
+
+    return Model4;
+})(AR);
+
+exports['default'] = Model4;
+module.exports = exports['default'];
diff --git a/dest/temp/specs/angular-dao-discriminators.specs.js b/dest/temp/specs/angular-dao-discriminators.specs.js
@@ -0,0 +1,58 @@
+'use strict';
+
+describe('Angular DAO', function () {
+
+  var ModelManager, ModelManager3, httpBackend, $rootScope, $timeout;
+
+  beforeEach(function () {
+
+    module('tstModule', function (ModelManager4Provider) {
+      ModelManager4Provider.setRootUrl('http://MOCKURL.com/model2');
+      ModelManager4Provider.setDiscriminatorUrl('Type1', 'http://fakeurl/type1');
+      ModelManager4Provider.setDiscriminatorUrl('Type2', 'http://fakeurl/type2');
+    });
+
+    inject(function (_ModelManager4_, $httpBackend, _$rootScope_, _$timeout_) {
+      ModelManager4 = _ModelManager4_;
+      httpBackend = $httpBackend;
+      $rootScope = _$rootScope_;
+      $timeout = _$timeout_;
+    });
+  });
+
+  it('should be possible to instantiate discriminators', function () {
+    expect(ModelManager4.discriminators.length).toEqual(2);
+    expect(ModelManager4.discriminators[0].type).toEqual('Type1');
+    expect(ModelManager4.discriminators[1].type).toEqual('Type2');
+    expect(ModelManager4.discriminators[0].discriminatorUrl).toEqual('http://fakeurl/type1');
+    expect(ModelManager4.discriminators[1].discriminatorUrl).toEqual('http://fakeurl/type2');
+  });
+
+  it('should make GET queries on parent url', function () {
+    httpBackend.expectGET('http://MOCKURL.com/model2').respond();
+    ModelManager4.get();
+    httpBackend.flush();
+  });
+
+  it('should instanciate discriminators according to __t value', function () {
+    // TODO : make a GET request, respond with two types, and check their urls
+    httpBackend.expectGET('http://MOCKURL.com/model2').respond([{ _id: 123, name: 'Type1', __t: 'Type1' }, { _id: 321, name: 'Type2', __t: 'Type2' }]);
+
+    ModelManager4.get().then(function (data) {
+      expect(data.data[0].rootUrl).toEqual('http://fakeurl/type1');
+      expect(data.data[1].rootUrl).toEqual('http://fakeurl/type2');
+    });
+    httpBackend.flush();
+  });
+
+  it('should make POST queries on correct discriminator URL', function () {
+    var obj = ModelManager4.createModel({ _id: 123456, name: '12345', __t: 'Type1' });
+    obj.name = '23456';
+    httpBackend.expectPUT('http://fakeurl/type1/123456', { name: '23456' }).respond();
+    obj.save();
+  });
+
+  afterEach(function () {
+    httpBackend.verifyNoOutstandingExpectation();
+  });
+});
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "author": "flogou <[email protected]>",
   "name": "angular-orm",
-  "version": "2.0.0-alpha-11",
+  "version": "2.0.0-alpha-12",
   "description": "",
   "homepage": "",
   "dependencies": {

diff --git a/src/ActiveRecord.js b/src/ActiveRecord.js
@@ -1,4 +1,5 @@
 //_ = require('lodash');
+import Discriminator from './Discriminator'
 import ServiceLocator from './ServiceLocator'
 import SessionManager from './SessionManager'
 var deep = require('deep-diff').diff

diff --git a/src/DaoHelper.js b/src/DaoHelper.js
@@ -24,6 +24,14 @@ export default class DaoHelper{
                 this.dao.url = url;
             }
 
+            setDiscriminatorUrl(type, url) {
+              _.each(this.dao.discriminators, (discriminator) => {
+                if (discriminator.type === type) {
+                  discriminator.discriminatorUrl = url
+                }
+              })
+            }
+
             $get(){
                 return this.dao;
             }

diff --git a/src/Discriminator.js b/src/Discriminator.js
@@ -0,0 +1,15 @@
+//_ = require('lodash');
+import ServiceLocator from './ServiceLocator'
+import SessionManager from './SessionManager'
+
+
+export default function Discriminator (Model, type) {
+
+  let Discriminator = class extends Model{
+    static get type (){
+      return type
+    }
+  };
+
+  return Discriminator;
+}