Merge branch 'Mark/origin' into creditCard

1 files changed, 19 insertions, 4 deletions

diff --git a/lib/image.js b/lib/image.js
index 20576d92..dc512a68 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -35,11 +35,14 @@ var Image = function (faker) {
    * @param {boolean} randomize
    * @method faker.image.imageUrl
    */
-  self.imageUrl = function (width, height, category, randomize) {
+  self.imageUrl = function (width, height, category, randomize, https) {
       var width = width || 640;
       var height = height || 480;
-
-      var url ='http://lorempixel.com/' + width + '/' + height;
+      var protocol = 'http://';
+      if (typeof https !== 'undefined' && https === true) {
+        protocol = 'https://';
+      }
+      var url = protocol + 'lorempixel.com/' + width + '/' + height;
       if (typeof category !== 'undefined') {
         url += '/' + category;
       }
@@ -192,7 +195,19 @@ var Image = function (faker) {
    */
   self.transport = function (width, height, randomize) {
     return faker.image.imageUrl(width, height, 'transport', randomize);
-  }  
+  };
+  /**
+   * dataUri
+   *
+   * @param {number} width
+   * @param {number} height
+   * @method faker.image.dataurl
+   */
+  self.dataUri = function (width, height) {
+    var rawPrefix = 'data:image/svg+xml;charset=UTF-8,';
+    var svgString = '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" width="' + width + '" height="' + height + '"> <rect width="100%" height="100%" fill="grey"/>  <text x="0" y="20" font-size="20" text-anchor="start" fill="white">' + width + 'x' + height + '</text> </svg>';
+    return rawPrefix + encodeURIComponent(svgString);
+  };
 }
 
 module["exports"] = Image;
\ No newline at end of file