Merge branch 'release/3.0.0-beta7'

Author: shprink

CHANGELOG.md

@@ -1,4 +1,40 @@
-<a name="3.0.0-beta56></a>
+<a name="3.0.0-beta7></a>
+### 3.0.0-beta7 (2017-02-04)
+
+* BREAKING CHANGE: `WpApiModule.initializeApp` is now `WpApiModule.forRoot`
+
+Follow the following docs to migrate to the new way to bootstrap your module:
+
+An exported function instead `WpApiLoaderFactory` is mandatory to be used with [AoT compilation](https://angular.io/docs/ts/latest/cookbook/aot-compiler.html) or [Ionic 2](http://ionic.io/).
+
+
+```js
+import { Http } from '@angular/http';
+import { 
+  WpApiModule
+  WpApiLoader,
+  WpApiStaticLoader
+} from 'wp-api-angular'
+
+export function WpApiLoaderFactory(http: Http) {
+  return new WpApiStaticLoader(http, 'http://YOUR_DOMAIN/wp-json/', /* namespace is optional, default: '/wp/v2' */);
+}
+
+@NgModule({
+  imports: [
+    BrowserModule,
+    WpApiModule.forRoot({
+      provide: WpApiLoader,
+      useFactory: (WpApiLoaderFactory),
+      deps: [Http]
+    })
+  ],
+  bootstrap: [App]
+})
+export class AppModule { }
+```
+
+<a name="3.0.0-beta6></a>
 ### 3.0.0-beta6 (2017-02-01)
 
 export missing tokens to fix aot in ionic cli

README.md

@@ -30,22 +30,30 @@ UMD files are available `wp-api-angular.umd.js` and `wp-api-angular.umd.min.js`,
 
 ## Bootstrap
 
+An exported function instead `WpApiLoaderFactory` is mandatory to be used with [AoT compilation](https://angular.io/docs/ts/latest/cookbook/aot-compiler.html) or [Ionic 2](http://ionic.io/).
+
 
 ```js
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { WpApiModule } from 'wp-api-angular'
-import { App } from './app';
+import { Http } from '@angular/http';
+import { 
+  WpApiModule,
+  WpApiLoader,
+  WpApiStaticLoader
+} from 'wp-api-angular'
+
+export function WpApiLoaderFactory(http: Http) {
+  return new WpApiStaticLoader(http, 'http://YOUR_DOMAIN/wp-json/', /* namespace is optional, default: '/wp/v2' */);
+}
 
 @NgModule({
   imports: [
     BrowserModule,
-    WpApiModule.initializeApp({
-      baseUrl: "http://YOUR_DOMAIN/wp-json/",
-      namespace: '/wp/v2' // (optional, default: '/wp/v2')
+    WpApiModule.forRoot({
+      provide: WpApiLoader,
+      useFactory: (WpApiLoaderFactory),
+      deps: [Http]
     })
   ],
-  declarations: [App],
   bootstrap: [App]
 })
 export class AppModule { }

demo/module.ts

@@ -1,20 +1,29 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import 'rxjs/add/operator/toPromise';
+import { Http } from '@angular/http';
 import {
-  WpApiModule
+  WpApiModule,
+  WpApiLoader,
+  WpApiStaticLoader
 } from '../dist/wp-api-angular'
 import { App } from './app';
 
 let config = require('../config.json');
 
 console.info('config', config);
 
+export function WpApiLoaderFactory(http: Http) {
+  return new WpApiStaticLoader(http, config.baseUrl);
+}
+
 @NgModule({
   imports: [
     BrowserModule,
-    WpApiModule.initializeApp({
-      baseUrl: config.baseUrl
+    WpApiModule.forRoot({
+      provide: WpApiLoader,
+      useFactory: (WpApiLoaderFactory),
+      deps: [Http]
     })
   ],
   declarations: [App],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-api-angular",
-  "version": "3.0.0-beta6",
+  "version": "3.0.0-beta7",
   "description": "WordPress WP-API v2 client for Angular2",
   "main": "wp-api-angular.js",
   "typings": "wp-api-angular.d.ts",

src/Comments.ts

@@ -7,8 +7,8 @@ import { RequestOptionsArgs } from '@angular/http/src/interfaces';
 import { Response } from '@angular/http/src/static_response';
 
 import { WpApiParent } from './Parent';
-import { WpApiConfig } from './tokens';
-import { WpApiAppConfig } from './wp-api-angular';
+
+import { WpApiLoader } from './Loaders';
 
 export interface IWpApiComments {
   getList(options?: RequestOptionsArgs): Observable<Response>;
@@ -21,10 +21,10 @@ export interface IWpApiComments {
 @Injectable()
 export class WpApiComments extends WpApiParent implements IWpApiComments {
   constructor(
-    @Inject(WpApiConfig) public config: WpApiAppConfig,
+    public wpApiLoader: WpApiLoader,
     public http: Http
   ) {
-    super(config, http);
+    super(wpApiLoader, http);
   }
   getList(options = {}) {
     return this.httpGet(`/comments`, options)

src/Custom.ts

@@ -8,8 +8,8 @@ import { RequestOptionsArgs } from '@angular/http/src/interfaces';
 import { Response } from '@angular/http/src/static_response';
 
 import { WpApiParent } from './Parent';
-import { WpApiConfig } from './tokens';
-import { WpApiAppConfig } from './wp-api-angular';
+
+import { WpApiLoader } from './Loaders';
 
 export interface IWpApiCustom {
   getList(options?: RequestOptionsArgs): Observable<Response>;
@@ -21,11 +21,11 @@ export interface IWpApiCustom {
 
 export class Custom extends WpApiParent implements IWpApiCustom {
   constructor(
-    @Inject(WpApiConfig) public config: WpApiAppConfig,
+    public wpApiLoader: WpApiLoader,
     public http: Http,
     public entityName: string
   ) {
-    super(config, http);
+    super(wpApiLoader, http);
   }
   getList(options = {}) {
     return this.httpGet(`/${this.entityName}`, options)
@@ -48,16 +48,16 @@ export class Custom extends WpApiParent implements IWpApiCustom {
 @Injectable()
 export class WpApiCustom extends WpApiParent {
   constructor(
-    @Inject(WpApiConfig) public config: WpApiAppConfig,
+    public wpApiLoader: WpApiLoader,
     public http: Http
   ) {
-    super(config, http);
+    super(wpApiLoader, http);
   }
 
   getInstance(entityName = '') {
     if (typeof entityName !== 'string') {
       throw new Error(`getInstance needs an entity name`);
     }
-    return new Custom(this.config, this.http, entityName);
+    return new Custom(this.wpApiLoader, this.http, entityName);
   }
 }

src/Loaders.ts

@@ -0,0 +1,21 @@
+import { Http, HttpModule } from '@angular/http';
+import { stripTrailingSlash } from './utils';
+
+export abstract class WpApiLoader {
+  abstract getWebServiceUrl(postfix: string): string;
+}
+
+export class WpApiStaticLoader implements WpApiLoader {
+  completeUrl: string;
+  constructor(
+    private http: Http,
+    private baseUrl: string = 'http://changeYourDomainHere.com/wp-json',
+    private namespace: string = '/wp/v2'
+  ) {
+    this.completeUrl = `${stripTrailingSlash(this.baseUrl)}${this.namespace}`;
+  }
+
+  public getWebServiceUrl(postfix: string): string {
+    return `${this.completeUrl}${postfix}`
+  }
+}

src/Media.ts

@@ -8,8 +8,8 @@ import { RequestOptionsArgs } from '@angular/http/src/interfaces';
 import { Response } from '@angular/http/src/static_response';
 
 import { WpApiParent } from './Parent';
-import { WpApiConfig } from './tokens';
-import { WpApiAppConfig } from './wp-api-angular';
+
+import { WpApiLoader } from './Loaders';
 
 export interface IWpApiMedia {
   getList(options?: RequestOptionsArgs): Observable<Response>;
@@ -22,10 +22,10 @@ export interface IWpApiMedia {
 @Injectable()
 export class WpApiMedia extends WpApiParent implements IWpApiMedia {
   constructor(
-    @Inject(WpApiConfig) public config: WpApiAppConfig,
+    public wpApiLoader: WpApiLoader,
     public http: Http
   ) {
-    super(config, http);
+    super(wpApiLoader, http);
   }
   getList(options = {}) {
     return this.httpGet(`/media`, options)

src/Pages.ts

@@ -8,8 +8,8 @@ import { RequestOptionsArgs } from '@angular/http/src/interfaces';
 import { Response } from '@angular/http/src/static_response';
 
 import { WpApiParent } from './Parent';
-import { WpApiConfig } from './tokens';
-import { WpApiAppConfig } from './wp-api-angular';
+
+import { WpApiLoader } from './Loaders';
 
 export interface IWpApiPages {
   getList(options?: RequestOptionsArgs): Observable<Response>;
@@ -26,10 +26,10 @@ export interface IWpApiPages {
 @Injectable()
 export class WpApiPages extends WpApiParent implements IWpApiPages {
   constructor(
-    @Inject(WpApiConfig) public config: WpApiAppConfig,
+    public wpApiLoader: WpApiLoader,
     public http: Http
   ) {
-    super(config, http);
+    super(wpApiLoader, http);
   }
 
   getList(options = {}) {

src/Parent.ts

@@ -7,9 +7,9 @@ import { Observable } from 'rxjs/Observable';
 import { RequestOptionsArgs } from '@angular/http/src/interfaces';
 import { Response } from '@angular/http/src/static_response';
 
-import { WpApiAppConfig } from './wp-api-angular';
+import { WpApiLoader } from './Loaders';
 import { stripTrailingSlash } from './utils';
-import { WpApiConfig } from './tokens';
+
 
 export interface IParent {
   httpGet(url: string, options?: RequestOptionsArgs): Observable<Response>;
@@ -23,29 +23,26 @@ export interface IParent {
 @Injectable()
 export class WpApiParent implements IParent {
   constructor(
-    @Inject(WpApiConfig) public config: WpApiAppConfig,
+    public wpApiLoader: WpApiLoader,
     public http: Http
   ) { }
 
-  getFullUrl(postfix: string): string {
-    return `${stripTrailingSlash(this.config.baseUrl)}${this.config.namespace || '/wp/v2'}${postfix}`;
-  }
   httpGet(url: string, options = {}) {
-    return this.http.get(this.getFullUrl(url), options);
+    return this.http.get(this.wpApiLoader.getWebServiceUrl(url), options);
   }
   httpHead(url: string, options = {}) {
-    return this.http.head(this.getFullUrl(url), options);
+    return this.http.head(this.wpApiLoader.getWebServiceUrl(url), options);
   }
   httpDelete(url: string, options = {}) {
-    return this.http.delete(this.getFullUrl(url), options);
+    return this.http.delete(this.wpApiLoader.getWebServiceUrl(url), options);
   }
   httpPost(url: string, body = {}, options = {}) {
-    return this.http.post(this.getFullUrl(url), body, options);
+    return this.http.post(this.wpApiLoader.getWebServiceUrl(url), body, options);
   }
   httpPut(url: string, body = {}, options = {}) {
-    return this.http.put(this.getFullUrl(url), body, options);
+    return this.http.put(this.wpApiLoader.getWebServiceUrl(url), body, options);
   }
   httpPatch(url: string, body = {}, options = {}) {
-    return this.http.patch(this.getFullUrl(url), body, options);
+    return this.http.patch(this.wpApiLoader.getWebServiceUrl(url), body, options);
   }
 }