Merge pull request #313 from morrislaptop/image-url-dimensions-and-randomizer

[api] Added randomness to image generation
  * Random image height and width parameter

2 files changed, 40 insertions, 29 deletions

diff --git a/lib/image.js b/lib/image.js
index 01f7f5cb..5479f349 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -2,14 +2,14 @@ var Image = function (faker) {
 
   var self = this;
 
-  self.image = function () {
+  self.image = function (width, height, randomize) {
     var categories = ["abstract", "animals", "business", "cats", "city", "food", "nightlife", "fashion", "people", "nature", "sports", "technics", "transport"];
-    return self[faker.random.arrayElement(categories)]();
+    return self[faker.random.arrayElement(categories)](width, height, randomize);
   };
   self.avatar = function () {
     return faker.internet.avatar();
   };
-  self.imageUrl = function (width, height, category) {
+  self.imageUrl = function (width, height, category, randomize) {
       var width = width || 640;
       var height = height || 480;
 
@@ -17,46 +17,51 @@ var Image = function (faker) {
       if (typeof category !== 'undefined') {
         url += '/' + category;
       }
+
+      if (randomize) {
+        url += '?' + faker.random.number()
+      }
+
       return url;
   };
-  self.abstract = function (width, height) {
-    return faker.image.imageUrl(width, height, 'abstract');
+  self.abstract = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'abstract', randomize);
   };
-  self.animals = function (width, height) {
-    return faker.image.imageUrl(width, height, 'animals');
+  self.animals = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'animals', randomize);
   };
-  self.business = function (width, height) {
-    return faker.image.imageUrl(width, height, 'business');
+  self.business = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'business', randomize);
   };
-  self.cats = function (width, height) {
-    return faker.image.imageUrl(width, height, 'cats');
+  self.cats = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'cats', randomize);
   };
-  self.city = function (width, height) {
-    return faker.image.imageUrl(width, height, 'city');
+  self.city = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'city', randomize);
   };
-  self.food = function (width, height) {
-    return faker.image.imageUrl(width, height, 'food');
+  self.food = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'food', randomize);
   };
-  self.nightlife = function (width, height) {
-    return faker.image.imageUrl(width, height, 'nightlife');
+  self.nightlife = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'nightlife', randomize);
   };
-  self.fashion = function (width, height) {
-    return faker.image.imageUrl(width, height, 'fashion');
+  self.fashion = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'fashion', randomize);
   };
-  self.people = function (width, height) {
-    return faker.image.imageUrl(width, height, 'people');
+  self.people = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'people', randomize);
   };
-  self.nature = function (width, height) {
-    return faker.image.imageUrl(width, height, 'nature');
+  self.nature = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'nature', randomize);
   };
-  self.sports = function (width, height) {
-    return faker.image.imageUrl(width, height, 'sports');
+  self.sports = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'sports', randomize);
   };
-  self.technics = function (width, height) {
-    return faker.image.imageUrl(width, height, 'technics');
+  self.technics = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'technics', randomize);
   };
-  self.transport = function (width, height) {
-    return faker.image.imageUrl(width, height, 'transport');
+  self.transport = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'transport', randomize);
   }  
 }
 
diff --git a/test/image.unit.js b/test/image.unit.js
index 04bf3475..1429dff9 100644
--- a/test/image.unit.js
+++ b/test/image.unit.js
@@ -21,6 +21,12 @@ describe("image.js", function () {
 
             assert.equal(imageUrl, 'http://lorempixel.com/100/100/abstract');
         });
+        it.only("returns a random image url from lorempixel with a randomizer", function () {
+            var imageUrl = faker.image.imageUrl(100, 100, undefined, true);
+
+            console.log(imageUrl);
+            assert.ok(imageUrl.match(/^http:\/\/lorempixel.com\/100\/100\?[\d]+$/));
+        });
     });
     describe("avatar()", function () {
         it("return a random avatar from UIFaces", function () {