Skip to content

Documentation improvements, dep management #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 11, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,24 +158,12 @@ module.exports = function (grunt) {
}
}
}
},
mocha: {
yaml_suite: {
options: {
// log: true,
run: true,
urls: [ 'http://localhost:8888' ],
timeout: 10e3,
'--web-security': false
}
}
}
});

// load plugins
grunt.loadNpmTasks('grunt-run');
grunt.loadNpmTasks('grunt-open');
grunt.loadNpmTasks('grunt-mocha');
grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-mocha-test');
grunt.loadNpmTasks('grunt-contrib-clean');
Expand All @@ -188,11 +176,9 @@ module.exports = function (grunt) {
grunt.registerTask('default', [
/*jshint scripturl:true*/
'jshint',
'mochaTest:unit',
'build',
'mochaTest:yaml_suite',
// 'start:integration_server',
// 'mocha:yaml_suite' -- this will fail because of the way that PhantomJS handle's DELETE requests with body's
'mochaTest:unit',
'mochaTest:yaml_suite'
]);

grunt.registerTask('build', [
Expand Down Expand Up @@ -227,6 +213,11 @@ module.exports = function (grunt) {

var taskData = this.data;

/**
* You must always run the build task first, to ensure that the lastest API and yaml tests are available.
* This is run in the default and browser_tests:{{browser}} tests.
*/
grunt.task.requires('build');
grunt.task.requires('run:integration_server');

grunt.config.set('open.yaml_suite_' + this.target, {
Expand Down
16 changes: 12 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Official *low-level* client for Elasticsearch.
## Features

- One-to-one mapping with REST API and other language clients
- Generalized, pluggable architecture. See [replacing core components](TODO: details the peices that are replaceable)
- Generalized, pluggable architecture. See [replacing core components](docs/replacing_core_components.md)
- Configurable, automatic discovery of cluster nodes
- Persistent, Keep-Alive connections
- Load balancing (with pluggable selection strategy) across all available nodes.
Expand Down Expand Up @@ -59,6 +59,14 @@ bower install elasticsearch-angular
bower install elasticsearch-jquery
```

## Docs
- [Configuration](#configuration)
- [API](docs/api.md)
- [Replacing Core Components](docs/replacing_core_components.md)
- [Errors](docs/errors.md)
- [Setting Up Logging](docs/setting_up_logging.md)
- [FAQ](#faq)

## Configuration

The `Client` constructor accepts a single object as it's argument, and the following keys can be used to configure that client instance:
Expand Down Expand Up @@ -95,7 +103,7 @@ log: {
}
```

Unless a constructor is specified, this sets the output settings for the bundled logger. See [setting up logging](TODO: detail logging why) for more information.
Unless a constructor is specified, this sets the output settings for the bundled logger. See [setting up logging](docs/setting_up_logging.md) for more information.

### connectionClass
Type: `String`, `Constructor`
Expand Down Expand Up @@ -148,7 +156,7 @@ Type: `Number`

Defailt: `3`

How many times should the client try to connect to other nodes before returning a [ConnectionFault](TODO: error types) error. (see [node death](#node-death))
How many times should the client try to connect to other nodes before returning a [ConnectionFault](docs/error.md#connectionfault) error. (see [node death](#node-death))

### timeout
Type: `Number`
Expand Down Expand Up @@ -202,7 +210,7 @@ The number of milliseconds this request has to complete. It defaults to the time

### Methods

All the methods can be seen [here](TODO: api docs), or take a look at [api.js](src/lib/api.js).
All the methods can be seen [here](docs/api.md), or take a look at [api.js](src/lib/api.js).

### Examples

Expand Down
Loading