Merge branch 'master' of github.com:wikibus/heracles

Author: tpluscode

.babelrc

@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    ["transform-runtime", {
+      "polyfill": false,
+      "regenerator": true
+    }]
+  ]
+}

.travis.yml

@@ -1,6 +1,12 @@
 language: node_js
 node_js:
   - "node"
+before_install:
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo apt-get update
+  - sudo apt-get install gcc-5 g++-5
+  - sudo rm /usr/bin/g++
+  - sudo ln -s /usr/bin/g++-5 /usr/bin/g++
 install:
   - npm i -g yarn
   - yarn install

karma.conf.js

@@ -42,8 +42,8 @@ module.exports = function (config) {
         sl_firefox_latest: {
             base: 'BrowserStack',
             browser: 'firefox',
-            os: 'OS X',
-            os_version: 'Mountain Lion'
+            os: 'Windows',
+            os_version: '8.1'
         },
         sl_safari_9: {
             base: 'BrowserStack',
@@ -169,6 +169,10 @@ module.exports = function (config) {
         browserDisconnectTimeout : 10000, // default 2000
         browserDisconnectTolerance : 1, // default 0
         browserNoActivityTimeout : 4*60*1000, //default 10000
-        captureTimeout : 4*60*1000 //default 60000
+        captureTimeout : 4*60*1000, //default 60000
+
+        browserStack: {
+            startTunnel: true
+        }
     });
 };

package.json

@@ -50,6 +50,13 @@
     "@types/isomorphic-fetch": "0.0.34",
     "@types/jasmine": "^2.5.53",
     "@types/sinon": "^2.3.3",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
+    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-es3": "^1.0.1",
+    "babel-preset-stage-0": "^6.24.1",
     "core-decorators": "^0.19.0",
     "core-js": "^2.5.0",
     "gitbook-plugin-etoc": "^1.2.2",

src/HydraResponse.ts

@@ -1,12 +1,9 @@
+import {IResourceGraph, ResourceGraph} from './ResourceGraph';
 import {HydraResource} from './Resources';
 import {IResource} from './Resources/Resource';
 import {IResponseWrapper, ResponseWrapper} from './ResponseWrapper';
 import {IRootSelector} from './RootSelectors';
 
-export interface IResourceGraph {
-    [uri: string]: HydraResource;
-}
-
 export interface IHydraResponse extends Iterable<HydraResource>, IResponseWrapper {
 
     /**
@@ -37,7 +34,7 @@ export function create(
     response: IResponseWrapper,
     resources: IResourceGraph,
     rootSelectors: IRootSelector[]): IHydraResponse {
-    const safeResources = resources || {};
+    const safeResources = resources || new ResourceGraph();
     const safeSelectors = rootSelectors || [];
 
     class HydraResponse extends ResponseWrapper implements IHydraResponse {
@@ -48,7 +45,7 @@ export function create(
         }
 
         public get(identifier: string) {
-            return safeResources[identifier];
+            return safeResources.get(identifier);
         }
 
         get root() {

src/MediaTypeProcessors/RdfProcessor.ts

@@ -6,10 +6,10 @@ import * as stringToStream from 'string-to-stream';
 import {IHydraClient} from '../alcaeus';
 import * as Constants from '../Constants';
 import {JsonLd} from '../Constants';
-import {IResourceGraph} from '../HydraResponse';
 import {forOwn} from '../LodashUtil';
 import {ParserFactory} from '../ParserFactory';
 import {IResourceFactory} from '../ResourceFactory';
+import {IResourceGraph, ResourceGraph} from '../ResourceGraph';
 import {ApiDocumentation} from '../Resources';
 import {IResource} from '../Resources/Resource';
 import {IResponseWrapper} from '../ResponseWrapper';
@@ -105,7 +105,7 @@ async function flatten(json, url): Promise<object> {
 function resourcify(
     createResource: (obj, resources) => IResource,
     obj,
-    resourcified: object) {
+    resourcified: IResourceGraph) {
     if ((typeof obj === 'object') === false) {
         return obj;
     }
@@ -144,18 +144,13 @@ function resourcify(
 }
 
 function processResources(createResource: (obj, resources) => IResource, resources): IResourceGraph {
-    const resourcified = {};
+    const resourcified = new ResourceGraph();
     resources.forEach((res) => {
-        try {
-            res[JsonLd.Id] = new URL(res[JsonLd.Id]).href;
-        } catch (e) {}
-
         resourcified[res[JsonLd.Id]] = res;
     });
 
-    resources.reduceRight((acc: object, val) => {
-        const id = val[JsonLd.Id];
-        acc[id] = createResource(val, acc);
+    resources.reduceRight((acc: ResourceGraph, val) => {
+        acc.add(createResource(val, acc));
         return acc;
     }, resourcified);
 

src/ResourceGraph.ts

@@ -0,0 +1,16 @@
+import {HydraResource} from './Resources';
+import {IResource} from './Resources/Resource';
+
+export interface IResourceGraph {
+    get(uri: string): HydraResource;
+}
+
+export class ResourceGraph implements IResourceGraph {
+    public get(uri: string): HydraResource {
+        return this[uri] || this[decodeURI(uri)];
+    }
+
+    public add(resource: IResource) {
+        this[resource.id] = resource;
+    }
+}

src/RootSelectors/CanonicalLinkSelector.ts

@@ -1,6 +1,6 @@
 import * as li from 'parse-link-header';
 import * as Constants from '../Constants';
-import {IResourceGraph} from '../HydraResponse';
+import {IResourceGraph} from '../ResourceGraph';
 import {IResponseWrapper} from '../ResponseWrapper';
 
 const CanonicalLinkRel = 'canonical';

src/RootSelectors/ExactIdMatchSelector.ts

@@ -1,4 +1,5 @@
-import {IHydraResponse, IResourceGraph} from '../HydraResponse';
+import {IHydraResponse} from '../HydraResponse';
+import {IResourceGraph} from '../ResourceGraph';
 
 export default {
     selectRoot(resources: IResourceGraph, response: IHydraResponse) {

src/RootSelectors/PartialCollectionViewSelector.ts

@@ -1,6 +1,7 @@
 import {Core} from '../Constants';
 import Vocab = Core.Vocab;
-import {IHydraResponse, IResourceGraph} from '../HydraResponse';
+import {IHydraResponse} from '../HydraResponse';
+import {IResourceGraph} from '../ResourceGraph';
 import {IResponseWrapper} from '../ResponseWrapper';
 import {IRootSelector} from './index';