Merge remote-tracking branch 'Marak/master'

3 files changed, 16 insertions, 1 deletions

diff --git a/lib/fake.js b/lib/fake.js
index 977ba292..7e24c854 100644
--- a/lib/fake.js
+++ b/lib/fake.js
@@ -86,7 +86,12 @@ function Fake (faker) {
       params = parameters;
     }
 
-    var result = fn.call(this, params);
+    var result;
+    if (typeof params === "string" && params.length === 0) {
+      result = fn.call(this);
+    } else {
+      result = fn.call(this, params);
+    }
 
     // replace the found tag with the returned fake value
     res = str.replace('{{' + token + '}}', result);
diff --git a/lib/finance.js b/lib/finance.js
index 9b478573..a7c7b873 100644
--- a/lib/finance.js
+++ b/lib/finance.js
@@ -134,6 +134,7 @@ var Finance = function (faker) {
       }
       return symbol;
   }
+
 }
 
 module['exports'] = Finance;
diff --git a/lib/random.js b/lib/random.js
index b152ddbd..d3cbf3ea 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -189,6 +189,15 @@ function Random (faker, seed) {
     return faker.random.arrayElement(Object.keys(faker.locales));
   };
 
+  /**
+   * alphaNumeric
+   *
+   * @method faker.random.alphaNumeric
+   */
+  this.alphaNumeric = function alphaNumeric() {
+    return faker.random.arrayElement(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"]);
+  }
+
   return this;
 
 }