null+****@clear*****
null+****@clear*****
2012年 8月 2日 (木) 12:22:33 JST
SHIMODA Hiroshi 2012-08-02 12:22:33 +0900 (Thu, 02 Aug 2012) New Revision: 62ee8879cb68b4594ac18e65522fe6492ddbf919 https://github.com/groonga/gcs/commit/62ee8879cb68b4594ac18e65522fe6492ddbf919 Log: Shorten constant names Modified files: lib/database/domain.js lib/database/index-field.js test/api-configuration.test.js test/database-domain.test.js Modified: lib/database/domain.js (+12 -12) =================================================================== --- lib/database/domain.js 2012-08-02 12:09:11 +0900 (596c0dd) +++ lib/database/domain.js 2012-08-02 12:22:33 +0900 (0666660) @@ -2,28 +2,28 @@ var nativeNroonga = require('nroonga'); var nroonga = require('../wrapped-nroonga'); var IndexField = require('./index-field').IndexField; -exports.MINIMUM_DOMAIN_NAME_LENGTH = 3; -exports.MAXIMUM_DOMAIN_NAME_LENGTH = 28; -exports.INVALID_DOMAIN_NAME_CHARACTER_PATTERN = /[^\-a-z0-9]/g; +exports.MINIMUM_NAME_LENGTH = 3; +exports.MAXIMUM_NAME_LENGTH = 28; +exports.INVALID_NAME_CHARACTER_PATTERN = /[^\-a-z0-9]/g; exports.INVALID_TABLE_NAME_CHARACTER_PATTERN = /[^_a-z0-9]/g; -var DEFAULT_DOMAIN_ID = - exports.DEFAULT_DOMAIN_ID = - Domain.DEFAULT_DOMAIN_ID = '00000000000000000000000000'; +var DEFAULT_ID = + exports.DEFAULT_ID = + Domain.DEFAULT_ID = '00000000000000000000000000'; function assertValidDomainName(domain) { if (typeof domain != 'string') throw new Error('domain name must be a string'); - if (domain.length < exports.MINIMUM_DOMAIN_NAME_LENGTH) + if (domain.length < exports.MINIMUM_NAME_LENGTH) throw new Error('too short domain name (minimum length = ' + - exports.MINIMUM_DOMAIN_NAME_LENGTH + ')'); + exports.MINIMUM_NAME_LENGTH + ')'); - if (domain.length > exports.MAXIMUM_DOMAIN_NAME_LENGTH) + if (domain.length > exports.MAXIMUM_NAME_LENGTH) throw new Error('too long domain name (max length = ' + - exports.MAXIMUM_DOMAIN_NAME_LENGTH + ')'); + exports.MAXIMUM_NAME_LENGTH + ')'); - var invalidCharacter = domain.match(exports.INVALID_DOMAIN_NAME_CHARACTER_PATTERN) || + var invalidCharacter = domain.match(exports.INVALID_NAME_CHARACTER_PATTERN) || domain.match(exports.INVALID_TABLE_NAME_CHARACTER_PATTERN); if (invalidCharacter) { var characters = Array.prototype.map.call(invalidCharacter, function(aCharacter) { @@ -170,7 +170,7 @@ Domain.prototype = { }, get id() { - return this._id === undefined ? DEFAULT_DOMAIN_ID : this._id ; + return this._id === undefined ? DEFAULT_ID : this._id ; }, set id(value) { return this._id = value; Modified: lib/database/index-field.js (+10 -10) =================================================================== --- lib/database/index-field.js 2012-08-02 12:09:11 +0900 (f499691) +++ lib/database/index-field.js 2012-08-02 12:22:33 +0900 (cd7d7d0) @@ -1,10 +1,10 @@ var nroonga = require('../wrapped-nroonga'); -exports.MINIMUM_FIELD_NAME_LENGTH = 3; -exports.MAXIMUM_FIELD_NAME_LENGTH = 64; -exports.INVALID_FIELD_NAME_CHARACTER_PATTERN = /[^_a-z0-9]/g; +exports.MINIMUM_NAME_LENGTH = 3; +exports.MAXIMUM_NAME_LENGTH = 64; +exports.INVALID_NAME_CHARACTER_PATTERN = /[^_a-z0-9]/g; exports.INVALID_COLUMN_NAME_CHARACTER_PATTERN = /[^_a-z0-9]/g; -exports.RESERVED_FIELD_NAMES = [ +exports.RESERVED_NAMES = [ 'body', 'docid', 'text_relevance' @@ -17,15 +17,15 @@ function assertValidFieldName(field) { if (typeof field != 'string') throw new Error('field name must be a string'); - if (field.length < exports.MINIMUM_FIELD_NAME_LENGTH) + if (field.length < exports.MINIMUM_NAME_LENGTH) throw new Error('too short field name (minimum length = ' + - exports.MINIMUM_FIELD_NAME_LENGTH + ')'); + exports.MINIMUM_NAME_LENGTH + ')'); - if (field.length > exports.MAXIMUM_FIELD_NAME_LENGTH) + if (field.length > exports.MAXIMUM_NAME_LENGTH) throw new Error('too long field name (max length = ' + - exports.MAXIMUM_FIELD_NAME_LENGTH + ')'); + exports.MAXIMUM_NAME_LENGTH + ')'); - var invalidCharacter = field.match(exports.INVALID_FIELD_NAME_CHARACTER_PATTERN) || + var invalidCharacter = field.match(exports.INVALID_NAME_CHARACTER_PATTERN) || field.match(exports.INVALID_COLUMN_NAME_CHARACTER_PATTERN); if (invalidCharacter) { var characters = Array.prototype.map.call(invalidCharacter, function(aCharacter) { @@ -34,7 +34,7 @@ function assertValidFieldName(field) { throw new Error(characters.join(', ') + ' cannot appear in a field name'); } - var index = exports.RESERVED_FIELD_NAMES.indexOf(field); + var index = exports.RESERVED_NAMES.indexOf(field); if (index > -1) index = exports.RESERVED_COLUMN_NAMES.indexOf(field); if (index > -1) throw new Error(field + ' is a reserved field name'); Modified: test/api-configuration.test.js (+6 -6) =================================================================== --- test/api-configuration.test.js 2012-08-02 12:09:11 +0900 (48d9daa) +++ test/api-configuration.test.js 2012-08-02 12:22:33 +0900 (0c8ad16) @@ -250,16 +250,16 @@ suite('Configuration API', function() { Created: 'true', Deleted: 'false', DocService: { - Endpoint: 'doc-companies-' + Domain.DEFAULT_DOMAIN_ID + '.localhost' + Endpoint: 'doc-companies-' + Domain.DEFAULT_ID + '.localhost' }, - DomainId: Domain.DEFAULT_DOMAIN_ID + '/companies', + DomainId: Domain.DEFAULT_ID + '/companies', DomainName: 'companies', NumSearchableDocs: '0', RequiresIndexDocuments: 'false', SearchInstanceCount: '0', SearchPartitionCount: '0', SearchService: { - Endpoint: 'search-companies-' + Domain.DEFAULT_DOMAIN_ID + '.localhost' + Endpoint: 'search-companies-' + Domain.DEFAULT_ID + '.localhost' } }; var status = response.body.CreateDomainResponse.CreateDomainResult.DomainStatus; @@ -293,16 +293,16 @@ suite('Configuration API', function() { Created: 'false', Deleted: 'true', DocService: { - Endpoint: 'doc-companies-' + Domain.DEFAULT_DOMAIN_ID + '.localhost' + Endpoint: 'doc-companies-' + Domain.DEFAULT_ID + '.localhost' }, - DomainId: Domain.DEFAULT_DOMAIN_ID + '/companies', + DomainId: Domain.DEFAULT_ID + '/companies', DomainName: 'companies', NumSearchableDocs: '0', RequiresIndexDocuments: 'false', SearchInstanceCount: '0', SearchPartitionCount: '0', SearchService: { - Endpoint: 'search-companies-' + Domain.DEFAULT_DOMAIN_ID + '.localhost' + Endpoint: 'search-companies-' + Domain.DEFAULT_ID + '.localhost' } }; var status = response.body.DeleteDomainResponse.DeleteDomainResult.DomainStatus; Modified: test/database-domain.test.js (+1 -1) =================================================================== --- test/database-domain.test.js 2012-08-02 12:09:11 +0900 (2b15fee) +++ test/database-domain.test.js 2012-08-02 12:22:33 +0900 (28ce849) @@ -218,7 +218,7 @@ suite('database', function() { test('id from database (unknown table)', function() { domain = new Domain('unknown', context); - assert.equal(domain.id, Domain.DEFAULT_DOMAIN_ID); + assert.equal(domain.id, Domain.DEFAULT_ID); }); test('indexFields', function() { -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download