merge release v0.5.0

Author: steffans

.gitignore

@@ -1,2 +1,3 @@
 /node_modules
+/test/specs.js
 .DS_Store

README.md

@@ -46,27 +46,27 @@ The http service can be used globally `Vue.http` or in a Vue instance `this.$htt
 
 ### Methods
 
-* `get(url, [data], [success], [options])`
-* `post(url, [data], [success], [options])`
-* `put(url, [data], [success], [options])`
-* `patch(url, [data], [success], [options])`
-* `delete(url, [data], [success], [options])`
-* `jsonp(url, [data], [success], [options])`
+* `get(url, [data], [options])`
+* `post(url, [data], [options])`
+* `put(url, [data], [options])`
+* `patch(url, [data], [options])`
+* `delete(url, [data], [options])`
+* `jsonp(url, [data], [options])`
 
 ### Options
 
 * **url** - `string` - URL to which the request is sent
-* **data** - `Object|string` - Data to be sent as the request message data
 * **method** - `string` - HTTP method (e.g. GET, POST, ...)
+* **data** - `Object|string` - Data to be sent as the request message data
 * **params** - `Object` - Parameters object to be appended as GET parameters
 * **headers** - `Object` - Headers object to be sent as HTTP request headers
-* **success** - `function(data, status, request)` - Callback function to be called when the request finishes
-* **error** - `function(data, status, request)` - Callback function to be called when the request fails
-* **beforeSend** - `function(request, options)` - Callback function to modify the request object before it is sent
+* **beforeSend** - `function(request)` - Callback function to modify the request object before it is sent
 * **emulateHTTP** - `boolean` - Send PUT, PATCH and DELETE requests with a HTTP POST and set the `X-HTTP-Method-Override` header
 * **emulateJSON** - `boolean` -  Send request data as `application/x-www-form-urlencoded` content type
 * **xhr** - `Object` - Parameters object to be set on the native XHR object
 * **jsonp** - `string` - Callback function name in a JSONP request
+* **timeout** - `number` - Request timeout in milliseconds (`0` means no timeout)
+
 
 ### Example
 
@@ -76,14 +76,24 @@ new Vue({
     ready: function() {
 
       // GET request
-      this.$http.get('/someUrl', function (data, status, request) {
+      this.$http.get('/someUrl').then(function (response) {
+
+          // get status
+          response.status;
+
+          // get all headers
+          response.headers();
+
+          // get 'expires' header
+          response.headers('expires');
 
           // set data on vm
-          this.$set('someData', data)
+          this.$set('someData', response.data)
+
+      }, function (response) {
 
-      }).error(function (data, status, request) {
           // handle error
-      })
+      });
 
     }
 
@@ -115,28 +125,70 @@ new Vue({
 
     ready: function() {
 
-      var resource = this.$resource('someItem/:id');
+      var resource = this.$resource('someItem{/id}');
 
       // get item
-      resource.get({id: 1}, function (item, status, request) {
-          this.$set('item', item)
-      })
+      resource.get({id: 1}).then(function (response) {
+          this.$set('item', response.item)
+      });
 
       // save item
-      resource.save({id: 1}, {item: this.item}, function (data, status, request) {
+      resource.save({id: 1}, {item: this.item}).then(function (response) {
           // handle success
-      }).error(function (data, status, request) {
+      }, function (response) {
           // handle error
-      })
+      });
 
       // delete item
-      resource.delete({id: 1}, function (data, status, request) {
+      resource.delete({id: 1}).then(function (response) {
           // handle success
-      }).error(function (data, status, request) {
+      }, function (response) {
           // handle error
-      })
+      });
 
     }
 
 })
 ```
+
+## Interceptors
+
+Interceptors can be defined globally and are used for pre- and postprocessing of a request.
+
+```javascript
+Vue.http.interceptors.push({
+
+    request: function (request) {
+        return request;
+    },
+
+    response: function (response) {
+        return response;
+    }
+
+});
+```
+
+#### Interceptor Factory
+
+If Promises are needed inside of a Interceptor, a factory function can be used.
+
+```javascript
+Vue.http.interceptors.push(function (Promise) {
+    return {
+
+            request: function (request) {
+                if (reject) {
+                    return Promise.reject();
+                }
+            },
+
+            response: function (response) {
+                if (reject) {
+                    return Promise.reject();
+                }
+            }
+
+       };
+});
+```

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.17",
+  "version": "0.5.0",
   "homepage": "https://github.com/vuejs/vue-resource",
   "license": "MIT",
   "ignore": [