diff options
| author | snusnu <gamsnjaga@gmail.com> | 2010-02-21 03:05:28 +0100 |
|---|---|---|
| committer | Yehuda Katz <yehudakatz@YK.local> | 2010-02-20 20:17:29 -0800 |
| commit | f81c6bc0404ba2a03eed0ec6c08bbac45661305f (patch) | |
| tree | 6c6d892fb444687556ba001c189e0d6e533cddb7 /actionpack/lib | |
| parent | fed72b5842e5e8604917602a15c126d48cf12fde (diff) | |
| download | rails-f81c6bc0404ba2a03eed0ec6c08bbac45661305f.tar.gz rails-f81c6bc0404ba2a03eed0ec6c08bbac45661305f.tar.bz2 rails-f81c6bc0404ba2a03eed0ec6c08bbac45661305f.zip | |
AMo #key is now #to_key and CI is probably happy
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.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/record_identifier.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb index 9c35c5b0c3..3f966b1b64 100644 --- a/actionpack/lib/action_controller/record_identifier.rb +++ b/actionpack/lib/action_controller/record_identifier.rb @@ -77,8 +77,8 @@ module ActionController # make sure yourself that your dom ids are valid, in case you overwrite this method. def record_key_for_dom_id(record) return record.id unless record.respond_to?(:to_model) - key = record.to_model.key - key ? sanitize_dom_id(key.join('-')) : key + key = record.to_model.to_key + key ? sanitize_dom_id(key.join('_')) : key end # Replaces characters that are invalid in HTML DOM ids with valid ones. |