Skip to content
Commits on Aug 7, 2012
  1. @josevalim

    Merge pull request #110 from pivotal-medici/fix_default_url_options

    Return empty hash when url_options not provided
    josevalim committed Aug 7, 2012
  2. Return empty hash when url_options not provided

    Alex Kwiatkowski & Will Bagby committed Aug 7, 2012
Commits on Jul 29, 2012
  1. @josevalim

    Merge pull request #106 from raycohen/scope_option_precedence

    Scope option precedence
    josevalim committed Jul 29, 2012
  2. @raycohen
Commits on Jul 28, 2012
  1. @raycohen
  2. @josevalim

    Merge pull request #105 from raycohen/readme-fix-custom-attributes

    fix custom attributes with scope readme section
    josevalim committed Jul 28, 2012
  3. @raycohen
Commits on Jul 26, 2012
  1. @josevalim

    Merge pull request #103 from joliss/cleanup

    Use blocks instead of eval to define methods
    josevalim committed Jul 25, 2012
Commits on Jul 25, 2012
  1. @joliss
Commits on Jul 24, 2012
  1. @josevalim

    Merge pull request #101 from teeparham/patch-1

    fix typo in README
    josevalim committed Jul 24, 2012
Commits on Jul 23, 2012
  1. @teeparham

    fix typo in README

    teeparham committed Jul 23, 2012
  2. @josevalim

    Merge pull request #100 from teeparham/readme-arrays

    Add section on Arrays to README
    josevalim committed Jul 23, 2012
  3. @teeparham

    Merge branch 'array-serializer-root' of github.com:teeparham/active_m…

    …odel_serializers into readme-arrays
    teeparham committed Jul 23, 2012
  4. more README markdown cleanup

    Tee Parham committed Jul 23, 2012
  5. @teeparham

    cleanup markdown in docs

    teeparham committed Jul 23, 2012
Commits on Jul 21, 2012
  1. @teeparham
  2. @teeparham
  3. @josevalim
  4. @josevalim
  5. @josevalim
  6. @josevalim

    Merge pull request #94 from teeparham/array-serializer-root

    Add root option to ArraySerializer
    josevalim committed Jul 21, 2012
  7. @josevalim
  8. @josevalim

    Merge pull request #97 from twinturbo/include-bug

    Include Related Bugs
    josevalim committed Jul 21, 2012
  9. @josevalim

    Update README.markdown

    josevalim committed Jul 21, 2012
  10. @josevalim

    Merge pull request #99 from matthewrobertson/master

    Documentation on how to add custom attributes
    josevalim committed Jul 21, 2012
Commits on Jul 20, 2012
  1. @matthewrobertson

    Added a section to the README about defining custom attributes by ove…

    …rriding `serializable_hash`
    matthewrobertson committed Jul 20, 2012
Commits on Jul 16, 2012
  1. @josevalim

    Merge pull request #98 from ccschmitz/patch-1

    Fix a couple typos
    josevalim committed Jul 16, 2012
  2. @ccschmitz

    Fix a couple typos.

    ccschmitz committed Jul 16, 2012
  3. Don't include empty polymoprhic associations

    Take this serializer:
    
    class TodoSerializer < ActiveModel::Serializer
      root :todo, :include => true
      has_one :reference, :polymorphic => true
    end
    
    A nil reference would generate this JSON:
    
    {
      "todo": { "reference": null },
      "nil_classes": []
    }
    
    This commit prevents the `nil_classes` key from being added when
    serializing and including nil polymoprhic associations.
    twinturbo committed Jul 16, 2012
  4. Raise error when associations cannot be included

    include! only works when the source serializer has a root set. The
    as_json method sets up some state for the include! method. If a child
    association has associations with `:include => true` or `root foo,
    :include => true` would cause an undefined method error for `NilClass`.
    This is entirely unhelpful for the end user.
    
    This commit raise an error when this situation occurs. It makes it clear
    that it's not a problem with AMS but the serialization graph.
    twinturbo committed Jul 16, 2012
Commits on Jul 15, 2012
  1. Actually test set serialization

    twinturbo committed Jul 15, 2012
  2. @josevalim

    Merge pull request #96 from bradleypriest/fixbuild

    Fix Travis on 1.8.7
    josevalim committed Jul 15, 2012
  3. @bradleypriest

    Fix travis

    bradleypriest committed Jul 15, 2012
  4. Close #90

    twinturbo committed Jul 15, 2012
  5. @josevalim

    Merge pull request #50 from twinturbo/polymorphism

    Polymorphism
    josevalim committed Jul 15, 2012
Something went wrong with that request. Please try again.