Merge pull request #490 from VeliovGroup/dev

v1.8.3
veliovgroup · Sep 10, 2017 · 1d1be8a · 1d1be8a
2 parents c800703 + a1a58a9
commit 1d1be8a
Show file tree

Hide file tree

Showing 12 changed files with 65 additions and 62 deletions.
diff --git a/.npm/package/npm-shrinkwrap.json b/.npm/package/npm-shrinkwrap.json
diff --git a/.versions b/.versions
@@ -1,54 +1,45 @@
 [email protected]
-babel-compiler@6.19.4
+babel-compiler@6.20.0
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
-[email protected]
+[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]_3
 [email protected]
-ddp-client@2.0.0
+ddp-client@2.1.0
 [email protected]
 [email protected]
-[email protected]
 [email protected]
-[email protected].1
+[email protected].2
 [email protected]
-[email protected].2
+[email protected].3
 [email protected]
-[email protected].13
+[email protected].14
 [email protected]
-[email protected]
-[email protected]
 [email protected]
 [email protected]
-[email protected]
 [email protected]
-[email protected].0
-minimongo@1.2.1
-modules@0.9.2
+[email protected].1
+minimongo@1.3.0
+modules@0.10.0
 [email protected]
-[email protected]
+[email protected]
+[email protected]
 [email protected]
-[email protected]
-[email protected]
+[email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].2
-promise@0.8.9
+ostrio:[email protected].3
+promise@0.9.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected]
-[email protected]
 [email protected]
-[email protected]
 [email protected]
 [email protected]
-[email protected].17
+[email protected].18
 [email protected]
diff --git a/client.coffee b/client.coffee
@@ -116,10 +116,10 @@ class FilesCollection
 
     try
       _URL = window.URL || window.webkitURL || window.mozURL || window.msURL || window.oURL || false
-      if window?.Worker and window?.Blob and _URL
+      if window.Worker and window.Blob and _URL
         @_supportWebWorker = true
         @_webWorkerUrl     = _URL.createObjectURL(new Blob(['!function(a){"use strict";a.onmessage=function(b){var c=b.data.f.slice(b.data.cs*(b.data.cc-1),b.data.cs*b.data.cc);if(b.data.ib===!0)postMessage({bin:c,chunkId:b.data.cc});else{var d;a.FileReader?(d=new FileReader,d.onloadend=function(a){postMessage({bin:(d.result||a.srcElement||a.target).split(",")[1],chunkId:b.data.cc,s:b.data.s})},d.onerror=function(a){throw(a.target||a.srcElement).error},d.readAsDataURL(c)):a.FileReaderSync?(d=new FileReaderSync,postMessage({bin:d.readAsDataURL(c).split(",")[1],chunkId:b.data.cc})):postMessage({bin:null,chunkId:b.data.cc,error:"File API is not supported in WebWorker!"})}}}(this);'], {type: 'application/javascript'}))
-      else if window?.Worker
+      else if window.Worker
         @_supportWebWorker = true
         @_webWorkerUrl     = Meteor.absoluteUrl 'packages/ostrio_files/worker.min.js'
       else

diff --git a/cursor.coffee b/cursor.coffee
@@ -35,7 +35,7 @@ class FileCursor
   @summary Returns downloadable URL to File
   @returns {String}
   ###
-  link: (version) ->
+  link: (version = 'original') ->
     @_collection._debug "[FilesCollection] [FileCursor] [link(#{version})]"
     return if @_fileRef then @_collection.link(@_fileRef, version) else ''
 

diff --git a/docs/collection-instances.md b/docs/collection-instances.md
@@ -51,18 +51,18 @@ This simplified example shows, how to make use of that technique in your own imp
 Assume having a map of all `Mongo.Collection` instances:
 
 ```javascript
-constvar collectionsMap = {};
+const collectionsMap = {};
 ````
 
 Since you may not want to store the *FilesCollection* instance (*because it is not a* `Mongo.Collection`), you can still reference the underlying Mongo.Collection:
 
 ```javascript
-var Images = new FilesCollection({collectionName: 'Images'});
+const Images = new FilesCollection({collectionName: 'Images'});
 collectionsMap['Images'] = Images.collection;
 ````
 
 Access the *FilesCollection* by reference:
 
 ```javascript
-var Images = collectionsMap['Images'].filesCollection;
+const Images = collectionsMap['Images'].filesCollection;
 ````
diff --git a/docs/collection.md b/docs/collection.md
@@ -73,7 +73,8 @@ if (Meteor.isServer) {
       fields: {
         extension: 1,
         _downloadRoute: 1,
-        _collectionName: 1
+        _collectionName: 1,
+        'versions.versionName.extension': 1 // <-- Required only for file's version .link(version), and if extension is different from original file
       }
     });
   });

diff --git a/docs/constructor.md b/docs/constructor.md
@@ -102,7 +102,7 @@
     </tr>
     <tr>
       <td align="right">
-        <code>config.continueUploadTTL</code> {<em>String</em>}
+        <code>config.continueUploadTTL</code> {<em>Number</em>}
       </td>
       <td>
         Server
@@ -907,7 +907,7 @@ const Images = new FilesCollection({
       // check real mimetype
       const { Magic, MAGIC_MIME_TYPE } = require('mmmagic');
       const magic = new Magic(MAGIC_MIME_TYPE);
-      magic.detectFile(file.path, Meteor.bindEnvironment((err, mimetype) => {
+      magic.detectFile(file.path, Meteor.bindEnvironment((err, mimeType) => {
         if (err || !~mimeType.indexOf('image')) {
           // is not a real image --> delete
           console.log('onAfterUpload, not an image: ', file.path);

diff --git a/docs/file-subversions.md b/docs/file-subversions.md
@@ -24,6 +24,7 @@ this.Videos = new FilesCollection({
           path: version.path,
           size: version.size,
           type: version.type,
+          name: version.nameWithExtension,
           extension: version.extension
         };
         return Videos.update(fileRef._id, upd);

diff --git a/docs/image-processing.md b/docs/image-processing.md
@@ -222,6 +222,7 @@ const createThumbnails = (collection, fileRef, cb) => {
                         size: stat.size,
                         type: fileRef.type,
                         extension: fileRef.extension,
+                        name: fileRef.name, // <-- Name with extension used if file's version is being downloaded
                         meta: {
                           width: imgInfo.width,
                           height: imgInfo.height

diff --git a/lib.coffee b/lib.coffee
@@ -48,9 +48,10 @@ formatFleURL = (fileRef, version = 'original') ->
   check version, String
 
   root = __meteor_runtime_config__.ROOT_URL.replace(/\/+$/, '')
+  vRef = ((fileRef.versions and fileRef.versions[version]) or fileRef)
 
-  if fileRef.extension?.length
-    ext = '.' + fileRef.extension
+  if vRef.extension?.length
+    ext = '.' + vRef.extension.replace(/^\./, '')
   else
     ext = ''
 

diff --git a/package.js b/package.js
@@ -1,16 +1,16 @@
 Package.describe({
   name: 'ostrio:files',
-  version: '1.8.2',
+  version: '1.8.3',
   summary: 'File upload via DDP/HTTP to server FS, AWS, GridFS, DropBox, Google Drive or other 3rd party storage',
   git: 'https://github.com/VeliovGroup/Meteor-Files',
   documentation: 'README.md'
 });
 
 Npm.depends({
-  'fs-extra': '4.0.0',
+  'fs-extra': '4.0.1',
   'request': '2.81.0',
   'throttle': '1.0.3',
-  'file-type': '5.2.0'
+  'file-type': '6.1.0'
 });
 
 Package.onUse(function(api) {

diff --git a/server.coffee b/server.coffee
@@ -7,6 +7,7 @@
 @summary Require NPM packages
 ###
 `import fs       from 'fs-extra'`
+`import nodeQs   from 'querystring'`
 `import events   from 'events'`
 `import request  from 'request'`
 `import Throttle from 'throttle'`
@@ -400,10 +401,10 @@ class FilesCollection
           uris = uri.split '/'
           if uris.length is 3
             params =
-              query: if request._parsedUrl.query then JSON.parse('{"' + decodeURI(request._parsedUrl.query).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}') else {}
+              query: if request._parsedUrl.query then nodeQs.parse(request._parsedUrl.query) else {}
               _id: uris[0]
               version: uris[1]
-              name: uris[2]
+              name: uris[2].split('?')[0]
             http = {request, response, params}
             self.download http, uris[1], self.collection.findOne(uris[0]) if self._checkAccess http
           else
@@ -427,7 +428,7 @@ class FilesCollection
               _file   = _file.split('?')[0]
 
             params =
-              query: if request._parsedUrl.query then JSON.parse('{"' + decodeURI(request._parsedUrl.query).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}') else {}
+              query: if request._parsedUrl.query then nodeQs.parse(request._parsedUrl.query) else {}
               file: _file
               _id: _file.split('.')[0]
               version: version
@@ -1184,7 +1185,7 @@ class FilesCollection
     else
       dispositionType = 'inline; '
 
-    dispositionName     = "filename=\"#{encodeURI(fileRef.name)}\"; filename*=UTF-8''#{encodeURI(fileRef.name)}; "
+    dispositionName     = "filename=\"#{encodeURI(vRef.name or fileRef.name)}\"; filename*=UTF-8''#{encodeURI(vRef.name or fileRef.name)}; "
     dispositionEncoding = 'charset=UTF-8'
 
     if !http.response.headersSent