From bc8ee47acecf2045f9bb4a504cd8494b8a7113e9 Mon Sep 17 00:00:00 2001
From: ChinCluBi <chincub@gmail.com>
Date: Fri, 12 Aug 2016 14:21:05 +0700
Subject: move random image from lorempixel.com to unsplash.com

---
 lib/image.js | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/image.js b/lib/image.js
index 20576d92..ef4c12da 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -5,6 +5,8 @@
 var Image = function (faker) {
 
   var self = this;
+  var otherCategories = ["abstract", "animals", "business", "cats", "city", "nightlife", "fashion", "sports", "technics", "transport"];
+  var unsplashCategories = ["food", "nature", "people", "technology", "objects", "buildings"];
 
   /**
    * image
@@ -15,8 +17,8 @@ var Image = function (faker) {
    * @method faker.image.image
    */
   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)](width, height, randomize);
+    var allCategories = unsplashCategories.concat(otherCategories);
+    return self[faker.random.arrayElement(allCategories)](width, height, randomize);
   };
   /**
    * avatar
@@ -39,14 +41,25 @@ var Image = function (faker) {
       var width = width || 640;
       var height = height || 480;
 
-      var url ='http://lorempixel.com/' + width + '/' + height;
-      if (typeof category !== 'undefined') {
-        url += '/' + category;
+      var url ='https://source.unsplash.com';
+
+      if (typeof category !== 'undefined' && unsplashCategories.indexOf(category) > -1) {
+        url += '/category/' + category;
+      }
+
+      url += '/' + width + 'x' + height
+
+      if (typeof category !== 'undefined' && otherCategories.indexOf(category) > -1) {
+        url += '?' + category
       }
 
+      /*
+      Current version of unsplash official wrapper(source.unsplash.com) does not support full randomize yet.
+      I will implement randomize function with official unsplash api in next version.
       if (randomize) {
         url += '?' + faker.random.number()
       }
+      */
 
       return url;
   };
@@ -192,7 +205,40 @@ var Image = function (faker) {
    */
   self.transport = function (width, height, randomize) {
     return faker.image.imageUrl(width, height, 'transport', randomize);
-  }  
+  };
+  /**
+   * technology
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.technology
+   */
+  self.technology = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'technology', randomize);
+  };
+  /**
+   * objects
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.objects
+   */
+  self.objects = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'objects', randomize);
+  };
+  /**
+   * buildings
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.buildings
+   */
+  self.buildings = function (width, height, randomize) {
+    return faker.image.imageUrl(width, height, 'buildings', randomize);
+  };
 }
 
-module["exports"] = Image;
\ No newline at end of file
+module["exports"] = Image;
-- 
cgit v1.2.3


From 87acfc6a5c072cbf00ab02d1cf673d4db7832946 Mon Sep 17 00:00:00 2001
From: ChinCluBi <chinnaporn.s@ku.th>
Date: Tue, 27 Sep 2016 03:19:57 +0700
Subject: added lorempixel and unsplash properties to image obj

---
 lib/image.js                      | 241 ++------------------------------------
 lib/image_providers/lorempixel.js | 199 +++++++++++++++++++++++++++++++
 lib/image_providers/unsplash.js   | 129 ++++++++++++++++++++
 3 files changed, 338 insertions(+), 231 deletions(-)
 create mode 100644 lib/image_providers/lorempixel.js
 create mode 100644 lib/image_providers/unsplash.js

(limited to 'lib')

diff --git a/lib/image.js b/lib/image.js
index ef4c12da..f64b1545 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -1,244 +1,23 @@
 /**
  *
  * @namespace faker.image
+ * @property {object} lorempixel - faker.image.lorempixel
+ * @property {object} unsplash - faker.image.unsplash
+ * @default Default provider is unsplash image provider
  */
 var Image = function (faker) {
 
-  var self = this;
-  var otherCategories = ["abstract", "animals", "business", "cats", "city", "nightlife", "fashion", "sports", "technics", "transport"];
-  var unsplashCategories = ["food", "nature", "people", "technology", "objects", "buildings"];
+  var self = this
+  var Lorempixel = require('./image_providers/lorempixel');
+  var Unsplash = require('./image_providers/unsplash');
 
-  /**
-   * image
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.image
-   */
-  self.image = function (width, height, randomize) {
-    var allCategories = unsplashCategories.concat(otherCategories);
-    return self[faker.random.arrayElement(allCategories)](width, height, randomize);
-  };
-  /**
-   * avatar
-   *
-   * @method faker.image.avatar
-   */
-  self.avatar = function () {
-    return faker.internet.avatar();
-  };
-  /**
-   * imageUrl
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {string} category
-   * @param {boolean} randomize
-   * @method faker.image.imageUrl
-   */
-  self.imageUrl = function (width, height, category, randomize) {
-      var width = width || 640;
-      var height = height || 480;
 
-      var url ='https://source.unsplash.com';
+  self.lorempixel = new Lorempixel(faker);
+  self.unsplash = new Unsplash(faker);
 
-      if (typeof category !== 'undefined' && unsplashCategories.indexOf(category) > -1) {
-        url += '/category/' + category;
-      }
-
-      url += '/' + width + 'x' + height
-
-      if (typeof category !== 'undefined' && otherCategories.indexOf(category) > -1) {
-        url += '?' + category
-      }
+  Object.assign(self, self.unsplash);
+}
 
-      /*
-      Current version of unsplash official wrapper(source.unsplash.com) does not support full randomize yet.
-      I will implement randomize function with official unsplash api in next version.
-      if (randomize) {
-        url += '?' + faker.random.number()
-      }
-      */
 
-      return url;
-  };
-  /**
-   * abstract
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.abstract
-   */
-  self.abstract = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'abstract', randomize);
-  };
-  /**
-   * animals
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.animals
-   */
-  self.animals = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'animals', randomize);
-  };
-  /**
-   * business
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.business
-   */
-  self.business = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'business', randomize);
-  };
-  /**
-   * cats
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.cats
-   */
-  self.cats = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'cats', randomize);
-  };
-  /**
-   * city
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.city
-   */
-  self.city = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'city', randomize);
-  };
-  /**
-   * food
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.food
-   */
-  self.food = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'food', randomize);
-  };
-  /**
-   * nightlife
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.nightlife
-   */
-  self.nightlife = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'nightlife', randomize);
-  };
-  /**
-   * fashion
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.fashion
-   */
-  self.fashion = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'fashion', randomize);
-  };
-  /**
-   * people
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.people
-   */
-  self.people = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'people', randomize);
-  };
-  /**
-   * nature
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.nature
-   */
-  self.nature = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'nature', randomize);
-  };
-  /**
-   * sports
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.sports
-   */
-  self.sports = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'sports', randomize);
-  };
-  /**
-   * technics
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.technics
-   */
-  self.technics = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'technics', randomize);
-  };
-  /**
-   * transport
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.transport
-   */
-  self.transport = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'transport', randomize);
-  };
-  /**
-   * technology
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.technology
-   */
-  self.technology = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'technology', randomize);
-  };
-  /**
-   * objects
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.objects
-   */
-  self.objects = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'objects', randomize);
-  };
-  /**
-   * buildings
-   *
-   * @param {number} width
-   * @param {number} height
-   * @param {boolean} randomize
-   * @method faker.image.buildings
-   */
-  self.buildings = function (width, height, randomize) {
-    return faker.image.imageUrl(width, height, 'buildings', randomize);
-  };
-}
 
 module["exports"] = Image;
diff --git a/lib/image_providers/lorempixel.js b/lib/image_providers/lorempixel.js
new file mode 100644
index 00000000..44c0e007
--- /dev/null
+++ b/lib/image_providers/lorempixel.js
@@ -0,0 +1,199 @@
+/**
+ *
+ * @namespace lorempixel
+ * @memberof faker.image
+ */
+var Lorempixel = function (faker) {
+
+  var self = this;
+
+  /**
+   * image
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.image
+   */
+  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)](width, height, randomize);
+  };
+  /**
+   * avatar
+   *
+   * @method faker.image.lorempixel.avatar
+   */
+  self.avatar = function () {
+    return faker.internet.avatar();
+  };
+  /**
+   * imageUrl
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} category
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.imageUrl
+   */
+  self.imageUrl = function (width, height, category, randomize) {
+      var width = width || 640;
+      var height = height || 480;
+
+      var url ='http://lorempixel.com/' + width + '/' + height;
+      if (typeof category !== 'undefined') {
+        url += '/' + category;
+      }
+
+      if (randomize) {
+        url += '?' + faker.random.number()
+      }
+
+      return url;
+  };
+  /**
+   * abstract
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.abstract
+   */
+  self.abstract = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'abstract', randomize);
+  };
+  /**
+   * animals
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.animals
+   */
+  self.animals = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'animals', randomize);
+  };
+  /**
+   * business
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.business
+   */
+  self.business = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'business', randomize);
+  };
+  /**
+   * cats
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.cats
+   */
+  self.cats = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'cats', randomize);
+  };
+  /**
+   * city
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.city
+   */
+  self.city = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'city', randomize);
+  };
+  /**
+   * food
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.food
+   */
+  self.food = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'food', randomize);
+  };
+  /**
+   * nightlife
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.nightlife
+   */
+  self.nightlife = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'nightlife', randomize);
+  };
+  /**
+   * fashion
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.fashion
+   */
+  self.fashion = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'fashion', randomize);
+  };
+  /**
+   * people
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.people
+   */
+  self.people = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'people', randomize);
+  };
+  /**
+   * nature
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.nature
+   */
+  self.nature = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'nature', randomize);
+  };
+  /**
+   * sports
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.sports
+   */
+  self.sports = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'sports', randomize);
+  };
+  /**
+   * technics
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.technics
+   */
+  self.technics = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'technics', randomize);
+  };
+  /**
+   * transport
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {boolean} randomize
+   * @method faker.image.lorempixel.transport
+   */
+  self.transport = function (width, height, randomize) {
+    return faker.image.lorempixel.imageUrl(width, height, 'transport', randomize);
+  }
+}
+
+module["exports"] = Lorempixel;
diff --git a/lib/image_providers/unsplash.js b/lib/image_providers/unsplash.js
new file mode 100644
index 00000000..75d0d453
--- /dev/null
+++ b/lib/image_providers/unsplash.js
@@ -0,0 +1,129 @@
+/**
+ *
+ * @namespace unsplash
+ * @memberof faker.image
+ */
+var Unsplash = function (faker) {
+
+  var self = this;
+  var categories = ["food", "nature", "people", "technology", "objects", "buildings"];
+
+  /**
+   * image
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} keyword
+   * @method faker.image.unsplash.image
+   * @description search image from unsplash
+   */
+  self.image = function (width, height, keyword) {
+    return self.imageUrl(width, height, undefined, keyword);
+  };
+  /**
+   * avatar
+   *
+   * @method faker.image.unsplash.avatar
+   */
+  self.avatar = function () {
+    return faker.internet.avatar();
+  };
+  /**
+   * imageUrl
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} category
+   * @param {string} keyword
+   * @method faker.image.unsplash.imageUrl
+   */
+  self.imageUrl = function (width, height, category, keyword) {
+      var width = width || 640;
+      var height = height || 480;
+
+      var url ='https://source.unsplash.com';
+
+      if (typeof category !== 'undefined') {
+          url += '/category/' + category;
+      }
+
+      url += '/' + width + 'x' + height;
+
+      if (typeof keyword !== 'undefined') {
+          var keywordFormat = new RegExp('^([A-Za-z0-9].+,[A-Za-z0-9]+)$|^([A-Za-z0-9]+)$');
+          if (keywordFormat.test(keyword)) {
+            url += '?' + keyword;
+          }
+      }
+
+      return url;
+  };
+  /**
+   * food
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} keyword
+   * @method faker.image.unsplash.food
+   */
+  self.food = function (width, height, keyword) {
+    return faker.image.imageUrl(width, height, 'food', keyword);
+  };
+  /**
+   * people
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} keyword
+   * @method faker.image.unsplash.people
+   */
+  self.people = function (width, height, keyword) {
+    return faker.image.imageUrl(width, height, 'people', keyword);
+  };
+  /**
+   * nature
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} keyword
+   * @method faker.image.unsplash.nature
+   */
+  self.nature = function (width, height, keyword) {
+    return faker.image.imageUrl(width, height, 'nature', keyword);
+  };
+  /**
+   * technology
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} keyword
+   * @method faker.image.unsplash.technology
+   */
+  self.technology = function (width, height, keyword) {
+    return faker.image.imageUrl(width, height, 'technology', keyword);
+  };
+  /**
+   * objects
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} keyword
+   * @method faker.image.unsplash.objects
+   */
+  self.objects = function (width, height, keyword) {
+    return faker.image.imageUrl(width, height, 'objects', keyword);
+  };
+  /**
+   * buildings
+   *
+   * @param {number} width
+   * @param {number} height
+   * @param {string} keyword
+   * @method faker.image.unsplash.buildings
+   */
+  self.buildings = function (width, height, keyword) {
+    return faker.image.imageUrl(width, height, 'buildings', keyword);
+  };
+}
+
+module["exports"] = Unsplash;
-- 
cgit v1.2.3


From 267d8f41d0a104f4613a23165a2264e87dc9594b Mon Sep 17 00:00:00 2001
From: ChinCluBi <chinnaporn.s@ku.th>
Date: Tue, 27 Sep 2016 03:27:59 +0700
Subject: remove object.assign.fix unit test

---
 lib/image.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/image.js b/lib/image.js
index f64b1545..9ac21ce2 100644
--- a/lib/image.js
+++ b/lib/image.js
@@ -15,7 +15,8 @@ var Image = function (faker) {
   self.lorempixel = new Lorempixel(faker);
   self.unsplash = new Unsplash(faker);
 
-  Object.assign(self, self.unsplash);
+  // Object.assign(self, self.unsplash);
+  // How to set default as unsplash? should be image.default?
 }
 
 
-- 
cgit v1.2.3


From 900f3d87cbfd9b86119c4505e3b9dc1e84ea5969 Mon Sep 17 00:00:00 2001
From: ChinCluBi <chinnaporn.s@ku.th>
Date: Tue, 27 Sep 2016 03:30:37 +0700
Subject: fix bug unsplash object

---
 lib/image_providers/unsplash.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/image_providers/unsplash.js b/lib/image_providers/unsplash.js
index 75d0d453..514fe84c 100644
--- a/lib/image_providers/unsplash.js
+++ b/lib/image_providers/unsplash.js
@@ -67,7 +67,7 @@ var Unsplash = function (faker) {
    * @method faker.image.unsplash.food
    */
   self.food = function (width, height, keyword) {
-    return faker.image.imageUrl(width, height, 'food', keyword);
+    return faker.image.unsplash.imageUrl(width, height, 'food', keyword);
   };
   /**
    * people
@@ -78,7 +78,7 @@ var Unsplash = function (faker) {
    * @method faker.image.unsplash.people
    */
   self.people = function (width, height, keyword) {
-    return faker.image.imageUrl(width, height, 'people', keyword);
+    return faker.image.unsplash.imageUrl(width, height, 'people', keyword);
   };
   /**
    * nature
@@ -89,7 +89,7 @@ var Unsplash = function (faker) {
    * @method faker.image.unsplash.nature
    */
   self.nature = function (width, height, keyword) {
-    return faker.image.imageUrl(width, height, 'nature', keyword);
+    return faker.image.unsplash.imageUrl(width, height, 'nature', keyword);
   };
   /**
    * technology
@@ -100,7 +100,7 @@ var Unsplash = function (faker) {
    * @method faker.image.unsplash.technology
    */
   self.technology = function (width, height, keyword) {
-    return faker.image.imageUrl(width, height, 'technology', keyword);
+    return faker.image.unsplash.imageUrl(width, height, 'technology', keyword);
   };
   /**
    * objects
@@ -111,7 +111,7 @@ var Unsplash = function (faker) {
    * @method faker.image.unsplash.objects
    */
   self.objects = function (width, height, keyword) {
-    return faker.image.imageUrl(width, height, 'objects', keyword);
+    return faker.image.unsplash.imageUrl(width, height, 'objects', keyword);
   };
   /**
    * buildings
@@ -122,7 +122,7 @@ var Unsplash = function (faker) {
    * @method faker.image.unsplash.buildings
    */
   self.buildings = function (width, height, keyword) {
-    return faker.image.imageUrl(width, height, 'buildings', keyword);
+    return faker.image.unsplash.imageUrl(width, height, 'buildings', keyword);
   };
 }
 
-- 
cgit v1.2.3