Merge branch 'master' into release

CHANGELOG.md

@@ -1,3 +1,17 @@
+##### 3.0.0-rc.5 - 26 September 2016
+
+###### Backwards compatible changes
+- Fixed some edge cases with Schemas related to anyOf, oneOf, allOf, and additionalProperties
+- #386 - Added intermediate `SimpleStore` class between `Container` and `DataStore`.
+- #393 - Added `Schema#pick` method
+
+###### Bug fixes
+- #374 - revert() after a save() does not work with Schema defined properties
+- #387 - Switch to passing only the current-change in 'changes' emit by @pik
+
+###### Other
+- #406 - refactor(test): splits tests into smaller ones by @stalniy
+
 ##### 3.0.0-rc.4 - 03 August 2016
 
 ###### Bug fixes

README.md

@@ -1,28 +1,28 @@
 <img src="https://raw.githubusercontent.com/js-data/js-data/master/js-data.png" alt="js-data logo" title="js-data" align="right" width="96" height="96" />
 
-# [js-data v3](http://www.js-data.io/) [![Slack Status][b1]][b2] [![npm version][b3]][b4] [![npm downloads][b5]][b6] [![coverage][bcov]][lcov]
+# [js-data v3](http://www.js-data.io/) [![Slack][1]][2] [![NPM][3]][4] [![Downloads][5]][6] [![Coverage][7]][8]
 
 | __Browser tests__ | __Node.js tests__ |
 | ---------------------------------|----|
-| [![Sauce Test Status][b7]][b8] | [![Circle CI][b9]][b10] [![Circle CI][b11]][b10] [![Circle CI][b12]][b10] [![Circle CI][b13]][b10] [![Circle CI][b14]][b10] [![Circle CI][b15]][b10] |
-
-[b1]: http://slack.js-data.io/badge.svg
-[b2]: http://slack.js-data.io
-[b3]: https://img.shields.io/npm/v/js-data.svg?style=flat
-[b4]: https://www.npmjs.org/package/js-data
-[b5]: https://img.shields.io/npm/dm/js-data.svg?style=flat
-[b6]: https://www.npmjs.org/package/js-data
-[b7]: https://saucelabs.com/browser-matrix/jsdata.svg
-[b8]: https://saucelabs.com/u/jsdata
-[b9]: https://img.shields.io/circleci/project/js-data/js-data.svg
-[b10]: https://circleci.com/gh/js-data/js-data
-[b11]: https://img.shields.io/badge/Node.js-v6.x-brightgreen.svg
-[b12]: https://img.shields.io/badge/Node.js-v5.x-brightgreen.svg
-[b13]: https://img.shields.io/badge/Node.js-v4.x-brightgreen.svg
-[b14]: https://img.shields.io/badge/Node.js-v0.12.x-brightgreen.svg
-[b15]: https://img.shields.io/badge/Node.js-v0.10.x-brightgreen.svg
-[bcov]: https://img.shields.io/codecov/c/github/js-data/js-data/master.svg
-[lcov]: https://codecov.io/github/js-data/js-data
+| [![Tests][9]][10] | [![Tests][11]][12] [![Tests][13]][12] [![Tests][14]][12] [![Tests][15]][12] [![Tests][16]][12] [![Tests][17]][12] |
+
+[1]: http://slack.js-data.io/badge.svg
+[2]: http://slack.js-data.io
+[3]: https://img.shields.io/npm/v/js-data.svg?style=flat
+[4]: https://www.npmjs.org/package/js-data
+[5]: https://img.shields.io/npm/dm/js-data.svg?style=flat
+[6]: https://www.npmjs.org/package/js-data
+[7]: https://img.shields.io/codecov/c/github/js-data/js-data/master.svg
+[8]: https://codecov.io/github/js-data/js-data
+[9]: https://saucelabs.com/browser-matrix/jsdata.svg
+[10]: https://saucelabs.com/u/jsdata
+[11]: https://img.shields.io/circleci/project/js-data/js-data.svg
+[12]: https://circleci.com/gh/js-data/js-data
+[13]: https://img.shields.io/badge/Node.js-v6.x-brightgreen.svg
+[14]: https://img.shields.io/badge/Node.js-v5.x-brightgreen.svg
+[15]: https://img.shields.io/badge/Node.js-v4.x-brightgreen.svg
+[16]: https://img.shields.io/badge/Node.js-v0.12.x-brightgreen.svg
+[17]: https://img.shields.io/badge/Node.js-v0.10.x-brightgreen.svg
 
 __JSData v3 release candidate is stable. More features may be added before 3.0.0,
 and there might be some bugs. Some adapters still need to be updated to work
@@ -40,23 +40,34 @@ data API on the server and the client. JSData employs conventions for rapid
 development, but allows for endless customization in order to meet your
 particular needs.
 
-To get started, visit the main website at __[http://js-data.io](http://www.js-data.io/v3.0/docs/home)__.
+### Just getting started?
+
+Start with the [JSData Getting Started Tutorial][18] or checkout the [API Reference Documentation][19].
+
+### Need help?
+
+Please [post a question][20] on Stack Overflow. **This is the preferred method.**
+
+You can also chat with folks on the [Slack Channel][21]. If you end up getting
+your question answered, please still consider consider posting your question to
+Stack Overflow (then possibly answering it yourself). Thanks!
+
+### Want to contribute?
 
-## Links
+Awesome! You can get started over at the [Contributing guide][22].
 
-* [Quick start](http://www.js-data.io/v3.0/docs/home#quick-start) - Get started in 5 minutes
-* [Guides and Tutorials](http://www.js-data.io/v3.0/docs/installation) - Learn how to use JSData
-* [API Reference Docs](http://api.js-data.io) - Explore components, methods, options, etc.
-* [Community & Support](http://js-data.io/docs/community) - Find solutions and chat with the community
-* [General Contributing Guide](http://js-data.io/docs/contributing) - Give back and move the project forward
-  * [Contributing to js-data core](https://github.com/js-data/js-data/blob/master/.github/CONTRIBUTING.md)
+And thank you!
 
-## License
+### License
 
-The MIT License (MIT)
+[The MIT License (MIT)][23]
 
-Copyright (c) 2014-2016 js-data project authors
+Copyright (c) 2014-2016 [js-data project authors][24]
 
-* [LICENSE](https://github.com/js-data/js-data/blob/master/LICENSE)
-* [AUTHORS](https://github.com/js-data/js-data/blob/master/AUTHORS)
-* [CONTRIBUTORS](https://github.com/js-data/js-data/blob/master/CONTRIBUTORS)
+[18]: http://www.js-data.io/v3.0/docs/home
+[19]: http://api.js-data.io/
+[20]: http://stackoverflow.com/questions/tagged/jsdata
+[21]: http://slack.js-data.io/
+[22]: https://github.com/js-data/js-data/blob/master/.github/CONTRIBUTING.md
+[23]: https://github.com/js-data/js-data/blob/master/LICENSE
+[24]: https://github.com/js-data/js-data/blob/master/AUTHORS

karma.conf.js

@@ -95,6 +95,7 @@ module.exports = function (config) {
       'lib/mindex/index.js',
       'src/Collection.js',
       'src/Container.js',
+      'src/SimpleStore.js',
       'src/LinkedCollection.js',
       'src/DataStore.js',
       'src/index.js',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "js-data",
   "description": "Robust, framework-agnostic in-memory data store.",
-  "version": "3.0.0-rc.4",
+  "version": "3.0.0-rc.5",
   "homepage": "http://www.js-data.io",
   "repository": {
     "type": "git",
@@ -68,19 +68,20 @@
     "release": "npm test && npm run doc && repo-tools updates && repo-tools changelog && repo-tools authors"
   },
   "devDependencies": {
-    "babel-plugin-syntax-async-functions": "6.8.0",
+    "babel-plugin-external-helpers": "^6.8.0",
+    "babel-plugin-syntax-async-functions": "6.13.0",
     "babel-plugin-transform-es2015-modules-umd": "6.12.0",
-    "babel-plugin-transform-regenerator": "6.11.4",
-    "js-data-repo-tools": "0.5.5",
-    "karma": "1.1.2",
+    "babel-plugin-transform-regenerator": "6.14.0",
+    "js-data-repo-tools": "0.5.7",
+    "karma": "1.3.0",
     "karma-babel-preprocessor": "6.0.1",
     "karma-chai": "0.1.0",
-    "karma-chrome-launcher": "1.0.1",
-    "karma-mocha": "1.1.1",
-    "karma-phantomjs-launcher": "1.0.1",
+    "karma-chrome-launcher": "2.0.0",
+    "karma-mocha": "1.2.0",
+    "karma-phantomjs-launcher": "1.0.2",
     "karma-sauce-launcher": "1.0.0",
     "karma-sinon": "1.0.5",
-    "phantomjs-prebuilt": "2.1.10",
-    "uglify-js": "2.7.0"
+    "phantomjs-prebuilt": "2.1.12",
+    "uglify-js": "2.7.3"
   }
-}
+}

rollup.config.js

@@ -7,8 +7,11 @@ export default {
     babel({
       babelrc: false,
       presets: [
-        'es2015-rollup'
+        [
+          'es2015', { 'modules': false }
+        ]
       ],
+      plugins: ['external-helpers'],
       exclude: 'node_modules/**'
     })
   ]

src/Collection.js

@@ -58,7 +58,7 @@ const COLLECTION_DEFAULTS = {
  *
  * @example <caption>Collection#constructor</caption>
  * // import {Collection, Record} from 'js-data'
- * const JSData = require('js-data@3.0.0-beta.10')
+ * const JSData = require('js-data@3.0.0-rc.4')
  * const {Collection, Record} = JSData
  * console.log('Using JSData v' + JSData.version.full)
  *
@@ -102,7 +102,7 @@ function Collection (records, opts) {
      *
      * @example <caption>Collection#mapper</caption>
      * // Normally you would do: import {Collection, Mapper} from 'js-data'
-     * const JSData = require('js-data@3.0.0-beta.10')
+     * const JSData = require('js-data@3.0.0-rc.4')
      * const {Collection, Mapper} = JSData
      * console.log('Using JSData v' + JSData.version.full)
      *
@@ -418,7 +418,7 @@ export default Component.extend({
    *
    * @example <caption>Collection#filter</caption>
    * // Normally you would do: import {Collection} from 'js-data'
-   * const JSData = require('js-data@3.0.0-beta.10')
+   * const JSData = require('js-data@3.0.0-rc.4')
    * const {Collection} = JSData
    * console.log('Using JSData v' + JSData.version.full)
    *
@@ -883,7 +883,7 @@ export default Component.extend({
  * Create a subclass of this Collection:
  * @example <caption>Collection.extend</caption>
  * // Normally you would do: import {Collection} from 'js-data'
- * const JSData = require('js-data@3.0.0-beta.10')
+ * const JSData = require('js-data@3.0.0-rc.4')
  * const {Collection} = JSData
  * console.log('Using JSData v' + JSData.version.full)
  *

src/Component.js

@@ -32,7 +32,7 @@ function Component (opts) {
    *
    * @example <caption>Component#debug</caption>
    * // Normally you would do: import {Component} from 'js-data'
-   * const JSData = require('js-data@3.0.0-beta.10')
+   * const JSData = require('js-data@3.0.0-rc.4')
    * const {Component} = JSData
    * console.log('Using JSData v' + JSData.version.full)
    *
@@ -70,7 +70,7 @@ export default Settable.extend({
  *
  * @example <caption>Component.extend</caption>
  * // Normally you would do: import {Component} from 'js-data'
- * const JSData = require('js-data@3.0.0-beta.10')
+ * const JSData = require('js-data@3.0.0-rc.4')
  * const {Component} = JSData
  * console.log('Using JSData v' + JSData.version.full)
  *
@@ -203,7 +203,7 @@ utils.logify(Component.prototype)
  *
  * @example <caption>Component#emit</caption>
  * // import {Collection, DataStore} from 'js-data'
- * const JSData = require('js-data@3.0.0-beta.10')
+ * const JSData = require('js-data@3.0.0-rc.4')
  * const {Collection, DataStore} = JSData
  *
  * const collection = new Collection()

src/Container.js

@@ -905,7 +905,7 @@ export const proxiedMapperMethods = [
  *
  * @example <caption>Container#constructor</caption>
  * // import {Container} from 'js-data'
- * const JSData = require('js-data@3.0.0-beta.10')
+ * const JSData = require('js-data@3.0.0-rc.4')
  * const {Container} = JSData
  * console.log('Using JSData v' + JSData.version.full)
  *
@@ -957,7 +957,7 @@ export function Container (opts) {
      *
      * @example <caption>Container#mapperClass</caption>
      * // import {Container, Mapper} from 'js-data'
-     * const JSData = require('js-data@3.0.0-beta.10')
+     * const JSData = require('js-data@3.0.0-rc.4')
      * const {Container} = JSData
      * console.log('Using JSData v' + JSData.version.full)
      *
@@ -990,7 +990,7 @@ export function Container (opts) {
    *
    * @example <caption>Container#mapperDefaults</caption>
    * // import {Container} from 'js-data'
-   * const JSData = require('js-data@3.0.0-beta.10')
+   * const JSData = require('js-data@3.0.0-rc.4')
    * const {Container} = JSData
    * console.log('Using JSData v' + JSData.version.full)
    *
@@ -1025,7 +1025,7 @@ const props = {
    *
    * @example <caption>Container#on</caption>
    * // import {Container} from 'js-data'
-   * const JSData = require('js-data@3.0.0-beta.10')
+   * const JSData = require('js-data@3.0.0-rc.4')
    * const {Container} = JSData
    * console.log('Using JSData v' + JSData.version.full)
    *
@@ -1061,7 +1061,7 @@ const props = {
    *
    * @example <caption>Container#as</caption>
    * // import {Container} from 'js-data'
-   * const JSData = require('js-data@3.0.0-beta.10')
+   * const JSData = require('js-data@3.0.0-rc.4')
    * const {Container} = JSData
    * console.log('Using JSData v' + JSData.version.full)
    *
@@ -1106,7 +1106,7 @@ const props = {
    *
    * @example <caption>Container#defineMapper</caption>
    * // import {Container} from 'js-data'
-   * const JSData = require('js-data@3.0.0-beta.10')
+   * const JSData = require('js-data@3.0.0-rc.4')
    * const {Container} = JSData
    * console.log('Using JSData v' + JSData.version.full)
    *
@@ -1223,7 +1223,7 @@ const props = {
    *
    * @example <caption>Container#getMapper</caption>
    * // import {Container} from 'js-data'
-   * const JSData = require('js-data@3.0.0-beta.10')
+   * const JSData = require('js-data@3.0.0-rc.4')
    * const {Container} = JSData
    * console.log('Using JSData v' + JSData.version.full)
    *
@@ -1254,7 +1254,7 @@ const props = {
    *
    * @example <caption>Container#getMapperByName</caption>
    * // import {Container} from 'js-data'
-   * const JSData = require('js-data@3.0.0-beta.10')
+   * const JSData = require('js-data@3.0.0-rc.4')
    * const {Container} = JSData
    * console.log('Using JSData v' + JSData.version.full)
    *
@@ -1319,7 +1319,7 @@ Component.extend(props)
  * Create a subclass of this Container:
  * @example <caption>Container.extend</caption>
  * // Normally you would do: import {Container} from 'js-data'
- * const JSData = require('js-data@3.0.0-beta.10')
+ * const JSData = require('js-data@3.0.0-rc.4')
  * const {Container} = JSData
  * console.log('Using JSData v' + JSData.version.full)
  *