chore: rename to flow.js

Author: AidasK

.travis.yml

@@ -3,8 +3,8 @@ node_js:
   - 0.1
 env:
   global:
-  - secure: QnbopydTyvqD3CmNZa6Ppu68m7ug+HKXYOvWhcdbqWQryDHGzoMk/ehQjrFszAAO0s+4a//aMzlNJnZQW8wYxtXyA5RlPGl4Vbr9uhSeHNEgxBzgeqSD8+3ZjgE/ORmuds7jjPDStG50uotD+DubQKLiMe/vn9Ej9bArpZ2pGKk=
-  - secure: GkU6vcxcmPtVo3nnMj+HGX+Hde1jU/ad/Un2Sexx0nBZzYd3d/A2HGdbd4NAtjioyucUCyHSYaG2n3yE+u16ucFDYBB9Wu1zlXynku39pSiDcz/pjh9mR7VBHg4VNGKqe5ZtU5udohFsOZMYTegqk5nw9yW6VgZzRa/1mWsg2YY=
+  - SAUCE_USERNAME=aidaskk
+  - SAUCE_ACCESS_KEY=6e96b47e-6665-4f69-beaa-085e5d5b6b9b
 before_script:
   - sh -e /etc/init.d/xvfb start
   - npm install --quiet -g grunt-cli karma

CHANGELOG.md

@@ -22,7 +22,7 @@
  - **singleFile** parameter added. Then enabled, uploaded file will replace current one.
 
 ## Breaking Changes
-
+ - **Resumable** was renamed to **Flow**
  - **ResumableFile.fileName** parameter renamed to **ResumableFile.name**
  - **Resumable.getOpt** method dropped, use Resumable.opts parameter instead if needed.
  - **Resumable.maxFiles**, **Resumable.minFileSize**, **Resumable.maxFileSize**,

Gruntfile.js

@@ -8,8 +8,8 @@ module.exports = function(grunt) {
         banner: '/*! <%= pkg.name %> <%= pkg.version %> */\n'
       },
       build: {
-        src: 'src/resumable.js',
-        dest: 'build/resumable.min.js'
+        src: 'src/flow.js',
+        dest: 'build/flow.min.js'
       }
     },
     coveralls: {

README.md

@@ -1,4 +1,4 @@
-## Flow.js [![Build Status](https://travis-ci.org/resumable2/resumable.js.png)](https://travis-ci.org/resumable2/resumable.js) [![Coverage Status](https://coveralls.io/repos/resumable2/resumable.js/badge.png?branch=master)](https://coveralls.io/r/resumable2/resumable.js?branch=master)
+## Flow.js [![Build Status](https://travis-ci.org/flowjs/flow.js.png)](https://travis-ci.org/flowjs/flow.js) [![Coverage Status](https://coveralls.io/repos/flowjs/flow.js/badge.png?branch=master)](https://coveralls.io/r/flowjs/flow.js?branch=master)
 
 
 Flow.js is a JavaScript library providing multiple simultaneous, stable and resumable uploads via the HTML5 File API. 

bower.json

@@ -1,7 +1,7 @@
 {
-  "name": "resumable.js",
-  "version": "2.0.0-beta",
-  "main": "src/resumable.js",
+  "name": "flow.js",
+  "version": "2.0.0-beta2",
+  "main": "src/flow.js",
   "ignore": [
     "**/.*",
     "node_modules",

package.json

@@ -1,16 +1,18 @@
 {
-  "name": "resumable.js",
+  "name": "flow.js",
   "version": "2.0.0-beta",
-  "description": "Resumable.js is a JavaScript library providing multiple simultaneous, stable and resumable uploads via the HTML5 File API",
-  "main": "resumable.js",
+  "description": "Flow.js library implements html5 file upload and provides multiple simultaneous, stable, fault tolerant and resumable uploads.",
+  "main": "src/flow.js",
   "scripts": {
     "test": "grunt test"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/resumable2/resumable.js.git"
+    "url": "git://github.com/flowjs/flow.js.git"
   },
   "keywords": [
+    "flow.js",
+    "flow",
     "resumable.js",
     "file upload",
     "resumable upload",
@@ -19,12 +21,11 @@
     "javascript upload",
     "upload"
   ],
-  "author": "",
+  "author": "Aidas Klimas",
   "license": "MIT",
-  "gitHead": "75d9526a46767454ca304ad257d0cef448815f1a",
   "readmeFilename": "README.md",
   "bugs": {
-    "url": "https://github.com/resumable2/resumable.js/issues"
+    "url": "https://github.com/flowjs/flow.js/issues"
   },
   "devDependencies": {
     "grunt": "~0.4.1",

samples/Backend on PHP.md

@@ -1,4 +1,6 @@
-# Sample server implementation in PHP 
+# Sample server implementation in PHP
+
+Take a look at flow.js php library https://github.com/flowjs/flow-php-server.
 
 [Chris Gregory](http://online-php.com) has provided this sample implementation for PHP. 
 
@@ -8,7 +10,7 @@ It's a sample implementation to illustrate chunking. It should probably not be u
 <?php
 /**
  * This is the implementation of the server side part of
- * Resumable.js client script, which sends/uploads files
+ * Flow.js client script, which sends/uploads files
  * to a server in several chunks.
  *
  * The script receives the files in a standard way as if
@@ -123,8 +125,8 @@ function createFileFromChunks($temp_dir, $fileName, $chunkSize, $totalSize) {
 //check if request is GET and the requested chunk exists or not. this makes testChunks work
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 
-    $temp_dir = 'temp/'.$_GET['resumableIdentifier'];
-    $chunk_file = $temp_dir.'/'.$_GET['resumableFilename'].'.part'.$_GET['resumableChunkNumber'];
+    $temp_dir = 'temp/'.$_GET['flowIdentifier'];
+    $chunk_file = $temp_dir.'/'.$_GET['flowFilename'].'.part'.$_GET['flowChunkNumber'];
     if (file_exists($chunk_file)) {
          header("HTTP/1.0 200 Ok");
        } else
@@ -140,14 +142,14 @@ if (!empty($_FILES)) foreach ($_FILES as $file) {
 
     // check the error status
     if ($file['error'] != 0) {
-        _log('error '.$file['error'].' in file '.$_POST['resumableFilename']);
+        _log('error '.$file['error'].' in file '.$_POST['flowFilename']);
         continue;
     }
 
     // init the destination file (format <filename.ext>.part<#chunk>
     // the file is stored in a temporary directory
-    $temp_dir = 'temp/'.$_POST['resumableIdentifier'];
-    $dest_file = $temp_dir.'/'.$_POST['resumableFilename'].'.part'.$_POST['resumableChunkNumber'];
+    $temp_dir = 'temp/'.$_POST['flowIdentifier'];
+    $dest_file = $temp_dir.'/'.$_POST['flowFilename'].'.part'.$_POST['flowChunkNumber'];
 
     // create the temporary directory
     if (!is_dir($temp_dir)) {
@@ -156,12 +158,12 @@ if (!empty($_FILES)) foreach ($_FILES as $file) {
 
     // move the temporary file
     if (!move_uploaded_file($file['tmp_name'], $dest_file)) {
-        _log('Error saving (move_uploaded_file) chunk '.$_POST['resumableChunkNumber'].' for file '.$_POST['resumableFilename']);
+        _log('Error saving (move_uploaded_file) chunk '.$_POST['flowChunkNumber'].' for file '.$_POST['flowFilename']);
     } else {
 
         // check if all the parts present, and create the final destination file
-        createFileFromChunks($temp_dir, $_POST['resumableFilename'], 
-                $_POST['resumableChunkSize'], $_POST['resumableTotalSize']);
+        createFileFromChunks($temp_dir, $_POST['flowFilename'],
+                $_POST['flowChunkSize'], $_POST['flowTotalSize']);
     }
 }
 ```

samples/Frontend in jQuery.md

@@ -1,59 +1,2 @@
-# Resumable.js front-end in jQuery
-[@steffentchr](http://twitter.com/steffentchr)
-
-This library is originally built to work with [23 Video](http://www.23video.com), and the 23 uploader is a good example of:
-
-* Selecing files or drag-dropping them in
-* Using events to build UI and progress bar
-* Pausing and Resuming uploads
-* Recovering uploads after browser crashes and even across different computers
-* Detecting file support from chunks, for example whether an upload is actually a video file
-* Building thumbnails from chunks to give better feedback during upload
-* Falling back to alternative upload options when Resumable.js is not supported.
-
-There's [a free trial for 23 Video](http://www.23video.com/signup) if
-you want to see this in action, but the pieces are:
-
-* Resumable.js itself.
-* [A piece of jQuery](http://reinvent.23video.com/resources/um/script/resumable-uploader.js), which sets up Resumable.js and glues it to the UI.
-* [An API methods](http://www.23developer.com/api/photo-redeem-upload-token) with support for Resumable.js chunks and feedback.
-* Finally, some HTML elements for the glue script to use.
-
-```html
-<div class="resumable-drop" ondragenter="jQuery(this).addClass('resumable-dragover');" ondragend="jQuery(this).removeClass('resumable-dragover');" ondrop="jQuery(this).removeClass('resumable-dragover');">
-  Drop video files here to upload or <a class="resumable-browse"><u>select from your computer</u></a>
-</div>
-
-<div class="progress" style="display:none;">
-  <table>
-    <tr>
-      <td width="100%"><div class="progress-container"><div class="progress-bar"></div></div></td>
-      <td class="progress-text" nowrap="nowrap"></td>
-      <td class="progress-pause" nowrap="nowrap">
-        <a href="#" onclick="uploader.resumable.upload(); return(false);" class="progress-resume-link"><img src="/resources/um/graphics/uploader/resume.png" title="Resume upload" /></a>
-        <a href="#" onclick="uploader.resumable.pause(); return(false);" class="progress-pause-link"><img src="/resources/um/graphics/uploader/pause.png" title="Pause upload" /></a>
-      </td>
-    </tr>
-  </table>
-</div>
-
-<div class="uploader-list" style="display:none;">
-  <div class="uploader-item">
-    ... (generated thumbnails for each file)
-  </div>
-</div>
-
-<div class="file-edit-container" style="display:none;">
-  ... (elements for the edit UI)
-</div>
-
-<script src="/resources/um/script/resumable.js"></script>
-<script src="/resources/um/script/resumable-uploader.js"></script>
-<script>
-  uploader = (function($){
-      var upload_token = '<api upload token>';
-      var meta = {};
-      return (new ResumableUploader(upload_token, meta, $('.resumable-browse'), $('.resumable-drop'), $('.progress'), $('.uploader-list'), $('.file-edit-container')));
-    })(jQuery);
-</script>
-```
+# Flow.js front-end in jQuery
+ Waiting for your contribution, for now look in Node.js sample at https://github.com/flowjs/flow.js/tree/master/samples/Node.js

samples/Node.js/README.md

@@ -14,6 +14,6 @@ File chunks will be uploaded to samples/Node.js/tmp directory.
 
 ## Enabling Cross-domain Uploads
 
-If you would like to load the resumable.js library from one domain and have your Node.js reside on another, you must allow 'Access-Control-Allow-Origin' from '*'.  Please remember, there are some potential security risks with enabling this functionality.  If you would still like to implement cross-domain uploads, open app.js and uncomment lines 24-31 and uncomment line 17.
+If you would like to load the flow.js library from one domain and have your Node.js reside on another, you must allow 'Access-Control-Allow-Origin' from '*'.  Please remember, there are some potential security risks with enabling this functionality.  If you would still like to implement cross-domain uploads, open app.js and uncomment lines 24-31 and uncomment line 17.
 
 Then in public/index.html, on line 49, update the target with your server's address.  For example: target:'http://www.example.com/upload'

samples/Node.js/app.js

@@ -1,5 +1,5 @@
 var express = require('express');
-var resumable = require('./resumable-node.js')('tmp/');
+var flow = require('./flow-node.js')('tmp/');
 var app = express();
 
 // Host most stuff in the public folder
@@ -8,9 +8,9 @@ app.use(express.static(__dirname + '/../../src'));
 
 app.use(express.bodyParser());
 
-// Handle uploads through Resumable.js
+// Handle uploads through Flow.js
 app.post('/upload', function(req, res){
-  resumable.post(req, function(status, filename, original_filename, identifier){
+  flow.post(req, function(status, filename, original_filename, identifier){
     console.log('POST', status, original_filename, identifier);
     res.send(200, {
       // NOTE: Uncomment this funciton to enable cross-domain request.
@@ -30,16 +30,16 @@ app.post('/upload', function(req, res){
   });
 */
 
-// Handle status checks on chunks through Resumable.js
+// Handle status checks on chunks through Flow.js
 app.get('/upload', function(req, res){
-  resumable.get(req, function(status, filename, original_filename, identifier){
+  flow.get(req, function(status, filename, original_filename, identifier){
     console.log('GET', status);
     res.send(200, (status == 'found' ? 200 : 404));
   });
 });
 
 app.get('/download/:identifier', function(req, res){
-	resumable.write(req.params.identifier, res);
+	flow.write(req.params.identifier, res);
 });
 
 app.listen(3000);

samples/Node.js/resumable-node.js samples/Node.js/flow-node.js

@@ -2,7 +2,7 @@ var fs = require('fs'), path = require('path'), util = require('util'), Stream =
 
 
 
-module.exports = resumable = function(temporaryFolder){
+module.exports = flow = function(temporaryFolder){
   var $ = this;
   $.temporaryFolder = temporaryFolder;
   $.maxFileSize = null;
@@ -21,7 +21,7 @@ module.exports = resumable = function(temporaryFolder){
     // Clean up the identifier
     identifier = cleanIdentifier(identifier);
     // What would the file name be?
-    return path.join($.temporaryFolder, './resumable-'+identifier+'.'+chunkNumber);
+    return path.join($.temporaryFolder, './flow-'+identifier+'.'+chunkNumber);
   }
 
   var validateRequest = function(chunkNumber, chunkSize, totalSize, identifier, filename, fileSize){
@@ -30,30 +30,30 @@ module.exports = resumable = function(temporaryFolder){
 
     // Check if the request is sane
     if (chunkNumber==0 || chunkSize==0 || totalSize==0 || identifier.length==0 || filename.length==0) {
-      return 'non_resumable_request';
+      return 'non_flow_request';
     }
     var numberOfChunks = Math.max(Math.floor(totalSize/(chunkSize*1.0)), 1);
     if (chunkNumber>numberOfChunks) {
-      return 'invalid_resumable_request1';
+      return 'invalid_flow_request1';
     }
 
     // Is the file too big?
     if($.maxFileSize && totalSize>$.maxFileSize) {
-      return 'invalid_resumable_request2';
+      return 'invalid_flow_request2';
     }
 
     if(typeof(fileSize)!='undefined') {
       if(chunkNumber<numberOfChunks && fileSize!=chunkSize) {
         // The chunk in the POST request isn't the correct size
-        return 'invalid_resumable_request3';
+        return 'invalid_flow_request3';
       }
       if(numberOfChunks>1 && chunkNumber==numberOfChunks && fileSize!=((totalSize%chunkSize)+chunkSize)) {
         // The chunks in the POST is the last one, and the fil is not the correct size
-        return 'invalid_resumable_request4';
+        return 'invalid_flow_request4';
       }
       if(numberOfChunks==1 && fileSize!=totalSize) {
         // The file is only a single chunk, and the data size does not fit
-        return 'invalid_resumable_request5';
+        return 'invalid_flow_request5';
       }
     }
 
@@ -63,11 +63,11 @@ module.exports = resumable = function(temporaryFolder){
   //'found', filename, original_filename, identifier
   //'not_found', null, null, null
   $.get = function(req, callback){
-    var chunkNumber = req.param('resumableChunkNumber', 0);
-    var chunkSize = req.param('resumableChunkSize', 0);
-    var totalSize = req.param('resumableTotalSize', 0);
-    var identifier = req.param('resumableIdentifier', "");
-    var filename = req.param('resumableFilename', "");
+    var chunkNumber = req.param('flowChunkNumber', 0);
+    var chunkSize = req.param('flowChunkSize', 0);
+    var totalSize = req.param('flowTotalSize', 0);
+    var identifier = req.param('flowIdentifier', "");
+    var filename = req.param('flowFilename', "");
 
     if(validateRequest(chunkNumber, chunkSize, totalSize, identifier, filename)=='valid') {
       var chunkFilename = getChunkFilename(chunkNumber, identifier);
@@ -85,23 +85,23 @@ module.exports = resumable = function(temporaryFolder){
 
   //'partly_done', filename, original_filename, identifier
   //'done', filename, original_filename, identifier
-  //'invalid_resumable_request', null, null, null
-  //'non_resumable_request', null, null, null
+  //'invalid_flow_request', null, null, null
+  //'non_flow_request', null, null, null
   $.post = function(req, callback){
 
     var fields = req.body;
     var files = req.files;
 
-    var chunkNumber = fields['resumableChunkNumber'];
-    var chunkSize = fields['resumableChunkSize'];
-    var totalSize = fields['resumableTotalSize'];
-    var identifier = cleanIdentifier(fields['resumableIdentifier']);
-    var filename = fields['resumableFilename'];
+    var chunkNumber = fields['flowChunkNumber'];
+    var chunkSize = fields['flowChunkSize'];
+    var totalSize = fields['flowTotalSize'];
+    var identifier = cleanIdentifier(fields['flowIdentifier']);
+    var filename = fields['flowFilename'];
 
-		var original_filename = fields['resumableIdentifier'];
+		var original_filename = fields['flowIdentifier'];
 
     if(!files[$.fileParameterName] || !files[$.fileParameterName].size) {
-      callback('invalid_resumable_request', null, null, null);
+      callback('invalid_flow_request', null, null, null);
       return;
     }
     var validation = validateRequest(chunkNumber, chunkSize, totalSize, identifier, files[$.fileParameterName].size);