change to support amd, modules.export only Faker and Faker to global otheriwse. change domains - removed .uk and added biz, io, me, net, org

5 files changed, 56 insertions, 9 deletions

diff --git a/BUILD/BUILD.js b/BUILD/BUILD.js
index 0290e304..c97d9ea3 100755
--- a/BUILD/BUILD.js
+++ b/BUILD/BUILD.js
@@ -48,9 +48,20 @@ docs.API += '</ul>';
 code += 'var definitions = Faker.definitions; \n';
 code += 'var Helpers = Faker.Helpers; \n';
 
-// exports hack for dual sided stuff
 // if we are running in a CommonJS env, export everything out
-code += 'if(typeof exports != "undefined"){for(var prop in Faker){exports[prop] = Faker[prop];}}';
+code +=["\nif (typeof define == 'function'){",
+"   define(function(){",
+"	    return Faker;",
+"   });",
+"}",
+"else if(typeof module !== 'undefined' && module.exports) {",
+"	module.exports = Faker;",
+"}",
+"else {",
+"	this.Faker = Faker;",
+"};",
+"",
+"}()); // end Faker closure"].join('\n');
 
 // generate core library
 fs.writeFile('../Faker.js', code, function() {
diff --git a/BUILD/main.js b/BUILD/main.js
index 40a24a87..e7bc6176 100644
--- a/BUILD/main.js
+++ b/BUILD/main.js
@@ -50,7 +50,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
           var randomCard = Faker.Helpers.createCard(); // random contact card containing many properties
 
 */
+!(function(){
 
+'use strict';
+
+// exported module
 var Faker = {};
 
 Faker.version = "0.5.5";
diff --git a/Faker.js b/Faker.js
index 032f4ca2..8053a908 100644
--- a/Faker.js
+++ b/Faker.js
@@ -17,7 +17,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-/*************** AUTOGENERATED @ 1346347992002 ***************
+/*************** AUTOGENERATED @ 1351521582934 ***************
     WARNING: THIS FILE WAS AUTOGENERATED BY THE FAKER BUILD SCRIPT
     MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING
     THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!!
@@ -36,6 +36,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
           var randomEmail = Faker.Internet.email(); // [email protected]
           var randomCard = Faker.Helpers.createCard(); // random contact card containing many properties
 */
+!(function(){
+'use strict';
+// exported module
 var Faker = {};
 Faker.version = "0.5.5";
 Faker.Name = {};
@@ -498,7 +501,7 @@ Faker.definitions.bs_noun = function () {
 };
 
 Faker.definitions.domain_suffix = function () {
-	return ["co.uk", "com", "us", "uk", "ca", "biz", "info", "name"];
+	return ["co.uk", "com", "us", "net", "ca", "biz", "info", "name", "io", "org", "biz", "tv", "me"];
 };
 
 Faker.definitions.lorem = function () {
@@ -531,4 +534,17 @@ Faker.definitions.phone_formats = function () {
 };
 var definitions = Faker.definitions; 
 var Helpers = Faker.Helpers; 
-if(typeof exports != "undefined"){for(var prop in Faker){exports[prop] = Faker[prop];}}
\ No newline at end of file
+
+if (typeof define == 'function'){
+   define(function(){
+	    return Faker;
+   });
+}
+else if(typeof module !== 'undefined' && module.exports) {
+	module.exports = Faker;
+}
+else {
+	this.Faker = Faker;
+};
+
+}()); // end Faker closure
\ No newline at end of file
diff --git a/examples/js/Faker.js b/examples/js/Faker.js
index 032f4ca2..8053a908 100644
--- a/examples/js/Faker.js
+++ b/examples/js/Faker.js
@@ -17,7 +17,7 @@ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-/*************** AUTOGENERATED @ 1346347992002 ***************
+/*************** AUTOGENERATED @ 1351521582934 ***************
     WARNING: THIS FILE WAS AUTOGENERATED BY THE FAKER BUILD SCRIPT
     MODIFYING THIS FILE IS FINE, BUT YOU REALLY SHOULD BE MODIFYING
     THE LIBRARY DIRECTLY AND REGENERATING THIS FILE USING BUILD.js!!!!
@@ -36,6 +36,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
           var randomEmail = Faker.Internet.email(); // [email protected]
           var randomCard = Faker.Helpers.createCard(); // random contact card containing many properties
 */
+!(function(){
+'use strict';
+// exported module
 var Faker = {};
 Faker.version = "0.5.5";
 Faker.Name = {};
@@ -498,7 +501,7 @@ Faker.definitions.bs_noun = function () {
 };
 
 Faker.definitions.domain_suffix = function () {
-	return ["co.uk", "com", "us", "uk", "ca", "biz", "info", "name"];
+	return ["co.uk", "com", "us", "net", "ca", "biz", "info", "name", "io", "org", "biz", "tv", "me"];
 };
 
 Faker.definitions.lorem = function () {
@@ -531,4 +534,17 @@ Faker.definitions.phone_formats = function () {
 };
 var definitions = Faker.definitions; 
 var Helpers = Faker.Helpers; 
-if(typeof exports != "undefined"){for(var prop in Faker){exports[prop] = Faker[prop];}}
\ No newline at end of file
+
+if (typeof define == 'function'){
+   define(function(){
+	    return Faker;
+   });
+}
+else if(typeof module !== 'undefined' && module.exports) {
+	module.exports = Faker;
+}
+else {
+	this.Faker = Faker;
+};
+
+}()); // end Faker closure
\ No newline at end of file
diff --git a/lib/definitions.js b/lib/definitions.js
index 640f0bc2..57f7fe8f 100644
--- a/lib/definitions.js
+++ b/lib/definitions.js
@@ -137,7 +137,7 @@ exports.bs_noun = function() {
 };
 
 exports.domain_suffix = function() {
-	return ["co.uk", "com", "us", "uk", "ca", "biz", "info", "name"];
+	return ["co.uk", "com", "us", "net", "ca", "biz", "info", "name", "io", "org", "biz", "tv", "me"];
 };
 
 // lorem.js definitions