Skip to content

Commit

Permalink
3.0.0-beta.2
Browse files Browse the repository at this point in the history
  • Loading branch information
jmdobry committed Apr 18, 2016
1 parent 1743018 commit 4434ef4
Show file tree
Hide file tree
Showing 33 changed files with 129 additions and 315 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(delete this line) GitHub Issues are NOT for support questions.
(delete this line) GitHub Issues ARE for bug reports, feature requests, and other issues.
(delete this line) GitHub Issues are not for support questions.
(delete this line) GitHub Issues are for bug reports, feature requests, and other issues.
(delete this line) Find out how to Get Support here: http://js-data.io/docs/support.

<your detailed, discussable, actionable, and helpful text goes here>
<your detailed, actionable, and helpful text goes here>

Thanks!
6 changes: 3 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This is the official list of js-data-http project authors.
#
# This file is controlled by scripts/authors.js
#
# Names are formatted as:
# # commits Name or Organization <email address>
# Name or Organization <email address>
#
# The email address is not required for organizations.
#
InternalFX <[email protected]>
Ivan Voznyakovsky <[email protected]>
Jason Dobry <[email protected]>
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
##### 3.0.0-beta.2 - 17 April 2016

Official v3 beta release

###### Other
- Upgraded some devDependencies

##### 3.0.0-alpha.10 - 02 April 2016

###### Backwards compatible bug fixes
Expand Down
19 changes: 9 additions & 10 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# People who have contributed to the js-data-http project.
# This is the official list of js-data-http project contributors.
#
# This file is controlled by scripts/authors.js
# Names are formatted as:
# Name <email address>
#
# Names should be added to this file as:
# [commit count] Name <email address>
1 InternalFX <[email protected]>
1 Ivan Voznyakovsky <[email protected]>
69 Jason Dobry <[email protected]>
1 Josh Drake <[email protected]>
1 RobertHerhold <[email protected]>
3 Tomás Fox <[email protected]>
InternalFX <[email protected]>
Ivan Voznyakovsky <[email protected]>
Jason Dobry <[email protected]>
Josh Drake <[email protected]>
RobertHerhold <[email protected]>
Tomás Fox <[email protected]>
74 changes: 10 additions & 64 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,70 +21,16 @@ and will use axios unless you provide a different http library.
Tested on IE9, Chrome 46, Firefox 41 & Safari 7.1 using
<img src="https://raw.githubusercontent.com/js-data/js-data-localstorage/master/bs.jpg" alt="bs logo" title="browserstack" width="150" height="35" style="vertical-align: middle" />

To get started, visit __[http://js-data.io](http://www.js-data.io)__.
To get started, visit the main website at __[http://js-data.io](http://www.js-data.io/v3.0/docs/js-data-http)__.

## Table of contents
## Links

* [Quick start](#quick-start)
* [Dependencies](#dependencies)
* [Guides and Tutorials](#guides-and-tutorials)
* [API Reference Docs](#api-reference-docs)
* [Community](#community)
* [Support](#support)
* [Contributing](#contributing)
* [License](#license)

## Quick Start
`npm install --save js-data js-data-http` or `bower install --save js-data js-data-http`.

`npm install --save axios js-data js-data-http-node`

__ES6__

```js
// Doesn't make much sense to use DataStore on the server
import {Container} from 'js-data'
import HttpAdapter from 'js-data-http-node'

const adapter = new HttpAdapter()
const container = new Container()

container.registerAdapter('http', adapter, { default: true })

container.defineMapper('school')
container.defineMapper('student')

container.find('school', 1).then(function (school) {
// ...
})
```

## Dependencies

`js-data-http` bundles axios and depends on `js-data`. `js-data-fetch` depends
on `js-data`. `js-data-http-node` depends on `js-data` and optionally axios.

See [JSData's dependencies](https://github.com/js-data/js-data/blob/master/README.md#dependencies).

## Guides and Tutorials

[Get started at http://js-data.io](http://js-data.io)

## API Reference Docs

[Visit http://api.js-data.io](http://api.js-data.io).

## Community

[Explore the Community](http://js-data.io/docs/community).

## Support

[Find out how to Get Support](http://js-data.io/docs/support).

## Contributing

[Read the Contributing Guide](http://js-data.io/docs/contributing).
* [Quick start](http://www.js-data.io/v3.0/docs/js-data-http)
* [Guides and Tutorials](http://www.js-data.io/v3.0/docs/home)
* [API Reference Docs](http://api.js-data.io/js-data-http)
* [Community](http://js-data.io/docs/community)
* [Support](http://js-data.io/docs/support)
* [Contributing](http://js-data.io/docs/contributing)

## License

Expand All @@ -105,7 +51,7 @@ Copyright (c) 2014-2016 js-data-http project authors
[circle_l]: https://circleci.com/gh/js-data/js-data-http/tree/master
[dn_b]: https://img.shields.io/npm/dm/js-data-http.svg?style=flat
[dn_l]: https://www.npmjs.org/package/js-data-http
[cov_b]: https://img.shields.io/coveralls/js-data/js-data-http/master.svg?style=flat
[cov_l]: https://coveralls.io/github/js-data/js-data-http?branch=master
[cov_b]: https://img.shields.io/codecov/c/github/js-data/js-data-http/3.0.svg?style=flat
[cov_l]: https://codecov.io/github/js-data/js-data-http
[cod_b]: https://img.shields.io/codacy/3931bbd8d838463297f70640aa78251b.svg
[cod_l]: https://www.codacy.com/app/jasondobry/js-data-http/dashboard
2 changes: 1 addition & 1 deletion build_examples/node/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var JSData = require('js-data')
var HttpAdapter = require('../../')

var adapter = new HttpAdapter()
var store = new JSData.DataStore()
var store = new JSData.Container()
store.registerAdapter('http', adapter, { default: true })
store.defineMapper('user')

Expand Down
4 changes: 2 additions & 2 deletions build_examples/r.js/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require.config({
paths: {
// customize these ass needed
'js-data-http': '../../node/dist/js-data-http-node',
// customize these as needed
'js-data-http': '../../node/dist/js-data-http',
'js-data': '../../node_modules/js-data/dist/js-data',
}
});
Expand Down
20 changes: 9 additions & 11 deletions dist/js-data-http.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js-data-http.js.map

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions dist/js-data-http.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js-data-http.min.map

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions fetch/AUTHORS

This file was deleted.

12 changes: 0 additions & 12 deletions fetch/CONTRIBUTORS

This file was deleted.

2 changes: 1 addition & 1 deletion fetch/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2016 Jason Dobry
Copyright (c) 2014-2016 js-data-http project authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
21 changes: 14 additions & 7 deletions fetch/dist/js-data-fetch.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fetch/dist/js-data-fetch.js.map

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion fetch/dist/js-data-fetch.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fetch/dist/js-data-fetch.min.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions fetch/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "js-data-fetch",
"description": "HTTP adapter for js-data that uses the fetch API.",
"version": "3.0.0-alpha.10",
"version": "3.0.0-beta.2",
"homepage": "https://github.com/js-data/js-data-http",
"repository": {
"type": "git",
Expand All @@ -19,6 +19,6 @@
"fetch"
],
"peerDependencies": {
"js-data": "^3.0.0-alpha.20"
"js-data": "^3.0.0-beta.1"
}
}
13 changes: 0 additions & 13 deletions node/AUTHORS

This file was deleted.

12 changes: 0 additions & 12 deletions node/CONTRIBUTORS

This file was deleted.

2 changes: 1 addition & 1 deletion node/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2016 Jason Dobry
Copyright (c) 2014-2016 js-data-http project authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
13 changes: 6 additions & 7 deletions node/dist/js-data-http-node.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node/dist/js-data-http-node.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions node/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "js-data-http-node",
"description": "Node.js HTTP adapter for js-data.",
"version": "3.0.0-alpha.10",
"version": "3.0.0-beta.2",
"homepage": "https://github.com/js-data/js-data-http",
"repository": {
"type": "git",
Expand All @@ -19,10 +19,10 @@
"node.js"
],
"dependencies": {
"js-data-adapter": "^0.2.4"
"js-data-adapter": "~0.3.0"
},
"peerDependencies": {
"axios": "^0.9.1",
"js-data": "^3.0.0-alpha.20"
"js-data": "^3.0.0-beta.1"
}
}
Loading

0 comments on commit 4434ef4

Please sign in to comment.