Skip to content

Commit 591858d

Browse files
committed
Updated findAll specs for like/notLike, contains/notContains to use generators
2 parents 4731af5 + 0bcf45b commit 591858d

21 files changed

+697
-641
lines changed

.jshintrc

-34
This file was deleted.

.npmignore

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Logs
2+
logs
3+
*.log
4+
5+
# Runtime data
6+
pids
7+
*.pid
8+
*.seed
9+
10+
# Directory for instrumented libs generated by jscoverage/JSCover
11+
lib-cov
12+
13+
# Coverage directory used by tools like istanbul
14+
coverage
15+
16+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
17+
.grunt
18+
19+
# Compiled binary addons (http://nodejs.org/api/addons.html)
20+
build/Release
21+
22+
# Dependency directory
23+
# Commenting this out is preferred by some people, see
24+
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
25+
node_modules
26+
27+
# Users Environment Variables
28+
.lock-wscript
29+
30+
.idea/
31+
*.iml
32+
coverage/
33+
src/
34+
test/
35+
mocha.start.js
36+
webpack.config.js
37+
rethinkdb_data

.travis.yml

-19
This file was deleted.

CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
##### 2.1.0 - 26 October 2015
2+
3+
###### Backwards compatible bug fixes
4+
- #16 - Handle cursor errors by @BBB
5+
6+
###### Other
7+
- Removed Grunt
8+
- Tests now use yield and generators
9+
10+
##### 2.0.3 - 13 October 2015
11+
12+
###### Backwards compatible bug fixes
13+
- #13, #14 - Using `where` in a query without an operator breaks by @internalfx
14+
115
##### 2.0.2 - 09 September 2015
216

317
###### Backwards compatible bug fixes

CONTRIBUTING.md

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing Guide
22

3-
First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
3+
First, support is handled via the [Slack Channel](http://slack.js-data.io) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
44

55
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
66

@@ -22,3 +22,17 @@ When submitting issues on GitHub, please include as much detail as possible to m
2222
1. The `dist/` folder & files will be generated, do NOT commit `dist/*`! They will be committed when a release is cut.
2323
1. Submit your PR and we'll review!
2424
1. Thanks!
25+
26+
#### Have write access?
27+
28+
Here's how to make a release on the `master` branch:
29+
30+
1. Bump `package.json` to the appropriate version.
31+
1. `npm test` must succeed.
32+
1. This time, the built `dist/js-data-rethinkdb.js` file _will_ be committed, so stage its changes.
33+
1. Mention the release version in the commit message, e.g. `Stable Version 1.2.3`
34+
1. Push to master.
35+
1. Create a git tag. Name it the version of the release, e.g. `1.2.3`
36+
- Easiest way is to just create a GitHub Release, which will create the tag for you. Name the Release and the git tag the same thing.
37+
1. `git fetch origin` if you tagged it via GitHub Release, so you can get the tag on your local machine.
38+
1. `npm publish .` (Make sure you got the version bumped correctly!)

Gruntfile.js

-97
This file was deleted.

README.md

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<img src="https://raw.githubusercontent.com/js-data/js-data/master/js-data.png" alt="js-data logo" title="js-data" align="right" width="64" height="64" />
22

3-
## js-data-rethinkdb [![npm version](https://img.shields.io/npm/v/js-data-rethinkdb.svg?style=flat-square)](https://www.npmjs.org/package/js-data-rethinkdb) [![Travis CI](https://img.shields.io/travis/js-data/js-data-rethinkdb.svg?style=flat-square)](https://travis-ci.org/js-data/js-data-rethinkdb) [![npm downloads](https://img.shields.io/npm/dm/js-data-rethinkdb.svg?style=flat-square)](https://www.npmjs.org/package/js-data-rethinkdb) [![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/js-data/js-data-rethinkdb/blob/master/LICENSE)
3+
## js-data-rethinkdb [![Slack Status][sl_b]][sl_l] [![npm version][npm_b]][npm_l] [![Circle CI][circle_b]][circle_l] [![npm downloads][dn_b]][dn_l] [![Coverage Status][cov_b]][cov_l] [![Codacy][cod_b]][cod_l]
44

55
RethinkDB adapter for [js-data](http://www.js-data.io/).
66

@@ -10,20 +10,8 @@ RethinkDB adapter for [js-data](http://www.js-data.io/).
1010
### Example App
1111
[js-data-examples/server/rethinkdb](https://github.com/js-data/js-data-examples/tree/master/server/rethinkdb)
1212

13-
### Project Status
14-
15-
__Latest Release:__ [![Latest Release](https://img.shields.io/github/release/js-data/js-data-rethinkdb.svg?style=flat-square)](https://github.com/js-data/js-data-rethinkdb/releases)
16-
17-
__Status:__
18-
19-
[![Dependency Status](https://img.shields.io/gemnasium/js-data/js-data-rethinkdb.svg?style=flat-square)](https://gemnasium.com/js-data/js-data-rethinkdb) [![Codacity](https://img.shields.io/codacy/69206fcb0df6462ca559610af32fd1fb.svg?style=flat-square)](https://www.codacy.com/public/jasondobry/js-data-rethinkdb/dashboard)
20-
21-
__Supported Platforms:__
22-
23-
[![node version](https://img.shields.io/badge/Node-0.10%2B-green.svg?style=flat-square)](https://github.com/js-data/js-data)
24-
2513
### Quick Start
26-
`npm install --save js-data js-data-rethinkdb`.
14+
`npm install --save js-data js-data-rethinkdb rethinkdbdash`.
2715

2816
```js
2917
var JSData = require('js-data');
@@ -43,7 +31,7 @@ store.registerAdapter('rethinkdb', adapter, { default: true });
4331
[CHANGELOG.md](https://github.com/js-data/js-data-rethinkdb/blob/master/CHANGELOG.md)
4432

4533
### Community
46-
- [Gitter Channel](https://gitter.im/js-data/js-data) - Better than IRC!
34+
- [Slack Channel](http://slack.js-data.io/) - Better than IRC!
4735
- [Announcements](http://www.js-data.io/blog)
4836
- [Mailing List](https://groups.io/org/groupsio/jsdata) - Ask your questions!
4937
- [Issues](https://github.com/js-data/js-data-rethinkdb/issues) - Found a bug? Feature request? Submit an issue!
@@ -52,7 +40,7 @@ store.registerAdapter('rethinkdb', adapter, { default: true });
5240

5341
### Contributing
5442

55-
First, support is handled via the [Gitter Channel](https://gitter.im/js-data/js-data) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
43+
First, support is handled via the [Slack Channel](http://slack.js-data.io/) and the [Mailing List](https://groups.io/org/groupsio/jsdata). Ask your questions there.
5644

5745
When submitting issues on GitHub, please include as much detail as possible to make debugging quick and easy.
5846

@@ -98,3 +86,16 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
9886
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
9987
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
10088
SOFTWARE.
89+
90+
[sl_b]: http://slack.js-data.io/badge.svg
91+
[sl_l]: http://slack.js-data.io
92+
[npm_b]: https://img.shields.io/npm/v/js-data-rethinkdb.svg?style=flat
93+
[npm_l]: https://www.npmjs.org/package/js-data-rethinkdb
94+
[circle_b]: https://img.shields.io/circleci/project/js-data/js-data-rethinkdb/master.svg?style=flat
95+
[circle_l]: https://circleci.com/gh/js-data/js-data-rethinkdb/tree/master
96+
[dn_b]: https://img.shields.io/npm/dm/js-data-rethinkdb.svg?style=flat
97+
[dn_l]: https://www.npmjs.org/package/js-data-rethinkdb
98+
[cov_b]: https://img.shields.io/coveralls/js-data/js-data-rethinkdb/master.svg?style=flat
99+
[cov_l]: https://coveralls.io/github/js-data/js-data-rethinkdb?branch=master
100+
[cod_b]: https://img.shields.io/codacy/69206fcb0df6462ca559610af32fd1fb.svg
101+
[cod_l]: https://www.codacy.com/app/jasondobry/js-data-rethinkdb/dashboard

circle.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
machine:
2+
node:
3+
version: 4.1.0
4+
5+
dependencies:
6+
pre:
7+
- source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list
8+
- wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add -
9+
- sudo apt-get update -qq
10+
- sudo apt-get install rethinkdb -y --force-yes
11+
post:
12+
- sudo rethinkdb --io-threads 2048 --daemon
13+
- ulimit -S -n 2048
14+
- sleep 10
15+
test:
16+
override:
17+
- npm run ci
18+
post:
19+
- sudo killall rethinkdb

0 commit comments

Comments
 (0)