Merge pull request #25 from stryju/feature/from-json

BaseObject.fromJSON

Author: ProLoser

modules/App.js

@@ -1,14 +1,12 @@
 var module = angular.module('App', ['ui.router', 'App.Authentication', 'App.Guest']);
 
 
-module.config( ($urlRouterProvider, $rootScope) => {
-
+module.config(function($urlRouterProvider, $rootScope) {
     // Default URL if no matches
-    $urlRouterProvider.otherwise("/projects");
+    $urlRouterProvider.otherwise('/projects');
 
     // Global catching of uiRouter errors (for development)
     $rootScope.$on('stateChangeError', (event, toState, toParams, fromState, fromParams, error) => {
     	console.log( event, toState, toParams, fromState, fromParams, error );
     });
-
 });

modules/Authentication/Authenticated.js

@@ -5,31 +5,29 @@ Authentication Module
 Most of the actual app is located under here. This abstract module primarily tackles authenticating the user
 */
 
-var module = angular.module('App.Authenticated', ['ui.router'])
+var module = angular.module('App.Authenticated', ['ui.router']);
 
-module.config(function($stateProvider)
+module.config(function($stateProvider) {
   $stateProvider.state('authenticated', {
     templateUrl: 'modules/Authenticated/Authenticated.html',
     abstract: true,
     resolve: {
-        user: (User, Authentication, $state, $q) => {
-            return Authentication.checkCredentials().then((response) => {
-              return new User(response.data);
-            }, (error) => {
-              // must return a rejected promise in order to stay in rejected-mode
-              return $q.reject( $state.go('login') );
-            });
-        },
-        // layout variable for breadcrumb nav (populated by children)
-        breadcrumbs: () => {
-          return [];
-        }
+      user: (User, Authentication, $state, $q) => {
+        return Authentication.checkCredentials()
+          .then(
+            (response) => new User(response.data),
+            // must return a rejected promise in order to stay in rejected-mode
+            (error) => $q.reject($state.go('login'))
+          );
+      },
+      // layout variable for breadcrumb nav (populated by children)
+      breadcrumbs: () => []
     },
-    onEnter: (user) => {
-        user.open();
+    onEnter(user) {
+      user.open();
     },
-    onExit: (user) => {
-        user.close();
+    onExit(user) {
+      user.close();
     }
   });
 });

modules/Authentication/Login.js

@@ -9,51 +9,44 @@ $modal is part of ui.bootstrap
 // Tracks the previous location and allows you to redirect back to that location
 var previousLocation;
 
-var module = angular.module('App.Login', ['ui.router', 'ui.bootstrap'])
+var module = angular.module('App.Login', ['ui.router', 'ui.bootstrap']);
 
-module.config( ($stateProvider) => {
+module.config(function($stateProvider) {
   $stateProvider.state('login', {
     parent: 'guest',
     url: '/login',
     resolve: {
-      user: (User) => {
-        return new User();
-      },
+      user: (User) => new User(),
       redirect: ($location) => {
         return () => {
           // Note we're returning a function to be called later, that has the redirect info pre-filled
           // TODO: Change to state code
           $location.path( previousLocation );
         };
       },
-      modal: ($modal) => {
-        return $modal.open({
-          templateUrl: "modules/Authentication/Login.html",
-          controller: 'Login',
-        });
-      }
+      modal: ($modal) => $modal.open({
+        templateUrl: 'modules/Authentication/Login.html',
+        controller: 'Login',
+      })
     },
-    onExit: (modal) => {
+    onExit(modal) {
       modal.close();
     }
   });
 });
 
-module.run( ($rootScope, $location) => {
+module.run(function($rootScope, $location) {
   $rootScope.$on('$stateChangeStart', (event, toState, toParams, fromState, fromParams) => {
     // TODO: Change to state code
-    previousLocation = $location.path()
+    previousLocation = $location.path();
   });
 });
 
 module.controller('Login', ($scope, UserObject, Authentication, user, redirect) => {
   $scope.user = user;
 
   $scope.login = () => {
-    Authentication.login($scope.user, $scope.rememberMe).then( () => {
-      redirect();
-    }, (response) => {
-      $scope.error = response;
-    });
+    Authentication.login($scope.user, $scope.rememberMe)
+      .then( redirect, (response) => $scope.error = response);
   };
 });

modules/Guest/Guest.js

@@ -1,6 +1,6 @@
 var module = angular.module('App.Guest', ['ui.router']);
 
-module.config( ($stateProvider) => {
+module.config(function($stateProvider) {
   $stateProvider.state('guest', {
     templateUrl: 'modules/Guest/Guest.html',
     abstract: true

modules/Object.js

@@ -1,12 +1,17 @@
 var module = angular.module('App');
 
 module.factory('BaseObject', () => {
-
   class BaseObject {
-    constructor(data = {}) {
-      for (property in data) {
-        this[property] = data[property];
-      }
+    /*
+    Creates a new instance from JSON.
+    */
+    static new(data) {
+      return new this(data);
+    }
+
+
+    constructor(data) {
+      Object.assign(this, data);
     }
 
     /*

modules/Paginator.js

@@ -1,8 +1,8 @@
 /**
  * Paginator - Simple paginator utility example that abstracts logic in a controllable pattern
- * 
+ *
  * @param paginate {function} Query function that takes paginationOptions
- * 
+ *
  * @example
  *   resolve: {
  *     // Prepares the paginator
@@ -15,7 +15,7 @@
  *       return paginator.next();
  *     }
  *   }
- * 
+ *
  * @example
  *   resolve: {
  *     taskPaginator: function(Paginator, Task, $stateParams) {
@@ -29,9 +29,7 @@
  *   }
  */
 angular.module('App').factory('Paginator', function($q){
-
   class Paginator {
-    
     constructor(paginate, options) {
       this.paginate = paginate;
       this.items = [];
@@ -42,24 +40,26 @@ angular.module('App').factory('Paginator', function($q){
         offset: 0
       }, options);
     }
-    
+
     next() {
       if (this.hasMore) {
         this.loading = true;
-        
-        return this.paginate(this.options).then((response) => {
-          //If the results are less than the required limit then the results are finished
-          this.hasMore = response.data.results.length >= this.options.limit;
-          
-          this.items = this.items.concat(response.data.results);
-          this.options.offset = this.items.length;
-          return this.items;
-        }).finally(() => this.loading = false);
+
+        return this.paginate(this.options)
+          .then((response) => {
+            //If the results are less than the required limit then the results are finished
+            this.hasMore = response.data.results.length >= this.options.limit;
+
+            this.items = this.items.concat(response.data.results);
+            this.options.offset = this.items.length;
+
+            return this.items;
+          })
+          .finally(() => this.loading = false);
       } else {
         return $q.when(this.items);
       }
     }
-    
   }
 
   return Paginator;

modules/Project/Project.js

@@ -4,39 +4,35 @@ Project Module
 */
 var module = angular.module('App.Project', ['ui.router', 'ui.bootstrap'])
 
-module.config( ($stateProvider) => {
+module.config(function($stateProvider) {
   $stateProvider.state( 'projects', {
     parent: 'authenticated',
     url: '/projects',
     templateUrl: 'modules/Project/Projects.html',
     controller: 'Projects',
     resolve: {
-      projects: (authenticatedUser, Project) => {
-        return Project.list(authenticatedUser.id);
-      }
+      projects: (authenticatedUser, Project) => Project.list(authenticatedUser.id)
     },
     // `breadcrumbs` resolved in `authenticated` state
-    onEnter: function(breadcrumbs) {
+    onEnter(breadcrumbs) {
       breadcrumbs.push({ label: 'Projects', sref: 'projects' });
     },
-    onExit: function(breadcrumbs) {
+    onExit(breadcrumbs) {
       breadcrumbs.pop();
     },
   });
   $stateProvider.state( 'projects.new', {
     url: '/new', // /projects/new (state must be defined BEFORE /:projectId)
     resolve: {
-      project: (authenticatedUser, Project) => {
-        return new Project({ user_id: authenticatedUser.id });
-      }
+      project: (authenticatedUser, Project) => new Project({ user_id: authenticatedUser.id })
     },
     templateUrl: 'modules/Project/Form.html',
     controller: 'ProjectForm',
     // `breadcrumbs` resolved in `authenticated` state
-    onEnter: function(breadcrumbs) {
+    onEnter(breadcrumbs) {
       breadcrumbs.push({ label: 'New', sref: 'projects.new' });
     },
-    onExit: function(breadcrumbs) {
+    onExit(breadcrumbs) {
       breadcrumbs.pop();
     }
   });
@@ -54,15 +50,13 @@ module.config( ($stateProvider) => {
       }
     },
     resolve: {
-      project: ($stateParams, Project) => {
-        return Project.get($stateParams.projectId);
-      }
+      project: ($stateParams, Project) => Project.get($stateParams.projectId)
     },
-    onEnter: (project, breadcrumbs) => {
+    onEnter(project, breadcrumbs) {
       project.open();
       breadcrumbs.push({ label: project.name, sref: 'project' }); // Params inferred when going up
     },
-    onExit: (project, breadcrumbs) => {
+    onExit(project, breadcrumbs) {
       project.close();
       breadcrumbs.pop();
     }
@@ -92,37 +86,29 @@ module.controller( 'ProjectForm', ($scope, project) => {
 
 module.factory('ProjectObject', (BaseObject, $http) => {
   class Project extends BaseObject {
-    
     static list(userId) {
-      return $http.get('/api/projects', { params: { user_id: userId } }).then( (response) => {
-        return response.data.map( (project) => {
-          return new Project(project);
-        });
-      });
+      return $http.get('/api/projects', { params: { user_id: userId } })
+        .then( (response) => response.data.map(Project.new));
     }
-    
+
     static get(id) {
-      return $http.get('/api/projects/' + id).then( (response) => {
-        return new Project(response.data);
-      });
+      return $http.get(`/api/projects/${id}`)
+        .then( (response) => new Project(response.data));
     }
-    
+
 
     create() {
-      return $http.post('/api/projects', this ).then( (response) => {
-        this.id = response.data.id;
-        return response.data;
-      });
+      return $http.post('/api/projects', this )
+        .then( (response) => {
+          this.id = response.data.id;
+          return response.data;
+        });
     }
 
     update() {
-      return $http.put('/api/projects/' + this.id, this );
-    }
-
-    close() {
-      super.close();
+      return $http.put(`/api/projects/${this.id}`, this);
     }
   }
 
-  return ProjectObject;
+  return Project;
 });