Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
c04cdb0
Improve mapping of nested arrays.
albanm Apr 1, 2014
2a6e07b
added possibility to specify any river options
albanm Apr 24, 2014
b11adb9
support changing indexName with river without loosing the correct col…
albanm Apr 25, 2014
95368d0
make serialize more robust for deep models with empty parts
albanm May 9, 2014
c7db5a7
make serialize compatible with nested arrays and their mappings
albanm May 9, 2014
57b5ece
first support of bulk indexing mode
albanm Jun 9, 2014
122f0ed
forgotten callback
albanm Jun 9, 2014
a3a2a2a
Update repo info in package.json
taterbase Oct 24, 2014
75efeee
Update badge
taterbase Oct 24, 2014
4ad5c37
Update readme.md
taterbase Oct 24, 2014
822ee1e
Keep geo_* types in the mapping
nlko Feb 17, 2014
9f8fa2f
Correct boost test field (support ES 0.9 and 1.0).
nlko Feb 17, 2014
02b0138
Add test for undefined object field in the path prior of its use
nlko Feb 20, 2014
2214a6f
Added testfor geo_shape and updated manual
nlko Feb 20, 2014
d0e2be2
Add ES 1.0 support for geo shape tests
nlko Feb 20, 2014
82fb1b2
Correct enveloppe test
nlko Feb 25, 2014
cd84784
Get first level of hits field
huseyinbabal Mar 17, 2014
a6f6c3e
Update hydrated tests to conform to api
taterbase Oct 27, 2014
241dfde
remove river code
taterbase Oct 27, 2014
23a1b19
Merge pull request #15 from mongoosastic/cubuzoa/feature/hydrate-hits
taterbase Oct 27, 2014
6d7fab7
Merge pull request #14 from mongoosastic/nlko-geo_shape
taterbase Oct 27, 2014
44e1ce1
Merge pull request #16 from mongoosastic/remove-river-code
taterbase Oct 27, 2014
9a79e38
use containEql instead of include
taterbase Oct 27, 2014
75800d8
resolve conflicts
taterbase Oct 27, 2014
7d531f5
Merge pull request #17 from mongoosastic/albanm/feature/bulk-and-arra…
taterbase Oct 27, 2014
a5711a0
big api changes, big version bump
taterbase Oct 27, 2014
b5e5cc0
Add documentation about bulk api
taterbase Oct 27, 2014
178df7b
Document geo_shape
taterbase Oct 27, 2014
b48f7a4
remove semicolons from mongoosastic.js
taterbase Oct 28, 2014
080f7f6
first pass at integrating elasticsearch driver
taterbase Oct 28, 2014
7af9fff
Close to fixing geo test
taterbase Oct 28, 2014
c78cf01
had to scale back abstraction on search
taterbase Oct 29, 2014
6af3339
All tests passing
taterbase Oct 29, 2014
755fd8e
remove elastical dependency
taterbase Oct 29, 2014
4416171
Break out docs
taterbase Oct 29, 2014
1c58fbe
uppercase README
taterbase Oct 29, 2014
953a3b3
refactor bulk api
taterbase Oct 30, 2014
7c84d8e
don't stop bulk options with synchronize
taterbase Oct 30, 2014
0ac8a96
refresh readme
taterbase Oct 30, 2014
848fd23
Update query interface
taterbase Oct 30, 2014
59b1ef6
Add gitter badge
taterbase Oct 30, 2014
e9f1a87
formatting
taterbase Oct 30, 2014
a465b96
significant version bump
taterbase Oct 30, 2014
3353734
longer delay for bulk test
taterbase Oct 30, 2014
516438f
updates for travis
taterbase Oct 30, 2014
fcc6a46
Add changelog
taterbase Oct 30, 2014
4c71de6
Merge pull request #21 from mongoosastic/feature/official-driver
taterbase Oct 30, 2014
3a6ad9b
'protocol' and 'auth' options are ignored
sascha Nov 1, 2014
0d27dbc
Merge pull request #23 from sascha/master
taterbase Nov 2, 2014
8ef97d5
bump package.json
taterbase Nov 2, 2014
1618f4b
Treat null query like undefined
taterbase Nov 5, 2014
a1ee33a
remove unstable node testing, broken for now
taterbase Nov 5, 2014
feb2060
get rid of "continue" when encounter objectid
b96705008 Nov 9, 2014
47e383a
Merge pull request #26 from b96705008/master
taterbase Nov 9, 2014
622239d
Update semver
taterbase Nov 9, 2014
eee48de
Serialize on bulk calls. Serialize: this = full model.
Nov 10, 2014
bc39789
Merge pull request #27 from ignlg/feature/serialize-cast-bulk
taterbase Nov 10, 2014
c065446
Update semver
taterbase Nov 10, 2014
93d00fb
In documentation files, rename "truncate" to "esTruncate"
nickserv Nov 21, 2014
39e6980
Merge pull request #30 from nicolasmccurdy/mention-estruncate
taterbase Nov 21, 2014
d4636e3
Update semver
taterbase Nov 21, 2014
098d5c0
add settings when index is created
cwagner22 Dec 10, 2014
390cb0e
Merge pull request #35 from jitowix/master
taterbase Dec 11, 2014
a1c2599
Update semver
taterbase Dec 11, 2014
f2a5e2a
API changed
janryWang Feb 6, 2015
72a3713
Update README.md
janryWang Feb 6, 2015
f16503a
Update README.md
janryWang Feb 6, 2015
4cc52be
Update tweet.js
janryWang Feb 6, 2015
6cc7ff6
Update package.json
janryWang Feb 6, 2015
e5712cf
Update search-features-test.js
janryWang Feb 6, 2015
cf5d89e
Update geo-test.js
janryWang Feb 6, 2015
8820f48
Update bulk-test.js
janryWang Feb 6, 2015
bb8cbe4
Update boost-field-test.js
janryWang Feb 6, 2015
0733fe7
Update index-test.js
janryWang Feb 6, 2015
30ae963
Update index-test.js
janryWang Feb 6, 2015
a67d584
Update synchronize-test.js
janryWang Feb 6, 2015
1230a60
Update truncate-test.js
janryWang Feb 6, 2015
5595d0a
Update mongoosastic.js
janryWang Feb 6, 2015
551b17f
API changed
janryWang Feb 6, 2015
59cfee6
API changed
janryWang Feb 6, 2015
867f497
API changed
janryWang Feb 6, 2015
4b35e39
API changed
janryWang Feb 6, 2015
ec21dd8
API changed
janryWang Feb 6, 2015
5ff7653
Update bulk-test.js
janryWang Feb 6, 2015
3e0409c
Update bulk-test.js
janryWang Feb 6, 2015
b3bd091
Update bulk-test.js
janryWang Feb 6, 2015
60d8f63
Update mongoosastic.js
janryWang Feb 6, 2015
e0a9343
API changed
janryWang Feb 6, 2015
476c0bc
API changed
janryWang Feb 6, 2015
583510b
test remove
janryWang Feb 6, 2015
8cfdfc5
scroll back
janryWang Feb 6, 2015
a40977b
to now
outerkk Feb 6, 2015
8dd2a34
update test/config.js and readme.md
outerkk Feb 6, 2015
4f7fb43
update reademe.md
outerkk Feb 6, 2015
f1af9cc
Update mongoosastic.js
janryWang Apr 8, 2015
893e630
bug fixed
outerkk Apr 14, 2015
baf8295
Merge remote-tracking branch 'origin/master'
outerkk Apr 14, 2015
126df46
bug fixed
outerkk Apr 15, 2015
e4d4564
bug fixed
outerkk Apr 15, 2015
32cd74f
bug fixed
outerkk Apr 15, 2015
74f7460
test
outerkk Apr 16, 2015
2535249
test
outerkk Apr 16, 2015
760f98f
test
outerkk Apr 16, 2015
f587900
测试无误
outerkk Apr 16, 2015
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
32 changes: 31 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,32 @@
.DS_Store
# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Deployed apps should consider commenting this line out:
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules

# Ignore .env configuration files
.env

# Ignore .DS_Store files on OS X
.DS_Store
.idea
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
language: node_js

node_js:
- 0.11
- 0.10
- 0.8

services:
- mongodb
- elasticsearch

notifications:
email:
- james.r.carr@gmail.com
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## 2.0.0 (2014-10-10)

Features:

- Moved to [official elasticsearch driver](https://github.com/elasticsearch/elasticsearch-js)
- Caused `search` api to conform closer to official driver
- Added options to searching
- Refactored bulk api
- Refreshed README.md
- Added CHANGELOG.md
- Added CONTRIBUTING.md
- Added LICENSE.md
53 changes: 53 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Contributing
Pull requests are always welcome as long as an accompanying test case is
associated.

This project is configured to use [git
flow](https://github.com/nvie/gitflow/) and the following conventions
are used:

* ``develop`` - represents current active development and can possibly be
unstable.
* ``master`` - pristine copy of repository, represents the currently
stable release found in the npm index.
* ``feature/**`` - represents a new feature being worked on

If you wish to contribute, the only requirement is to:

- branch a new feature branch from develop (if you're working on an
issue, prefix it with the issue number)
- make the changes, with accompanying test cases
- issue a pull request against develop branch

Although I use git flow and prefix feature branches with "feature/" I
don't require this for pull requests... all I care is that the feature
branch name makes sense.

Pulls requests against master or pull requests branched from master will
be rejected.

## Examples
Someone picks up issue #39 on selective indexing.

Good branch names:
* 39-selective-indexing
* feature/39-selective-indexing

Someone submits a new feature that allows shard configuration:

Good branch names:
* feature/shard-configuration
* shard-configuration
* or file an issue, then create a feature branch

Feel free to ping me if you need help! :)

## Running Tests
In order to run the tests you will need:

* An elasticsearch server running on port 9200
* A mongodb server
* [mocha](http://visionmedia.github.com/mocha/)

With those installed, running ''npm test'' will run the tests with the
preferred timeout (which is extended for integration tests.
9 changes: 9 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[The MIT License](https://tldrlegal.com/l/mit)

Copyright (c) 2012 James R. Carr <james.r.carr@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Loading