aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Commented metaprogramming turned out to be noisier not clearerJeremy Kemper2010-02-252-12/+12
|
* let the rails command recurse upwards looking for script/rails, and exec ↵David Heinemeier Hansson2010-02-251-9/+28
| | | | ruby on it for better portability [Xavier Noria] (Closes #4008)
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-02-250-0/+0
|\
| * add time_separator for minutes only if minutes aren't hiddenSantiago Pastorino2010-02-242-1/+42
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | add time_separator for minutes only if minutes aren't hiddenSantiago Pastorino2010-02-252-1/+42
|/ | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Renamed LocalizedCache to DetailsCache.José Valim2010-02-248-57/+60
|
* Use render instead render_to_body.José Valim2010-02-242-2/+2
|
* Cleanup render callstack and make render(:json => {}, :status => 401) work ↵José Valim2010-02-242-23/+24
| | | | again.
* Remove ActionController::Base.resources_path_namesCarl Lerche2010-02-243-18/+18
|
* Remove references to ActionDispatch::Routing::Routes in favor of ↵Carl Lerche2010-02-245-8/+8
| | | | Rails.appication.routes.
* Remove the renderer option from the hash.José Valim2010-02-241-1/+1
|
* Fix render :file => "#{Rails.root}/public/404.html", :status => :not_found. ↵Yehuda Katz2010-02-233-1/+11
| | | | Closes #8994
* Woops, forgot to actually add active_support/core_ext/file/path.rbCarlhuda2010-02-233-0/+7
|
* Revert "Fix test load paths for those not using bundler"Carlhuda2010-02-2322-93/+50
| | | | | | This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818. This commit broke tests. You cannot have a file called "bundler" on the load path.
* Makes send_file work again by deferring to Rack::Sendfile. Carlhuda2010-02-237-72/+80
| | | | | | | | | | * Add the Rack::Sendfile middleware * Make the header to use configurable via config.action_dispatch.x_sendfile_header (default to "X-Sendfile"). * Add Railties tests to confirm that these work * Remove the :stream, :buffer_size, and :x_senfile default options to send_file * Change the log subscriber to always say "Sent file" * Add deprecation warnings for options that are now no-ops Note that servers can configure this by setting X-Sendfile-Type. Hosting companies and those creating packages of servers specially designed for Rails applications are encouraged to specify this header so that this can work transparently.
* Make AD::Response correctly handle bodies that respond_to?(:to_path) as per ↵Carlhuda2010-02-231-0/+12
| | | | the Rack spec
* Fix streaming by having it create a File object, which can be handled by ↵Carlhuda2010-02-235-18/+22
| | | | Rack servers as appropriate
* avoid @lock_value not initialized warningSantiago Pastorino2010-02-221-1/+1
|
* avoid @transaction_joinable not initialized warningSantiago Pastorino2010-02-221-1/+1
|
* avoid active not initialized warningSantiago Pastorino2010-02-221-0/+1
|
* Rename erubis_implementation to erb_implementation.José Valim2010-02-221-3/+3
|
* Include missing modules.José Valim2010-02-223-3/+4
|
* Adding options to register observers and interceptors through ↵Mikel Lindsaar2010-02-223-1/+42
| | | | | | ActionMailer::Base.register_observer and ActionMailer::Base.register_interceptor. These hook into Mail.register_interceptor and Mail.register_observer. Also bumped Mail requirement to 2.1.3 Signed-off-by: José Valim <jose.valim@gmail.com>
* don't set @expected.date in generated mailer testDavid Chelimsky2010-02-221-1/+0
| | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com> Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix AMo isolated tests.José Valim2010-02-221-1/+1
|
* Use ActionDispatch::Routing everywhereMartin Schürrer2010-02-2124-59/+64
|
* TypoMartin Schürrer2010-02-211-1/+1
|
* Add a tests which ensures filtered_parameters does not raise an error for a ↵José Valim2010-02-211-1/+1
| | | | mixed array [#3928 status:resolved]
* Store compiled parameter filters so we don't have to compile them in each ↵José Valim2010-02-211-25/+40
| | | | request.
* Make install appear on rake -T.José Valim2010-02-211-0/+1
|
* Also check if application is a valid constant in rake rails:update.José Valim2010-02-211-5/+11
|
* Add a test for default_url_options in AM.José Valim2010-02-211-0/+11
|
* Add validators reflection so you can do 'Person.validators' and ↵Prem Sichanugrist2010-02-215-3/+73
| | | | | | '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-2120-125/+112
| | | | 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-215-27/+70
|
* AMo #key is now #to_key and CI is probably happysnusnu2010-02-208-29/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Rename engines_load_path to railties_load_path.José Valim2010-02-202-3/+3
|
* Adds #key and #to_param to the AMo interfacesnusnu2010-02-198-2/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix a bunch of pending tests by providing an introspection mode for the ↵Carlhuda2010-02-194-21/+42
| | | | Response object that does up-front parsing of the headers to populate things like @etag
* 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
|
* require publicize_conversion_method to ensure to_date and to_datetime became ↵Santiago Pastorino2010-02-191-0/+1
| | | | public before redefining them (avoid warnings)
* Remove empty line and trailing hash, breaks documentation generationDirkjan Bussink2010-02-191-2/+0
| | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
* warning: instance variable @_const_missing not initialized fixedSantiago Pastorino2010-02-191-1/+1
|
* Fix test ordering bug related to introducing masked Name classYehuda Katz2010-02-191-14/+6
|
* Fix a problem where nil was appearing in the listYehuda Katz2010-02-191-4/+6
|
* Reinstate pending tests that were supposed to be fixed before theJoshua Peek2010-02-192-29/+19
| | | | | | beta. Shout louder this time so they actually get fixed.
* Allow to choose the template path and template name used in implicit ↵José Valim2010-02-192-46/+81
| | | | rendering with ActionMailer.
* Revert behavior from a5684dfa3c16472bfa5d5d861ba78cb6dbadcb59 and ensure ↵José Valim2010-02-193-11/+20
| | | | after_initializer is executed after to_prepare callbacks.
* ruby 1.9 array.to_s returns a string representing an escaped arraySantiago Pastorino2010-02-181-1/+1
| | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 12:15:04 +0000