Commit Graph

657 Commits

Author SHA1 Message Date
Steve Klabnik
614edeff7f Merge pull request #327 from ansonhoyt/master
Update docs with example of attribute named "object"
2013-06-06 15:58:42 -07:00
Anson Hoyt
173f3f2a17 Explain how to include an attribute named "object" 2013-06-06 14:41:45 -04:00
Steve Klabnik
edb673eea3 Merge pull request #325 from dgalarza/edge_build_fix
Use minitest/autorun
2013-06-04 18:33:08 -07:00
Damian Galarza
0d674369ff Use minitest/autorun
Allows edge gemset to build
2013-06-04 19:17:31 -04:00
Santiago Pastorino
1d7cb2da75 Merge pull request #321 from teeparham/ruby19
Remove support for ruby 1.8 (fixes #310)
2013-05-31 15:51:25 -07:00
Tee Parham
725952c862 require ruby >= 1.9.3
* remove 1.9.2 from travis
2013-05-30 15:26:56 -06:00
Tee Parham
31e1dab69f require rails >= 3.2
* remove ancient confusing comment in SerializerGenerator
2013-05-30 15:26:17 -06:00
Tee Parham
d10b5f6ac0 add ruby 1.8 install note [ci skip]
fixes #310
2013-05-30 15:25:06 -06:00
Tee Parham
c3fa96456c upgrade hash syntax in tests 2013-05-30 15:25:06 -06:00
Tee Parham
74ba9dc76c upgrade hash syntax 2013-05-30 15:25:06 -06:00
Tee Parham
b686b73edf add note to changelog [ci skip] 2013-05-30 15:24:49 -06:00
Tee Parham
a857952d12 remove 1.8 versions from travis 2013-05-29 19:46:55 -06:00
Tee Parham
62167d243b require ruby >= 1.9.2 in gemspec [ci skip]
* use consistent quotes
2013-05-29 19:45:27 -06:00
Tee Parham
143e5d9866 do not generate id method (was for 1.8 only)
see https://github.com/rails-api/active_model_serializers/issues/127
for original motivation
2013-05-29 19:39:00 -06:00
Santiago Pastorino
2c563eaace Turn off Travis' email notifications 2013-05-29 18:00:39 -07:00
Santiago Pastorino
1b142a23f1 Add campfire notifications 2013-05-29 17:07:45 -07:00
Santiago Pastorino
c97acfd9ba Always set a serializer for each item of an Array
model.active_model_serializer could return nil so we need to ensure that
if serializer is not setted we set DefaultSerializer to it.

This reverts commit 64ed05c484.

Fixes #318
2013-05-28 18:13:07 -07:00
Steve Klabnik
8795f2bc1e Add CONTRIBUTING.md 2013-05-25 08:04:05 -05:00
Santiago Pastorino
c023052df8 Add CHANGELOG.md entries 2013-05-24 15:00:29 -07:00
Santiago Pastorino
f68003f64d Merge pull request #313 from geigerzaehler/fix_root
Don't wrap array items in root element
2013-05-24 14:49:41 -07:00
Santiago Pastorino
9521e912fe serialize_ids call methods on the corresponding serializer if defined 2013-05-24 14:09:27 -07:00
Thomas Scholtes
258248d6c0 Don't wrap array items in root element 2013-05-24 10:23:59 +02:00
Santiago Pastorino
ee846f39af Fix build in 1.8.7 2013-05-22 14:24:22 -07:00
Santiago Pastorino
f533fa24df Merge pull request #306 from dgalarza/controller_action_scope_name_fix
Allow a controller to properly override scope_name
2013-05-22 14:21:20 -07:00
Steve Klabnik
50c9f02249 Merge pull request #309 from rymai/patch-1
Fix typo for ActiveModel::Serializer::Caching in the CHANGELOG
2013-05-22 06:55:24 -07:00
Rémy Coutable
18313df12d Fix typo for ActiveModel::Serializer::Caching in the CHANGELOG 2013-05-22 16:54:27 +03:00
Damian Galarza
bbc3ae44cc Allow a controller to properly override scope_name 2013-05-21 21:24:50 -04:00
Santiago Pastorino
fd8cb67b85 Add CHANGELOG entries 2013-05-21 17:33:59 -07:00
Santiago Pastorino
86d993ea38 Merge branch 'refactor' 2013-05-21 17:04:16 -07:00
Santiago Pastorino
35608a8550 Move version.rb file to serializer directory 2013-05-21 17:03:09 -07:00
Santiago Pastorino
055f8fe33c AMS::Associations::Base is now AMS::Association. HasMany and HasOne inherits from it. 2013-05-21 17:03:08 -07:00
Santiago Pastorino
787b7cf24a Document Associations 2013-05-21 17:03:08 -07:00
Santiago Pastorino
0b6326eb35 Move polymorphic to initialize + reader 2013-05-21 17:03:08 -07:00
Santiago Pastorino
36feb5d44f Refactor embeddable? method 2013-05-21 17:03:08 -07:00
Santiago Pastorino
bbd3c8b157 Define embeddable? as an alias of object 2013-05-21 17:03:08 -07:00
Santiago Pastorino
e295af2e2b Move embed methods to initialize and define readers 2013-05-21 17:03:08 -07:00
Santiago Pastorino
cd9e106640 All the attr_readers together 2013-05-21 17:03:08 -07:00
Santiago Pastorino
1c3f14407c There's no need for target_serializer method 2013-05-21 17:03:08 -07:00
Santiago Pastorino
feaefeeef3 Use name reader 2013-05-21 17:03:08 -07:00
Santiago Pastorino
296970415a Move key method to the base class 2013-05-21 17:03:08 -07:00
Santiago Pastorino
ecbb8bf6a6 Use == || == instead of include? 2013-05-21 17:03:08 -07:00
Santiago Pastorino
eb5b27de69 Initialize things in the initialize method and define readers 2013-05-21 17:03:08 -07:00
Santiago Pastorino
ea6d712cc8 key method is defined on subclasses 2013-05-21 17:03:07 -07:00
Santiago Pastorino
2dd0090f13 Reorder methods 2013-05-21 17:03:07 -07:00
Santiago Pastorino
0b648fceac Use private instead of protected, we don't use explicit receivers 2013-05-21 17:03:07 -07:00
Santiago Pastorino
f9e189e9d7 Rename associated_object to object 2013-05-21 17:03:07 -07:00
Santiago Pastorino
85bf3d2f3d Move duplicated code to the Base class 2013-05-21 17:03:07 -07:00
Santiago Pastorino
03669a74bc Associations::Config is now Associations::Base 2013-05-21 17:03:07 -07:00
Santiago Pastorino
2b22acff53 Use the readers instead of accessing the ivar directly 2013-05-21 17:03:07 -07:00
Santiago Pastorino
251fdc7ba4 Rename opts to klass_options 2013-05-21 17:03:07 -07:00