Commit Graph

1576 Commits

Author SHA1 Message Date
Benjamin Fleischer
bc4805cbc1 Bump version to v0.10.8 2018-11-01 16:24:08 -05:00
Benjamin Fleischer
f1a2ec7f99 Add change to changelog 2018-11-01 16:19:43 -05:00
Benjamin Fleischer
09264da273 Merge branch 'fix_thread_safety_bug' into 0-10-stable 2018-11-01 16:17:02 -05:00
Benjamin Fleischer
238d7921ec Lint per rubocop 2018-11-01 14:51:18 -05:00
Benjamin Fleischer
b358271ef5 Note that we dup the entire reflection instance 2018-11-01 14:21:59 -05:00
LongCB
c7e847fc72 Fix thread unsafe behavior 2018-11-01 14:20:47 -05:00
Benjamin Fleischer
127b04ba33 Add failing test for reflection thread safety bug 2018-11-01 13:57:07 -05:00
Benjamin Fleischer
cb67434b46
Merge pull request #2279 from mkon/link-conditions
Support conditions in link statements
2018-10-31 13:27:28 -05:00
Konstantin Munteanu
572f11b7e0 value is always a link 2018-10-25 09:54:36 +02:00
Konstantin Munteanu
ca6c009273 typos 2018-10-25 09:45:34 +02:00
Konstantin Munteanu
0d3999c36d Support conditions in link statements 2018-10-25 09:45:34 +02:00
Benjamin Fleischer
05e5ba6939
Merge pull request #2281 from alvincrespo/alvincrespo-patch-1
Fix documentation around class name comparison
2018-10-24 17:05:19 -05:00
Benjamin Fleischer
4b2b9ef730
Merge pull request #2297 from vnbrs/patch-1
Remove unnecessary line break from exception message
2018-10-24 17:02:19 -05:00
Benjamin Fleischer
01ecc5dea3 Update Changelog 2018-10-24 17:01:25 -05:00
Benjamin Fleischer
12724807e9 Merge branch 'Hirurg103-0-10-stable' into 0-10-stable 2018-10-24 16:59:59 -05:00
Vinicius Brasil
bcf21ea0a6
Remove unnecessary line break from exception message
This removes the unnecessary line break from the exception message. Example:

```
Cannot infer root key from collection type. Please\n
specify the root or each_serializer option, or render a JSON String
```
2018-10-24 14:10:59 -03:00
Dzmitry
db4e5267fd Fix the bug that serializer could not be found if the association's serializer is namespaced but the model is not
[fix #2295]
2018-10-20 15:42:11 +03:00
Benjamin Fleischer
eb865c276d Update Changelog 2018-10-11 15:03:44 -05:00
Benjamin Fleischer
506636abfb Merge branch 'f-mer-0-10-stable-eager_load' into 0-10-stable 2018-10-11 15:01:41 -05:00
Fabian Mersch
65313b901b Remove obsolete autoloads 2018-10-11 21:32:12 +02:00
Fabian Mersch
2a8b9f4105 Eager load modules on boot
Using ActiveModelSerializers with a threaded web server eg. Puma
uninitialized constant errors are thrown. Leaving this article for
reference:
http://blog.plataformatec.com.br/2012/08/eager-loading-for-greater-good/.
2018-10-11 21:32:12 +02:00
Benjamin Fleischer
fce8be0dc0
Merge pull request #2290 from rails-api/minitest_ci
Minitest 5.11 breaks; needs something like ::Minitest::Result.from
2018-10-10 10:59:37 -05:00
Benjamin Fleischer
f5f5d4db9e Fix Rails master 2018-10-10 09:39:48 -05:00
Benjamin Fleischer
ed97e94e71 Exclude deprecated rubies 2018-10-09 15:14:40 -05:00
Benjamin Fleischer
4f9d64096b Minitest 5.11 breaks; needs something like ::Minitest::Result.from 2018-10-09 14:39:41 -05:00
Alvin Crespo
3a200d7fe1
Minor doc update
Use model.class.name to do the correct comparison
2018-09-07 14:28:21 -04:00
Benjamin Fleischer
f3a19bd515
Merge pull request #2260 from abhaynikam/2258-fix-class-name-documentation
[docs] Fix class name documentation
2018-06-22 16:51:55 -05:00
Benjamin Fleischer
9c77bb6a60
Merge pull request #2263 from vthomas2007/fix-readme-lint-links
Fix Lint links in README
2018-06-22 16:50:53 -05:00
Vince Thomas
76936e7bb9 Fix Lint links in README 2018-06-21 09:46:23 -04:00
Abhay Nikam
4559774d60 Updated the defination for the class_name in documentation 2018-06-21 08:49:33 +05:30
Abhay Nikam
993a48fdcf wordsmitting 2018-06-07 10:05:21 +05:30
Abhay Nikam
65cf4836c8 Updated class_name defination. 2018-06-07 10:04:03 +05:30
Abhay Nikam
f3b202746b Added examples to use class_name options for association. 2018-06-07 09:58:48 +05:30
Benjamin Fleischer
41f2e11c4d
Merge pull request #2222 from rails-api/ci_fix
CI looks like JRuby is still failing sometimes
2017-11-19 16:21:26 -06:00
Benjamin Fleischer
5fe473fe0d JRuby AR adapter are now 5x.0 for Rails 5.x+ 2017-11-19 15:34:13 -06:00
Benjamin Fleischer
d274295ee5 Merge branch 'quake-collection_cache' into 0-10-stable 2017-11-19 11:50:41 -06:00
quake wang
a9ea81a831 resolve collection cache error 2017-11-19 11:33:48 -06:00
Benjamin Fleischer
ca531789c3 Bump to 0.10.7; update changelog 2017-11-14 20:50:51 -06:00
Benjamin Fleischer
c41e243ed8
Merge pull request #2218 from rails-api/opt_in_belongs_to_uses_foreign_key
Fix 0.10.6 regression; make using belongs_to on self opt-in
2017-11-13 09:40:37 -06:00
Benjamin Fleischer
b41451c9bf Make tests pass 2017-11-13 08:36:23 -06:00
Benjamin Fleischer
3dd6cccb4d Fix 0.10.6 regression; make using belongs_to on self opt-in 2017-11-13 08:36:23 -06:00
Benjamin Fleischer
00a47d3da4
Prove CI broken (#2220)
* Remove appveyor rubygems/bundler stuff
* Try specifying different jdbc adapter
* Attempt to fix failing JRuby test I cannot reproduce

```
bundle exec rake ci
Picked up _JAVA_OPTIONS: -Xmx2048m -Xms512m
/home/travis/.rvm/rubies/jruby-9.1.9.0/bin/jruby -w -I"lib:lib:test" -r./test/test_helper.rb  -w -I"/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/rake-11.3.0/lib" "/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/rake-11.3.0/lib/rake/rake_test_loader.rb" "test/**/*_test.rb"

ActiveModelSerializers::Adapter::JsonApi::PaginationLinksTest#test_raises_descriptive_error_when_serialization_context_unset [/home/travis/build/rails-api/active_model_serializers/test/adapter/json_api/pagination_links_test.rb:186]:
[] exception expected, not
Class: <ActiveModelSerializers::Adapter::JsonApi::PaginationLinks::MissingSerializationContextError>
Message: <" JsonApi::PaginationLinks requires a ActiveModelSerializers::SerializationContext.\n Please pass a ':serialization_context' option or\n override CollectionSerializer#paginated? to return 'false'.\n">
---Backtrace---
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/adapter/json_api/pagination_links.rb:14:in `block in initialize'
org/jruby/RubyHash.java:1187:in `fetch'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/adapter/json_api/pagination_links.rb:13:in `initialize'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/adapter/json_api.rb:520:in `pagination_links_for'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/adapter/json_api.rb:147:in `success_document'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/adapter/json_api.rb:59:in `serializable_hash'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/adapter/base.rb:59:in `as_json'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/serializable_resource.rb:8:in `as_json'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/logging.rb:69:in `block in as_json'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:117:in `call'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:555:in `block in compile'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:505:in `call'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:498:in `block in around'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:343:in `block in simple'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/logging.rb:22:in `block in instrument_rendering'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/logging.rb:79:in `block in notify_render'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/notifications.rb:164:in `block in instrument'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/notifications/instrumenter.rb:20:in `instrument'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/notifications.rb:164:in `instrument'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/logging.rb:78:in `notify_render'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/logging.rb:21:in `block in instrument_rendering'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/logging.rb:97:in `tag_logger'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/logging.rb:20:in `block in instrument_rendering'
org/jruby/RubyBasicObject.java:1724:in `instance_exec'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:441:in `block in make_lambda'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:342:in `block in simple'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:497:in `block in around'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:505:in `call'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:92:in `__run_callbacks__'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:778:in `_run_render_callbacks'
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/activesupport-4.2.10/lib/active_support/callbacks.rb:81:in `run_callbacks'
/home/travis/build/rails-api/active_model_serializers/lib/active_model_serializers/logging.rb:68:in `block in as_json'
/home/travis/build/rails-api/active_model_serializers/test/adapter/json_api/pagination_links_test.rb:187:in `block in test_raises_descriptive_error_when_serialization_context_unset'

Command failed with status (1): [ruby -w -I"lib:lib:test" -r./test/test_helper.rb  -w -I"/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/rake-11.3.0/lib" "/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/rake-11.3.0/lib/rake/rake_test_loader.rb" "test/**/*_test.rb" ]
/home/travis/build/rails-api/active_model_serializers/vendor/bundle/jruby/2.3.0/gems/rake-11.3.0/exe/rake:27:in `<main>'
Tasks: TOP => ci => default => test
(See full trace by running task with --trace)
```
2017-11-13 08:34:56 -06:00
Benjamin Fleischer
3c5e11bb0f
Merge pull request #2216 from rails-api/serialize_resource_with_nil_id
Fix: Serialize resource type for unpersisted records (blank id)
2017-11-01 10:36:22 -05:00
Benjamin Fleischer
33ec26fa12 Merge branch 'stratigos-patch-1' into 0-10-stable 2017-10-31 16:46:20 -05:00
Todd Morningstar
0bbeeb384e Update serializers.md
* Add note that any controller reference is acceptable for `serialization_scope`
 * Add note about `ActionController::API` and `view_context` set to `nil`, with respect to accessing helpers in a Serializer
 * refs #2144
 * Update CHANGELOG.md
2017-10-31 17:15:43 -04:00
Benjamin Fleischer
196216b250
Merge pull request #2212 from rails-api/remove_legacy_embeds
Remove legacy has_many_embed_ids test [ci skip]
2017-10-31 14:54:02 -05:00
Benjamin Fleischer
51f2643f40 Style 2017-10-31 14:48:27 -05:00
Benjamin Fleischer
9745a2f735 Fix: ResourceIdentifier.for_type_with_id can serialize unpersisted resources 2017-10-31 14:47:55 -05:00
Benjamin Fleischer
5916014b48 Fix: resource object identifier with nil id excludes id 2017-10-31 14:34:30 -05:00
Benjamin Fleischer
92dde58f5f Assert serializer-defined types are not inflected 2017-10-31 14:31:33 -05:00