Merge pull request #561 from VeliovGroup/dev

v1.9.6
veliovgroup · Jan 17, 2018 · f3f9a7e · f3f9a7e
2 parents 93747a6 + ba25aea
commit f3f9a7e
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 5 deletions.
diff --git a/.versions b/.versions
@@ -30,7 +30,7 @@ [email protected]
 [email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].5
+ostrio:[email protected].6
 [email protected]
 [email protected]
 [email protected]

diff --git a/core.js b/core.js
@@ -10,6 +10,9 @@ export default class FilesCollectionCore extends EventEmitter {
   }
 
   static schema = {
+    _id: {
+      type: String
+    },
     size: {
       type: Number
     },
@@ -44,6 +47,20 @@ export default class FilesCollectionCore extends EventEmitter {
       type: String,
       optional: true
     },
+    ext: {
+      type: String,
+      optional: true
+    },
+    extensionWithDot: {
+      type: String,
+      optional: true
+    },
+    mime: {
+      type: String,
+    },
+    'mime-type': {
+      type: String,
+    },
     _storagePath: {
       type: String
     },

diff --git a/docs/insert.md b/docs/insert.md
@@ -40,6 +40,17 @@
         Set to dataURI {<em>String</em>} for Base64
       </td>
     </tr>
+    <tr>
+      <td align="right">
+        <code>settings.fileName</code> {<em>String</em>}
+      </td>
+      <td>
+        [REQUIRED] <strong>only</strong> for <code>base64</code> uploads
+      </td>
+      <td>
+        For regular uploads this option is [OPTIONAL], will replace default file's name provided in HTML5 <code>files</code> item
+      </td>
+    </tr>
     <tr>
       <td align="right">
         <code>settings.isBase64</code> {<em>Boolean</em>}

diff --git a/docs/schema.md b/docs/schema.md
@@ -6,6 +6,9 @@ For more info see [Collection2](https://github.com/aldeed/meteor-collection2) an
 
 ```javascript
 var defaultSchema = {
+  _id: {
+    type: String
+  },
   size: {
     type: Number
   },
@@ -40,6 +43,20 @@ var defaultSchema = {
     type: String,
     optional: true
   },
+  ext: {
+    type: String,
+    optional: true
+  },
+  extensionWithDot: {
+    type: String,
+    optional: true
+  },
+  mime: {
+    type: String,
+  },
+  'mime-type': {
+    type: String,
+  },
   _storagePath: {
     type: String
   },

diff --git a/lib.js b/lib.js
@@ -66,9 +66,9 @@ const formatFleURL = (fileRef, version = 'original') => {
   check(version, String);
 
   const _root = __meteor_runtime_config__.ROOT_URL.replace(/\/+$/, '');
-  const vRef = ((fileRef.versions && fileRef.versions[version]) || fileRef);
+  const vRef = (fileRef.versions && fileRef.versions[version]) || fileRef || {};
 
-  if (vRef.extension && _.isString(vRef, 'extension')) {
+  if (_.isString(vRef.extension)) {
     ext = `.${vRef.extension.replace(/^\./, '')}`;
   } else {
     ext = '';

diff --git a/package.js b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'ostrio:files',
-  version: '1.9.5',
+  version: '1.9.6',
   summary: 'File upload via DDP/HTTP to server, 3rd party storage support: AWS S3, GridFS, DropBox and others',
   git: 'https://github.com/VeliovGroup/Meteor-Files',
   documentation: 'README.md'

diff --git a/server.js b/server.js
@@ -289,7 +289,7 @@ export class FilesCollection extends FilesCollectionCore {
 
     if (!this.disableUpload) {
       this._preCollection = new Mongo.Collection(`__pre_${this.collectionName}`);
-      this._preCollection._ensureIndex({createdAt: 1}, {expireAfterSeconds: this.continueUploadTTL, background: true});
+      this._preCollection._ensureIndex({ createdAt: 1 }, { expireAfterSeconds: this.continueUploadTTL, background: true });
       const _preCollectionCursor = this._preCollection.find({}, {
         fields: {
           _id: 1,