initial address.unit.js

Author: BryanDonovan

.jshintignore

@@ -1,2 +1,3 @@
 lib/definitions.js
 lib/version.js
+lib/helpers.js

Makefile

@@ -8,14 +8,13 @@ BUSTER = ./node_modules/.bin/buster test
 main: lint test
 
 cover:
-	$(ISTANBUL) cover test/run.js
+	$(ISTANBUL) cover test/run.js --root ./lib -- -T unit,functional
 
 check-coverage:
 	$(ISTANBUL) check-coverage $(COVERAGE_OPTS)
 
 test: cover check-coverage
 
-
 test-cov: cover check-coverage
 	open coverage/lcov-report/index.html
 

lib/address.js

@@ -1,4 +1,5 @@
 var Helpers = require('./helpers');
+var random = require('./random');
 var definitions = require('../lib/definitions');
 
 exports.zipCode = function () {
@@ -10,31 +11,31 @@ exports.zipCodeFormat = function (format) {
 };
 
 exports.city = function () {
-    switch (Helpers.randomNumber(3)) {
+    switch (random.number(3)) {
     case 0:
-        return Helpers.randomize(definitions.city_prefix()) + " " + Helpers.randomize(definitions.first_name()) + Helpers.randomize(definitions.city_suffix());
+        return random.city_prefix() + " " + random.first_name() + random.city_suffix();
     case 1:
-        return Helpers.randomize(definitions.city_prefix()) + " " + Helpers.randomize(definitions.first_name());
+        return random.city_prefix() + " " + random.first_name();
     case 2:
-        return Helpers.randomize(definitions.first_name()) + Helpers.randomize(definitions.city_suffix());
+        return random.first_name() + random.city_suffix();
     case 3:
-        return Helpers.randomize(definitions.last_name()) + Helpers.randomize(definitions.city_suffix());
+        return random.last_name() + random.city_suffix();
     }
 };
 
 exports.streetName = function () {
-    switch (Helpers.randomNumber(1)) {
+    switch (random.number(1)) {
     case 0:
-        return Helpers.randomize(definitions.last_name()) + " " + Helpers.randomize(definitions.street_suffix());
+        return random.last_name() + " " + random.street_suffix();
     case 1:
-        return Helpers.randomize(definitions.first_name()) + " " + Helpers.randomize(definitions.street_suffix());
+        return random.first_name() + " " + random.street_suffix();
     }
 };
 
 exports.streetAddress = function (i) {
     if (typeof i == 'undefined') { i = false; }
     var address = "";
-    switch (Helpers.randomNumber(2)) {
+    switch (random.number(2)) {
     case 0:
         address =  Helpers.replaceSymbolWithNumber("#####") + " " + this.streetName();
         break;

lib/definitions.js

@@ -14,16 +14,15 @@ exports.randomize = function (array) {
 // parses string for a symbol and replace it with a random number from 1-10
 exports.replaceSymbolWithNumber = function (string, symbol) {
     // default symbol is '#'
-    if (typeof symbol == 'undefined') {
+    if (symbol === undefined) {
         symbol = '#';
     }
 
     var str = '';
     for (var i = 0; i < string.length; i++) {
         if (string[i] == symbol) {
             str += Math.floor(Math.random() * 10);
-        }
-        else {
+        } else {
             str += string[i];
         }
     }
@@ -32,9 +31,7 @@ exports.replaceSymbolWithNumber = function (string, symbol) {
 
 // takes an array and returns it randomized
 exports.shuffle = function (o) {
-    for (var j, x, i = o.length; i; j = parseInt(Math.random() * i, 10), x = o[--i], o[i] = o[j], o[j] = x) {
-        return null; // dummy for lint.  This one-liner is a bad way to write a function.
-    }
+    for (var j, x, i = o.length; i; j = parseInt(Math.random() * i, 10), x = o[--i], o[i] = o[j], o[j] = x);
     return o;
 };
 

lib/helpers.js

@@ -4,7 +4,6 @@ var definitions = require('../lib/definitions');
 exports.words = function (num) {
     if (typeof num == 'undefined') { num = 3; }
     return Helpers.shuffle(definitions.lorem()).slice(0, num);
-    //Words.shuffle[0, num]
 };
 
 exports.sentence = function (wordCount) {

lib/lorem.js

@@ -17,6 +17,11 @@ var random = {
  * Generate methods that return random elements from definition arrays.
  */
 var method_names = [
+    // Address
+    'city_prefix',
+    'city_suffix',
+    'street_suffix',
+
     // Name
     'first_name',
     'last_name',
@@ -32,11 +37,10 @@ var method_names = [
     'bs_noun'
 ];
 
-for (var i = 0; i < method_names.length; i++) {
-    var method_name = method_names[i];
+method_names.forEach(function (method_name) {
     random[method_name] = function () {
         return random.array_rand(definitions[method_name]());
     };
-}
+});
 
 module.exports = random;

lib/random.js

@@ -0,0 +1,105 @@
+var assert = require('assert');
+var sinon = require('sinon');
+var Faker = require('../index');
+var random = require('../lib/random');
+
+describe("name.js", function () {
+    describe("city()", function () {
+        beforeEach(function () {
+            sinon.spy(random, 'city_prefix');
+            sinon.spy(random, 'first_name');
+            sinon.spy(random, 'last_name');
+            sinon.spy(random, 'city_suffix');
+        });
+
+        afterEach(function () {
+            random.number.restore();
+            random.city_prefix.restore();
+            random.first_name.restore();
+            random.last_name.restore();
+            random.city_suffix.restore();
+        });
+
+        it("occasionally returns prefix + first name + suffix", function () {
+            sinon.stub(random, 'number').returns(0);
+
+            var city = Faker.Address.city();
+            assert.ok(city);
+
+            assert.ok(random.city_prefix.calledOnce);
+            assert.ok(random.first_name.calledOnce);
+            assert.ok(random.city_suffix.calledOnce);
+        });
+
+        it("occasionally returns prefix + first name", function () {
+            sinon.stub(random, 'number').returns(1);
+
+            var city = Faker.Address.city();
+            assert.ok(city);
+
+            assert.ok(random.city_prefix.calledOnce);
+            assert.ok(random.first_name.calledOnce);
+            assert.ok(!random.city_suffix.called);
+        });
+
+        it("occasionally returns first name + suffix", function () {
+            sinon.stub(random, 'number').returns(2);
+
+            var city = Faker.Address.city();
+            assert.ok(city);
+
+            assert.ok(!random.city_prefix.called);
+            assert.ok(random.first_name.calledOnce);
+            assert.ok(random.city_suffix.calledOnce);
+        });
+
+        it("occasionally returns last name + suffix", function () {
+            sinon.stub(random, 'number').returns(3);
+
+            var city = Faker.Address.city();
+            assert.ok(city);
+
+            assert.ok(!random.city_prefix.called);
+            assert.ok(!random.first_name.called);
+            assert.ok(random.last_name.calledOnce);
+            assert.ok(random.city_suffix.calledOnce);
+        });
+    });
+
+    describe("streetName()", function () {
+        beforeEach(function () {
+            sinon.spy(random, 'first_name');
+            sinon.spy(random, 'last_name');
+            sinon.spy(random, 'street_suffix');
+        });
+
+        afterEach(function () {
+            random.number.restore();
+            random.first_name.restore();
+            random.last_name.restore();
+            random.street_suffix.restore();
+        });
+
+        it("occasionally returns last name + suffix", function () {
+            sinon.stub(random, 'number').returns(0);
+
+            var street_name = Faker.Address.streetName();
+            assert.ok(street_name);
+
+            assert.ok(!random.first_name.called);
+            assert.ok(random.last_name.calledOnce);
+            assert.ok(random.street_suffix.calledOnce);
+        });
+
+        it("occasionally returns first name + suffix", function () {
+            sinon.stub(random, 'number').returns(1);
+
+            var street_name = Faker.Address.streetName();
+            assert.ok(street_name);
+
+            assert.ok(random.first_name.calledOnce);
+            assert.ok(!random.last_name.called);
+            assert.ok(random.street_suffix.calledOnce);
+        });
+    });
+});