replace isomorphic fetch with whatwg-fetch and node-fetch

.npmignore

@@ -0,0 +1,5 @@
+test
+.babelrc
+.eslintrc
+*.yml
+build.js

README.md

@@ -43,6 +43,20 @@
                 console.info(event.title)
         })
 
+## NodeJS
+
+You will need to bring your own fetch library
+
+    // npm install node-fetch
+    global.fetch = require('node-fetch') 
+    var Client = require('predicthq')
+
+    // or
+    var fetch = require('node-fetch')
+    var Client = require('predicthq')
+    var phq = new Client({access_token: "ACCESS_TOKEN", fetch: fetch})
+
+
 
 ## Endpoints
 

package.json

@@ -2,7 +2,7 @@
   "name": "predicthq",
   "version": "0.0.4",
   "description": "PredictHQ Event Intelligence",
-  "main": "index.js",
+  "main": "dist/predicthq.js",
   "scripts": {
     "lint": " node node_modules/eslint/bin/eslint.js  ./src/",
     "test": "NODE_ENV=test node_modules/mocha/bin/mocha --require babel-core/register test",
@@ -43,10 +43,10 @@
     "core-js": "2.1.4",
     "dotenv": "2.0.0",
     "es6-promise": "3.1.2",
-    "isomorphic-fetch": "2.2.1",
     "jsonschema": "1.1.0",
     "lodash": "4.6.1",
     "loglevel": "1.4.0",
+    "whatwg-fetch": "^0.11.0",
     "youarei": "1.0.2"
   },
   "devDependencies": {
@@ -71,6 +71,7 @@
     "module-deps": "4.0.5",
     "mversion": "1.10.1",
     "nock": "7.2.2",
+    "node-fetch": "^1.5.1",
     "npm-check-updates": "2.5.8",
     "uglify-js": "2.6.2"
   }

src/client.js

@@ -8,19 +8,19 @@ import Accounts from "./endpoints/v1/accounts"
 import {polyfill} from 'es6-promise'
 polyfill()
 
-import 'isomorphic-fetch'
+// For the browser only (server side must bring their own fetch lib)
+import 'whatwg-fetch';
 
 import YouAreI from 'youarei'
 
 import dotenv from 'dotenv'
 dotenv.config({silent: true})
 
-
 let log = logger.getLogger("predicthq.client")
 
 class Client {
 
-    constructor(options){
+    constructor(options) {
 
         options = options || {}
 
@@ -33,8 +33,21 @@ class Client {
         this.users = new Users(this)
         this.accounts = new Accounts(this)
 
+        this.fetch = options.fetch || false
+        if (!this.fetch){
+            // Server
+            if (typeof(global) != 'undefined' && global.hasOwnProperty('fetch'))
+                this.fetch = global.fetch
+            // Browser
+            else if (typeof(window) != 'undefined' && window.hasOwnProperty('fetch'))
+                this.fetch = window.fetch
+            else {
+                this.fetch = ()=> { throw "No Fetch Library present. You must provide one!" }
+            }
+        }
     }
 
+
     request(method, path, returnClass, options){
 
         let access_token = this.options.access_token
@@ -47,7 +60,7 @@ class Client {
 
             log.debug(uri.to_string())
 
-            fetch(uri.to_string(), {
+            this.fetch(uri.to_string(), {
                 method: method,
                 headers: {
                     'Authorization': 'Bearer ' + access_token,

test/shared.js

@@ -6,6 +6,8 @@
 
  */
 
+global.fetch = require('node-fetch')
+
 import expect from 'expect'
 import nock from 'nock'
 

test/test_events_search.js

@@ -19,7 +19,6 @@ logger.getLogger("predicthq.client").setLevel('DEBUG')
 let access_token = process.env.ACCESS_TOKEN
 let test_account_id = process.env.TEST_ACCOUNT_ID
 
-
 describe('Events', () => {
     it('Search', (done) => {