added: FrameworkImage supports Buffer

petersirka · petersirka · commit 0cffe962d58e · 2014-09-25T19:08:47.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -38,6 +38,7 @@ Framework supports a backward compatibility.
 - added: framework.on('init')
 - added: framework.merge('/merge.js', '/js/file1.js', '/js/file2.js')
 - added: framework supports X-Forwarded-Protocol header
+- added: FrameworkImage supports buffer
 
 - updated: (IMPORTANT) all models are loaded after is the framework loaded
 - updated: Utils.request(), timeout is possible to add as cookie, headers or encoding
diff --git a/image.js b/image.js
@@ -196,8 +196,12 @@ Image.prototype.save = function(filename, callback) {
             callback(null, filename);
     });
 
-    if (self.currentStream)
-        self.currentStream.pipe(cmd.stdin);
+    if (self.currentStream) {
+        if (self.currentStream instanceof Buffer)
+            cmd.stdin.end(self.currentStream);
+        else
+            self.currentStream.pipe(cmd.stdin);
+    }
 
     return self;
 };
@@ -232,8 +236,12 @@ Image.prototype.pipe = function(stream, type, options) {
     cmd.on('error', stream.emit.bind(stream, 'error'));
     cmd.stdout.pipe(stream, options);
 
-    if (self.currentStream)
-        self.currentStream.pipe(cmd.stdin);
+    if (self.currentStream) {
+        if (self.currentStream instanceof Buffer)
+            cmd.stdin.end(self.currentStream);
+        else
+            self.currentStream.pipe(cmd.stdin);
+    }
 
     return self;
 };
@@ -256,8 +264,12 @@ Image.prototype.stream = function(type) {
 
     var cmd = spawn(self.isIM ? 'convert' : 'gm', self.arg(self.filename === null ? '-' : self.filename, (type ? type + ':' : '') + '-'));
 
-    if (self.currentStream)
-        self.currentStream.pipe(cmd.stdin);
+    if (self.currentStream) {
+        if (self.currentStream instanceof Buffer)
+            cmd.stdin.end(self.currentStream);
+        else
+            self.currentStream.pipe(cmd.stdin);
+    }
 
     return cmd.stdout;
 };
diff --git a/minify/total.js/image.js b/minify/total.js/image.js
diff --git a/test/test-framework-test.js b/test/test-framework-test.js
@@ -1,14 +1,24 @@
-var framework = require('../index');
-var url = 'http://127.0.0.1:8001/';
+// var framework = require('../index');
+// var url = 'http://127.0.0.1:8001/';
+//
+// var mem = require('memwatch');
+//
+// mem.on('leak', function(info) {
+//     console.log('LEAK ->', info);
+// });
+//
+// mem.on('stats', function(info) {
+//     console.log('STATS ->', JSON.stringify(info));
+// });
+//
+// framework.http('debug', { port: 8001 });
 
-var mem = require('memwatch');
+var Image = require('../image');
+var fs = require('fs');
+var buffer = fs.readFileSync('/users/petersirka/desktop/picture.png');
 
-mem.on('leak', function(info) {
-    console.log('LEAK ->', info);
-});
+var img = Image.load(buffer);
 
-mem.on('stats', function(info) {
-    console.log('STATS ->', JSON.stringify(info));
-});
-
-framework.http('debug', { port: 8001 });
+img.resize('50%');
+img.output('png');
+img.save('/users/petersirka/desktop/picture-resize.png');
