Commit Graph

866 Commits

Author SHA1 Message Date
Steve Klabnik
723049e28f Merge pull request #493 from shakirshakiel/master
fixing sideloading of nested associations
2014-07-28 12:34:17 -04:00
Steve Klabnik
e185becd5d allow failure on rails master 2014-07-04 22:49:36 -04:00
Steve Klabnik
e316532eef Fix up .travis.yml 2014-07-04 22:15:06 -04:00
Steve Klabnik
55fc6536fe Remove Coveralls
Coveralls is fine, but it's interfering with Travis somehow.
2014-07-04 22:11:49 -04:00
Steve Klabnik
0c2691a46d Merge pull request #518 from ebouchut/patch-2
Fix a typo.
2014-07-04 18:30:57 -07:00
Steve Klabnik
eb06f0315f Merge pull request #517 from ebouchut/patch-1
Fix a typo.
2014-07-04 18:30:53 -07:00
Kyle Fritz
76c8de7b9f root key format 2014-04-14 13:45:12 -04:00
Kyle Fritz
00c54baae3 Support lowerCamel key format 2014-03-30 12:31:21 -04:00
Wojtek Mach
2e31a14125 Add :only/:except options 2014-03-12 16:55:08 -03:00
Arthur Nogueira Neves
3201c63162 Merge pull request #524 from depy/master
Adds an example for using ArraySerializer under Render independently.
2014-03-11 08:41:13 -04:00
Arthur Nogueira Neves
289dfac743 Merge pull request #528 from arthurnn/travis_one_file
Few Travis configs
2014-03-10 20:17:38 -04:00
Arthur Neves
c8d0a5408b
Use minitest 4.7.x on rails 3.2 2014-03-10 20:00:49 -04:00
Ken Ip
8ca4d4fcd6 HasOne nil object should return [] under embedded key.
Ensure that @wrap_in_array is always respected when set to true even
when associated object is nil.
2014-03-10 16:42:04 -03:00
Arthur Neves
a19e95c83c
test on rails 4.1 2014-03-10 15:30:06 -04:00
Arthur Neves
9f7f267c8f Test against ruby 2.1.1 2014-03-10 15:28:46 -04:00
Arthur Neves
1e952ea702 Use new ENV on travis 2014-03-10 15:28:29 -04:00
Arthur Neves
488f257821
Use RAILS_VERSION on Gemfile 2014-03-10 15:27:37 -04:00
Arthur Neves
b6520315d8
only require coverage_setup on CI 2014-03-10 15:23:09 -04:00
Matjaz Muhic
d9ff6db36d Adds an example for using ArraySerializer under Render independently. 2014-03-06 19:53:24 +01:00
Arthur Nogueira Neves
97f7914107 Merge pull request #522 from teeparham/rubinius_2
Update Rubinius Gemfiles, Travis
2014-02-28 17:17:40 -05:00
Tee Parham
c19fcd5afe Update Rubinius Gemfiles, Travis
Simplify the Gemfile setup for Travis by requiring version 2.2.5.

This commit updates the Travis version of Rubinius to 2.2.5+, which
includes the ruby standard library. Thus platform-specific Gemfile
configuration is no longer needed for Rubinius.

Also, Rubinius 2.2.5 does not work with sqilte3 1.3.9, so require
sqlite3 version 1.3.8 until it does.

💻 To run the tests locally, you will need to use Rubinius
2.2.5.
2014-02-28 10:49:33 -07:00
Arthur Neves
61882e1e41 Allow to fail on ruby-head 2014-02-20 16:25:01 -05:00
Eric Bouchut
0465bc2b8e Fix a typo. 2014-02-20 14:22:38 +01:00
Eric Bouchut
4eee8eed50 Fix a typo. 2014-02-20 12:56:36 +01:00
Santiago Pastorino
2792210a88 Merge pull request #494 from billychan/add-doc-independent-usage
add doc for use serailizer independently
2014-02-04 12:37:03 -08:00
Santiago Pastorino
d985e6424c Merge pull request #462 from fab/master
Generator now properly detects ApplicationSerializer
2014-02-04 10:05:03 -08:00
Fab Mackojc
74d3398016 Update docs to explain ApplicationSerializer feature 2014-02-01 21:37:22 +11:00
Fab Mackojc
a49e04a6f2 Generator now properly detects ApplicationSerializer 2014-02-01 21:37:13 +11:00
Billy
b4cd4cd5ba add doc for use serailizer independently 2014-01-23 11:46:07 +08:00
Shakir Shakiel
9ae5142775 fixing sideloading of nested associations 2014-01-22 00:07:28 +05:30
Santiago Pastorino
9436d73b92 Travis now installs Bundler 1.5.1 2014-01-12 11:33:04 -02:00
Santiago Pastorino
1c440b513f Depend on the released activerecord-jdbcsqlite3-adapter
create_table_definition changed from 3 to 4 parameters was fixed and
was included in 1.3.5
2014-01-10 12:57:21 -02:00
Santiago Pastorino
1ec499bd64 Use Minitest::Test instead of ActiveModel::TestCase 2014-01-09 21:52:10 -02:00
Adrian Mugnolo and Santiago Pastorino
cec7980208 Don't embed empty associations in root 2014-01-09 15:45:20 -02:00
Santiago Pastorino
3e510c829b Don't concat to nil objects 2014-01-09 15:35:29 -02:00
Jorge Bejar
df481b2b35 Don't memoize association serializer 2014-01-09 15:30:51 -02:00
Santiago Pastorino
3329a43d02 Merge pull request #487 from jlecour/patch-1
README : Mention the `options` and `UrlHelpers` issue
2014-01-09 06:27:05 -08:00
Jérémy Lecour
e1f84c26ee Mention the options and UrlHelpers issue 2014-01-09 15:23:09 +01:00
Santiago Pastorino
36b917ef23 Add license to gemspec 2014-01-07 15:31:52 -02:00
Santiago Pastorino
de78df509a Version = 0.9.0.alpha1 2014-01-07 15:28:23 -02:00
Santiago Pastorino
ed9a5288f9 Revert "Merge branch 'context'"
This reverts commit 1bd8180a94, reversing
changes made to 9bb32331f4.
2014-01-07 15:02:09 -02:00
Santiago Pastorino
1bd8180a94 Merge branch 'context' 2014-01-06 15:51:05 -02:00
Adrian Mugnolo and Santiago Pastorino
dc32b5fc1b Extract context build to a method 2014-01-06 15:50:53 -02:00
Adrian Mugnolo and Santiago Pastorino
0d8ef2b165 Nest scope under context option 2014-01-06 15:50:30 -02:00
Santiago Pastorino
8bd2542ed2 Allow to pass context around serializers 2014-01-06 12:22:16 -02:00
Santiago Pastorino
9bb32331f4 Force install Bundler 1.5.1 as a workaround of http://changelog.travis-ci.com/post/71633370723/mri-ruby-2-1-0-and-jruby-1-7-9-available 2014-01-03 20:32:05 -02:00
Santiago Pastorino
78245b07bc Move the default value to the options param 2014-01-03 20:02:43 -02:00
Santiago Pastorino
5fa4002039 Allow only to pass scope to associations
Closes #483
2014-01-03 19:48:01 -02:00
Santiago Pastorino
60fc55021c Revert "Allow to pass options to associations"
This reverts commit c8cfe94f29.
2014-01-03 19:44:40 -02:00
Santiago Pastorino
c8cfe94f29 Allow to pass options to associations
Closes #331
2014-01-02 19:56:08 -02:00