Merge pull request #29 from predicthq/add_user_agent_header

Add user agent header

Author: robertkern

.gitignore

@@ -39,4 +39,4 @@ node_modules
 
 #dist   # Ugh, bower!
 
-
+package-lock.json

bower.json

@@ -27,5 +27,5 @@
     ".gitignore",
     ".babelrc"
   ],
-  "version": "0.0.19"
+  "version": "0.0.20"
 }

build.js

@@ -8,7 +8,7 @@ var UglifyJS = require("uglify-js")
 var chalk = require('chalk')
 var filesize = require("filesize")
 var fs = require("fs")
-
+var package = require('./package')
 var _ = require('lodash')
 
 var browserify = require('browserify')
@@ -23,7 +23,8 @@ b.transform('babelify')
 b.transform('brfs')
 
 b.transform(envify({
-        ENDPOINT_URL: 'https://api.predicthq.com'
+        ENDPOINT_URL: 'https://api.predicthq.com',
+        VERSION: package.version
 }))
 
 console.info(chalk.green('\tBuild process started..\n'))

dist/predicthq.js

@@ -1,4 +1,4 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.PredictHQ = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.PredictHQ = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 (function (global){
 'use strict';
 
@@ -22116,6 +22116,7 @@ var Client = function () {
         options = options || {};
 
         this.baseUrl = options.endpoint || "https://api.predicthq.com";
+        this.version = "0.0.20";
 
         if (typeof this.baseUrl == 'undefined') throw "No endpoint URL set";
 
@@ -22143,6 +22144,7 @@ var Client = function () {
     _createClass(Client, [{
         key: "request",
         value: function request(method, path, returnClass, options) {
+            var _this = this;
 
             var access_token = this.options.access_token;
 
@@ -22160,7 +22162,8 @@ var Client = function () {
                     method: method,
                     headers: {
                         'Authorization': 'Bearer ' + access_token,
-                        'Accept': 'application/json'
+                        'Accept': 'application/json',
+                        'X-User-Agent': "PHQ-JS-SDK/" + _this.version
                     }
                 }).then(function (response) {
                     return response.json();
@@ -22342,9 +22345,7 @@ function _inherits(subClass, superClass) {
     if (typeof superClass !== "function" && superClass !== null) {
         throw new TypeError("Super expression must either be null or a function, not " + (typeof superClass === "undefined" ? "undefined" : _typeof(superClass)));
     }subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } });if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
-} /*
-  
-  */
+}
 
 var Accounts = function (_BaseEndpoint) {
     _inherits(Accounts, _BaseEndpoint);
@@ -22362,13 +22363,6 @@ var Accounts = function (_BaseEndpoint) {
 
             return this.client.get("/v1/accounts/" + _account + "/");
         }
-    }, {
-        key: "subscriptions",
-        value: function subscriptions() {
-            var account = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'self';
-
-            return this.client.get("/v1/accounts/" + account + "/subscriptions/");
-        }
     }]);
 
     return Accounts;
@@ -23011,4 +23005,4 @@ _.trim;
 exports.logger = _loglevel2.default;
 
 },{"../dist/lodash.custom":1,"loglevel":61}]},{},[71])(71)
-});
+});

dist/predicthq.min.js

@@ -1,18 +1,18 @@
 {
   "name": "predicthq",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "PredictHQ Event Intelligence",
   "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",
-    "test_browser": "ACCESS_TOKEN=$(node -r dotenv/config -e 'console.log(process.env.TEST_USER_PASSWORD_ACCESS_TOKEN)'); ACCOUNT_ID=$(node -r dotenv/config -e 'console.log(process.env.TEST_ACCOUNT_ID)'); ENDPOINT_URL=$(node -r dotenv/config -e 'console.log(process.env.ENDPOINT_URL)'); node_modules/mocha-phantomjs/bin/mocha-phantomjs --web-security no -b -R dot test/browser/runner.html?endpoint=${ENDPOINT_URL}\\&token=${ACCESS_TOKEN}\\&account_id=${ACCOUNT_ID}",
+    "lint": "node node_modules/eslint/bin/eslint.js  ./src/",
+    "test": "VERSION=$npm_package_version NODE_ENV=test node_modules/mocha/bin/mocha --require babel-core/register test",
+    "test_browser": "VERSION=$npm_package_version ACCESS_TOKEN=$(node -r dotenv/config -e 'console.log(process.env.TEST_USER_PASSWORD_ACCESS_TOKEN)'); ACCOUNT_ID=$(node -r dotenv/config -e 'console.log(process.env.TEST_ACCOUNT_ID)'); ENDPOINT_URL=$(node -r dotenv/config -e 'console.log(process.env.ENDPOINT_URL)'); node_modules/mocha-phantomjs/bin/mocha-phantomjs --web-security no -b -R dot test/browser/runner.html?endpoint=${ENDPOINT_URL}\\&token=${ACCESS_TOKEN}\\&account_id=${ACCOUNT_ID}",
     "update": "node node_modules/npm-check-updates/bin/npm-check-updates --upgradeAll",
     "build": "NODE_ENV=production node node_modules/browserify/bin/cmd.js src/client.js -t babelify | node_modules/uglify-js/bin/uglifyjs -o dist/predicthq.js; node build.js",
     "list_lodash_methods": "node_modules/lodash-modularize/bin/lodash-modularize src/**/**/*.js --list -g _",
     "lodash": "lodash_methods=$(npm run --silent list_lodash_methods | sed -e \"s/\\x1b\\[.\\{1,5\\}m//g\"); node_modules/lodash-cli/bin/lodash -o dist/lodash.custom.js include=$lodash_methods",
-    "coverage": "node_modules/.bin/babel-node node_modules/babel-istanbul/lib/cli.js cover node_modules/mocha/bin/_mocha -- test",
-    "coverage_to_travis": "node_modules/.bin/babel-node node_modules/babel-istanbul/lib/cli.js cover node_modules/mocha/bin/_mocha -- test && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
+    "coverage": "VERSION=$npm_package_version node_modules/.bin/babel-node node_modules/babel-istanbul/lib/cli.js cover node_modules/mocha/bin/_mocha -- test",
+    "coverage_to_travis": "VERSION=$npm_package_version node_modules/.bin/babel-node node_modules/babel-istanbul/lib/cli.js cover node_modules/mocha/bin/_mocha -- test && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
     "patch": "node_modules/mversion/bin/version patch -m"
   },
   "repository": {

package.json

@@ -26,6 +26,7 @@ class Client {
         options = options || {}
 
         this.baseUrl = options.endpoint || process.env.ENDPOINT_URL
+        this.version = process.env.VERSION
 
         if (typeof(this.baseUrl) == 'undefined')
             throw "No endpoint URL set"
@@ -71,7 +72,8 @@ class Client {
                 method: method,
                 headers: {
                     'Authorization': 'Bearer ' + access_token,
-                    'Accept': 'application/json'
+                    'Accept': 'application/json',
+                    'X-User-Agent': `PHQ-JS-SDK/${this.version}`
                 }
             }).then(function(response) {
                     return response.json()

src/client.js

@@ -1,7 +1,3 @@
-/*
-
-*/
-
 import {_} from "../../utils"
 
 import {ResultSet} from "../../resultset"
@@ -19,10 +15,6 @@ class Accounts extends BaseEndpoint {
         return this.client.get(`/v1/accounts/${account}/`)
     }
 
-    subscriptions(account = 'self'){
-        return this.client.get(`/v1/accounts/${account}/subscriptions/`)
-    }
-
 }
 
-export default Accounts
+export default Accounts

src/endpoints/v1/accounts.js

@@ -14,7 +14,6 @@ import Client from '../src/client'
 logger.getLogger("predicthq.client").setLevel('DEBUG')
 
 let test_client_credentials_access_token = process.env.TEST_CLIENT_CREDENTIALS_ACCESS_TOKEN
-let test_user_password_access_token = process.env.TEST_USER_PASSWORD_ACCESS_TOKEN
 
 describe('Accounts', () => {
 
@@ -31,22 +30,6 @@ describe('Accounts', () => {
 
             }).catch(done)
 
-    }),
-
-    it('Subscriptions', (done) => {
-
-        let c = new Client({ access_token : test_user_password_access_token})
-
-        c.accounts.subscriptions()
-            .then((results)=>{
-
-               expect(_.keys(results)).toEqual(['app_subscription', 'api_subscription'])
-
-                done()
-
-            }).catch(done)
-
     })
 
 })
-

test/test_accounts.js

@@ -149,7 +149,7 @@ describe('Events', () => {
         c.events.count({'rank_level': [5], 'category': 'sports'})
             .then((results)=> {
 
-                expect(_.keys(results.toDict())).toEqual([ 'count', 'top_rank', 'rank_levels', 'categories', 'labels' ])
+                expect(_.keys(results.toDict())).toEqual([ 'count', 'top_rank', 'top_local_rank', 'rank_levels', 'local_rank_levels', 'categories', 'labels' ])
 
                 expect(results.toDict()['count']).toBeGreaterThan(10000)