aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
| * Remove ActiveModel dependency from ActionPackGuillermo Iguaran2012-06-305-24/+33
| | | | | | | | | | | | | | | | ActiveModel is used in ActionPack for ActiveModel::Naming for a few, mostly optional aspects of ActionPack related to automatically converting an ActiveModel compliant object into a key for params and routing. It uses only three methods of ActiveModel (ActiveModel::Naming.route_key, ActiveModel::Naming.singular_route_key and ActiveModel::Naming.param_key).
* | Merge pull request #6908 from apotonick/av-prepare2José Valim2012-06-302-20/+13
|\ \ | | | | | | Av prepare2
| * | removing the AV::Base.helpers class attribute as it is not needed.Nick Sutterer2012-06-291-1/+0
| | |
| * | remove AV.prepare and move all helper-related logic into the controller. ↵Nick Sutterer2012-06-292-19/+13
| |/ | | | | | | | | | | this decouples the view since it no longer knows about routes internals. this is a result of an ongoing discussion at https://github.com/rails/rails/pull/6826.
* | Remove more tests related to draw external routes filesRafael Mendonça França2012-06-294-53/+1
| | | | | | | | Related with 5e7d6bba79393de0279917f93b82f3b7b176f4b5
* | Revert "Allow loading external route files from the router"José Valim2012-06-292-19/+0
|/ | | | | | | | | | | | | | This reverts commit 6acebb38bc0637bc05c19d87f8767f16ce79189b. Usage of this feature did not reveal any improvement in existing apps. Conflicts: actionpack/lib/action_dispatch/routing/mapper.rb guides/source/routing.textile railties/lib/rails/engine.rb railties/lib/rails/paths.rb railties/test/paths_test.rb
* Remove file added by mistake at 88230b7cf77181c2088cce3314493caa9b3ac1fbRafael Mendonça França2012-06-261-1/+0
|
* Merge pull request #6859 from bogdan/deprecate_monkey_patchJosé Valim2012-06-263-0/+19
|\ | | | | AS::Callbacks: deprecate monkey patch code
| * AS::Callbacks: deprecate monkey patch codeBogdan Gusiev2012-06-263-0/+19
| | | | | | | | | | Deprecate usage of filter object with #before and #after methods as around callback
* | :update_details method no more exists on @lookup_contextAkira Matsuda2012-06-261-2/+1
|/ | | | the method has gone in this commit: 119e9e2dafb0cdc5b85613b730333679aef534af
* Move number helper i18n related tests to ASCarlos Antonio da Silva2012-06-241-122/+0
| | | | | They also make more sense here since all the related logic with I18n is handled by AS::NumberHelper, and not by AV anymore.
* Refactor AV number helper tests with invalid numbersCarlos Antonio da Silva2012-06-241-44/+14
| | | | | | Just make use of the returning exception from assert_raise, instead of calling the method again with a rescue clause to test the saved exception number.
* Do not propagate the :raise option to AS number helpersCarlos Antonio da Silva2012-06-241-7/+19
| | | | | ActiveSupport::NumberHelper does not make use of :raise, so there's no need to propagate it down.
* Merge pull request #6805 from tim-vandecasteele/uploadedfile-paramifyCarlos Antonio da Silva2012-06-232-1/+8
|\ | | | | Don't paramify ActionDispatch::Http::UploadedFile in tests
| * Don't paramify ActionDispatch::Http::UploadedFile in testsTim Vandecasteele2012-06-222-1/+8
| | | | | | | | | | | | | | | | | | | | To test uploading a file without using fixture_file_upload, a posted ActionDispatch::Http::UploadedFile should not be paramified (just like Rack::Test::UploadedFile). (Rack::Test::UploadedFile and ActionDispatch::Http::UploadedFile don't share the same API, tempfile is not accessible on Rack::Test::UploadedFile as discussed in https://github.com/brynary/rack-test/issues/30)
* | eliminating another string subclassAaron Patterson2012-06-221-3/+7
| |
* | fix some accidental nilsAaron Patterson2012-06-222-3/+3
| |
* | add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-221-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-222-1/+2
|\ \
| * | fixes a few mistakes in api docs [ci skip]Vijay Dev2012-06-221-1/+1
| | |
| * | Fix misprint in UrlHelper moduleAlexey Vakhov2012-06-181-1/+1
| | |
| * | Add rdoc to phone_field Gaurish Sharma2012-06-161-0/+1
| | | | | | | | | [API docs](http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-phone_field) for `phone_field` provide no information on what the method actually does. no description nor access to source code. so added this
* | | use mutex_m rather than use a delegate systemAaron Patterson2012-06-211-6/+3
| | |
* | | Merge pull request #6428 from pinetops/resolver_concurrency_fixYehuda Katz2012-06-212-23/+80
|\ \ \ | | | | | | | | Make the Resolver template cache threadsafe
| * | | Improve the readability of the Resolver change detection codeTom Clarke2012-05-221-11/+19
| | | |
| * | | More granular locking of the Resolver template cacheTom Clarke2012-05-211-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid holding a global lock when doing template resolution, instead add individual locks on a per cache entry basis. The global lock is now only used for manipulation of the main cache data structure.
| * | | Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-212-23/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access.
* | | | stop subclassing stringAaron Patterson2012-06-212-4/+11
| | | |
* | | | Removed warnings.Arun Agrawal2012-06-211-3/+3
| |_|/ |/| | | | | | | | | | | 1. Change in test name as already defined. 2. ambiguous first argument; put parentheses or even spaces
* | | add :nodoc: to AV StylesheetIncludeTag, JavascriptIncludeTag and AssetIncludeTagFrancesco Rodriguez2012-06-193-4/+4
| | |
* | | Merge pull request #6777 from route/logger_in_metal_testsCarlos Antonio da Silva2012-06-191-0/+17
|\ \ \ | | | | | | | | | | | | Added test for case when view doesn't have logger method when using ActionController::Metal controller.
| * | | Added test for case when view doesn't have logger method when using ↵Dmitry Vorotilin2012-06-191-0/+17
| | | | | | | | | | | | | | | | ActionController::Metal controller.
* | | | Ensure that cache-control headers are mergedJames Tucker2012-06-182-10/+44
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several aspects to this commit, that don't well fit into broken down commits, so they are detailed here: * When a user uses response.headers['Cache-Control'] = some_value, then the documented convention in ConditionalGet is not adhered to, in this case, response.cache_control is ignored due to `return if self[CACHE_CONTROL].present?` * When a middleware sets cache-control headers that would clobber, they're converted to symbols directly, without underscores. This would lead to bugs. * Items that would live in :extras if set through expires_in, are placed directly in the @cache_control hash, and not respected in many cases (somewhat adhering to the aforementioned documentation). * Although quite useless, any directive named 'extras' would be ignored. The general convention applied is that expires_* take precedence, but no longer overwrite everything and expires_* are ALWAYS applied, even if the header is set. I am still unhappy about the contents of this commit, and the code in general. Ideally it should be refactored to no longer use :extras. I'd likely recommend expanding @cache_control into a class, and giving it the power to handle the merge in a more efficient fashion. Such a commit would be a larger change that could have additional semantic changes for other libraries unless they utilize expires_in in very standard ways.
* | | Bump tzinfo gem.kennyj2012-06-171-1/+1
| | |
* | | Merge pull request #6752 from steveklabnik/fix_5680Rafael Mendonça França2012-06-163-4/+21
|\ \ \ | | | | | | | | Respect absolute paths in compute_source_path.
| * | | Respect absolute paths in compute_source_path.Steve Klabnik2012-06-163-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using compute_source_path to determine the full path of an asset, if our source begins with '/', we don't want to include the directory. Examples are illustrative: > compute_source_path("foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/stylesheets/foo.css" > compute_source_path("/foo", "stylesheets", "css") => "/Users/steve/src/my_app/public/foo.css" Before this patch, the second example would return the same as the first. Fixes #5680.
* | | | TestCase does not need to be loaded when loading the frameworkAaron Patterson2012-06-151-1/+3
| | | |
* | | | Support unicode character route in config/routes.rb.kennyj2012-06-165-3/+25
|/ / /
* | | Use status, content_type, body method signature for render tooSantiago Pastorino2012-06-141-4/+3
| | |
* | | Refactor public exceptions to reuse render format methodCarlos Antonio da Silva2012-06-141-9/+6
| | |
* | | adding a test for #6459Aaron Patterson2012-06-141-0/+10
| | |
* | | Revert "AV::TestCase does not need to be loaded when eagerly loading the"Aaron Patterson2012-06-141-2/+1
| | | | | | | | | | | | This reverts commit f5e7cb84cd377feb1b60c5356ce02123e9c94380.
* | | we raise a subclass of LoadError, so rescue thatAaron Patterson2012-06-141-1/+6
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-142-8/+26
|\ \
| * | moar copy edits [ci skip]Vijay Dev2012-06-141-2/+1
| | |
| * | copy editing [ci skip]Vijay Dev2012-06-141-4/+7
| | |
| * | fixed http token authentication formattingJakub Kuźma2012-06-121-8/+13
| | |
| * | on CSRF whitelisting the argument for :if must be a symbolDaniel Lopes2012-06-071-1/+1
| | |
| * | fix typos on the CSRF whitelisting docDaniel Lopes2012-06-071-3/+3
| | |
| * | Document the CSRF whitelisting on get requestsDaniel Lopes2012-06-071-5/+16
| | |