Santiago Pastorino
33b0a30fcc
default could be a symbol here so attribute.to_s.humanize should be the final option
2010-12-05 12:57:45 -02:00
Santiago Pastorino
3ab98cf6e0
If default is provided don't add attribute.to_s.humanize to the options
2010-12-05 12:36:56 -02:00
Xavier Noria
48386d245b
Merge branch 'master' of git://github.com/lifo/docrails
2010-12-05 10:33:50 +01:00
Santiago Pastorino
acbabd9626
Don't compute this string again
2010-12-02 15:43:12 -02:00
Thilo Utke
7148b933c4
ActiveModel::Errors.to_hash returns plain OrderedHash and used in to_json serialization to properly handle multiple errors per attribute [ #5615 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-12-01 11:43:37 +01:00
José Valim
1ec126dd37
Revert "Fix generation of wrong json string when field has multiple errors"
...
This reverts commit a9b666b51d28b2e74da630c31327dee7cbe96d37.
2010-12-01 11:42:30 +01:00
Krekoten' Marjan
a9b666b51d
Fix generation of wrong json string when field has multiple errors
2010-12-01 00:03:42 +08:00
Aditya Sanghi
04922bafda
grammar fix
2010-11-27 19:56:08 +05:30
Carl Lerche
ccd2f3ede5
Update the version.rb files to include a PRE part
2010-11-16 17:19:46 -08:00
Robert Pankowecki
88688cdd8e
Fix when database column name has some symbolic characters. [ #5818 state:resolved]
2010-11-14 17:24:31 +08:00
snusnu
973b908777
Added missing AS require to active_model/naming.rb
...
We saw a failing spec when running the DataMapper
ActiveModel compliance specs for dm-active_model.
ActiveModel::Naming#model_name
relies on the Module#parents method defined in
active_support/core_ext/module/introspection.rb
Adding the appropriate require statement of course
fixed our specs.
2010-10-30 00:20:31 +08:00
Xavier Noria
db520042b3
Merge branch 'master' of git://github.com/lifo/docrails
2010-10-06 23:16:13 +02:00
Ernie Miller
33aaa15f62
Convert to model before calling model_name on a record in ActiveModel::Naming
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-10-04 21:26:41 +02:00
fastred
4ea9a8d9ad
Fix syntax error in ActiveModel::Validations .validate example
2010-10-01 18:32:46 +02:00
José Valim
fe0251e408
Merge remote branch 'miloops/warnings'
...
Conflicts:
actionpack/lib/action_controller/metal/url_for.rb
2010-09-27 21:00:54 +02:00
thedarkone
9c57bd8578
Fix Namind#model_name.
2010-09-27 17:46:00 +02:00
Emilio Tagua
be9883b09d
Don't redefine existing attributes accessors.
2010-09-27 11:19:19 -03:00
John Firebaugh
75a960ca6e
Don't act destructively on ActiveModel::Name#human options hash. [ #5366 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-09-25 10:59:54 +02:00
Rodrigo Rosenfeld Rosas
8d30193b08
Properly interpolate i18n keys in modules [ #5572 state:resolved]
2010-09-24 20:41:12 +02:00
Obie Fernandez
275f922a23
Better shortcut options for custom validators [ #5672 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-09-24 12:49:16 +02:00
Xavier Noria
8c0c815ba7
resolves rdoc conflict
2010-09-23 22:35:08 +02:00
Emilio Tagua
dc2f26ca38
Perf: refactor methods using inject when not need in activemodel.
...
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
2010-09-22 18:08:03 -03:00
Neeraj Singh
8ae913664f
remove irrelevant comments
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-09-18 20:33:40 +02:00
Alexey Mahotkin
dfebdb1b03
Tiny fixes to rdoc
2010-09-16 17:10:36 +04:00
Mikel Lindsaar
bca9b84a4a
Fixing documentation to reflect deprecated add_to_base
2010-09-12 14:19:38 +10:00
Jeremy Kemper
d79b1aa0ba
Fewer object allocations
2010-09-09 14:37:58 -07:00
Jeremy Kemper
cb67d16629
Cheaper attribute_method_matchers
2010-09-09 14:37:58 -07:00
Jeremy Kemper
82ea5db030
Fix require for class_attribute
2010-09-09 14:34:29 -07:00
Jakub Suder
2524cf404c
fixed some issues with JSON encoding
...
- as_json in ActiveModel should return a hash
and handle :only/:except/:methods options
- Array and Hash should call as_json on their elements
- json methods should not modify options argument
[#5374 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-09-07 11:33:10 -07:00
Carlos Antonio da Silva
69a4c67a3f
Fix docs related to param_key in ActiveModel::Naming
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-09-05 18:14:37 +02:00
Piotr Sarnacki
bf1ac82cec
Add some documantation on new route_key and param_key in ActiveModel::Naming
2010-09-03 22:59:15 +02:00
Piotr Sarnacki
6e5aed057f
Prepared ActiveModel::Naming to handle cases for namespaced isolated engines
2010-09-03 22:59:15 +02:00
José Valim
599e46bf24
Revert "Setup explicit requires for files with exceptions. Removed them from autoloading."
...
Booting a new Rails application does not work after this commit [#5359 state:open]
This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6.
2010-09-02 21:11:03 +02:00
Andreas Garnæs
1503e45e2e
ActiveModel#to_xml fix (renamed parameter).
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-09-02 12:55:45 +02:00
Łukasz Strzałkowski
38a421b34d
Setup explicit requires for files with exceptions. Removed them from autoloading.
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-09-02 11:54:04 +02:00
Subba Rao Pasupuleti
0ae81a2124
Refactoring conditional logic
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-09-01 14:00:26 +02:00
Subba Rao Pasupuleti
2d74ed49f4
reader method eliminates defined? checks
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-09-01 13:59:53 +02:00
José Valim
f0ee4a6002
Remove deprecations in ActiveModel.
2010-08-29 20:45:34 -03:00
Jaime Iniesta
5430f5bd06
lifecycle should be two words, life cycle
2010-08-26 14:23:58 +02:00
James Miller
4b07bc8475
to_json => as_json
2010-08-25 15:23:21 -07:00
David Heinemeier Hansson
21b1f29720
Master is now targeting 3.1.0.beta
2010-08-23 21:44:57 -05:00
Santiago Pastorino
9992a1a4bf
type fixed
2010-08-22 19:59:36 -03:00
Neeraj Singh
2ffa50f5a9
after_validation should be called irrespective of the result of validation.
...
I confirmed that this is the behavior on 2.3.x .
[5419 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-08-20 11:24:43 -03:00
Xavier Noria
a0ca3d1067
Merge remote branch 'docrails/master'
2010-08-18 00:25:32 +02:00
Xavier Noria
ea2ad26a8d
you rarely want ^ or $ in validations, use \A when you mean \A
2010-08-18 00:15:01 +02:00
Trey Bean
bee414748c
Missing object for comparison in ActiveModel::EachValidator example code.
2010-08-17 12:51:13 -06:00
José Valim
d0cf212cb5
to_key should return all exists keys (if any exists), regardless if the object is persisted or not. If you need it to reflect persistance, you should use to_param.
2010-08-15 11:29:15 -03:00
Santiago Pastorino
b95d6e84b0
Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)
2010-08-14 13:17:32 +02:00
Subba Rao Pasupuleti
f8f437191f
no callbacks should be created for empty array [ #5289 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-08-14 13:17:30 +02:00
Subba Rao Pasupuleti
b61ff257e9
tidy up validations length code [ #5297 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-08-14 13:17:29 +02:00