Allow Elasticsearch index name to be set from pelias-config

integration/address_matching.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/admin_matching.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasAdmin.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasHousenumber.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasIndexOneEdgeGram.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasIndexTwoEdgeGram.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasPhrase.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasQueryFullToken.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasQueryPartialToken.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasStreet.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/analyzer_peliasZip.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/autocomplete_abbreviated_street_names.js

@@ -1,4 +1,3 @@
-
 // Tests to ensure no regressions in the way the autocomplete analyzers handle
 // synonym expansions and the corresponding matching of those tokens.
 

integration/autocomplete_directional_synonym_expansion.js

@@ -1,4 +1,3 @@
-
 // Tests to ensure no regressions in the way the autocomplete analyzers handle
 // synonym expansions and the corresponding matching of those tokens.
 

integration/autocomplete_street_synonym_expansion.js

@@ -1,4 +1,3 @@
-
 // Tests to ensure no regressions in the way the autocomplete analyzers handle
 // synonym expansions and the corresponding matching of those tokens.
 

integration/bounding_box.js

@@ -1,4 +1,3 @@
-
 // validate bounding box behaves as expected
 
 var tape = require('tape'),

integration/dynamic_templates.js

@@ -1,4 +1,3 @@
-
 // http://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-root-object-type.html#_dynamic_templates
 
 var tape = require('tape'),

integration/run.js

@@ -1,4 +1,3 @@
-
 var tape = require('tape');
 var common = {};
 

integration/source_layer_sourceid_filtering.js

@@ -1,4 +1,3 @@
-
 // validate analyzer is behaving as expected
 
 var tape = require('tape'),

integration/validate.js

@@ -1,4 +1,3 @@
-
 // simply validate that the schema doesn't error when inserted in to
 // your local elasticsearch server, useful to sanity check version upgrades.
 

mappings/partial/centroid.js

@@ -1,4 +1,3 @@
-
 // @ref: http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-geo-point-type.html
 var schema = {
   'type': 'geo_point',

punctuation.js

@@ -1,4 +1,3 @@
-
 // These characters will be removed from ngrams/shingles
 // @see: org/apache/lucene/analysis/cn/smart/stopwords.txt
 

scripts/create_index.js

@@ -1,9 +1,11 @@
-var config = require('pelias-config').generate().esclient;
+var config = require('pelias-config').generate();
 var es = require('elasticsearch');
-var client = new es.Client(config);
+var client = new es.Client(config.esclient);
 var schema = require('../schema');
 
-client.indices.create( { index: 'pelias', body: schema }, function( err, res ){
-  console.log( '[put mapping]', '\t', 'pelias', err || '\t', res );
+var indexName = config.schema.indexName;
+
+client.indices.create( { index: indexName, body: schema }, function( err, res ){
+  console.log( '[put mapping]', '\t', indexName, err || '\t', res );
   process.exit( !!err );
 });

scripts/drop_index.js

@@ -11,8 +11,8 @@ if( isForced() ) drop();
 else prompt( drop, fail );
 
 function drop(){
-  client.indices.delete( { index: 'pelias' }, function( err, res ){
-    console.log( '\n[delete mapping]', '\t', 'pelias', err || '\t', res );
+  client.indices.delete( { index: config.schema.indexName }, function( err, res ){
+    console.log( '\n[delete mapping]', '\t', config.schema.indexName, err || '\t', res );
     process.exit( !!err );
   });
 }
@@ -25,7 +25,7 @@ function warnIfNotLocal() {
 
 function prompt( yes, no ){
   warnIfNotLocal();
-  rl.question( 'Are you sure you want to drop the pelias index and delete ALL records? ', function( answer ){
+  rl.question( 'Are you sure you want to drop the ' + config.schema.indexName + ' index and delete ALL records? ', function( answer ){
     if( !answer.match(/^y(es)?$/i) ) return no();
     return yes();
   });

scripts/output_mapping.js

@@ -1,9 +1,9 @@
-var config = require('pelias-config').generate().esclient;
+var config = require('pelias-config').generate();
 var es = require('elasticsearch');
-var client = new es.Client(config);
+var client = new es.Client(config.esclient);
 var schema = require('../schema');
 
-var _index = ( process.argv.length > 3 ) ? process.argv[3] : 'pelias';
+var _index = ( process.argv.length > 3 ) ? process.argv[3] : config.schema.indexName;
 var _type = ( process.argv.length > 2 ) ? process.argv[2] : null; // get type from cli args
 
 if( !_type ){

scripts/reset_type.js

@@ -3,7 +3,7 @@ var es = require('elasticsearch');
 var client = new es.Client(config);
 var schema = require('../schema');
 
-var _index = ( process.argv.length > 3 ) ? process.argv[3] : 'pelias';
+var _index = ( process.argv.length > 3 ) ? process.argv[3] : config.schema.indexName;
 var _type = ( process.argv.length > 2 ) ? process.argv[2] : null; // get type from cli args
 
 if( !_type ){

scripts/update_settings.js

@@ -1,9 +1,9 @@
-var config = require('pelias-config').generate().esclient;
+var config = require('pelias-config').generate();
 var es = require('elasticsearch');
-var client = new es.Client(config);
+var client = new es.Client(config.esclient);
 var schema = require('../schema');
 
-var _index = 'pelias';
+var _index = config.schema.indexName;
 
 // Error: ElasticsearchIllegalArgumentException[can't change the number of shards for an index
 if( schema.settings.hasOwnProperty('index') &&

settings.js

@@ -1,4 +1,3 @@
-
 var Mergeable = require('mergeable');
 var peliasConfig = require('pelias-config');
 var punctuation = require('./punctuation');

test/compile.js

@@ -1,4 +1,3 @@
-
 var path = require('path'),
     schema = require('../'),
     fixture = require('./fixtures/expected.json');

test/document.js

@@ -1,4 +1,3 @@
-
 var schema = require('../mappings/document');
 
 module.exports.tests = {};

test/partial-admin.js

@@ -1,4 +1,3 @@
-
 var schema = require('../mappings/partial/admin');
 
 module.exports.tests = {};
@@ -52,4 +51,4 @@ module.exports.all = function (tape, common) {
   for( var testCase in module.exports.tests ){
     module.exports.tests[testCase](test, common);
   }
-};
+};

test/partial-hash.js

@@ -1,4 +1,3 @@
-
 var schema = require('../mappings/partial/hash');
 
 module.exports.tests = {};
@@ -37,4 +36,4 @@ module.exports.all = function (tape, common) {
   for( var testCase in module.exports.tests ){
     module.exports.tests[testCase](test, common);
   }
-};
+};

test/partial-literal.js

@@ -1,4 +1,3 @@
-
 var schema = require('../mappings/partial/literal');
 
 module.exports.tests = {};

test/run.js

@@ -1,4 +1,3 @@
-
 var tape = require('tape'),
     diff = require('difflet')({ indent : 2, comment : true });
 

test/settings.js

@@ -1,4 +1,3 @@
-
 var path = require('path'),
     settings = require('../settings'),
     fs = require('fs');