Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Aug 7, 2012
  1. José Valim

    Merge pull request #110 from pivotal-medici/fix_default_url_options

    josevalim authored
    Return empty hash when url_options not provided
  2. Return empty hash when url_options not provided

    Alex Kwiatkowski & Will Bagby authored
Commits on Jul 29, 2012
  1. José Valim

    Merge pull request #106 from raycohen/scope_option_precedence

    josevalim authored
    Scope option precedence
  2. Ray Cohen
Commits on Jul 28, 2012
  1. Ray Cohen
  2. José Valim

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

    josevalim authored
    fix custom attributes with scope readme section
  3. Ray Cohen
Commits on Jul 26, 2012
  1. José Valim

    Merge pull request #103 from joliss/cleanup

    josevalim authored
    Use blocks instead of eval to define methods
Commits on Jul 25, 2012
  1. Jo Liss
Commits on Jul 24, 2012
  1. José Valim

    Merge pull request #101 from teeparham/patch-1

    josevalim authored
    fix typo in README
Commits on Jul 23, 2012
  1. Tee Parham

    fix typo in README

    teeparham authored
  2. José Valim

    Merge pull request #100 from teeparham/readme-arrays

    josevalim authored
    Add section on Arrays to README
  3. Tee Parham

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

    teeparham authored
    …odel_serializers into readme-arrays
  4. more README markdown cleanup

    Tee Parham authored
  5. Tee Parham

    cleanup markdown in docs

    teeparham authored
Commits on Jul 21, 2012
  1. Tee Parham
  2. Tee Parham
  3. José Valim
  4. José Valim
  5. José Valim
  6. José Valim

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

    josevalim authored
    Add root option to ArraySerializer
  7. José Valim
  8. José Valim

    Merge pull request #97 from twinturbo/include-bug

    josevalim authored
    Include Related Bugs
  9. José Valim

    Update README.markdown

    josevalim authored
  10. José Valim

    Merge pull request #99 from matthewrobertson/master

    josevalim authored
    Documentation on how to add custom attributes
Commits on Jul 20, 2012
  1. Matthew Robertson
Commits on Jul 16, 2012
  1. José Valim

    Merge pull request #98 from ccschmitz/patch-1

    josevalim authored
    Fix a couple typos
  2. Chris Schmitz

    Fix a couple typos.

    ccschmitz authored
  3. Don't include empty polymoprhic associations

    twinturbo authored
    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.
  4. Raise error when associations cannot be included

    twinturbo authored
    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.
Commits on Jul 15, 2012
  1. Actually test set serialization

    twinturbo authored
  2. José Valim

    Merge pull request #96 from bradleypriest/fixbuild

    josevalim authored
    Fix Travis on 1.8.7
  3. Bradley Priest

    Fix travis

    bradleypriest authored
  4. Close #90

    twinturbo authored
  5. José Valim

    Merge pull request #50 from twinturbo/polymorphism

    josevalim authored
    Polymorphism
Something went wrong with that request. Please try again.