Permalink
Commits on Dec 3, 2012
  1. Merge pull request #114 from chancancode/fix_default_serializer_options

    Fix default_serializer_options, closes #112 & #113
    steveklabnik committed Dec 3, 2012
  2. Fix default_serializer_options, closes #112 & #113

    Allow options such as :serializer, :scope, :root etc to be set via
    default_serializer_options and allow the inline options to override such
    defaults.
    chancancode committed Aug 14, 2012
Commits on Nov 30, 2012
  1. Merge pull request #166 from gabetax/initializer-documentation

    Update documentation to use ActiveSupport.on_load to disable root
    steveklabnik committed Nov 30, 2012
Commits on Nov 25, 2012
  1. Merge pull request #163 from frodsan/yapr_travis

    Yet Another PR on Travis
    carlosantoniodasilva committed Nov 25, 2012
  2. add ruby-head to travis.yml

    Francesco Rodriguez committed Nov 25, 2012
  3. use proper tags for jruby on travis

    Francesco Rodriguez committed Nov 25, 2012
  4. Merge pull request #162 from frodsan/fix_edge_tests

    Fix failing tests on Rails master
    rafaelfranca committed Nov 25, 2012
  5. no need to allow failures

    Francesco Rodriguez committed Nov 25, 2012
  6. move gemfiles/Gemfile.edge to root

    Francesco Rodriguez committed Nov 25, 2012
  7. Fix failing tests on Rails master

    Francesco Rodriguez committed Nov 25, 2012
Commits on Nov 23, 2012
  1. Merge pull request #160 from byroot/143-throw-decriptive-error

    [PR] Throw a descriptive error if attempting to serialize an array with Serializer not ArraySerializer
    joliss committed Nov 23, 2012
  2. Throw a descriptive error if attempting to serialize an array with Se…

    …rializer not ArraySerializer #143
    byroot committed Nov 23, 2012
Commits on Nov 22, 2012
  1. Merge pull request #117 from joliss/computed-attributes

    Make schema not crash on computed attributes & associations
    joliss committed Nov 22, 2012
Commits on Nov 21, 2012
  1. Merge pull request #157 from frodsan/fix_readme

    update travis link [ci skip]
    rafaelfranca committed Nov 21, 2012
  2. update travis link [ci skip]

    Francesco Rodriguez committed Nov 21, 2012
Commits on Nov 20, 2012
  1. Merge pull request #156 from frodsan/fix_rbx_travis_tag

    Update travis.yml to use the right Rubinius versions
    rafaelfranca committed Nov 20, 2012
  2. Update travis.yml to use the right Rubinius versions

    Francesco Rodriguez committed Nov 20, 2012
  3. Merge pull request #155 from teeparham/array_serializer_test

    Move ArraySerializer tests and test fakes into separate files
    rafaelfranca committed Nov 20, 2012
  4. Merge pull request #152 from samnang/setting_root

    Fixed root(false) vs root=false inconsistency
    steveklabnik committed Nov 20, 2012
Commits on Nov 19, 2012
  1. Add alias_method ActiveModel::Serializer.root= to be consistency with…

    … ActiveModel::ArraySerializer
    samnang committed Nov 19, 2012
  2. Merge pull request #150 from kurko/fixes_new_repo_readme

    Fixes repo URL in the README's installation instructions
    joliss committed Nov 19, 2012
  3. Fixes repo URL in the README's installation instructions

    When the gem moved over to github.com/rails_api/, the README instructions
    were still pointing to github.com/josevalim/.
    kurko committed Nov 19, 2012
Commits on Oct 31, 2012
  1. Make schema not crash on computed associations

    We pick nil here as well.
    joliss committed Aug 17, 2012
  2. Make schema not crash on computed attributes

    We do not know the type for computed attributes, so we pick nil.
    
    Perhaps at some point we might add a :type option for attributes (or
    not), but in any case it's important to not crash when there are
    computed attributes.
    joliss committed Aug 17, 2012
  3. Merge pull request #142 from joliss/sideloading-complexity

    When objects are sideloaded multiple times, serialize them only once
    wycats committed Oct 31, 2012
Commits on Oct 29, 2012
  1. Remove newly-redundant OrderedSet

    joliss committed Oct 29, 2012
  2. When objects are sideloaded multiple times, serialize them only once

    To achieve this, we make the following change when sideloading: Instead
    of serializing associations and discarding duplicate *hashes*, we
    memorize the *objects* (records) that we have already serialized, and
    only serialize those that are new.
    
    This change is mostly transparent, and brings down serialization time
    from 3.1 seconds to 1.0 seconds on my set of sample data.
    
    There is one change in the behavior: If you sideload the same object
    multiple times, and it yields different hashes, like so:
    
        embed :ids, include: true
        has_many :comments
        has_many :recent_comments, root: comments, serializer: CommentShortSerializer
    
    then previously, it would be included multiple times, whereas now, the
    first hash wins. (I haven't actually tested this.) I don't know that
    either option is preferable. It's not covered by the test suite, and I
    think it's an edge case that is OK to ignore entirely.
    joliss committed Oct 29, 2012
  3. In the test, use the same :hash across serializers

    Otherwise, `include!` will not remember the unique_values of
    already-sideloaded hashes across serializer calls.
    joliss committed Oct 29, 2012
Commits on Oct 17, 2012
  1. Revert "clean up lazy loading of serialization support for

    ActiveRecord::Base and ActionController::Base"
    
    The whole idea of having a lazy hook is that it can be executed
    in the context of different targets. The moment you hardcode the class,
    the hooks can no longer run in the proper context.
    
    This reverts commit 506e2ac.
    josevalim committed Oct 17, 2012
Commits on Oct 9, 2012
  1. Merge pull request #136 from garysweaver/master

    Adding documentation for :serializer and :polymorphic options on associations
    joliss committed Oct 9, 2012