Merge pull request #1 from avatao/develop

Getting ready to publish

.gitignore

@@ -4,4 +4,6 @@ yarn-error.log*
 
 node_modules/
 .idea/
-dist/
+dist/
+
+**/.DS_Store

CHANGELOG.md

@@ -1,3 +1,9 @@
+1.0.0-alpha.3 / 2017-06-20
+==================
+
+* First published version
+* Library is INCOMPLETE and will not work properly with angular yet
+
 1.0.0-alpha.2 / 2017-06-20
 ==================
 

lib/models/angular-collection.model.ts

@@ -14,10 +14,16 @@ import {AngularItem} from './angular-item.model';
 import {AngularLink} from './angular-link.model';
 import {AngularQuery} from './angular-query.model';
 import {AngularTemplate} from './angular-template.model';
+import {Http} from '@angular/http';
 
 export class AngularCollection extends CollectionBase {
 
+    public static httpService: Http;
+
     constructor(collection: CollectionJSON) {
+        if (typeof AngularCollection.httpService === 'undefined') {
+            throw new Error('Please configure the HTTP service -> AngularCollection.httpService')
+        }
         super(collection);
     }
 

lib/models/angular-link.model.ts

@@ -1,16 +1,3 @@
-import {ReflectiveInjector} from '@angular/core';
-import {
-    BaseRequestOptions,
-    BaseResponseOptions,
-    BrowserXhr,
-    ConnectionBackend,
-    CookieXSRFStrategy,
-    Http,
-    RequestOptions,
-    ResponseOptions,
-    XHRBackend,
-    XSRFStrategy,
-} from '@angular/http';
 import {Collection, LinkJSON} from 'collection-json-base/interfaces';
 import {LinkBase} from 'collection-json-base/models';
 import 'rxjs/add/operator/map';
@@ -20,23 +7,11 @@ import {AngularCollection} from './angular-collection.model';
 
 export class AngularLink extends LinkBase {
 
-    private http: Http;
-
     constructor(link: LinkJSON) {
         super(link);
-        const injector = ReflectiveInjector.resolveAndCreate([
-          Http,
-          BrowserXhr,
-          {provide: RequestOptions, useClass: BaseRequestOptions},
-          {provide: ResponseOptions, useClass: BaseResponseOptions},
-          {provide: ConnectionBackend, useClass: XHRBackend},
-          {provide: XSRFStrategy, useFactory: () => new CookieXSRFStrategy()},
-        ]);
-
-        this.http = injector.get(Http);
     }
 
     public follow(): Observable<Collection> {
-        return this.http.get(this.href).map((response) => new AngularCollection(response.json().collection));
+        return AngularCollection.httpService.get(this.href).map((response) => new AngularCollection(response.json().collection));
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "collection-json-angular",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "main": "index.js",
   "types": "index.d.ts",
   "description": "Implementation of the collection-json.ts library for Angular",
@@ -12,7 +12,6 @@
     "pack": "npm run build && npm run copy && cd dist && npm pack",
     "upload": "npm run build && npm run copy && cd dist && npm publish"
   },
-  "private": true,
   "repository": {
     "type": "git",
     "url": "git+https://github.com/avatao/collection-json-angular.git"

tsconfig.json

@@ -5,6 +5,8 @@
     "noImplicitAny": true,
     "noUnusedParameters": true,
     "noUnusedLocals": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
 
     "target": "es5",
     "lib": ["es2015", "dom"],