null+****@clear*****
null+****@clear*****
2012年 6月 21日 (木) 10:32:46 JST
Yoji SHIDARA 2012-06-21 10:32:46 +0900 (Thu, 21 Jun 2012) New Revision: 3a45fcc8fa0a3d60135df7d4511a8ce4a3f4978b https://github.com/groonga/gcs/commit/3a45fcc8fa0a3d60135df7d4511a8ce4a3f4978b Log: Now 'us-east-1' is not required for GCS Modified files: lib/domain.js test/domain.test.js Modified: lib/domain.js (+1 -1) =================================================================== --- lib/domain.js 2012-06-21 10:28:13 +0900 (cfa0845) +++ lib/domain.js 2012-06-21 10:32:46 +0900 (cde41db) @@ -78,7 +78,7 @@ Domain.prototype = { exports.Domain = Domain; Domain.getNameFromHost = function(host) { - var domainMatcher = /^(?:doc|search)-(.+)-([^\.\-]+)\.us-east-1\./; + var domainMatcher = /^(?:doc|search)-(.+)-([^\.\-]+)\./; var match = host.match(domainMatcher); if (match) return match[1]; Modified: test/domain.test.js (+7 -7) =================================================================== --- test/domain.test.js 2012-06-21 10:28:13 +0900 (e45c50c) +++ test/domain.test.js 2012-06-21 10:32:46 +0900 (cbcc702) @@ -71,7 +71,7 @@ suite('domain', function() { suite('from host name', function() { test('valid', function() { - var host = 'doc-test0123-id0123.us-east-1.example.com'; + var host = 'doc-test0123-id0123.example.com'; var request = { headers: { host: host } }; var domain = new Domain(request); assert.equal(domain.name, 'test0123'); @@ -79,7 +79,7 @@ suite('domain', function() { test('invalid', function() { assert.throw(function() { - var host = 'doc-domain_name-id0123.us-east-1.example.com'; + var host = 'doc-domain_name-id0123.example.com'; var request = { headers: { host: host } }; var domain = new Domain(request); }, /cannot appear in a domain name/); @@ -88,31 +88,31 @@ suite('domain', function() { suite('getNameFromHost', function() { test('valid, doc, lower case and number', function() { - var host = 'doc-test0123-id0123.us-east-1.example.com'; + var host = 'doc-test0123-id0123.example.com'; var name = Domain.getNameFromHost(host); assert.equal(name, 'test0123'); }); test('valid, search, lower case and number', function() { - var host = 'search-test0123-id0123.us-east-1.example.com'; + var host = 'search-test0123-id0123.example.com'; var name = Domain.getNameFromHost(host); assert.equal(name, 'test0123'); }); test('valid, doc, lower case, hyphen and number', function() { - var host = 'doc-test-0123-id0123.us-east-1.example.com'; + var host = 'doc-test-0123-id0123.example.com'; var name = Domain.getNameFromHost(host); assert.equal(name, 'test-0123'); }); test('valid, search, lower case, hyphen and number', function() { - var host = 'search-test-0123-id0123.us-east-1.example.com'; + var host = 'search-test-0123-id0123.example.com'; var name = Domain.getNameFromHost(host); assert.equal(name, 'test-0123'); }); test('invalid', function() { - var host = 'cloudsearch.us-east-1.example.com'; + var host = 'cloudsearch.example.com'; var name = Domain.getNameFromHost(host); assert.equal(name, ''); }); -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download