Permalink
Browse files

Merge branch 'master' into beta

Conflicts:
	CHANGELOG
  • Loading branch information...
wycats committed Sep 29, 2013
2 parents b4259a5 + 3017027 commit 2259c273d1d771a059c55dc52f93bc2e2f8cb59b
Showing with 2,948 additions and 269 deletions.
  1. +4 −0 .travis.yml
  2. +4 −1 Assetfile
  3. +36 −2 CHANGELOG
  4. +0 −1 Gemfile
  5. +12 −18 Gemfile.lock
  6. +5 −6 README.md
  7. +14 −3 Rakefile
  8. +239 −6 TRANSITION.md
  9. +1 −0 ember-dev.yml
  10. +10 −0 packages/activemodel-adapter/lib/initializers.js
  11. +2 −0 packages/activemodel-adapter/lib/main.js
  12. +1 −0 packages/activemodel-adapter/lib/system.js
  13. +100 −0 packages/activemodel-adapter/lib/system/active_model_adapter.js
  14. +217 −0 packages/activemodel-adapter/lib/system/active_model_serializer.js
  15. +24 −0 packages/activemodel-adapter/package.json
  16. +62 −0 packages/activemodel-adapter/tests/integration/active_model_adapter_test.js
  17. +503 −0 packages/activemodel-adapter/tests/integration/active_model_serializer_test.js
  18. +1 −1 packages/ember-data/lib/adapters/fixture_adapter.js
  19. +112 −25 packages/ember-data/lib/adapters/rest_adapter.js
  20. +4 −0 packages/ember-data/lib/core.js
  21. +14 −14 packages/ember-data/lib/serializers/json_serializer.js
  22. +174 −21 packages/ember-data/lib/serializers/rest_serializer.js
  23. +17 −30 packages/ember-data/lib/system/adapter.js
  24. +6 −1 packages/ember-data/lib/system/debug/debug_adapter.js
  25. +13 −9 packages/ember-data/lib/system/debug/debug_info.js
  26. +3 −4 packages/ember-data/lib/system/model/attributes.js
  27. +43 −9 packages/ember-data/lib/system/model/model.js
  28. +31 −8 packages/ember-data/lib/system/model/states.js
  29. +4 −2 packages/ember-data/lib/system/record_arrays/adapter_populated_record_array.js
  30. +6 −5 packages/ember-data/lib/system/record_arrays/many_array.js
  31. +8 −0 packages/ember-data/lib/system/record_arrays/record_array.js
  32. +25 −19 packages/ember-data/lib/system/relationships/belongs_to.js
  33. +28 −19 packages/ember-data/lib/system/relationships/ext.js
  34. +7 −3 packages/ember-data/lib/system/relationships/has_many.js
  35. +145 −38 packages/ember-data/lib/system/store.js
  36. +2 −2 packages/ember-data/lib/transforms/string.js
  37. +27 −0 packages/ember-data/tests/integration/adapter/find_test.js
  38. +139 −1 packages/ember-data/tests/integration/adapter/rest_adapter_test.js
  39. +63 −1 packages/ember-data/tests/integration/adapter/store_adapter_test.js
  40. +1 −1 packages/ember-data/tests/integration/debug_adapter_test.js
  41. +91 −0 packages/ember-data/tests/integration/records/collection_save_test.js
  42. +36 −0 packages/ember-data/tests/integration/records/unload_test.js
  43. +39 −2 packages/ember-data/tests/integration/relationships/belongs_to_test.js
  44. +130 −1 packages/ember-data/tests/integration/relationships/has_many_test.js
  45. +114 −0 packages/ember-data/tests/integration/serializers/json_serializer_test.js
  46. +150 −0 packages/ember-data/tests/integration/serializers/rest_serializer_test.js
  47. +25 −0 packages/ember-data/tests/unit/model/relationships_test.js
  48. +19 −0 packages/ember-data/tests/unit/model/rollback_test.js
  49. +21 −0 packages/ember-data/tests/unit/model_test.js
  50. +39 −1 packages/ember-data/tests/unit/store/push_test.js
  51. +1 −1 packages/ember-inflector/lib/ext/string.js
  52. +113 −10 packages/ember-inflector/lib/system/inflector.js
  53. +61 −2 packages/ember-inflector/tests/system/inflector_test.js
  54. +2 −2 tests/ember_configuration.js
View
@@ -1,6 +1,10 @@
---
rvm:
- 1.9.3
+install:
+- "npm install -g defeatureify"
+- "npm install -g yuidocjs"
+- "bundle install --deployment"
script: rake test[all]
after_success: bundle exec rake publish_build
notifications:
View
@@ -1,6 +1,6 @@
require 'ember-dev'
distros = {
- :full => %w(ember-data ember-inflector)
+ :full => %w(ember-data ember-inflector activemodel-adapter)
}
#MEGAHAX
@@ -20,10 +20,13 @@ distros.each do |name, modules|
match "#{name}.js" do
filter VersionInfo
+ filter EmberLicenseFilter
end
# Strip dev code
match "#{name}.prod.js" do
+ filter VersionInfo
+ filter EmberLicenseFilter
filter(EmberStripDebugMessagesFilter) { ["#{name}.prod.js", "min/#{name}.js"] }
end
View
@@ -1,4 +1,38 @@
-*Ember 1.0.0-beta.1 (September 04, 2013)*
+*Ember Data 1.0.0-beta.3 (September 28, 2013)*
+
+* Add `normalizePayload` to `RESTAdapter` for payload normalization that is the same
+ across all requests.
+* Add `record.toJSON()`
+* Normalize relationships on payloads returned from saves.
+* Rename `rootForType` to `pathForType` in `RESTAdapter`
+* Add `serializeIntoHash` in `RESTAdapter` to enable alternate root keys
+* Print Ember Data version in the debug output when Ember boots
+* Add `typeFromRoot`
+* Allow retries of records that were not found
+* Add `pushPayload` for pushing out of band records that still go through the
+ appropriate normalization logic.
+* Add an API for registering custom pluralization rules (see
+ 4df69d14ef2677977f520986070a2fdc45664008)
+* Add `unloadAll` on store
+* Infer the type of hasMany and belongsTo relationships by inflecting the key
+* Polymorphic relationship improvements
+* ActiveModel Adapter for working with Rails-like servers, not included by default
+ in the Ember Data build but available separately.
+* `store.metadataFor(type)` to get metadata provided by `findAll`.
+* `RecordArray#save`
+* `store.getById` returns null if a record isn't found
+* Fix a number of rollback-related cases
+* Fix async belongsTo
+* A number of `links`-related fixes
+* Ensure that `didLoad` fires when a record is created for the first time
+* Support primary and sideloaded data of the same type to be returned from array
+ lookups (via `posts` and `_posts`).
+* IE8 fixes
+* Add `record.changedAttributes()`
+* Properly handle absolute and relative links in the `RESTAdapter`
+* Records become clean again if their properties are set back to the original values
+
+*Ember 1.0.0-beta.2 (September 04, 2013)*
* Add support for `host` and `namespace` in the RESTAdapter
* Always use shorthand (`post`, not `App.Post`) in models
@@ -15,7 +49,7 @@
* `store.update` to update some, but not all attributes
* Thanks to Paul Chavard, Toran Billups, Bradley Priest, Kasper Tidemann, Yann Mainier,
Dali Zheng, Jeremy Green, Robert Jackson, Joe Bartels, Alexandre de Oliveria,
- Floren Jaby, Gordon Hempton, Ivan Vanderbyl, Johannel Würbach, Márcio Júnior,
+ Floren Jaby, Gordon Hempton, Ivan Vanderbyl, Johannes Würbach, Márcio Júnior,
Nick Ragaz, Ricardo Mendes, Ryunosuke SATO, Sylvain Mina, and ssured
*Ember 1.0.0-beta.1 (September 01, 2013)*
View
@@ -5,6 +5,5 @@ gem 'ember-dev', :git => 'https://github.com/emberjs/ember-dev.git', :branch =>
gem 'ember-source', '~> 1.0'
gem 'puma'
-gem 'thin'
gemspec
View
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/emberjs/ember-dev.git
- revision: 534ffdfc4b3468edb3951e9e2012cead25b36997
+ revision: 0c0743979a05a81cecf82d90bfed660c5645f25d
branch: master
specs:
ember-dev (0.1)
@@ -9,18 +9,19 @@ GIT
execjs
grit
kicker
+ puma
rack
rake-pipeline (~> 0.8.0)
rake-pipeline-web-filters (~> 0.7.0)
uglifier
GIT
remote: https://github.com/livingsocial/rake-pipeline.git
- revision: 65b1e744defa208e313703d89f3453447cc103b2
+ revision: a75d96fbadcc659a35a0ae59212e0bc60b58cc54
specs:
rake-pipeline (0.8.0)
json
- rake (~> 10.0.0)
+ rake (~> 10.1.0)
thor
PATH
@@ -32,17 +33,15 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- aws-sdk (1.16.1)
+ aws-sdk (1.19.0)
json (~> 1.4)
- nokogiri (< 1.6.0)
+ nokogiri (>= 1.4.4, < 1.6.0)
uuidtools (~> 2.1)
colored (1.2)
- daemons (1.1.9)
diff-lcs (1.2.4)
ember-source (1.0.0)
handlebars-source (= 1.0.12)
- eventmachine (1.0.3)
- execjs (2.0.1)
+ execjs (2.0.2)
ffi (1.9.0)
grit (2.5.0)
diff-lcs (~> 1.1)
@@ -52,30 +51,26 @@ GEM
json (1.8.0)
kicker (2.6.1)
listen
- listen (1.3.0)
+ listen (1.3.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
mime-types (1.25)
- multi_json (1.7.9)
+ multi_json (1.8.0)
nokogiri (1.5.10)
posix-spawn (0.3.6)
- puma (2.4.1)
+ puma (2.6.0)
rack (>= 1.1, < 2.0)
rack (1.5.2)
- rake (10.0.4)
+ rake (10.1.0)
rake-pipeline-web-filters (0.7.0)
rack
rake-pipeline (~> 0.6)
rb-fsevent (0.9.3)
- rb-inotify (0.9.1)
+ rb-inotify (0.9.2)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
- thin (1.5.1)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
thor (0.18.1)
uglifier (2.2.1)
execjs (>= 0.3.0)
@@ -91,4 +86,3 @@ DEPENDENCIES
ember-source (~> 1.0)
puma
rake-pipeline!
- thin
View
@@ -10,7 +10,7 @@ Ember Data provides a central Data Store, which can be configured with a range o
provided Adapters, but two core Adapters are provided: the RESTAdapter and BasicAdapter.
The RESTAdapter is configured for use by default. You can read more about it in
-the [Guides](http://emberjs.com/guides/models/the-rest-adapter/). It provides a fully
+the [Guides](http://emberjs.com/guides/models/connecting-to-an-http-server/). It provides a fully
RESTful mechanism for communicating with your persistence layer, and is the preferred
and recommened choice for use with Ember Data.
@@ -30,16 +30,15 @@ Yes.
#### Is It "Production Ready™"?
No. The API should not be considered stable until 1.0. Breaking changes,
-indexed by date, are listed in [`BREAKING_CHANGES.md`](https://github.com/emberjs/data/blob/master/BREAKING_CHANGES.md).
+and how to update accordingly, are listed in [`TRANSITION.md`](https://github.com/emberjs/data/blob/master/TRANSITION.md).
-A [guide is provided on the Ember.js site](http://emberjs.com/guides/models/) that is accurate as of revision 12.
+A [guide is provided on the Ember.js site](http://emberjs.com/guides/models/) that is accurate as of Ember Data 1.0 beta.
#### Getting ember-data
-The latest passing build from the "master" branch is available on [builds.emberjs.com](http://builds.emberjs.com):
+The latest passing build from the "master" branch is available on [http://emberjs.com/builds/#/canary/latest](http://emberjs.com/builds/#/canary/latest).
-* [Development](http://builds.emberjs.com.s3.amazonaws.com/ember-data-latest.js)
-* [Minified](http://builds.emberjs.com.s3.amazonaws.com/ember-data-latest.min.js)
+Similarly the latest passing build from the "beta" branch can be found on [http://emberjs.com/builds/#/beta/latest](http://emberjs.com/builds/#/beta/latest)
You also have the option to build ember-data.js yourself. Clone the repository, run `bundle` then `rake dist`. You'll find ember-data.js in the `dist` directory.
View
@@ -1,19 +1,30 @@
require "bundler/setup"
require "ember-dev/tasks"
+require 'pathname'
+require 'fileutils'
+
directory "tmp"
+task :docs => "ember:docs"
task :clean => "ember:clean"
task :dist => "ember:dist"
task :test, [:suite] => "ember:test"
task :default => :dist
-task :publish_build do
- root = File.expand_path(File.dirname(__FILE__)) + '/dist/'
+task :publish_build => [:dist, :docs] do
+ root_dir = Pathname.new(__FILE__).dirname
+ dist_dir = root_dir.join('dist')
+
+ FileUtils.cp root_dir.join('docs', 'build', 'data.json'),
+ dist_dir.join('ember-data-docs.json')
+
+ files = %w{ember-data.js ember-data-docs.json}
+
EmberDev::Publish.to_s3({
:access_key_id => ENV['S3_ACCESS_KEY_ID'],
:secret_access_key => ENV['S3_SECRET_ACCESS_KEY'],
:bucket_name => ENV['S3_BUCKET_NAME'],
- :files => [ root + 'ember-data.js' ]
+ :files => files.map { |f| dist_dir.join(f) }
})
end
Oops, something went wrong.

0 comments on commit 2259c27

Please sign in to comment.