Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Apr 1, 2010
  1. @dhh
Commits on Mar 28, 2010
  1. @jeremy
  2. @jeremy

    Cosmetics: mismatch indentation

    jeremy authored
  3. @fxn
  4. @fxn

    adds a few requires in active_model/dirty.rb

    fxn authored
    [#4284 state:committed]
Commits on Mar 27, 2010
  1. @jeremy

    Use Array.wrap uniformly

    jeremy authored
  2. @jeremy

    Fix unstated dep on HWIA

    jeremy authored
  3. @josevalim
  4. @jacobat @josevalim

    ActiveModel::Dirty#changes should return a HashWithIndifferentAccess [#…

    jacobat authored josevalim committed
    …4157 state:resolved]
    
    Keep the Rails style of inject
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Mar 26, 2010
  1. @wycats
  2. @josevalim
Commits on Mar 17, 2010
  1. @tenderlove @wycats

    cleaning up a bunch of method already defined warnings [#4209 state:r…

    tenderlove authored wycats committed
    …esolved]
    
    Signed-off-by: wycats <wycats@gmail.com>
Commits on Mar 16, 2010
  1. @tenderlove @wycats

    fisting uninitialized ivar warnings. [#4198 state:resolved]

    tenderlove authored wycats committed
    Signed-off-by: wycats <wycats@gmail.com>
  2. @tenderlove @wycats

    clean up more warnings, remove unnecessary methods, fix eval line num…

    tenderlove authored wycats committed
    …bers. [#4193 state:resolved]
    
    Signed-off-by: wycats <wycats@gmail.com>
Commits on Mar 12, 2010
  1. @lifo

    Merge remote branch 'mainstream/master'

    lifo authored
    Conflicts:
    	activerecord/lib/active_record/base.rb
    	railties/lib/rails/configuration.rb
    	railties/lib/rails/log_subscriber.rb
Commits on Mar 2, 2010
  1. @brynary
Commits on Feb 28, 2010
  1. @josevalim
  2. @josevalim
Commits on Feb 25, 2010
  1. @jeremy
  2. @jeremy
Commits on Feb 21, 2010
  1. @sikachu @josevalim

    Add validators reflection so you can do 'Person.validators' and 'Pers…

    sikachu authored josevalim committed
    …on.validators_on(:name)'.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
  2. @josevalim

    Require persisted? in ActiveModel::Lint and remove new_record? and de…

    josevalim authored
    …stroyed? methods. ActionPack does not care if the resource is new or if it was destroyed, it cares only if it's persisted somewhere or not.
  3. @josevalim
  4. @snusnu

    AMo #key is now #to_key and CI is probably happy

    snusnu authored Yehuda Katz committed
    Obviously #key is a too common name to be included
    in the AMo interface, #to_key fits better and also
    relates nicely to #to_param. Thx wycats, koz and
    josevalim for the suggestion.
    
    AR's #to_key implementation now takes customized
    primary keys into account and there's a testcase
    for that too.
    
    The #to_param AMo lint makes no assumptions on how
    the method behaves in the presence of composite
    primary keys. It leaves the decision wether to
    provide a default, or to raise and thus signal to
    the user that implementing this method will need
    his special attention, up to the implementers. All
    AMo cares about is that #to_param is implemented
    and returns nil in case of a new_record?.
    
    The default CompliantObject used in lint_test
    provides a naive default implementation that just
    joins all key attributes with '-'.
    
    The #to_key default implementation in lint_test's
    CompliantObject now returns [id] instead of [1].
    This was previously causing the (wrong) tests I
    added for AR's #to_key implementation to pass. The
    #to_key tests added with this patch should be
    better.
    
    The CI failure was caused by my lack of knowledge
    about the test:isolated task. The tests for the
    record_identifier code in action_controller are
    using fake non AR models and I forgot to stub the
    #to_key method over there. This issue didn't come
    up when running the test task, only test:isolated
    revealed it. This patch fixes that.
    
    All tests pass isolated or not, well, apart from
    one previously unpended test in action_controller
    that is unrelated to my patch.
Commits on Feb 20, 2010
  1. @snusnu

    Adds #key and #to_param to the AMo interface

    snusnu authored Yehuda Katz committed
    This commit introduces two new methods that every
    AMo compliant object must implement. Below are the
    default implementations along with the implied
    interface contract.
    
      # Returns an Enumerable of all (primary) key
      # attributes or nil if new_record? is true
      def key
        new_record? ? nil : [1]
      end
    
      # Returns a string representing the object's key
      # suitable for use in URLs, or nil if new_record?
      # is true
      def to_param
        key ? key.first.to_s : nil
      end
    
    1) The #key method
    
    Previously rails' record_identifier code, which is
    used in the #dom_id helper, relied on calling #id
    on the record to provide a reasonable DOM id. Now
    with rails3 being all ORM agnostic, it's not safe
    anymore to assume that every record ever will have
    an #id as its primary key attribute.
    
    Having a #key method available on every AMo object
    means that #dom_id can be implemented using
    
      record.to_model.key # instead of
      record.id
    
    Using this we're able to take composite primary
    keys into account (e.g. available in datamapper)
    by implementing #dom_id using a newly added
    
      record_key_for_dom_id(record)
    
    method. The user can overwrite this method to
    provide customized versions of the object's key
    used in #dom_id.
    
    Also, dealing with more complex keys that can
    contain arbitrary strings, means that we need to
    make sure that we only provide DOM ids that are
    valid according to the spec. For this reason, this
    patch sends the key provided through a newly added
    
      sanitize_dom_id(candidate_id)
    
    method, that makes sure we only produce valid HTML
    
    The reason to not just add #dom_id to the AMo
    interface was that it feels like providing a DOM
    id should not be a model concern. Adding #dom_id
    to the AMo interface would force these concern on
    the model, while it's better left to be implemented
    in a helper.
    
    Now one could say the same is true for #to_param,
    and actually I think that it doesn't really fit
    into the model either, but it's used in AR and it's
    a main part of integrating into the rails router.
    
    This is different from #dom_id which is only used
    in view helpers and can be implemented on top of a
    semantically more meaningful method like #key.
    
    2) The #to_param method
    
    Since the rails router relies on #to_param to be
    present, AR::Base implements it and returns the
    id by default, allowing the user to overwrite the
    method if desired.
    
    Now with different ORMs integrating into rails,
    every ORM railtie needs to implement it's own
    #to_param implementation while already providing
    code to be AMo compliant. Since the whole point of
    AMo compliance seems to be to integrate any ORM
    seamlessly into rails, it seems fair that all we
    really need to do as another ORM, is to be AMo
    compliant. By including #to_param into the official
    interface, we can make sure that this code can be
    centralized in the various AMo compliance layers,
    and not be added separately by every ORM railtie.
    
    3) All specs pass
Commits on Feb 14, 2010
  1. @lifo

    Merge remote branch 'mainstream/master'

    lifo authored
    Conflicts:
    	railties/README
    	railties/guides/source/active_support_core_extensions.textile
    	railties/guides/source/getting_started.textile
    	railties/lib/generators/rails/app/templates/README
Commits on Feb 6, 2010
  1. @sikachu @josevalim

    Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake i…

    sikachu authored josevalim committed
    …nstall' will be run correctly [#3879 status:resolved]
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Feb 4, 2010
  1. @lifo

    Merge remote branch 'mainstream/master'

    lifo authored
    Conflicts:
    	railties/guides/source/3_0_release_notes.textile
  2. @dhh

    Move to 3.0.0.beta

    dhh authored
Commits on Feb 2, 2010
  1. @mikel

    Merge branch 'master' of git://github.com/rails/rails

    mikel authored
    Conflicts:
    	activemodel/README
    	activemodel/lib/active_model/errors.rb
    	activemodel/lib/active_model/serialization.rb
    	railties/guides/source/3_0_release_notes.textile
Commits on Jan 31, 2010
  1. @mikel
  2. @lifo

    Merge remote branch 'mainstream/master'

    lifo authored
    Conflicts:
    	activemodel/lib/active_model/state_machine.rb
  3. @josh

    Axe AM state machine

    josh authored
    We're going do it eventually, get it done before 3.0 is final.
Commits on Jan 30, 2010
  1. @josevalim
Commits on Jan 23, 2010
  1. @lifo
Something went wrong with that request. Please try again.