popsicle - npm Package Compare versions

Comparing version 0.3.5 to 0.3.6

bower.json

		{
		"name": "popsicle",
		"main": "popsicle.js",
		"version": "0.3.5",
		"version": "0.3.6",
		"homepage": "https://github.com/blakeembrey/popsicle",
		@@ -6,0 +6,0 @@ "authors": [

package.json

		{
		"name": "popsicle",
		"version": "0.3.5",
		"version": "0.3.6",
		"description": "Simple HTTP requests for node and the browser",
		@@ -5,0 +5,0 @@ "main": "popsicle.js",

popsicle.js

		@@ -211,3 +211,3 @@ (function () {
		function type (str) {
		return str.split(/ ; /)[0];
		return str == null ? '' : str.split(/ ; /)[0];
		}
		@@ -397,2 +397,8 @@

		if (body === '') {
		response.body = null;

		return response;
		}

		try {
		@@ -545,22 +551,6 @@ if (JSON_MIME_REGEXP.test(type)) {

		var contentType = this.headers['content-type'];

		return contentType && type(contentType);
		return type(this.headers['content-type']);
		};

		/**
		* Return or set the accept header.
		*
		* @param {String} [value]
		* @return {String}
		*/
		Headers.prototype.accept = function (value) {
		if (value) {
		return this.set('Accept', value);
		}

		return this.headers.accept;
		};

		/**
		* Create a response instance.
		@@ -567,0 +557,0 @@ *

test/popsicle.js

		@@ -482,12 +482,9 @@ var isNode = typeof window === 'undefined';

		it('should keep non-parsable responses as empty strings', function () {
		it('should set non-parsable responses as null', function () {
		return popsicle({
		url: REMOTE_URL + '/echo',
		method: 'post',
		headers: {
		'Content-Type': 'text/html'
		}
		method: 'post'
		})
		.then(function (res) {
		expect(res.body).to.equal('');
		expect(res.body).to.equal(null);
		});
		@@ -511,13 +508,2 @@ });

		describe('accept', function () {
		it('should set the accept header', function () {
		return popsicle(REMOTE_URL + '/echo/header/accept')
		.accept('application/json')
		.then(function (res) {
		expect(res.body).to.equal('application/json');
		expect(res.type()).to.equal('text/html');
		});
		});
		});

		describe('request errors', function () {
		@@ -524,0 +510,0 @@ it('should error when requesting an unknown domain', function () {

New alerts