aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* Revert "Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an ↵José Valim2010-05-159-54/+26
| | | | | | | | 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 bc1c8d58ec45593acba614d1d0fecb49adef08ff.
* Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options ↵Jeroen van Dijk2010-05-159-26/+54
| | | | | | | | | | | | | | | | | | | | 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>
* minor changes to instance level validations implementation based on feedback ↵Josh Kalderimis2010-05-134-38/+17
| | | | from José Valim
* validation macros can now be used within an instanceJosh Kalderimis2010-05-1311-14/+89
|
* Revert "Refactor of active_model/naming.rb and allow collection and element ↵Santiago Pastorino2010-05-121-29/+5
| | | | | | | | to be writable" This reverts commit f7862b2c34b5b298bf7b937c55f0637ebfe43a25. Signed-off-by: José Valim <jose.valim@gmail.com>
* Make ActiveResource serialize XML correctly when element_name is set.Santiago Pastorino2010-05-121-1/+1
| | | | | | [#4529] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Refactor of active_model/naming.rb and allow collection and element to be ↵Santiago Pastorino2010-05-121-5/+29
| | | | | | writable Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge remote branch 'rails/master'Xavier Noria2010-05-092-6/+17
|\
| * updated AMo validations to use a context for valid? and invalid?, removing ↵Josh Kalderimis2010-05-081-5/+12
| | | | | | | | the dependency on AR
| * Active Model JSON serializer now supports custom root optionJatinder Singh2010-05-041-1/+5
| | | | | | | | | | | | [#4515 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | typo 'Provivdes' -> 'Provides'Santiago Pastorino2010-05-051-1/+1
|/
* Favor %{} in all code instead of (deprecated) {{}} as interpolation syntax ↵Lawrence Pit2010-05-033-5/+5
| | | | | | for I18n Signed-off-by: José Valim <jose.valim@gmail.com>
* Use %{} syntax in I18n (faster) instead of {{}}.José Valim2010-05-012-10/+10
|
* Move several configuration values from Hash to ActiveSupport::XmlMini, which ↵José Valim2010-04-291-111/+51
| | | | | | 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.
* Makes validates_acceptance_of to not override database fields [#4460 ↵Santiago Pastorino2010-04-282-2/+7
| | | | | | state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix validates_numericaly_of only integer error message [#4406 state:resolved]reu2010-04-252-11/+19
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Speed up xml serializer by computing values just once and remove unecessary ↵José Valim2010-04-221-18/+17
| | | | code duplication.
* Fix Active Model observer testsJeremy Kemper2010-04-161-0/+4
|
* ActiveModel::Observing: stop using Observable Ruby module, re-implement ↵Mislav Marohnić2010-04-161-7/+16
| | | | | | | | | `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>
* Re-define empty? for errors to check if the values inside the OrderedHash ↵Ryan Bigg2010-04-101-0/+5
| | | | | | are empty rather than the OrderedHash itself. [#4356 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Update versions (otherwise you install a gem from source as beta3 but ↵José Valim2010-04-101-1/+1
| | | | internally it's beta2) and update CHANGELOG.
* fix stack trace lines on class_evalSantiago Pastorino2010-04-092-5/+5
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* errors.rb needs to be declared as UTF-8 [#3941 state:resolved]Aaron Patterson2010-04-021-0/+2
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Restore changed_attributes method in ActiveModel::Dirty and loosen ↵Sam Pohlenz2010-04-011-12/+12
| | | | | | | | expectation on including class' initialize method. [#4308 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Prep for beta2, depend on latest BundlerDavid Heinemeier Hansson2010-04-011-1/+1
|
* Merge branch 'master' of github.com:rails/railsJeremy Kemper2010-03-283-0/+5
|\
| * adds missing requires for Object#blank? and Object#present?Xavier Noria2010-03-282-0/+2
| |
| * adds a few requires in active_model/dirty.rbXavier Noria2010-03-281-0/+3
| | | | | | | | [#4284 state:committed]
* | Cosmetics: mismatch indentationJeremy Kemper2010-03-281-1/+1
|/
* Use Array.wrap uniformlyJeremy Kemper2010-03-275-7/+12
|
* Fix unstated dep on HWIAJeremy Kemper2010-03-271-0/+2
|
* Fix tests added in previous commit.José Valim2010-03-271-0/+5
|
* ActiveModel::Dirty#changes should return a HashWithIndifferentAccess [#4157 ↵Jacob Atzen2010-03-271-1/+1
| | | | | | | | state:resolved] Keep the Rails style of inject Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' into docrailswycats2010-03-263-22/+23
|\
| * Remove reference to unexistent methods and fix typo.José Valim2010-03-261-1/+0
| |
| * cleaning up a bunch of method already defined warnings [#4209 state:resolved]Aaron Patterson2010-03-171-3/+15
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * fisting uninitialized ivar warnings. [#4198 state:resolved]Aaron Patterson2010-03-161-10/+7
| | | | | | | | Signed-off-by: wycats <wycats@gmail.com>
| * clean up more warnings, remove unnecessary methods, fix eval line numbers. ↵Aaron Patterson2010-03-161-9/+2
| | | | | | | | | | | | [#4193 state:resolved] Signed-off-by: wycats <wycats@gmail.com>
* | Merge remote branch 'mainstream/master'Pratik Naik2010-03-128-30/+123
|\| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb
| * Update versions of all components to normalize them to new formatBryan Helmkamp2010-03-021-2/+3
| |
| * Add missing information about attributes method.José Valim2010-02-281-3/+6
| |
| * ActiveModel::Lint should not require our models to respond to id.José Valim2010-02-281-2/+0
| |
| * Accept array of attributes as arg also, like 2.3Jeremy Kemper2010-02-251-1/+1
| |
| * Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.Jeremy Kemper2010-02-251-1/+1
| |
| * Add validators reflection so you can do 'Person.validators' and ↵Prem Sichanugrist2010-02-213-3/+45
| | | | | | | | | | | | 'Person.validators_on(:name)'. Signed-off-by: José Valim <jose.valim@gmail.com>
| * Require persisted? in ActiveModel::Lint and remove new_record? and ↵José Valim2010-02-212-21/+16
| | | | | | | | 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.
| * Add to_key and to_param methods to ActiveModel::Conversion.José Valim2010-02-211-10/+35
| |
| * AMo #key is now #to_key and CI is probably happysnusnu2010-02-201-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Adds #key and #to_param to the AMo interfacesnusnu2010-02-192-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote branch 'mainstream/master'Pratik Naik2010-02-141-1/+1
|\| | | | | | | | | | | | | | | Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 01:12:17 +0000