Part of #13 - renamed ApiUrl to ApiMapper

mdvorak · Apr 21, 2017 · e2f4a3d · e2f4a3d
1 parent abfe651
commit e2f4a3d
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/src/api-location.ts b/src/api-location.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { ApiUrl } from './api-url';
+import { ApiMapper } from './api-url';
 import { normalizeUrl } from './normalize';
 import { NavigationHandler } from './navigation-handler';
 
@@ -15,7 +15,7 @@ export class ApiLocation implements NavigationHandler {
 
   private urlValue: string;
 
-  constructor(private apiUrlService: ApiUrl,
+  constructor(private apiUrlService: ApiMapper,
               private location: Location) {
     this.location.subscribe(() => this.onLocationChanged());
     this.onLocationChanged();

diff --git a/src/api-url.spec.ts b/src/api-url.spec.ts
@@ -1,6 +1,6 @@
 import { async, TestBed } from '@angular/core/testing';
 
-describe('ApiUrl', () => {
+describe('ApiMapper', () => {
 
   beforeEach(async(() => {
 

diff --git a/src/api-url.ts b/src/api-url.ts
@@ -15,7 +15,7 @@ export const APP_API_PREFIX = new InjectionToken<string>('APP_API_PREFIX');
  * It maps view URLs to API and vice versa.
  */
 @Injectable()
-export class ApiUrl {
+export class ApiMapper {
   /**
    * API URL prefix. It's absolute URL, includes base href (if applicable).
    */

diff --git a/src/directives/api-link.directive.ts b/src/directives/api-link.directive.ts
@@ -1,7 +1,7 @@
 import { Directive, Input, HostBinding } from '@angular/core';
 import { Location } from '@angular/common';
 import { ResourceViewRegistry } from '../resource-view-registry';
-import { ApiUrl } from '../api-url';
+import { ApiMapper } from '../api-url';
 
 
 /**
@@ -18,7 +18,7 @@ export class ApiLinkDirective {
 
   private url: string|null;
 
-  constructor(private apiUrl: ApiUrl,
+  constructor(private apiUrl: ApiMapper,
               private location: Location,
               private dataRouteRegistry: ResourceViewRegistry) {
   }

diff --git a/src/directives/resource-link-with-href.spec.ts b/src/directives/resource-link-with-href.spec.ts
@@ -3,7 +3,7 @@ import { Component, DebugElement } from '@angular/core';
 import { ResourceViewRegistry } from '../resource-view-registry';
 import { TargetType } from './resource-link';
 import { Location } from '@angular/common';
-import { ApiUrl, APP_API_PREFIX } from '../api-url';
+import { ApiMapper, APP_API_PREFIX } from '../api-url';
 import { ViewData } from '../view-data';
 import { NavigationHandler } from '../navigation-handler';
 import { Headers } from '@angular/http';
@@ -51,7 +51,7 @@ describe(ResourceLinkWithHrefDirective.name, () => {
           provide: APP_API_PREFIX,
           useValue: API_PREFIX
         },
-        ApiUrl,
+        ApiMapper,
         ApiLocation,
       ]
     });

diff --git a/src/directives/resource-link-with-href.ts b/src/directives/resource-link-with-href.ts
@@ -1,7 +1,7 @@
 import { Directive, OnChanges, HostBinding, Input, Optional, HostListener } from '@angular/core';
 import { Location } from '@angular/common';
 import { TargetType, TARGET_SELF, TARGET_TOP } from './resource-link';
-import { ApiUrl } from '../api-url';
+import { ApiMapper } from '../api-url';
 import { ResourceViewRegistry } from '../resource-view-registry';
 import { ViewData } from '../view-data';
 import { supportsNavigation } from '../navigation-handler';
@@ -15,7 +15,7 @@ export class ResourceLinkWithHrefDirective implements OnChanges {
   @Input() target?: TargetType;
   @Input() external = false;
 
-  constructor(private apiUrl: ApiUrl,
+  constructor(private apiUrl: ApiMapper,
               private location: Location,
               private resourceViewRegistry: ResourceViewRegistry,
               @Optional() private view?: ViewData<any>) {

diff --git a/src/directives/resource-link.spec.ts b/src/directives/resource-link.spec.ts
@@ -3,7 +3,7 @@ import { Component, DebugElement } from '@angular/core';
 import { ResourceViewRegistry } from '../resource-view-registry';
 import { ResourceLinkDirective, TargetType } from './resource-link';
 import { Location } from '@angular/common';
-import { ApiUrl, APP_API_PREFIX } from '../api-url';
+import { ApiMapper, APP_API_PREFIX } from '../api-url';
 import { ViewData } from '../view-data';
 import { NavigationHandler } from '../navigation-handler';
 import { Headers } from '@angular/http';
@@ -49,7 +49,7 @@ describe(ResourceLinkDirective.name, () => {
           provide: APP_API_PREFIX,
           useValue: API_PREFIX
         },
-        ApiUrl,
+        ApiMapper,
         ApiLocation,
       ]
     });

diff --git a/src/index.ts b/src/index.ts
@@ -2,7 +2,7 @@ export { ResourceRouterModule, ResourceRouterOptions, RESOURCE_ROUTER_CONFIGURAT
 export { ViewData } from './view-data';
 export { ViewDataLoader, HttpViewDataLoader, DefaultHttpViewDataLoader } from './view-data-loader';
 export { ViewDef, Data, StatusType } from './view-definition';
-export { ApiUrl, APP_API_PREFIX } from './api-url';
+export { ApiMapper, APP_API_PREFIX } from './api-url';
 export { ApiLocation } from './api-location';
 export { ResourceViewRegistry, RESOURCE_VIEWS, TYPE_QUALITY_EVALUATOR } from './resource-view-registry'
 export { ResourceOutletComponent } from './directives/resource-outlet';

diff --git a/src/resource-router-module.ts b/src/resource-router-module.ts
@@ -17,7 +17,7 @@ import {
   Type
 } from '@angular/core';
 import { HttpModule } from '@angular/http';
-import { ApiUrl, APP_API_PREFIX } from './api-url';
+import { ApiMapper, APP_API_PREFIX } from './api-url';
 import { ApiLocation } from './api-location';
 import { ContentTypeStrategy, ViewTypeStrategy } from './view-type-strategy';
 import { RESOURCE_VIEWS, ResourceViewRegistry } from './resource-view-registry';
@@ -98,7 +98,7 @@ export class ResourceRouterModule {
           ]
         },
         Location,
-        ApiUrl,
+        ApiMapper,
         ApiLocation,
         ResourceViewRegistry,
         {