Commit Graph

335 Commits

Author SHA1 Message Date
Attila Domokos
5f9209e619 Fixing README.md 2013-03-13 20:53:20 -04:00
Steve Klabnik
ad886495a1 Travis now has bundler 1.3
So we don't need to install it any more.
2013-03-10 10:21:32 -07:00
Steve Klabnik
4b3c146638 ruby-head -> ruby2.0.0 2013-03-10 10:21:04 -07:00
Steve Klabnik
a546a942c5 Merge pull request #226 from pwim/master
More clearly recommend to add to Gemfile
2013-03-10 08:58:07 -07:00
Paul McMahon
87509e9537 More clearly recommend to add to Gemfile 2013-03-10 17:48:34 +09:00
Steve Klabnik
f4916f113f Merge pull request #223 from tchak/id-serialization-with-hooks
use `read_attribute_for_serialization` to serialize ids
2013-03-08 09:17:19 -08:00
Steve Klabnik
e76a16486f Merge pull request #170 from FundingGates/master
Support optional types for computed attributes
2013-03-08 09:11:29 -08:00
tchak
e2c10f4440 use read_attribute_for_serialization to serialize ids
* in order to allow some optimisation in simple cases, we call `read_attribute_for_serialization` on parent with association_id name
2013-03-08 09:57:42 +01:00
Steve Klabnik
a1755c5b27 Provide a mixin to override AR::Base#to_json
Fixes #192.
2013-03-06 15:32:09 -08:00
Steve Klabnik
7b86838fa6 Merge pull request #207 from stantona/create-default-serializer
Create DefaultSerializer so that as_json uses same interface.
2013-03-06 15:26:35 -08:00
Adam Stanton
5a55a6831a Remove line break on the conditional statement. 2013-03-06 11:48:50 -08:00
Steve Klabnik
85a7529dc9 Merge pull request #222 from miloshadzic/master
Update release version in README.
2013-03-06 11:26:42 -08:00
Miloš Hadžić
befac17160 Update release version in README. 2013-03-06 17:40:41 +01:00
Adam Stanton
da26ebd26f Merge branch 'create-default-serializer' into HEAD
Conflicts:
	lib/active_model/array_serializer.rb
2013-03-05 21:48:58 -08:00
Steve Klabnik
fabdc621ff bumping to 0.7.0 2013-03-05 17:07:16 -08:00
Steve Klabnik
dc2257977f Merge pull request #198 from jredburn/master
'embed_key' option to allow embedding by attributes other than IDs
2013-03-05 15:57:34 -08:00
Steve Klabnik
06c65871a8 Merge pull request #213 from michihuber/fix_rendering_nil_with_custom_serializer
Fix rendering nil with custom serializer
2013-03-05 15:54:51 -08:00
Jeremy Redburn
7cd7d295e0 Adding 'embed_key' option to allow embedding attributes other than ID 2013-03-05 18:52:31 -05:00
Steve Klabnik
d638e21c8c Merge pull request #180 from fellix/fix-remove-root-globally
Fix global ``` self.root = false ```
2013-03-05 15:48:08 -08:00
Steve Klabnik
585b1bc508 No longer recommend installation from git 2013-03-05 15:28:56 -08:00
Steve Klabnik
95937c6fc7 Merge pull request #167 from GateGuru/feature/specify-association-serializers-as-strings
Add support for specifying the serializer for an association as a String...
2013-03-05 15:04:29 -08:00
Steve Klabnik
49cca10592 Merge pull request #172 from vladson/patch-1
Added description of default_serializer_options to README.md. Fixes #168
2013-03-05 14:46:06 -08:00
Steve Klabnik
71bf522b38 Merge pull request #209 from ismaelga/attributes_with_keys
Able to specify keys on the attributes method
2013-03-05 14:29:28 -08:00
Steve Klabnik
9a54af30e2 Merge pull request #218 from phcoliveira/patch-1
Update README.md file to better describe scope.
2013-03-05 14:22:29 -08:00
Paulo H. C. de Oliveira
e322f903cf Update README.md file to better describe scope.
This commit also corrects the code about deactivating globally the root name of arrays.
2013-03-05 13:37:11 -03:00
Ismael Abreu
2d2094b588 changes to be able to specify multiple attributes with keys 2013-03-05 02:45:22 +00:00
Steve Klabnik
1c28577280 Merge pull request #215 from mulder/feature/reloading
Serializer Reloading via ActiveSupport::DescendantsTracker
2013-02-28 09:03:02 -08:00
Nicholas Mulder
918a9de546 Remove caching of Serializer constants to allow ActiveSupport::Dependency reloading to work 2013-02-28 10:02:38 -05:00
Nicholas Mulder
fa51c5f574 Add ActiveSupport::DescendantsTracker to Serializer and ArraySerializer 2013-02-28 10:01:40 -05:00
Michi Huber
c7a420d295 Don't fail if object is nil, render null 2013-02-26 11:17:28 +01:00
Michi Huber
58a063eff0 serialization test: respect root settings when root object is nil 2013-02-26 11:12:28 +01:00
Michi Huber
9f93f34a34 test cases by fblee
Merge remote-tracking branch 'fblee/master'
2013-02-26 09:57:35 +01:00
Steve Klabnik
0114e49238 Merge pull request #210 from tpitale/master
Reduce double map to once; Fixes datamapper eager loading.
2013-02-18 09:04:37 -08:00
Tony Pitale
dcd4121322 reduce 2x map; fixes datamapper eager loading 2013-02-17 16:44:27 -05:00
Adam Stanton
b4616d737c Restore order of fields in hash to original order. 2013-02-11 07:04:59 -08:00
Adam Stanton
e470b09c6e Remove pry-nav from gemspec. 2013-02-11 06:03:48 -08:00
Adam Stanton
c4fcf96eb4 Move DefaultSerializer from array_serializer.rb to serializer.rb 2013-02-10 09:49:11 -08:00
Adam Stanton
8f6218c587 Create DefaultSerializer so that as_json uses same interface.
This is to ensure that PORO's as_json is called if no serializer
is specified.

Original behaviour was that serializable_hash was being called,
overriding the as_json method.
2013-02-10 09:06:24 -08:00
Carlos Antonio da Silva
3e9b366a45 Merge pull request #206 from kirs/patch-1
Gemfile improvement in README [ci skip]
2013-02-09 13:41:41 -08:00
Kir Shatrov
dd989043e3 Gemfile improvement in README 2013-02-09 23:04:25 +02:00
Lee Mallabone
d35999a7ee Add failing test to show behavior of custom serializer with nils. 2013-02-06 17:32:15 -08:00
Rafael Felix
82951c1f8a Fix global `` self.root = false ``
Using the on_load hook does not change the defined root on
Serializer#inherited.

Related to #179
2013-01-24 09:13:41 -02:00
Steve Klabnik
cef10cf01d Revert "Merge pull request #186 from gerfuls/master"
This reverts commit d030cd99cf, reversing
changes made to a1d5561eac.
2013-01-15 11:51:42 -05:00
Steve Klabnik
d030cd99cf Merge pull request #186 from gerfuls/master
Fixed typo for turning off global root
2013-01-12 17:26:38 -08:00
Joshua Dover
016412b3d7 Fixed README typo 2013-01-12 19:18:08 -06:00
Steve Klabnik
a1d5561eac Merge pull request #185 from kevins90/update_readme_object_accessor
Revised one more instance in the doc referring to the object method alias
2013-01-11 10:10:05 -08:00
Kevin Tham
3cd953ffa8 Revised one more instance in the doc referring to the method alias to access the object being serialized 2013-01-11 10:01:37 -08:00
Rafael Mendonça França
95ff5d5960 Merge pull request #184 from eniolopes/master
Documentation for meta and meta_key options
2013-01-11 06:06:13 -08:00
Enio Lopes
97e7ec1d32 Uses colon on :meta_key 2013-01-11 11:22:45 -02:00
Enio Lopes
244021d65c Corrects some markdown properties, identation and text 2013-01-11 11:06:26 -02:00