e8c064bbe0
Regression with how base errors messages are added to a model. Works correctly for both string error messages and symbol translated messages.
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-23 14:45:55 +02:00
c0fc084e93
should be able to run ActiveModel validations_test [ #4933 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 21:38:27 +02:00
6ea967729f
Avoid method redefined warning
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-22 15:09:01 +02:00
0421fb7a91
Refactor previous commit a bit [ #4057 state:resolved]
2010-06-21 12:17:24 +02:00
26392c4ac5
Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options hash and make various Validators pass their (filtered) options.
...
This makes it possible to pass additional options through Validators to message generation. E.g. plugin authors want to add validates_presence_of :foo, :format => "some format".
Also, cleanup the :default vs :message options confusion in ActiveModel validation message generation.
Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in favor of ActiveModel::Errors#add_on_blank(attributes, options).
Also, refactoring of ActiveModel and ActiveRecord Validation tests. Test are a lot more DRY now. Better test coverage as well now.
The first four points were reapplied from an older patch of Sven Fuchs which didn't apply cleanly anymore and was not complete yet.
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-21 11:55:21 +02:00
207fa59675
Merge remote branch 'rails/master'
...
Conflicts:
actionpack/lib/abstract_controller/base.rb
2010-06-20 23:13:19 +02:00
95a8f252c0
remove executable permission from files that don't need it. [ #4802 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-20 00:50:48 +02:00
0247995d05
ActiveModel::Validations::Callbacks should not be required by default.
2010-06-19 18:20:02 +02:00
51739d3228
moving before_validation and after_validation functionality from ActiveRecord to ActiveModel
...
[#4653 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-19 17:59:52 +02:00
01f3f0dbae
use RDoc 2.2 to generate the documentation of individual components
2010-06-16 22:30:06 +02:00
de65c82bfa
Changes call backs to callbacks.
2010-06-15 22:48:10 +04:30
596300ac8a
Merge branch 'master' of github.com:lifo/docrails
2010-06-15 22:21:39 +04:30
3ae67fbebb
Add titles to the rest of the files in active_model/validations/*
2010-06-15 22:20:19 +04:30
d896d8fa20
Minor doc changes to active_model/validations/confirmation.rb
2010-06-15 22:17:06 +04:30
6907bfe1ab
Minor doc changes to active_model/validations/acceptance.rb
2010-06-15 22:13:30 +04:30
89b96c0313
Active Model lint - fix minor typos
2010-06-15 13:38:22 -04:00
ef404c771d
Fix a bunch of minor spelling mistakes
2010-06-15 12:04:22 +04:00
f17159b029
edit pass: the names of Rails components have a space, ie, "Active Record", not "ActiveRecord"
2010-06-14 23:22:04 +02:00
e67c28dfe0
Added headings to serializers.
2010-06-14 13:59:55 +04:30
7d7d54fa1f
Revised the rest of the files from ActiveModel.
2010-06-14 13:56:51 +04:30
2572af11ce
Revised and added headings.
2010-06-14 13:49:01 +04:30
de12b5e616
Revised naming.rb and lint.rb
2010-06-14 13:44:49 +04:30
c5db6450ec
Added headings and revised active_model.rb/lint.rb grammatically
2010-06-14 13:43:06 +04:30
626586b8c7
Minor changes to active_model/errors.rb
2010-06-14 13:40:57 +04:30
716c243def
Minor changes to active_model/callbacks.rb and dirty.rb
2010-06-14 13:38:29 +04:30
97d6778c80
Minor changes to active_model/attribute_methods
2010-06-14 13:36:05 +04:30
4523081317
Minor changes to callbacks and conversion API docs.
2010-06-14 13:28:00 +04:30
ed507300f0
Fix minor mistake in activemodel/README
2010-06-11 14:20:30 +04:00
ccf9577aee
Fix a bunch of minor spelling mistakes
2010-06-11 14:15:34 +04:00
835fd07b48
Fix spelling error in ActiveModel::Conversion docs. [ #4826 state:resolved]
2010-06-11 03:09:27 +03:00
b67ec8ba20
class_attribute is not a direct replacement of class_inheritable_*.
...
If you are setting a hash or an array in class_attribute or you need
to freeze it, to ensure people won't modify it in place or you need
to dup it on inheritance.
2010-06-10 19:39:09 +02:00
e11bb95d56
Validators should at model level and not at AR:Base level [ Closes #4804 ]
...
[#4804 state:resolved]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2010-06-10 11:50:42 -04:00
32d4330b81
Get ready for beta 4
2010-06-08 14:47:02 -04:00
a04060fb6f
Really make include_root_in_json default to true [ #3770 state:resolved]
2010-06-08 01:02:45 +02:00
b3d2080278
Observing module is using constantize
2010-06-06 22:42:28 -07:00
35ae42be4f
Bump i18n to 0.4.1
2010-06-05 22:05:58 -07:00
a0bb1dda11
revises rdoc of AMo::Error#add [ #4738 state:resolved]
2010-06-01 15:44:14 +02:00
31e1445a81
Unforce builder from AS
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-06-01 10:45:51 +02:00
1854209bb3
Unforce i18n from AS
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-31 12:56:25 +02:00
bdb2871df7
Fix xml serialization test [ #4650 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-19 13:02:13 +02:00
b462952886
Use better assertion methods for testing
...
[#4645 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-19 10:18:36 +02:00
8e3c3b06dc
Fixed numericality validator in ActiveModel to reject hex numbers for floats completely [ #4622 state:commited]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-18 03:10:56 +02:00
05e3fb45ee
Add a valid hex that shouldn't be valid to ActiveModel numericality tests [ #4622 state:commited]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-18 03:10:55 +02:00
5371242384
Valid hex strings aren't valid float column values, to match the integer restriction. [ #4622 state:resolved]
2010-05-17 07:58:26 -07:00
6b4e0cc526
a cloned object no longer mimics changed flags from creator , plus a test case [ #4614 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 23:04:40 +02:00
fdfebb7782
Make use of assert_equal to test equallity between object assert expects and object and a message of error
...
[#4611 state:committed]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-16 16:06:28 +02:00
d6cbb27e7b
Revert "Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options hash and make various Validators pass their (filtered) options."
...
Having a huge array to whitelist options is not the proper way to handle this case. This means that the ActiveModel::Errors object should know about the options given in *all* validators and break the extensibility added by the validators itself. If the intent is to whitelist options before sending them to I18n, each validator should clean its respective options instead of throwing the responsibility to the Errors object.
This reverts commit bc1c8d58ec
2010-05-15 21:55:16 +02:00
bc1c8d58ec
Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options hash and make various Validators pass their (filtered) options.
...
This makes it possible to pass additional options through Validators to message
generation. E.g. plugin authors want to add validates_presence_of :foo, :format
=> "some format".
Also, cleanup the :default vs :message options confusion in ActiveModel
validation message generation.
Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in
favor of ActiveModel::Errors#add_on_blank(attributes, options).
Original patch by Sven Fuchs, some minor changes and has been changed to be applicable to master again
[#4057 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-15 11:17:58 -07:00
92160219a8
minor changes to instance level validations implementation based on feedback from José Valim
2010-05-13 13:57:37 -07:00
9131a88bb8
validation macros can now be used within an instance
2010-05-13 13:57:37 -07:00
6334006b81
Revert "Refactor of active_model/naming.rb and allow collection and element to be writable"
...
This reverts commit f7862b2c34
2010-05-12 21:02:16 +02:00
bea3c26833
Make ActiveResource serialize XML correctly when element_name is set.
...
[#4529 ]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-12 09:31:36 -07:00
f7862b2c34
Refactor of active_model/naming.rb and allow collection and element to be writable
...
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-12 09:31:30 -07:00
e1a0d86fe0
Merge remote branch 'rails/master'
2010-05-09 11:46:45 +02:00
605c6455ac
removed AR from all AMo tests, including any unneeded files (schema, fixtures and test helper)
2010-05-09 00:08:11 +03:00
88ad3ed8b5
removed an old unused model in the AMo tests which also removes another AR dependency
2010-05-09 00:08:11 +03:00
66913a76af
removed use of AR in AMo tests and removed testing of scopes (:on) in individual validation tests and moved them to their own test file
2010-05-08 23:51:36 +03:00
82485068f8
updated AMo validations to use a context for valid? and invalid?, removing the dependency on AR
2010-05-08 23:51:28 +03:00
b38639ab71
typo 'Provivdes' -> 'Provides'
2010-05-05 00:55:44 -03:00
bce2c0ce37
Active Model JSON serializer now supports custom root option
...
[#4515 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-05-04 13:17:26 -07:00
9bd91b00b8
Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax for I18n
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-03 13:37:32 +02:00
13867a3f5f
Use %{} syntax in I18n (faster) instead of {{}}.
2010-05-01 12:54:52 +02:00
883f27aa9a
test cases for record.to_xml [ #458 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-30 13:19:30 +02:00
2e9af3638d
Move several configuration values from Hash to ActiveSupport::XmlMini, which both Hash and Array depends on.
...
Also, refactored ActiveModel serializers to just use ActiveSupport::XmlMini.to_tag. As consequence, if a serialized attribute is an array or a hash, it's not encoded as yaml, but as a hash or array.
2010-04-29 12:42:42 +02:00
580dd3b052
array.to_xml should be able to handle all types of data elements [ #4490 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-29 09:04:34 +02:00
ce48b3103a
Makes validates_acceptance_of to not override database fields [ #4460 state:committed]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-28 23:12:03 +02:00
77c099c231
Fix validates_numericaly_of only integer error message [ #4406 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-25 10:14:15 +02:00
9476daa829
Speed up xml serializer by computing values just once and remove unecessary code duplication.
2010-04-22 12:29:08 +02:00
1924cff934
Fix Active Model observer tests
2010-04-16 13:14:52 -07:00
c2ca73c9ee
ActiveModel::Observing: stop using Observable Ruby module, re-implement `notify_observers`
...
`Observable#notify_observers` from Ruby always returns false (which halts ActiveRecord
callback chains) and has extra features (like `changed`) that were never used.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-04-16 13:09:07 -07:00
4c8af9bf51
Update changelogs for release
2010-04-13 12:14:54 -07:00
d748cc3cd0
Re-define empty? for errors to check if the values inside the OrderedHash are empty rather than the OrderedHash itself. [ #4356 state:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-10 13:21:20 +02:00
ee309d506c
Update versions (otherwise you install a gem from source as beta3 but internally it's beta2) and update CHANGELOG.
2010-04-10 12:17:34 +02:00
13e00ce606
fix stack trace lines on class_eval
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-04-09 21:28:49 +02:00
30f3a3df77
errors.rb needs to be declared as UTF-8 [ #3941 state:resolved]
...
Signed-off-by: wycats <wycats@gmail.com>
2010-04-02 09:14:55 -07:00
3adaef8ae7
Restore changed_attributes method in ActiveModel::Dirty and loosen expectation on including class' initialize method.
...
[#4308 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-04-01 17:52:45 -07:00
f0364d87f0
Release is today, yo
2010-04-01 14:20:03 -07:00
c1883e75b3
Updated changelogs to differentiate beta1 and beta2
2010-04-01 14:04:55 -07:00
d2a48852a1
Updated changelogs
2010-04-01 13:55:06 -07:00
d956003fa4
Neat and tidy, I say
2010-04-01 13:46:04 -07:00
9b71c55d3d
Make your bed and clean up your gemspecs!
2010-04-01 13:44:09 -07:00
d868cb4f8a
Prep for beta2, depend on latest Bundler
2010-04-01 13:36:45 -07:00
7e3b4c1f2f
Merge branch 'master' of github.com:rails/rails
2010-03-28 11:34:16 -07:00
d1f3437cac
Cosmetics: mismatch indentation
2010-03-28 11:34:09 -07:00
76f024ac8d
adds missing requires for Object#blank? and Object#present?
2010-03-28 14:15:02 +02:00
3b1c69d2dd
adds a few requires in active_model/dirty.rb
...
[#4284 state:committed]
2010-03-28 12:43:20 +02:00
a98db7c6ef
Use Array.wrap uniformly
2010-03-27 11:50:11 -07:00
c3cea9b594
Fix unstated dep on HWIA
2010-03-27 11:03:36 -07:00
f1da7174cc
Fix tests added in previous commit.
2010-03-27 11:04:21 +01:00
a5d637d86c
ActiveModel::Dirty#changes should return a HashWithIndifferentAccess [ #4157 state:resolved]
...
Keep the Rails style of inject
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-03-27 10:48:32 +01:00
197904341f
Merge branch 'master' into docrails
2010-03-26 15:10:24 -07:00
4c7c406155
Remove reference to unexistent methods and fix typo.
2010-03-26 01:12:24 +01:00
b652aa8121
cleaning up a bunch of method already defined warnings [ #4209 state:resolved]
...
Signed-off-by: wycats <wycats@gmail.com>
2010-03-17 13:56:33 -07:00
df735cf5b7
fisting uninitialized ivar warnings. [ #4198 state:resolved]
...
Signed-off-by: wycats <wycats@gmail.com>
2010-03-16 15:11:00 -07:00
8c3e46c093
clean up more warnings, remove unnecessary methods, fix eval line numbers. [ #4193 state:resolved]
...
Signed-off-by: wycats <wycats@gmail.com>
2010-03-16 11:48:34 -07:00
e68bfaf1fe
Merge remote branch 'mainstream/master'
...
Conflicts:
activerecord/lib/active_record/base.rb
railties/lib/rails/configuration.rb
railties/lib/rails/log_subscriber.rb
2010-03-12 16:00:01 +00:00
4bc2cbc3cf
Load RAILS_VERSION relative to the gemspec file.
2010-03-06 21:33:28 -08:00
deb00bcb8c
Read Rails version from a file instead of modifying the load path and doing requires
...
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-03-04 21:25:52 -08:00
5c40c2691d
Stray line. Typo.
2010-03-02 10:44:40 -08:00
56ea20605a
Wordsmith gem descriptions
2010-03-02 10:43:41 -08:00
f221a6f19f
Leverage VERSION constants from gemspecs to avoid tedious updates when releasing
2010-03-02 00:32:53 -05:00
a4111bbca0
Update versions of all components to normalize them to new format
2010-03-02 00:32:48 -05:00
11db694e0b
Remove cruft in the gem packaging and release code
2010-03-01 19:00:19 -08:00
4377deed35
ensure activemodel lib is setup correctly
2010-02-28 18:27:00 -06:00
1a2fba1b6b
don't expand test path
2010-02-28 18:26:00 -06:00
ae8070e21b
Add missing information about attributes method.
2010-02-28 11:43:13 +01:00
32afcdcb88
ActiveModel::Lint should not require our models to respond to id.
2010-02-28 11:39:39 +01:00
2ba6049506
Accept array of attributes as arg also, like 2.3
2010-02-25 13:07:48 -08:00
f7b0a857e9
Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.
2010-02-25 09:32:29 -08:00
24ab5665b2
Revert "Fix test load paths for those not using bundler"
...
This reverts commit eec2d301d4
2010-02-23 17:31:17 -08:00
6fa2bbfd10
Fix AMo isolated tests.
2010-02-22 08:45:41 +01:00
8f97e9d19a
Add validators reflection so you can do 'Person.validators' and 'Person.validators_on(:name)'.
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-21 12:37:46 +01:00
250c809246
Require persisted? in ActiveModel::Lint and remove new_record? and destroyed? 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.
2010-02-21 11:12:14 +01:00
9dd67fce25
Add to_key and to_param methods to ActiveModel::Conversion.
2010-02-21 09:08:59 +01:00
f81c6bc040
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.
2010-02-20 20:17:29 -08:00
9acd686753
Adds #key and #to_param to the AMo interface
...
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
2010-02-19 23:31:25 -08:00
eec2d301d4
Fix test load paths for those not using bundler
2010-02-15 10:20:11 -06:00
6f3c5f6787
Merge remote branch 'mainstream/master'
...
Conflicts:
railties/README
railties/guides/source/active_support_core_extensions.textile
railties/guides/source/getting_started.textile
railties/lib/generators/rails/app/templates/README
2010-02-14 19:28:05 +00:00
9fd9e5d4f7
fixes doc generation
...
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2010-02-10 14:37:56 -08:00
5fe3dc4bf5
Adding ruby version spec to all gemspec files to at least 1.8.7
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-08 09:42:12 +01:00
1d9d9d2d89
Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' will be run correctly [ #3879 status:resolved]
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-02-06 15:51:44 +01:00
c548e21365
Bump git versions to 3.0.0.beta1 since we've released
2010-02-05 09:24:12 -08:00
459ecaf95d
Submarine the rake-gemcutter dep in Rakefiles
2010-02-05 00:03:03 -08:00
7b81f5981f
Fix task defines
2010-02-04 18:44:32 -08:00
c1785f3282
Release using gemcutter gem:push tasks
2010-02-04 18:28:45 -08:00
8260f0b40f
Merge remote branch 'mainstream/master'
...
Conflicts:
railties/guides/source/3_0_release_notes.textile
2010-02-04 13:14:44 +00:00
79817aa9e7
Move to 3.0.0.beta
2010-02-03 17:29:51 -08:00
12681c2a71
Merge branch 'master' of git://github.com/rails/rails
...
Conflicts:
activemodel/README
activemodel/lib/active_model/errors.rb
activemodel/lib/active_model/serialization.rb
railties/guides/source/3_0_release_notes.textile
2010-02-02 14:04:23 +11:00
d1eed079e1
Merge branch 'master' of git://github.com/rails/rails
2010-02-02 10:51:19 +11:00
fdcf4d6c51
Merge remote branch 'mainstream/master'
2010-02-01 23:42:38 +00:00
9f01dff9c2
Get rails tests running on bundler 0.9
2010-01-31 19:13:43 -08:00
65ad16568c
Updating copyright dates on all licenses
2010-02-01 10:10:53 +11:00
a07d0f8786
Full update on ActiveModel documentation
2010-02-01 10:08:20 +11:00
ed60021f39
Merge remote branch 'mainstream/master'
...
Conflicts:
activemodel/lib/active_model/state_machine.rb
2010-01-31 14:32:26 +00:00
db49c706b6
Axe AM state machine
...
We're going do it eventually, get it done before 3.0 is final.
2010-01-30 18:38:01 -06:00
d6e2f5013c
Drop AR I18n deprecation and simple use errors.messages as fallback.
2010-01-30 13:12:12 +01:00
efd0bd3b73
Merge remote branch 'mainstream/master'
2010-01-24 01:33:18 +05:30
1a50d2e66a
Stop overriding LoadError.new to return a MissingSourceError (and sometimes nil!)
2010-01-19 22:35:26 -08:00
c71120e29c
Merge remote branch 'mainstream/master'
2010-01-19 13:40:26 +05:30
3cb0283fb6
Documentation cleanup and linkage for validator
2010-01-19 11:29:01 +11:00
9aee365924
Adding ActiveModel::Validations documentation
2010-01-18 18:29:33 +11:00
91c38403be
Adding documentation for ActiveModel::Translation
2010-01-18 18:13:49 +11:00
71328a9856
Fixing up state machine docs
2010-01-18 17:20:25 +11:00
6e45bf53fb
Fixing documentation on ActiveModel::Observer#observed_classes
2010-01-18 00:21:45 -05:00
aa8cbb79dc
Partial Documentation for ActiveModel::StateMachine
2010-01-18 14:54:02 +10:00
31ea83eb89
Adding Proc support to validation messages so that they can become a little more dynamic, allowing for customisations during the request [ #3514 status:resolved].
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-17 14:40:10 +01:00
a6831b95d6
Updating ActiveModel::Errors documentation to plug Translations and Validations modules
2010-01-17 20:22:14 +11:00
19814df40d
Adding documentation for ActiveModel::Serialization
2010-01-17 20:14:14 +11:00
afd0c06dfa
Validates needs hash slice.
2010-01-17 09:57:16 +01:00
e6063282f9
Fixing documentation for ActiveModel::Observer
2010-01-17 19:12:12 +11:00
fbc7c2beca
Adding ActiveModel::Naming documentation
2010-01-17 15:52:33 +11:00
87bd8c803b
Update errors docs
2010-01-17 15:41:41 +11:00
cf55e4e382
Added documentation for ActiveModel::Lint
2010-01-17 15:35:18 +11:00
4d4bdb0766
Added ActiveModel::Errors documentation
2010-01-17 15:17:54 +11:00
6f663addaa
Merge branch 'master' of github.com:lifo/docrails
2010-01-17 12:46:51 +11:00
8834b2612b
Adding ActiveModel::AttributeMethods documentation
2010-01-17 12:42:53 +11:00
dba196cb7f
Merge docrails
2010-01-17 03:26:20 +05:30
b04230e3bb
Merge remote branch 'mainstream/master'
...
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
2010-01-17 03:20:30 +05:30
e1c15d9fa1
fixed column alignment
2010-01-16 23:09:32 +11:00
4a2d2ef91a
Adding RDoc for active_model dirty
2010-01-16 23:03:20 +11:00
db274a02ed
Fixed readme for ActiveModel::Dirty
2010-01-16 22:21:07 +11:00
d1bedd182b
Updated README
2010-01-15 10:01:40 +11:00
23e434f08f
ActiveModel::Conversion documentation
2010-01-15 08:29:08 +11:00
582228e435
ActiveModel::Callbacks documentation
2010-01-15 08:19:53 +11:00
b078f7fd39
Fix typos and add tests to ensure they will be caught the next time.
2010-01-11 23:38:35 +01:00
017f5d5308
Fix typo by renaming :genre to :gender.
2010-01-09 00:18:07 +01:00
7045c4c279
Allow validates to map some types to specific options. So now you can do:
...
validates :email, :presence => true, :format => /@/
validates :genre, :inclusion => %w(m f)
validates :password, :length => 6..20
2010-01-08 21:36:04 +01:00
fa14d6d51e
Compile length validator options still at the class level, so whenever the validator is called, it just needs to check for :maximum, :minimum and :is values.
2010-01-08 21:36:04 +01:00
47a5fd4c4b
Allow :if, :unless, :on, :allow_nil and :allow_blank as shared options in validates.
2010-01-07 19:23:59 +01:00
0a79eb7889
Add validates method as shortcut to setup validators for a given set of attributes:
...
class Person < ActiveRecord::Base
include MyValidators
validates :name, :presence => true, :uniqueness => true, :length => { :maximum => 100 }
validates :email, :presence => true, :email => true
end
[#3058 status:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-01-07 19:23:59 +01:00
a25ef06956
Allow to specify default attributes names translation in I18n yml files.
...
For example, you could easily specify :created_at and :updated_at translations as:
en:
attributes:
created_at: "Created at"
updated_at: "Updated at"
This configuration is built on ActiveModel, so it means those translations are
shared between different ORMs as well (but always as a fallback).
2010-01-07 15:31:50 +01:00
b0572ab2b6
Be sure to dup load paths before clearing the array.
2010-01-07 15:31:50 +01:00
190ce3ab37
Errors messages are now moved from :activerecord.errors to simply :errors on I18n yml files.
2010-01-07 15:31:49 +01:00
e5ed62deea
Autoload AR test case
2010-01-04 16:50:01 -06:00
640d9e7e32
Autoload AMo test case
2010-01-04 16:29:07 -06:00
2601a16ede
Autoload AS test case
2010-01-04 16:22:46 -06:00
5e94d3e3ea
Merge
2010-01-03 22:27:28 -08:00
532b11690f
Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 [DHH]
2010-01-03 22:02:10 -05:00
cda36a0731
Merge remote branch 'mainstream/master'
2010-01-04 03:24:39 +05:30
4796be33a4
Add missing tests to Validators.
2010-01-03 17:14:50 +01:00
08986ce290
Remove deprecated ActiveModel tests (%d and %s is no longer supported in error messages a couple months already)
2010-01-02 22:27:03 +01:00
653fa4c10c
Add naming to AMo::Lint
2010-01-02 22:27:02 +01:00
7cc0a4cfa1
Use activerecord.errors.format as in Rails 2.3.5.
2010-01-02 22:27:02 +01:00
5fdd0e80a4
Be sure to convert namespaced names to we have 'Parrots name' instead of 'Parrots.name' in error messages.
2010-01-02 22:27:02 +01:00
4f590b67b7
Ruby 1.9.2: explicit coercion check no longer needed; bug fixed upstream
2010-01-01 11:02:09 -08:00
ae7ada1fde
Some railties cleanup:
...
* Rename <framework>/rails.rb -> <framework>/railtie.rb
* Rails::Plugin -> Rails::Railtie
* Rails::Plugin::Vendored -> Rails::Plugin
2009-12-31 13:12:52 -08:00
e749424dfa
Rename rails.rb -> rails/all.rb and rails/core.rb -> rails.rb
2009-12-31 13:12:52 -08:00
a23f4b6aee
Add a /rails.rb for each framework for consistency
2009-12-31 11:57:59 -08:00
6d390671f6
Move ActiveRecord callbacks implementation to ActiveModel and make use of it.
...
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
2009-12-28 16:19:23 -08:00
632df063a3
Merge commit 'josevalim/validations'
2009-12-28 11:13:35 -08:00
292363c75f
Use i18n
2009-12-27 15:17:44 -08:00
74098e4cb6
No need to use ValidationsRepairHelper hack on ActiveModel anymore, Model.reset_callbacks(:validate) is enough. However, tests in ActiveRecord are still coupled, so moved ValidationsRepairHelper back there.
2009-12-23 13:30:58 +01:00
e31077c9aa
Small clean up in Naming and TTranslation tests.
2009-12-23 12:28:02 +01:00
44cd9e0e71
ActiveRecord::Validations are now built on top of Validator as well.
2009-12-23 12:14:00 +01:00
279067639f
validates_each uses a BlockValidator.
2009-12-23 01:38:15 +01:00
977a5c43b1
Added check_validity! to EachValidator and refactor existing ones.
2009-12-23 01:08:27 +01:00
f737c2d69b
All AMo modules are safe to defer
2009-12-22 17:39:41 -06:00
f1085f4128
Move validations in ActiveModel to validators, however all validatity checks are still in the class method.
2009-12-23 00:36:51 +01:00
ace20bd25e
Flip deferrable autoload convention
2009-12-22 17:27:37 -06:00
2476c5312d
Validator is simply sent to validate method. However, the API needs to change, so validate accepts a record.
2009-12-22 23:12:21 +01:00
Josh Kalderimis