Skip to content

Commit c51a1df

Browse files
committed
added API version config
1 parent 883b10e commit c51a1df

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ $ npm install enju --save
1919
enju use [node-config](https://github.com/lorenwest/node-config).
2020
`/your_project/config/default.cson`
2121
```cson
22-
enjuElasticsearchHost: 'http://localhost:9200'
23-
enjuIndexPrefix: ''
22+
enju:
23+
apiVersion: '2.4'
24+
elasticsearchHost: 'http://localhost:9200'
25+
indexPrefix: ''
2426
```
2527

2628

config/default.coffee

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
module.exports =
2-
enjuElasticsearchHost: 'http://localhost:9200'
3-
enjuIndexPrefix: ''
2+
enju:
3+
apiVersion: '2.4'
4+
elasticsearchHost: 'http://localhost:9200'
5+
indexPrefix: ''

lib/utils.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
@returns {Elasticsearch.Client}
1414
*/
1515
return new elasticsearch.Client({
16-
host: config.enjuElasticsearchHost
16+
host: config.enju.elasticsearchHost,
17+
apiVersion: config.enju.apiVersion
1718
});
1819
},
1920
getIndexPrefix: function() {
@@ -23,7 +24,7 @@
2324
@returns {string}
2425
*/
2526
var ref;
26-
return (ref = config.enjuIndexPrefix) != null ? ref : '';
27+
return (ref = config.enju.indexPrefix) != null ? ref : '';
2728
}
2829
};
2930

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "enju",
3-
"version": "0.2.8",
3+
"version": "0.3.0",
44
"description": "An elasticsearch on node.js written in CoffeeScript.",
55
"main": "index.js",
66
"scripts": {

src/lib/utils.coffee

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ module.exports =
99
@returns {Elasticsearch.Client}
1010
###
1111
new elasticsearch.Client
12-
host: config.enjuElasticsearchHost
12+
host: config.enju.elasticsearchHost
13+
apiVersion: config.enju.apiVersion
1314

1415
getIndexPrefix: ->
1516
###
1617
Get index prefix.
1718
@returns {string}
1819
###
19-
config.enjuIndexPrefix ? ''
20+
config.enju.indexPrefix ? ''

tests/test-utils.coffee

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ utils = require '../lib/utils'
33

44

55
exports.testGetIndexPrefix = (test) ->
6-
_enjuIndexPrefix = config.enjuIndexPrefix
7-
config.enjuIndexPrefix = 'index_'
6+
_enjuIndexPrefix = config.enju.indexPrefix
7+
config.enju.indexPrefix = 'index_'
88

99
test.expect 1
1010
test.equals utils.getIndexPrefix(), 'index_'
1111
test.done()
1212

13-
config.enjuIndexPrefix = _enjuIndexPrefix
13+
config.enju.indexPrefix = _enjuIndexPrefix

0 commit comments

Comments
 (0)