ditkrg/active_model_serializers
4
0
Fork 0
mirror of https://github.com/ditkrg/active_model_serializers.git synced 2026-01-23 06:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
410 Commits 15 Branches 40 Tags 5 MiB
329a38a7dd
Commit Graph

410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Klabnik
329a38a7dd Merge pull request #289 from teeparham/patch-2 
fix travis links
 2013-04-25 10:24:01 -07:00
Tee Parham
6b0ceba148 fix travis links 
The existing links work, but redirect.
 2013-04-24 21:55:50 -06:00
Steve Klabnik
497a887d59 Merge pull request #285 from bquorning/patch-1 
Change gem.homepage to new location
 2013-04-22 04:56:32 -07:00
Benjamin Quorning
01d82bc6b9 Change gem.homepage to new location 2013-04-22 12:56:16 +03:00
Steve Klabnik
2f21e77e90 Merge pull request #282 from morgoth/unify-calling-include_attribute 
Unify way of calling include_attribute? in attibutes and association methods
 2013-04-22 01:31:59 -07:00
Wojciech Wnętrzak
82f50ef81f Unify way of calling include_attribute? in attibutes and association methods. 2013-04-20 23:28:33 +02:00
Steve Klabnik
9eb2e281c6 Merge pull request #280 from jasonkriss/typos 
fix a couple minor typos
 2013-04-18 13:50:06 -07:00
Jason Kriss
4e762ee8b5 fix a couple typos 2013-04-18 13:39:14 -07:00
Steve Klabnik
3aa7773ebc Merge pull request #278 from vanstee/use-old-hash-syntax 
Fix the build in 1.8.7
 2013-04-16 20:06:28 -07:00
vanstee
ef6ab5f0c0 Switch back to the old hash syntax 
Just fixed up a couple of hash literals in the tests so that the build
passes for 1.8.7
 2013-04-16 22:55:57 -04:00
Steve Klabnik
bfb6a8895a Merge pull request #277 from gravis/patch-1 
Update CHANGELOG.md
 2013-04-16 11:13:35 -07:00
Philippe Lafoucrière
1b6dcd9c65 Update CHANGELOG.md 
Make it more consistent.
I've added some PR titles to 0.7, I'm not sure it's 100% comprehensive like this :(
The version numbers must match rubygems versions, I fixed it here.
Thanks
 2013-04-16 16:35:44 +03:00
Steve Klabnik
c1dacccbdc Merge pull request #273 from seanabrahams/embed-ids-not-using-local-method 
Fixes #267
 2013-04-15 17:44:06 -07:00
Steve Klabnik
3433eca4d3 Merge pull request #268 from vanstee/escape-attribute-names 
Support "unsymbolizable" strings as attribute names
 2013-04-15 17:25:24 -07:00
Kevin Curtin
958e3a1ee2 Let's not let edge rails break travis. 
We want to run tests against edge rails, but we don't want their build to break ours. So it
goes in allow_failures.
 2013-04-16 00:19:02 +00:00
Steve Klabnik
1b80caa22f Merge pull request #276 from darthdeus/patch-1 
Fix serialization_scope to check for private/protected methods
 2013-04-15 17:13:56 -07:00
Jakub Arnold
1c1a4f7673 Fix serialization_scope to check for private/protected methods 
The semantics of respond_to? on Ruby 2.0 have changed to return false for protected methods, which is usually the case for helpers like current_user.
 2013-04-13 09:59:10 +03:00
Sean Abrahams
79acd87829 Use method instead of asssociation_ids if method exists. Fixes #267 2013-04-10 14:38:53 -07:00
Sean Abrahams
a771f30816 If output is as expected, is this assert important? 2013-04-10 14:36:42 -07:00
vanstee
a900d31041 Support strings as attribute names 
When generating the `_fast_attributes` method, attribute names that
could not be represented as symbols (at least without escaping) would
throw parsing errors.
 2013-04-09 00:53:56 -04:00
Steve Klabnik
ab5d40f38b Sigh. 
When I did 9551a97464, I
forgot that some new code may use it.
 2013-04-03 23:56:06 -07:00
Steve Klabnik
2edaa22605 Require _our_ resource_override. 
Basically, when anyone else made a 'resource_override' generator,
it'd only require once. Because that's how require works. So let's make
sure that we require ours and nobody else's.

Fixes #251.
 2013-04-03 23:24:19 -07:00
Steve Klabnik
9551a97464 Revert 37b0690fb8. 
This feature causes more problems than it solves.
 2013-04-03 17:24:08 -07:00
Steve Klabnik
8d7252019c Merge pull request #256 from prathamesh-sonpatki/edge_rails_failing_test 
Fix failing tests for edge rails
 2013-03-27 09:10:31 -07:00
Prathamesh Sonpatki
f6cf469820 Fix failing tests for edge rails 
* Edge Rails returns an instance of 'Gem::Version' for 'Rails.version' due to e600384515dc06db2c56ff5be5c18779f7b379a5
 * Travis build was failing because of this as 'Rails.version.start_with? '4'' was giving 'undefined method' on 'Gem::Version' instance
 2013-03-27 10:29:36 +05:30
Steve Klabnik
c21370c2af Merge pull request #255 from prathamesh-sonpatki/lib/typos 
Fixed few typos in lib and test
 2013-03-26 18:00:54 -07:00
Prathamesh Sonpatki
75a72b5cc9 Fixed few typos 2013-03-26 20:29:35 +05:30
Steve Klabnik
afed6dcd4a Merge pull request #254 from prathamesh-sonpatki/typos 
Fixed typos
 2013-03-26 07:12:38 -07:00
Prathamesh Sonpatki
7d1ce9c56e Fixed typos 2013-03-26 18:18:20 +05:30
Steve Klabnik
049cff57c2 Merge pull request #250 from gabetax/documentation/belongs_to 
Document inclusion of belongs_to ActiveRecord associations
 2013-03-23 05:43:28 -07:00
Steve Klabnik
dc3f8cb24b Merge pull request #249 from michaelrkn/patch-1 
fix grammar in readme
 2013-03-23 05:42:26 -07:00
Gabe Martin-Dempesy
01d1228772 Document inclusion of belongs_to ActiveRecord associations 2013-03-23 00:48:00 -05:00
Michael Kaiser-Nyman
1fc314786e fix grammar in readme 2013-03-22 15:19:13 -07:00
Steve Klabnik
55ef0f9cbd Merge pull request #248 from KMahoney/default-serializer-options 
Update changelog for default serializer update
 2013-03-22 12:44:47 -07:00
Kevin Mahoney
0a3fcea4d5 Update Changelog 2013-03-22 18:31:50 +00:00
Steve Klabnik
6a54b892c8 Merge pull request #247 from KMahoney/default-serializer-options 
Pass options through when using default serializer
 2013-03-22 08:46:16 -07:00
Kevin Mahoney
2bd447d69d Pass options through when using default serializer 2013-03-22 13:12:33 +00:00
Steve Klabnik
680e2efbec Merge pull request #246 from beerlington/dry-option-setup 
Refactor and consolidate serializer option setup
 2013-03-20 08:56:54 -07:00
beerlington
e4ad25073d Adding doc for build_json method 2013-03-20 08:14:23 -04:00
beerlington
fd578fcf69 Refactor and consolidate serializer option setup 2013-03-19 22:21:41 -04:00
Steve Klabnik
c129ae2016 Generate id method on Ruby 1.8. 
Because object_id and id went through some flux, it's best to tell 1.8
specifically what we mean.

Closes #127.
 2013-03-19 14:53:08 -07:00
Steve Klabnik
145b6d499d First part of a fix for #208. 
I would like to get this under test.
 2013-03-19 13:52:20 -07:00
Steve Klabnik
5d2ae9b138 Merge pull request #242 from SamSaffron/fix 
this little bit of caching gives us a massive perf gain on Discourse
 2013-03-18 17:27:16 -07:00
Sam
af13d48dfa improved caching of root node for better performance 2013-03-18 16:21:34 -07:00
Steve Klabnik
324f9d83b3 Merge pull request #240 from beerlington/scope-name-alias 
Adding scope_name method to alias scope in Serializer
 2013-03-18 11:50:19 -07:00
beerlington
4a13f86961 Reference scope by same name as serialization scope 
By default, the serialization scope uses current_user, and you can
now reference the scope as "current_user" in the serializer. If you
override the scope using "serialization_scope" in your controller,
it will use that method name instead.
 2013-03-18 14:44:38 -04:00
Steve Klabnik
41a389a900 Move to CHANGELOG.md 2013-03-18 11:19:55 -07:00
Steve Klabnik
277d5ce44a Adding section for 0.8 to changelog 2013-03-18 11:19:55 -07:00
Steve Klabnik
9fef47db4d Merge pull request #238 from SamSaffron/fix 
fix inheritance issues
 2013-03-16 10:38:01 -07:00
Sam
ad1d34b2c4 Fix inheritance issues, poison cache if attributes change 2013-03-16 03:45:06 -07:00