Santiago Pastorino
|
d5308b4d0b
|
Remove old unneeded code
|
2013-10-26 03:01:17 -02:00 |
|
Santiago Pastorino
|
1eb09476ef
|
Revert "Merge pull request #422 from marclove/reduce-serializer-code-complexity"
This reverts commit 449849516b, reversing
changes made to e103569c22.
Conflicts:
lib/active_model/serializer.rb
|
2013-10-26 01:19:15 -02:00 |
|
Arthur Neves
|
303ac21428
|
Small refactoring
|
2013-10-25 19:58:06 -04:00 |
|
Arthur Nogueira Neves
|
449849516b
|
Merge pull request #422 from marclove/reduce-serializer-code-complexity
Reduce duplication; make accessor definition more explicit
|
2013-10-25 16:55:01 -07:00 |
|
Santiago Pastorino
|
e103569c22
|
Merge pull request #419 from whatsthebeef/master
Added note that objects will not be side-loaded if root is set to false
|
2013-10-25 16:16:12 -07:00 |
|
Marc Love
|
5ac6e626b5
|
Reduce complexity and duplication; make accessor definition more explicit
|
2013-10-25 15:33:24 -07:00 |
|
John Bower
|
3df8667708
|
Added note that objects will not be side-loaded if root is set to false
|
2013-10-25 16:32:23 -05:00 |
|
Arthur Nogueira Neves
|
74374ae5af
|
Merge pull request #418 from teeparham/patch-3
readme: move "Design and Implementation Guidelines" to the bottom
|
2013-10-25 09:15:49 -07:00 |
|
Tee Parham
|
6ed4598953
|
readme: move "Design and Implementation Guidelines" to the bottom
* rename "Design and Implementation" section to "Design and Implementation Guidelines"
|
2013-10-25 10:07:35 -06:00 |
|
Arthur Nogueira Neves
|
c4902f778c
|
Merge pull request #417 from teeparham/patch-2
update Readme
|
2013-10-25 08:57:01 -07:00 |
|
Tee Parham
|
fa3213e231
|
readme: clarify purpose
|
2013-10-25 09:36:27 -06:00 |
|
Tee Parham
|
b65715d5f8
|
split readme badges onto different lines
|
2013-10-25 09:26:28 -06:00 |
|
Santiago Pastorino
|
439643ba5a
|
Fix the stupid previous commit
|
2013-10-24 19:23:50 -02:00 |
|
Santiago Pastorino
|
b44e1af5dd
|
Move synchronize to setup method and make CONFIG private
|
2013-10-24 17:42:20 -02:00 |
|
Santiago Pastorino
|
dc33dac56b
|
This is not being used
|
2013-10-24 16:57:42 -02:00 |
|
Santiago Pastorino
|
dfdc292e35
|
Align =
|
2013-10-24 16:32:18 -02:00 |
|
Arthur Neves
|
860acad9af
|
s/side_load/embed_in_root
|
2013-10-24 14:12:02 -04:00 |
|
Santiago Pastorino
|
2b70503896
|
Add ActiveModel::SerializerSupport
|
2013-10-24 16:09:00 -02:00 |
|
Santiago Pastorino
|
cef6f85f44
|
Deprecate include in favor of side_load
|
2013-10-24 15:09:26 -02:00 |
|
Santiago Pastorino
|
48db253765
|
embed_in_root is now side_load
|
2013-10-24 14:57:41 -02:00 |
|
Santiago Pastorino
|
d26b7df158
|
Add test that checks if configs are applied to associations
|
2013-10-24 14:26:56 -02:00 |
|
Santiago Pastorino
|
a732efbc3c
|
Clean up tests a bit
|
2013-10-24 13:54:49 -02:00 |
|
Santiago Pastorino
|
d2f2508825
|
Reuse ivar
|
2013-10-24 13:40:24 -02:00 |
|
Santiago Pastorino
|
04f8c0c16f
|
Those are config tests
|
2013-10-24 13:37:15 -02:00 |
|
Santiago Pastorino
|
c83e643edd
|
Those lines are not needed
|
2013-10-24 13:35:57 -02:00 |
|
Santiago Pastorino
|
5c6541145a
|
Allow to embed nothing but still side loading
Closes #361, #399, #401
|
2013-10-24 13:24:49 -02:00 |
|
Santiago Pastorino
|
df5ef33ae6
|
Allow to turn off ams
Closes #378
You can define now
```
def default_serializer_options
{ serializer: false }
end
```
|
2013-10-23 20:34:34 -02:00 |
|
Arthur Nogueira Neves
|
78e13d66ea
|
Merge pull request #415 from ayrton/patch-1
Update CHANGELOG.md
|
2013-10-23 07:00:10 -07:00 |
|
Ayrton De Craene
|
a2d5ca42de
|
Update CHANGELOG.md
Fix typo
|
2013-10-23 11:43:45 +02:00 |
|
Santiago Pastorino
|
06e4c2c9d6
|
Test attributes declared as strings
Thanks @mikegee
Closes #380
|
2013-10-22 11:55:32 -02:00 |
|
Santiago Pastorino
|
db086794c6
|
Merge pull request #373 from phoet/patch-1
some remarks on testing in the readme
|
2013-10-22 06:46:44 -07:00 |
|
Santiago Pastorino
|
cf8145230e
|
Merge pull request #413 from strzalek/reorder-readme
Changes to README
|
2013-10-22 05:05:09 -07:00 |
|
Łukasz Strzałkowski
|
3f4ab36e7e
|
Add AMS heading
|
2013-10-22 09:53:42 +00:00 |
|
Łukasz Strzałkowski
|
e531df3b4e
|
Move design section to the top
|
2013-10-22 09:53:33 +00:00 |
|
Santiago Pastorino
|
3efea817b6
|
Merge pull request #412 from strzalek/thread-safe-config
Make Config class thread safe.
|
2013-10-21 13:30:53 -07:00 |
|
Łukasz Strzałkowski
|
d46584af40
|
Wrap config's data hash in mutex
|
2013-10-21 20:27:01 +00:00 |
|
Santiago Pastorino
|
8f583d2c46
|
Merge pull request #337 from lserman/update-meta-key-docs
Updating documentation to warn users that { root: false } will ignore the meta key
|
2013-10-21 13:12:28 -07:00 |
|
Santiago Pastorino
|
594eaa1576
|
Use scope in docs instead of current_user
Closes #322
|
2013-10-21 17:56:03 -02:00 |
|
Arthur Neves
|
55baaf2005
|
Dont use Class.embed on test
|
2013-10-21 15:10:00 -04:00 |
|
Arthur Neves
|
05ec509e1c
|
Use ActiveSupport::Deprecation.warn instead of warn
|
2013-10-21 15:02:39 -04:00 |
|
Santiago Pastorino
|
81080c230e
|
Merge pull request #411 from arthurnn/settings_fix
small settings fix
|
2013-10-21 11:29:49 -07:00 |
|
Arthur Neves
|
2ea0920f08
|
s/assert/assert_equal
|
2013-10-21 14:27:18 -04:00 |
|
Arthur Neves
|
455a898714
|
allow failures on jruby
|
2013-10-21 14:25:35 -04:00 |
|
Santiago Pastorino
|
7dcef9f0f5
|
Rename Settings to Config and use accessors to configure things
|
2013-10-21 16:23:35 -02:00 |
|
Santiago Pastorino
|
5b727cc291
|
Merge pull request #410 from arthurnn/settings_warn
Deprecate embed method on Serializer class
|
2013-10-21 11:05:51 -07:00 |
|
Arthur Neves
|
84801301b9
|
Add deprecation message to .embed method
|
2013-10-21 13:08:07 -04:00 |
|
Arthur Neves
|
41f1855056
|
Add accessors to settings class
|
2013-10-21 13:05:39 -04:00 |
|
Santiago Pastorino
|
e1d9df2e8b
|
Merge pull request #409 from arthurnn/travis_ci
Allow failures on .edge, till we fix rails
|
2013-10-19 15:02:18 -07:00 |
|
Arthur Neves
|
88df4f6a7c
|
Allow failures on .edge, till we fix rails
|
2013-10-19 16:59:20 -04:00 |
|
Santiago Pastorino
|
c65d387705
|
Merge branch 'rewrite'
|
2013-10-18 17:52:36 -02:00 |
|