aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template
Commit message (Collapse)AuthorAgeFilesLines
* AMo #key is now #to_key and CI is probably happysnusnu2010-02-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Revert "i18n translate with arrays issue solved"Yehuda Katz2010-02-191-5/+0
| | | | This reverts commit e7055e5b084f5e29e9cf8dab8d56943da65ccb43.
* i18n translate with arrays issue solvedSantiago Pastorino2010-02-191-0/+5
|
* i18n translate with arrays issue solvedSantiago Pastorino2010-02-181-0/+5
| | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
* Merge master.José Valim2010-02-171-1/+4
|\
| * Fix test load paths for those not using bundlerJoshua Peek2010-02-151-1/+4
| |
* | Rename Rails::Subscriber to Rails::LogSubscriberPrem Sichanugrist2010-02-161-6/+6
|/
* content_tag should escape its inputBruno Michel2010-02-143-9/+11
| | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
* simple_format returns a safe buffer escaping unsafe input [Santiago Pastorino]David Heinemeier Hansson2010-02-121-0/+12
|
* Fix pluralization for numbers formatted like '1.00'Gabriel Mansour2010-02-071-0/+2
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix nested attributes with specified collection.José Valim2010-02-071-0/+22
|
* Configuration values should be on AV::Base.José Valim2010-02-021-3/+3
|
* Modify the behavior of `radio_button_tag` to use `sanitize_to_id` for ↵Prem Sichanugrist2010-02-021-0/+4
| | | | | | consistency [#1792 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Deleted all references to ActionView::SafeBuffer in favor of ↵Santiago Pastorino2010-01-311-41/+0
| | | | | | ActiveSupport::SafeBuffer Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
* For performance reasons, you can no longer call html_safe! on Strings. ↵Yehuda Katz2010-01-315-7/+7
| | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe.
* data-remote needs to be on the form and not the submit when using button_to ↵Erik St. Martin2010-01-311-0/+7
| | | | :remote=>true
* add :remote option to form_tagStephen St. Martin2010-01-311-0/+6
|
* form_for should pass :remote to form_tag through html_optionsStephen St. Martin2010-01-311-0/+19
|
* deOMGifying Railties, Active Support, and Action PackMikel Lindsaar2010-01-312-4/+4
|
* Add rel=nofollow on non get remote linksJoshua Peek2010-01-301-2/+2
|
* Generate UJS code for :disable_withJoshua Peek2010-01-301-3/+3
|
* updating link_to and button_to to support :remote => true and other options ↵Erik St. Martin2010-01-302-12/+19
| | | | | | such as :confirm in a unobtrusive manor Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Include prototype ujs adapter with new appsJoshua Peek2010-01-301-8/+7
|
* Move form_remote_tag and remote_form_for into prototype_legacy_helperJoshua Peek2010-01-302-129/+0
|
* Move button_to_remote and submit_to_remote into prototype_legacy_helperJoshua Peek2010-01-301-18/+0
| | | | plugin
* Move link_to_function and link_to_remote into prototype_legacy_helperJoshua Peek2010-01-302-57/+0
| | | | plugin
* Drop AjaxHelperJoshua Peek2010-01-301-114/+0
|
* Move periodically_call_remote into prototype_legacy_helper pluginJoshua Peek2010-01-301-12/+0
|
* Move observe_field and observe_form to prototype_legacy_helper pluginJoshua Peek2010-01-301-37/+0
|
* Revert "Merge branch 'rails/master' into ujs"Joshua Peek2010-01-306-471/+326
| | | | | | | | | | | This reverts commit 3aa1ea1ae4baa4a03d03644e798eeb98a4745785, reversing changes made to 2c12a71378d2146c822acb389b00b866f6420ff5. Conflicts: actionpack/lib/action_view/helpers/javascript_helper.rb actionpack/lib/action_view/helpers/url_helper.rb actionpack/test/template/url_helper_test.rb
* Revert "fixed tests to also look for rails.js when using ↵Joshua Peek2010-01-301-7/+7
| | | | | | javascript_include_tag :defaults" This reverts commit 7f181e475080924164b3fa0071ee4898bd66cbb8.
* Deprecate link_to :popupJoshua Peek2010-01-291-30/+0
|
* fixed tests to also look for rails.js when using javascript_include_tag ↵Erik St. Martin2010-01-291-7/+7
| | | | :defaults
* updated tests + docs, plus minor inconsistency fixesStefan Penner2010-01-271-86/+182
|
* Added regression tests that discovered the previous issue. Stefan Penner2010-01-271-0/+14
|
* :href should be comming in through html_options and not optionsErik St. Martin2010-01-271-1/+1
|
* removing container inline js function of observed elements :function callbackErik St. Martin2010-01-271-2/+9
|
* periodically_call_remote does not need data-observe=trueErik St. Martin2010-01-271-2/+2
|
* test to go with last commit, explicit :href for link_to_remoteErik St. Martin2010-01-271-0/+5
|
* fix duplidate data-submit attribute, submit_to_remote should test urlStephen St. Martin2010-01-271-2/+2
|
* account for the fact a few options may be passed as symbols and need to be ↵Erik St. Martin2010-01-271-0/+5
| | | | converted to string
* removing Prototype inline js for attributes for :with and :condition, it now ↵Erik St. Martin2010-01-271-6/+24
| | | | is free form js that can be placed there, also moved :submit out into AjaxHelper, updated tests to reflect changes
* add missing test for :with option to link_to_remoteStephen St. Martin2010-01-271-0/+6
|
* add missing :before and :after callbacks for link_to_remoteStephen St. Martin2010-01-271-0/+5
|
* modified helper that adds attributes for :method to include rel='nofollow' ↵Erik St. Martin2010-01-271-3/+3
| | | | if :method => :delete, same as its remote_ equivalent
* making non remote versions of link_to, button_to, submit_tag and ↵Erik St. Martin2010-01-272-20/+20
| | | | image_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with
* link_to_remote and button_to_remote now support :confirmErik St. Martin2010-01-271-0/+10
|
* test :method option of link_to_remote, and ensure rel='nofollow' is added ↵Stephen St. Martin2010-01-271-0/+5
| | | | when :method => 'delete'
* port existing test suite to check for new output, and fix all breaking testsStephen St. Martin2010-01-271-121/+223
|