Merge branch 'master' into 0.6.0

Author: wkh237

README.md

@@ -875,6 +875,7 @@ A `session` is an object that helps you manage files. It simply maintains a list
 
 | Version | |
 |---|---|
+| 0.5.8 | Fix #33 PUT request will always be sent as POST on Android |
 | 0.5.7 | Fix #31 #30 Xcode pre 7.3 build error |
 | 0.5.6 | Add support for IOS network status indicator. Fix file stream ASCII reader bug. |
 | 0.5.5 | Remove work in progress code added in 0.5.2 which may cause memory leaks. |

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fetchblob",
-  "version": "0.5.7",
+  "version": "0.6.0",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

src/README.md

@@ -1,4 +1,4 @@
-# react-native-fetch-blob [![npm version](https://img.shields.io/badge/npm package-0.5.7-brightgreen.svg)](https://badge.fury.io/js/react-native-fetch-blob) ![](https://img.shields.io/badge/PR-Welcome-brightgreen.svg) ![](https://img.shields.io/badge/in progress-0.6.0-yellow.svg)
+# react-native-fetch-blob [![npm version](https://img.shields.io/badge/npm package-0.5.8-brightgreen.svg)](https://badge.fury.io/js/react-native-fetch-blob) ![](https://img.shields.io/badge/PR-Welcome-brightgreen.svg) ![](https://img.shields.io/badge/in progress-0.6.0-yellow.svg)
 
 A module provides upload, download, and files access API. Supports file stream read/write for process large files.
 
@@ -304,7 +304,7 @@ In `version >= 0.4.2` it is possible to know the upload/download progress.
 
 #### Android Media Scanner, and Downloads App Support
 
-If you want to make a file in `External Storage` becomes visible in Picture, Misuc, or other built-in apps, you will have to use `Media Scanner`. To make this happend, use `scanFile` method in `fs`.
+If you want to make a file in `External Storage` becomes visible in Picture, Music, or other built-in apps, you will have to use `Media Scanner`. To make this happend, use `scanFile` method in `fs`.
 
 
 ```js
@@ -851,6 +851,7 @@ A `session` is an object that helps you manage files. It simply maintains a list
 
 | Version | |
 |---|---|
+| 0.5.8 | Fix #33 PUT request will always be sent as POST on Android |
 | 0.5.7 | Fix #31 #30 Xcode pre 7.3 build error |
 | 0.5.6 | Add support for IOS network status indicator. Fix file stream ASCII reader bug. |
 | 0.5.5 | Remove work in progress code added in 0.5.2 which may cause memory leaks. |

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java

@@ -157,9 +157,9 @@ else if(type == "form")
                     break;
                 case "put" :
                     if(this.type == null || this.type.equalsIgnoreCase("octet"))
-                        req.post(ctx, url, entity, "application/octet-stream", handler);
+                        req.put(ctx, url, entity, "application/octet-stream", handler);
                     else
-                        req.post(ctx, url, entity, "multipart/form-data", handler);
+                        req.put(ctx, url, entity, "multipart/form-data", handler);
                     break;
                 case "delete" :
                     req.delete(url, handler);

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fetch-blob",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
   "main": "index.js",
   "scripts": {

test-server/server.js

@@ -79,8 +79,17 @@ app.all('/params', function(req, res) {
 app.all('/empty', function(req, res) {
   res.send('')
 })
+
+app.delete('/hey', function(req, res) {
+  res.send('man')
+})
+
 // handle multipart/form-data request
-app.post('/upload-form', function(req, res) {
+app.post('/upload-form', formUpload)
+
+app.put('/upload-form', formUpload)
+
+function formUpload(req, res) {
   console.log(req.headers)
   console.log(req.body)
   console.log(req.files)
@@ -94,7 +103,7 @@ app.post('/upload-form', function(req, res) {
     fields : req.body,
     files : req.files
   })
-})
+}
 
 function watch(source, dest, ignore) {
   // watch files in  test folder

test/test-0.1.x-0.4.x.js

@@ -114,3 +114,34 @@ describe('Progress report test', (report, done) => {
     })
 
 })
+
+
+describe('PUT request test', (report, done) => {
+
+  RNFetchBlob.fetch('PUT', `${TEST_SERVER_URL}/upload-form`, {
+      Authorization : "Bearer fsXcpmKPrHgAAAAAAAAAEGxFXwhejXM_E8fznZoXPhHbhbNhA-Lytbe6etp1Jznz",
+      'Content-Type' : 'multipart/form-data',
+    }, [
+      { name : 'test-img', filename : 'test-img.png', data: image},
+      { name : 'test-text', filename : 'test-text.txt', data: RNFetchBlob.base64.encode('hello.txt')},
+      { name : 'field1', data : 'hello !!'},
+      { name : 'field2', data : 'hello2 !!'}
+    ])
+  .then((resp) => {
+    resp = resp.json()
+    report(
+      <Assert key="check put form data #1" expect="hello !!" actual={resp.fields.field1}/>,
+      <Assert key="check put form data #2" expect="hello2 !!" actual={resp.fields.field2}/>,
+    )
+    done()
+  })
+})
+
+describe('DELETE request test', (report, done) => {
+  RNFetchBlob.fetch('DELETE', `${TEST_SERVER_URL}/hey`)
+  .then((resp) => {
+    report(
+      <Assert key="check DELETE request result" expect={'man'} actual={resp.text()}/>)
+      done()
+  })
+})