Fixes #18. Fixes #27.

Stable Version 2.1.1

Author: jmdobry

CHANGELOG.md

@@ -1,4 +1,10 @@
-##### 2.1.0 - xx September 2015
+##### 2.1.1 - 20 September 2015
+
+###### Backwards compatible bug fixes
+- #18 - Cannot read property 'http' of undefined
+- #27 - logResponse doesn't reject when this.http() rejects with something that is not an Error
+
+##### 2.1.0 - 11 September 2015
 
 ###### Backwards compatible API changes
 - #20 - DSHttpAdapter.POST does not pick DSHttpAdapter.defaults.basePath

Gruntfile.js

@@ -152,6 +152,7 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('test', ['build', 'karma:ci', 'karma:min']);
+  grunt.registerTask('test_c9', ['build', 'karma:c9']);
   grunt.registerTask('build', [
     'clean',
     'standard',

dist/js-data-http.js

@@ -1,6 +1,6 @@
 /*!
  * js-data-http
- * @version 2.1.0 - Homepage <http://www.js-data.io/docs/dshttpadapter>
+ * @version 2.1.1 - Homepage <http://www.js-data.io/docs/dshttpadapter>
  * @author Jason Dobry <[email protected]>
  * @copyright (c) 2014-2015 Jason Dobry 
  * @license MIT <https://github.com/js-data/js-data-http/blob/master/LICENSE>
@@ -127,6 +127,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  function DSHttpAdapter(options) {
 	    _classCallCheck(this, DSHttpAdapter);
 
+	    options = options || {};
 	    this.defaults = new Defaults();
 	    if (console) {
 	      this.defaults.log = function (a, b) {
@@ -234,7 +235,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	      }
 
 	      // logs the HTTP response
-	      function logResponse(data) {
+	      function logResponse(data, isRejection) {
+	        data = data || {};
 	        // examine the data object
 	        if (data instanceof Error) {
 	          // log the Error object
@@ -243,7 +245,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        } else if (typeof data === 'object') {
 	          var str = start.toUTCString() + ' - ' + config.method + ' ' + config.url + ' - ' + data.status + ' ' + (new Date().getTime() - start.getTime()) + 'ms';
 
-	          if (data.status >= 200 && data.status < 300) {
+	          if (data.status >= 200 && data.status < 300 && !isRejection) {
 	            if (_this.defaults.log) {
 	              _this.defaults.log(str, data);
 	            }
@@ -265,7 +267,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	        throw new Error('You have not configured this adapter with an http library!');
 	      }
 
-	      return this.http(config).then(logResponse, logResponse);
+	      return this.http(config).then(logResponse, function (data) {
+	        return logResponse(data, true);
+	      });
 	    }
 	  }, {
 	    key: 'GET',

dist/js-data-http.min.js

@@ -1,7 +1,7 @@
 {
   "name": "js-data-http",
   "description": "http adapter for js-data.",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "homepage": "http://www.js-data.io/docs/dshttpadapter",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
     "http"
   ],
   "devDependencies": {
-    "babel-core": "5.8.24",
-    "babel-eslint": "^4.1.1",
+    "babel-core": "5.8.25",
+    "babel-eslint": "4.1.3",
     "babel-loader": "5.3.2",
     "es6-promise": "3.0.2",
     "grunt": "0.4.5",
@@ -50,9 +50,9 @@
     "karma-script-launcher": "0.1.0",
     "karma-sinon": "1.0.4",
     "karma-spec-reporter": "0.0.20",
-    "standard": "^5.2.2",
+    "standard": "5.3.1",
     "time-grunt": "1.2.1",
-    "webpack-dev-server": "1.10.1"
+    "webpack-dev-server": "1.11.0"
   },
   "standard": {
     "parser": "babel-eslint"

dist/js-data-http.min.map

@@ -38,6 +38,7 @@ defaultsPrototype.verbsUseBasePath = false
 
 class DSHttpAdapter {
   constructor (options) {
+    options = options || {}
     this.defaults = new Defaults()
     if (console) {
       this.defaults.log = (a, b) => console[typeof console.info === 'function' ? 'info' : 'log'](a, b)
@@ -132,7 +133,8 @@ class DSHttpAdapter {
     }
 
     // logs the HTTP response
-    function logResponse (data) {
+    function logResponse (data, isRejection) {
+      data = data || {}
       // examine the data object
       if (data instanceof Error) {
         // log the Error object
@@ -141,7 +143,7 @@ class DSHttpAdapter {
       } else if (typeof data === 'object') {
         let str = `${start.toUTCString()} - ${config.method} ${config.url} - ${data.status} ${(new Date().getTime() - start.getTime())}ms`
 
-        if (data.status >= 200 && data.status < 300) {
+        if (data.status >= 200 && data.status < 300 && !isRejection) {
           if (_this.defaults.log) {
             _this.defaults.log(str, data)
           }
@@ -163,7 +165,9 @@ class DSHttpAdapter {
       throw new Error('You have not configured this adapter with an http library!')
     }
 
-    return this.http(config).then(logResponse, logResponse)
+    return this.http(config).then(logResponse, function (data) {
+      return logResponse(data, true)
+    })
   }
 
   GET (url, config) {

package.json

@@ -86,8 +86,9 @@ describe('DSHttpAdapter.find(resourceConfig, id, options)', function () {
     return dsHttpAdapter.find(Post, 1).then(function () {
       throw new Error('Should not have succeeded!');
     }, function () {
+      console.log(loggedError);
       assert.isString(loggedError);
-      assert.isTrue(loggedError.indexOf('api/posts/1') !== -1);
+      assert.isTrue(loggedError.indexOf('api/posts/1') !== -1, loggedError);
     });
   });