@pixwel/pixwel-sdk 2.1.2 → 2.1.4

package/dist/src/Ingest.js

@@ -540,7 +540,7 @@ var Ingest = function (_Model) {
 		/**
    * Create a File from an Ingest object
    *
-   * @param {object} params 
+   * @param {object} params
    */
 
 	}, {
@@ -551,16 +551,16 @@ var Ingest = function (_Model) {
 			    order = params.order;
 
 
-			this.filename = this.mapFromFilename({ allTags: allTags });
-			this.mediainfo = this.mapFromMediainfo();
+			var filename = this.mapFromFilename({ allTags: allTags });
+			var mediainfo = this.mapFromMediainfo();
 
-			var ingest = this.assemble({ order: order });
+			var ingest = this.assemble({ filename: filename, mediainfo: mediainfo, order: order });
 
 			var file = new _File2.default({
 				name: this.renderFilename({ allTags: allTags, allTypes: allTypes }),
 				path: this.renderPath(),
 				asset: ingest.asset._id,
-				generator: 'ingest',
+				generator: "ingest",
 				contextTag: ingest.context.tag,
 				language: ingest.selected.download.language,
 				country: ingest.selected.download.country,
@@ -581,15 +581,15 @@ var Ingest = function (_Model) {
 	}, {
 		key: "assemble",
 		value: function assemble(params) {
-			var original = this.data();
-			var filename = this.data().filename;
-			var mediainfo = this.data().mediainfo;
-
-			var order = params.order,
+			var filename = params.filename,
+			    mediainfo = params.mediainfo,
+			    order = params.order,
 			    _params$watermarks = params.watermarks,
 			    watermarks = _params$watermarks === undefined ? [] : _params$watermarks;
 
 
+			var original = this.data();
+
 			var defaults = {
 				workRequest: order._id,
 				selected: {
@@ -677,7 +677,7 @@ var Ingest = function (_Model) {
 	}], [{
 		key: "_resource",
 		get: function get() {
-			return 'ingests';
+			return "ingests";
 		}
 	}]);
 	return Ingest;

package/dist/src/Model.js

@@ -32,14 +32,16 @@ var _createClass2 = require("babel-runtime/helpers/createClass");
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
+var _lodash = require("lodash");
+
+var _lodash2 = _interopRequireDefault(_lodash);
+
 var _index = require("../index");
 
 var _axios = require("axios");
 
 var _axios2 = _interopRequireDefault(_axios);
 
-var _lodash = require("lodash");
-
 var _deepObjectDiff = require("deep-object-diff");
 
 var _validate = require("validate.js");
@@ -86,7 +88,6 @@ var Model = function () {
 		(0, _classCallCheck3.default)(this, Model);
 
 		(0, _assign2.default)(this, data);
-		this._name = 'model';
 		this._endpoint = _index.Pixwel.endpoint;
 		this._api = connection();
 		this._lastState = {};
@@ -258,7 +259,7 @@ var Model = function () {
 	}, {
 		key: "set",
 		value: function set(data) {
-			return (0, _assign2.default)(this, data);
+			return _lodash2.default.merge(this, data);
 		}
 		/**
    * Returns a deep clone of the current object

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@pixwel/pixwel-sdk",
 	"description": "",
-	"version": "2.1.2",
+	"version": "2.1.4",
 	"author": "Pixwel",
 	"license": "UNLICENSED",
 	"main": "./dist/index.js",
@@ -28,6 +28,7 @@
 		"@babel/runtime": "^7.5.5",
 		"axios": "^0.19.0",
 		"babel-loader": "^8.0.6",
+		"babel-runtime": "^6.26.0",
 		"deep-object-diff": "^1.1.0",
 		"lodash": "^4.17.15",
 		"ramda": "^0.26.1",

package/src/Ingest.js

@@ -14,7 +14,7 @@ export default class Ingest extends Model {
 		this._resource = "ingests";
 	}
 	static get _resource() {
-		return 'ingests';
+		return "ingests";
 	}
 	/**
 	 * Returns path given an ingest record
@@ -514,21 +514,21 @@ export default class Ingest extends Model {
 	/**
 	 * Create a File from an Ingest object
 	 *
-	 * @param {object} params 
+	 * @param {object} params
 	 */
 	createFile(params) {
 		let { allTags, allTypes, order } = params;
 
-		this.filename = this.mapFromFilename({ allTags });
-		this.mediainfo = this.mapFromMediainfo();
+		let filename = this.mapFromFilename({ allTags });
+		let mediainfo = this.mapFromMediainfo();
 
-		let ingest = this.assemble({ order });
+		let ingest = this.assemble({ filename, mediainfo, order });
 
 		let file = new File({
 			name: this.renderFilename({ allTags, allTypes }),
 			path: this.renderPath(),
 			asset: ingest.asset._id,
-			generator: 'ingest',
+			generator: "ingest",
 			contextTag: ingest.context.tag,
 			language: ingest.selected.download.language,
 			country: ingest.selected.download.country,
@@ -546,11 +546,9 @@ export default class Ingest extends Model {
 	 * @param {object} params
 	 */
 	assemble(params) {
-		let original = this.data();
-		let filename = this.data().filename;
-		let mediainfo = this.data().mediainfo;
+		let { filename, mediainfo, order, watermarks = [] } = params;
 
-		let { order, watermarks = [] } = params;
+		let original = this.data();
 
 		let defaults = {
 			workRequest: order._id,
@@ -656,4 +654,3 @@ function flatValues(data) {
 	}
 	return flatten(values(copy));
 }
-

package/src/Model.js

@@ -1,3 +1,4 @@
+import _ from "lodash";
 import { Pixwel } from "../index";
 import axios from "axios";
 import { cloneDeep } from "lodash";
@@ -41,7 +42,6 @@ function connection() {
 export default class Model {
 	constructor(data) {
 		Object.assign(this, data);
-		this._name = 'model';
 		this._endpoint = Pixwel.endpoint;
 		this._api = connection();
 		this._lastState = {};
@@ -134,7 +134,7 @@ export default class Model {
 	 * @param {object} data
 	 */
 	set(data) {
-		return Object.assign(this, data);
+		return _.merge(this, data);
 	}
 	/**
 	 * Returns a deep clone of the current object

package/test/Ingest.spec.js

@@ -1,5 +1,4 @@
-import Ingest from "../src/Ingest";
-import Order from "../src/Order";
+import { Ingest, Order } from "../index";
 
 import mock from "./mocks/mediainfo.mock";
 import proresMock from "./mocks/prores.mock";
@@ -928,10 +927,9 @@ describe("Ingest", () => {
 	describe("assemble", () => {
 		it("should set country and language from filename if not found in order", () => {
 			let original = {
-				context: {},
-				filename: {
-					asset: ""
-				},
+				context: {}
+			};
+			let filename = {
 				selected: {
 					download: {
 						language: "ENG",
@@ -939,27 +937,26 @@ describe("Ingest", () => {
 					}
 				}
 			};
+			let mediainfo = {};
 			let order = new Order();
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, mediainfo, order });
 			expect(data.selected.download.language).toBe("ENG");
 			expect(data.selected.download.country).toBe("US");
 		});
 		it("should use asset from filename when there is no context", () => {
 			let original = {
-				context: {},
-				filename: {
-					asset: {
-						_id: "a1b2c3"
-					}
-				}
+				context: {}
+			};
+			let filename = {
+				asset: { _id: "a1b2c3" },
 			};
 			let order = new Order();
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.asset).toBe("a1b2c3");
 		});
-		it("should prefer ingest asset data over filename when coming from workrequest", () => {
+		it("should prefer context asset data over filename when coming from workrequest", () => {
 			let original = {
 				asset: {
 					slug: "alpha"
@@ -1020,35 +1017,32 @@ describe("Ingest", () => {
 				asset: {
 					creative: true
 				},
-				context: {},
-				filename: {
-					selected: {
-						download: {
-							language: "ENG",
-							country: "US"
-						}
+				context: {}
+			};
+			let filename = {
+				selected: {
+					download: {
+						language: "ENG",
+						country: "US"
 					}
 				}
 			};
 			let order = new Order();
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.preview.revision).toBe("Unfinished");
 		});
 		it("should keep tags from parsed filename when order is empty", () => {
-			let original = {
-				asset: { creative: true },
-				context: {},
-				filename: {
-					selected: {
-						download: {
-							language: "ENG",
-							country: "US",
-							tags: {
-								Extra: ["coming-soon"],
-								SubDub: {
-									sub: true
-								}
+			let original = { asset: { creative: true }, context: {} };
+			let filename = {
+				selected: {
+					download: {
+						language: "ENG",
+						country: "US",
+						tags: {
+							Extra: ["coming-soon"],
+							SubDub: {
+								sub: true
 							}
 						}
 					}
@@ -1056,120 +1050,111 @@ describe("Ingest", () => {
 			};
 			let order = new Order();
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.download.tags).toEqual({
 				Extra: ["coming-soon"],
 				SubDub: { sub: true }
 			});
 		});
 		it("should set preview revision=Final for finished assets", () => {
-			let original = {
-				asset: { creative: false },
-				context: {},
-				filename: {
-					selected: { download: { language: "ENG", country: "US" } }
-				}
+			let original = { asset: { creative: false }, context: {} };
+			let filename = {
+				selected: { download: { language: "ENG", country: "US" } }
 			};
 			let order = new Order();
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.preview.revision).toBe("Final");
 		});
 		it("should enable preview if file is prores 1080p 23.98/25", () => {
-			let original = {
-				context: {},
-				mediainfo: {
-					selected: {
-						download: {
-							tags: {
-								Codec: "prores",
-								Resolution: "720x1080",
-								Framerate: "23.98"
-							}
+			let original = { context: {} };
+			let filename = {
+				selected: { download: { language: "ENG", country: "US" } }
+			};
+			let mediainfo = {
+				selected: {
+					download: {
+						tags: {
+							Codec: "prores",
+							Resolution: "720x1080",
+							Framerate: "23.98"
 						}
 					}
-				},
-				filename: {
-					selected: { download: { language: "ENG", country: "US" } }
 				}
 			};
 			let order = new Order();
 			let watermarks = [1];
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order, watermarks });
+			let data = ingest.assemble({ filename, mediainfo, order, watermarks });
 			expect(data.selected.preview.enabled).toBe(true);
 		});
 		it("should prefer language and country from order over filename", () => {
-			let original = {
-				context: {},
-				filename: {
-					selected: { download: { language: "ENG", country: "US" } }
-				}
+			let original = { context: {} };
+			let filename = {
+				selected: { download: { language: "ENG", country: "US" } }
 			};
 			let order = new Order({
 				territory: "FI",
 				language: "FIN"
 			});
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.download.language).toBe("FIN");
 			expect(data.selected.download.country).toBe("FI");
 		});
 		it("should correctly merge tags from mediainfo over filename", () => {
-			let original = {
-				context: {},
-				mediainfo: {
-					selected: { download: { tags: { Codec: "h264", Aspect: "16:9" } } }
-				},
-				filename: {
-					selected: { download: { tags: { Codec: "prores", Aspect: "4X3" } } }
-				}
+			let original = { context: {} };
+			let filename = {
+				selected: { download: { tags: { Codec: "prores", Aspect: "4X3" } } }
+			};
+			let mediainfo = {
+				selected: { download: { tags: { Codec: "h264", Aspect: "16:9" } } }
 			};
 			let order = new Order();
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ mediainfo, filename, order });
 			expect(data.selected.download.tags.Codec).toBe("h264");
 			expect(data.selected.download.tags.Aspect).toBe("16:9");
 		});
 		it("should set preview.type=sub if order.isSub", () => {
-			let original = { context: {}, filename: {}, mediainfo: {} };
+			let original = { context: {} };
+			let filename = {};
 			let order = {
 				isSub: jest.fn().mockReturnValue(true),
 				isDub: jest.fn().mockReturnValue(null)
 			};
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.preview.type).toBe("sub");
 		});
 		it("should set preview.type=dub if order.isDub", () => {
-			let original = { context: {}, filename: {}, mediainfo: {} };
+			let original = { context: {} };
+			let filename = {};
 			let order = {
 				isSub: jest.fn().mockReturnValue(null),
 				isDub: jest.fn().mockReturnValue(true)
 			};
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.preview.type).toBe("dub");
 		});
 		it("should set preview.type=both if order.isDub and order.isDub", () => {
-			let original = { context: {}, filename: {}, mediainfo: {} };
+			let original = { context: {} };
+			let filename = {};
 			let order = {
 				isSub: jest.fn().mockReturnValue(true),
 				isDub: jest.fn().mockReturnValue(true)
 			};
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.preview.type).toBe("both");
 		});
 		it("should retain Extra tags from order over filename", () => {
-			let original = {
-				context: { tag: "coming-soon" },
-				mediainfo: {},
-				filename: {
-					selected: {
-						download: {
-							tags: ["friday"]
-						}
+			let original = { context: { tag: "coming-soon" } };
+			let filename = {
+				selected: {
+					download: {
+						tags: ["friday"]
 					}
 				}
 			};
@@ -1178,7 +1163,7 @@ describe("Ingest", () => {
 				isDub: jest.fn().mockReturnValue(true)
 			};
 			let ingest = new Ingest(original);
-			let data = ingest.assemble({ order });
+			let data = ingest.assemble({ filename, order });
 			expect(data.selected.download.tags.Extra).toEqual(["coming-soon"]);
 		});
 	});

package/test/Model.spec.js

@@ -62,12 +62,13 @@ describe("Model", () => {
 		});
 	});
 	describe("set", () => {
-		it("should merge incoming data into the model", () => {
+		it("should deeply merge incoming data into the model", () => {
 			let model = new Model();
 			model.set({ details: { name: "Jeff" } });
+			model.set({ details: { age: "20" } });
 			expect(model.data()).toEqual({
 				_id: undefined,
-				details: { name: "Jeff" }
+				details: { name: "Jeff", age: "20" }
 			});
 		});
 	});