fix codestyle, move options check to .configure(), fix tests

Author: artzhookov

gulpfile.js

@@ -36,7 +36,7 @@ gulp.task('lint', function() {
 });
 
 gulp.task('lintTests', function() {
-	return gulp.src('./tests/*.js')
+	return gulp.src('./tests/**/*.js')
 		.pipe(jshint())
 		.pipe(jshint.reporter('unix'));
 });

lib/builder.js

@@ -27,13 +27,10 @@ Builder.prototype._reset = function() {
 };
 
 Builder.prototype._getPlaceholder = function () {
-  if (this.options.namedValues && !this.options.indexedValues) {
-    throw new Error('Use of options "indexedValues: false" is ' +
-      'not allowed together with "namedValues: true"');
-  }
-  var placeholder = this.options.namedValues ? 'p' : '';
-  var index = this.options.indexedValues ? (this._placeholderId++) : '';
-	return placeholder + index;
+	var placeholder = '';
+	if (this.options.namedValues) placeholder += 'p';
+	if (this.options.indexedValues) placeholder += this._placeholderId++;
+	return placeholder;
 };
 
 Builder.prototype._wrapPlaceholder = function(name) {
@@ -63,9 +60,7 @@ Builder.prototype._pushValue = function(value) {
 };
 
 Builder.prototype.configure = function(options) {
-	options = options || {};
-
-	this.options = _.defaults({}, options, {
+	options = _.defaults({}, options, {
 		separatedValues: true,
 		namedValues: true,
 		valuesPrefix: '$',
@@ -74,6 +69,15 @@ Builder.prototype.configure = function(options) {
 		indexedValues: true
 	});
 
+	if (options.namedValues && !options.indexedValues) {
+		throw new Error(
+			'Option `indexedValues`: false is ' +
+			'not allowed together with option `namedValues`: true'
+		);
+	}
+
+	this.options = options;
+
 	this.setDialect(this.options.dialect);
 
 	this._reset();

tests/0_base.js

@@ -205,7 +205,7 @@ describe('Builder', function() {
 
 		expect(result.query).to.be.equal('select * from "users" where "name" = $1;');
 		expect(result.values).to.be.eql(['John']);
-  });
+	});
 
 	it('should use prefix `@` for values with option `valuesPrefix` = @', function() {
 		jsonSql.configure({
@@ -219,7 +219,7 @@ describe('Builder', function() {
 
 		expect(result.query).to.be.equal('select * from "users" where "name" = @p1;');
 		expect(result.values).to.be.eql({p1: 'John'});
-  });
+	});
 
 	it('should return prefixed values with method `prefixValues`', function() {
 		var result = jsonSql.build({
@@ -230,7 +230,7 @@ describe('Builder', function() {
 		expect(result.query).to.be.equal('select * from "users" where "name" = @p1;');
 		expect(result.values).to.be.eql({p1: 'John'});
 		expect(result.prefixValues()).to.be.eql({'@p1': 'John'});
-  });
+	});
 
 	it('should return array values with method `getValuesArray`', function() {
 		var result = jsonSql.build({
@@ -260,26 +260,23 @@ describe('Builder', function() {
 		expect(result.values).to.be.eql(['John']);
 		expect(result.prefixValues()).to.be.eql({'$1': 'John'});
 		expect(result.getValuesObject()).to.be.eql({1: 'John'});
-  });
-
-  it('should throw if `indexedValues = false` and `namedValues = true`', function() {
-    jsonSql.configure({
-      namedValues: true,
-			indexedValues: false
-		});
+	});
 
-    expect(function() {
-			jsonSql.build({
-        table: 'users',
-        condition: {name: 'John'}
-      });
-    }).to.throw('Use of options "indexedValues: false" is ' +
-      'not allowed together with "namedValues: true"');
+	it('should throw if `indexedValues = false` and `namedValues = true`', function() {
+		expect(function() {
+			jsonSql.configure({
+				namedValues: true,
+				indexedValues: false
+			});
+		}).to.throw(
+			'Option `indexedValues`: false is not allowed ' +
+			'together with option `namedValues`: true'
+		);
 	});
-  
-  it('should not use index for values with option `indexedValues` = false', function() {
-    jsonSql.configure({
-      namedValues: false,
+
+	it('should not use index for values with option `indexedValues` = false', function() {
+		jsonSql.configure({
+			namedValues: false,
 			indexedValues: false
 		});