v0.1.6

Author: steffans

bower.json

@@ -2,7 +2,7 @@
   "name": "vue-resource",
   "main": "dist/vue-resource.js",
   "description": "A web request service for Vue.js",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "homepage": "https://github.com/vuejs/vue-resource",
   "license": "MIT",
   "ignore": [

dist/vue-resource.js

@@ -1,5 +1,5 @@
 /**
- * vue-resource v0.1.5
+ * vue-resource v0.1.6
  * https://github.com/vuejs/vue-resource
  * Released under the MIT License.
  */
@@ -102,7 +102,7 @@
 	            return '';
 	        });
 
-	        if (options.root !== false && !url.match(/^(https?:)?\//)) {
+	        if (typeof options.root === 'string' && !url.match(/^(https?:)?\//)) {
 	            url = options.root + '/' + url;
 	        }
 
@@ -130,7 +130,6 @@
 
 	    Url.options = {
 	        url: '',
-	        root: false,
 	        params: {}
 	    };
 
@@ -355,40 +354,36 @@
 	            options.data = '';
 	        }
 
-	        promise = (options.method.toLowerCase() == 'jsonp' ? jsonp : xhr).call(this, this.$url || Vue.url, options);
+	        promise = (options.method.toLowerCase() == 'jsonp' ? jsonp : xhr).call(this, this.$url || Vue.url, options).then(transformResponse, transformResponse);
 
-	        _.extend(promise, {
-
-	            success: function (onSuccess) {
-
-	                this.then(function (request) {
-	                    onSuccess.apply(self, parseReq(request));
-	                }, function () {});
+	        promise.success = function (fn) {
 
-	                return this;
-	            },
+	            promise.then(function (response) {
+	                fn.call(self, response.data, response.status, response);
+	            });
 
-	            error: function (onError) {
+	            return promise;
+	        };
 
-	                this.catch(function (request) {
-	                    onError.apply(self, parseReq(request));
-	                });
+	        promise.error = function (fn) {
 
-	                return this;
-	            },
+	            promise.catch(function (response) {
+	                fn.call(self, response.data, response.status, response);
+	            });
 
-	            always: function (onAlways) {
+	            return promise;
+	        };
 
-	                var cb = function (request) {
-	                    onAlways.apply(self, parseReq(request));
-	                };
+	        promise.always = function (fn) {
 
-	                this.then(cb, cb);
+	            var cb = function (response) {
+	                fn.call(self, response.data, response.status, response);
+	            };
 
-	                return this;
-	            }
+	            promise.then(cb, cb);
 
-	        });
+	            return promise;
+	        };
 
 	        if (options.success) {
 	            promise.success(options.success);
@@ -505,17 +500,15 @@
 	        return promise;
 	    }
 
-	    function parseReq(request) {
-
-	        var result;
+	    function transformResponse(response) {
 
 	        try {
-	            result = JSON.parse(request.responseText);
+	            response.data = JSON.parse(response.responseText);
 	        } catch (e) {
-	            result = request.responseText;
+	            response.data = response.responseText;
 	        }
 
-	        return [result, request.status, request];
+	        return response;
 	    }
 
 	    Http.options = {
@@ -525,7 +518,7 @@
 	        jsonp: 'callback',
 	        beforeSend: null,
 	        emulateHTTP: false,
-	        emulateJSON: false,
+	        emulateJSON: false
 	    };
 
 	    Http.headers = {

dist/vue-resource.min.js

@@ -1,6 +1,6 @@
 {
   "name": "vue-resource",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A web request service for Vue.js",
   "main": "src/index.js",
   "scripts": {