Merge pull request #16 from reyesoft/feature/mergin_relationships

Feature/mergin relationships

Author: pablorsk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-angular-jsonapi",
-  "version": "0.4.15",
+  "version": "0.5.12",
   "description": "JSONAPI library developed for AngularJS in Typescript",
   "repository": {
     "type": "git",
@@ -51,7 +51,6 @@
     "gulp-typescript": "^2.13.6",
     "gulp-util": "^3.0.7",
     "html-webpack-plugin": "^2.9.0",
-    "isparta-loader": "^2.0.0",
     "jasmine": "^2.4.1",
     "json-loader": "^0.5.4",
     "karma": "^0.13.14",

src/demo/authors/authors.service.ts

@@ -2,7 +2,7 @@
 
 import * as Jsonapi from '../../library/index';
 
-export class AuthorsService extends Jsonapi.Resource {
+export class AuthorsService extends Jsonapi.Service {
     type = 'authors';
     public schema: Jsonapi.ISchema = {
         attributes: {

src/demo/books/books.component.ts

@@ -32,6 +32,30 @@ class BooksController {
             },
             success => {
                 console.log('success books controller', success, this.books);
+
+                // TEST 1
+                // this test merge data with cache (this not include author or photos)
+                console.log('BooksRequest#1 received (author data from server)',
+                    (<Jsonapi.IResource>this.books[2].relationships.author.data).attributes
+                );
+
+                console.log('BooksRequest#2 requested');
+                let books2 = this.BooksService.all(
+                    success => {
+                        console.log('BooksRequest#2 received (author data from cache)',
+                            (<Jsonapi.IResource>books2[1].relationships.author.data)
+                        );
+                    }
+                );
+
+                // TEST 2
+                console.log('BookRequest#3 requested');
+                let book1 = this.BooksService.get(1,
+                    success => {
+                        console.log('BookRequest#3 received (author data from cache)',
+                            (<Jsonapi.IResource>book1.relationships.author.data).attributes
+                        );
+                    });
             },
             error => {
                 console.log('error books controller', error);

src/demo/books/books.service.ts

@@ -2,7 +2,7 @@
 
 import * as Jsonapi from '../../library/index';
 
-export class BooksService extends Jsonapi.Resource {
+export class BooksService extends Jsonapi.Service {
     type = 'books';
     public schema: Jsonapi.ISchema = {
         attributes: {

src/demo/photos/photos.service.ts

@@ -2,7 +2,7 @@
 
 import * as Jsonapi from '../../library/index';
 
-export class PhotosService extends Jsonapi.Resource {
+export class PhotosService extends Jsonapi.Service {
     type = 'photos';
     public schema: Jsonapi.ISchema = {
         attributes: {

src/library/core.ts

@@ -1,40 +1,37 @@
-/// <reference path="./index.d.ts" />
-
 import './services/core-services.service';
-import { ICore, IResource } from './interfaces';
+import { ICore, IService } from './interfaces';
 
 export class Core implements ICore {
-    public rootPath: string = 'http://url/';
-    public resources: Object = {};
+    private resourceServices: Object = {};
 
     public loadingsCounter: number = 0;
     public loadingsStart = () => {};
     public loadingsDone = () => {};
     public loadingsError = () => {};
     public loadingsOffline = () => {};
 
-    public static Me: ICore = null;
-    public static Services: any = null;
+    public static me: ICore;
+    public static injectedServices: any;
 
     /** @ngInject */
     public constructor(
         protected rsJsonapiConfig,
         protected JsonapiCoreServices
     ) {
-        Core.Me = this;
-        Core.Services = JsonapiCoreServices;
+        Core.me = this;
+        Core.injectedServices = JsonapiCoreServices;
     }
 
-    public _register(clase: IResource): boolean {
-        if (clase.type in this.resources) {
+    public _register(clase: IService): boolean {
+        if (clase.type in this.resourceServices) {
             return false;
         }
-        this.resources[clase.type] = clase;
+        this.resourceServices[clase.type] = clase;
         return true;
     }
 
-    public getResource(type: string): IResource {
-        return this.resources[type];
+    public getResourceService(type: string): IService {
+        return this.resourceServices[type];
     }
 
     public refreshLoadings(factor: number): void {
@@ -46,4 +43,5 @@ export class Core implements ICore {
         }
     }
 }
+
 angular.module('Jsonapi.services').service('JsonapiCore', Core);

src/library/index.ts

@@ -1,5 +1,3 @@
-/// <reference path="./index.d.ts" />
-
 import * as angular from 'angular';
 import 'angular-localforage';
 
@@ -26,12 +24,15 @@ angular.module('rsJsonapi', [
 ]);
 
 import { Core } from './core';
+import { Service } from './service';
 import { Resource } from './resource';
 
 // just for bootstrap this library on demo.
 // On dist version, all is exported inside a Jsonapi module
 export { Core };
 export { Resource };
+export { Service };
+
 export * from './interfaces';
 import { IResource } from './interfaces';
 import { IService } from './interfaces';

src/library/interfaces/attributes.d.ts

@@ -1,3 +1,9 @@
 export interface IAttributes {
-    [value: string]: boolean | string | number;
+    // problem with lines like
+    /*
+    this._receipt_number = order.attributes.receipt_number;
+    this.transaction.attributes._due_date_with_format = new Date(this.transaction.attributes.due_date);
+    */
+    // [value: string]: boolean | string | number;
+    [value: string]: any;
 }

src/library/interfaces/cache.d.ts

@@ -1,4 +1,4 @@
-import { ICollection } from '../interfaces';
+import { ICollection, IResource } from '../interfaces';
 
 export interface ICache {
     // collections: Object;
@@ -8,7 +8,10 @@ export interface ICache {
     isCollectionLive(url: string, ttl: number): boolean;
     getCollection(url: string): ICollection;
     setCollection(url: string, collection: ICollection): void;
-    clearAllCollections(): void;
+    clearAllCollections(): boolean;
+    isResourceLive(id: string, ttl: number): boolean;
+    setResource(resource: IResource): void;
+    getCollection(url: string): ICollection;
 
     removeResource(id: string): void;
 }

src/library/interfaces/collection.d.ts

@@ -1,5 +1,6 @@
 import { IResource } from './resource';
 import { IPage } from './page';
+import { IDataResource } from './data-resource';
 
 export interface ICollection extends Array<IResource> {
     $length: number;