aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Minor js review [ci skip]Carlos Antonio da Silva2012-12-181-7/+7
| | | | Remove/add ; where necessary, fix indentation.
* handle protocol option in stylesheet_link_tag and javascript_include_tagVasiliy Ermolovich2012-12-183-3/+33
| | | | closes #8388
* Format routes as html on debug pageschneems2012-12-174-2/+76
| | | | | | | | | When someone gets a routing exception, the routes are rendered (starting in Rails 4.0). This PR brings parity between the html routes in the `rails/info/routes` path and when rendered from an exception. This is the continuation of #8521 which brought html formatted routes. In addition to bringing parity to the two views, we're keeping our views DRY by rendering off of the same partials. In this case Railties depends on partials provided by ActionDispatch. I'm open to alternative implementations. Ideally both views will use the same code so any improvements or updates to it will be reproduced on both. <hr /> ![](http://f.cl.ly/items/3O1D0K1v0j0i343O3T3T/Screen%20Shot%202012-12-17%20at%203.07.20%20PM.png)
* Make conditional_layout? private and update documentationAndrew White2012-12-171-15/+23
| | | | | | | | | | | | | | | The conditional_layout? method is not for public use and doesn't actually do what the documentation suggested it does. It's actually used to determine whether or not to use the explicit layout definition defined in a controller or use the implicit layout definition. Also documentation was added for the action_has_layout? method which acts as a master switch for disabling the layout for the current action. This method was added so that action caching didn't depend on accessing layout internals but is also used by third-parties, most notably the [Hobo][1] application. [1]: https://github.com/hobo/hobo
* Merge pull request #8529 from schneems/schneems/debug-exceptions-extend-pathSteve Klabnik2012-12-161-1/+1
|\ | | | | DebugExceptions `File.join` => `File.expand_path`
| * DebugExceptions `File.join` => `File.expand_path`schneems2012-12-161-1/+1
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-151-0/+412
|\ \ | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb railties/lib/rails/info_controller.rb
| * | repeating documentation for form helpersThiago Pinto2012-12-091-18/+406
| | |
* | | Convert changelogs to 1.9 hash style and fix some formatting [ci skip]Carlos Antonio da Silva2012-12-141-26/+26
| | |
* | | Revert "Merge pull request #8499 from schneems/schneems/html-route-inspector"Steve Klabnik2012-12-141-24/+7
| | | | | | | | | | | | | | | | | | | | | This reverts commit ae68fc3864e99ab43c18fd12577744e1583f6b64, reversing changes made to 0262a18c7b0ab6f60fee842b3007388f9ffeb0fa. See here: https://github.com/rails/rails/pull/8499#issuecomment-11356417
* | | remove a cache we do not needAaron Patterson2012-12-141-5/+1
| | |
* | | Merge pull request #8510 from thedarkone/thread_safety_improvementsAaron Patterson2012-12-146-63/+48
|\ \ \ | | | | | | | | Thread safety improvements
| * | | Replace some global Hash usages with the new thread safe cache.thedarkone2012-12-146-63/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary of the changes: * Add thread_safe gem. * Use thread safe cache for digestor caching. * Replace manual synchronization with ThreadSafe::Cache in Relation::Delegation. * Replace @attribute_method_matchers_cache Hash with ThreadSafe::Cache. * Use TS::Cache to avoid the synchronisation overhead on listener retrieval. * Replace synchronisation with TS::Cache usage. * Use a preallocated array for performance/memory reasons. * Update the controllers cache to the new AS::Dependencies::ClassCache API. The original @controllers cache no longer makes much sense after @tenderlove's changes in 7b6bfe84f3 and f345e2380c. * Use TS::Cache in the connection pool to avoid locking overhead. * Use TS::Cache in ConnectionHandler.
* | | | Improve the documentation of cache_if and cache_unlessRafael Mendonça França2012-12-141-4/+7
| | | |
* | | | Merge pull request #8497 from acapilleri/conditional_cacheRafael Mendonça França2012-12-143-31/+55
|\ \ \ \ | | | | | | | | | | | | | | | Removed :if / :unless conditions to fragment cache in favour of *cache_i...
| * | | | Removed :if and :unless from fragment cache option in favour ofAngelo capilleri2012-12-143-31/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cache_if(condition, option, &block) and cache_unless(condition, option, &block). In the PR #8371 was introduced conditional options :if and :unless in the cache method. Example: <%= cache @model, if: some_condition(@model) do %> ... <%end%> This is a good feature but *cache_if* and and *cache_unless* are more concise and close to the standard of rails view helpers (ex: link_to_if and link_to_unless). Example: <%= cache_if condition, @model do %> ... <%end%>
* | | | | Clear url helper methods when routes are reloadedAndrew White2012-12-143-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | Remove all the old url helper methods when clear! is called on the route set because it's possible that some routes have been removed.
* | | | | Revert "Clear url helpers when reloading routes"Andrew White2012-12-142-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't actually remove old url helper methods as they are defined in a different module. This reverts commit 96bcef947bf713b7d9fc88f26dff69f568111262. Conflicts: actionpack/CHANGELOG.md
* | | | | Add missing require.Rafael Mendonça França2012-12-133-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | I was trying to use those files without Rails and that require was missing.
* | | | | Merge pull request #8499 from schneems/schneems/html-route-inspectorSteve Klabnik2012-12-131-7/+24
|\ \ \ \ \ | | | | | | | | | | | | Output routes in :html format
| * | | | | Output routes in :html formatschneems2012-12-121-7/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | By formatting routes for different media (txt/html) we can apply optimizations based on the format. We can include meta-data in the HTML to allow a rich experience while rendering and viewing the routes. This PR shows route helpers as they are used with the `_path` extension, it also has a javascript toggle on the top to switch to `_url`. This way the developer can see the exact named route helper they can use instead of having to modify a base. This is one example of an optimization that could be applied. Eventually we can link out to guides for the different columns to better explain what helper, HTTP Verb, Path, and Controller#action indicate. We could even add a route search box that could allow developers to input a given route and see all of the routes that match it. These are stand alone features and should be delivered separately.
* | | | | Bring back helpers_path attr accessorCarlos Antonio da Silva2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This is apparently used by the railtie to setup the app helpers paths correctly between initializers. I'll need to check it further.
* | | | | Refactor helpers code in Action Pack a bitCarlos Antonio da Silva2012-12-133-8/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Avoid calling class_eval when not needed * Remove helpers_path attr accessor, it's defined as a class attribute a few lines later * Avoid creating extra arrays when finding helpers, use flat_map and sort! * Remove not required refer variable when redirecting :back
* | | | Remove deprecation message from Action PackCarlos Antonio da Silva2012-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | Related to the deprecation of Time.utc_time in favor of Time.utc, in 48583f8bf74d1cefefea3cd6591bd546a9eaff6c.
* | | | Remove not used variable warnings from AM and ACCarlos Antonio da Silva2012-12-111-1/+1
| | | |
* | | | Fix rewinding in ActionDispatch::Request#raw_postMatt Venables2012-12-113-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If env['RAW_POST_DATA'] is nil, #raw_post will attempt to set it to the result of #body (which will return env['rack.input'] if env['RAW_POST_DATA'] is nil). #raw_post will then attempt to rewind the result of another call to #body. Since env['RAW_POST_DATA'] has already been set, the result of #body is not env['rack.input'] anymore. This causes env['rack.input'] to never be rewound.
* | | | Match the controller and path names defensively.Hiro Asari2012-12-101-1/+1
| | | | | | | | | | | | | | | | Use '\A' instead of '^', and make the alteration shorter.
* | | | Merge pull request #8468 from schneems/schneems/rack-index-pageSantiago Pastorino2012-12-101-1/+1
|\ \ \ \ | |/ / / |/| | | Use Rails to Render Default Index Page
| * | | Use Rails to Render Default Index Pageschneems2012-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an alternative implementation to #7771 thanks to the advice of @spastorino Rails is a dynamic framework that serves a static index.html by default. One of my first questions ever on IRC was solved by simply deleting my public/index.html file. This file is a source of confusion when starting as it over-rides any set "root" in the routes yet it itself is not listed in the routes. By making the page dynamic by default we can eliminate this confusion. This PR moves the static index page to an internal controller/route/view similar to `rails/info`. When someone starts a rails server, if no root is defined, this route will take over and the "dynamic" index page from rails/welcome_controller will be rendered. These routes are only added in development. If a developer defines a root in their routes, it automatically takes precedence over this route and will be rendered, with no deleting of files required. In addition to removing this source of confusion for new devs, we can now use Rails view helpers to build and render this page. While not the primary intent, the added value of "dogfooding" should not be under-estimated. The prior PR #7771 had push-back since it introduced developer facing files. This PR solves all of the same problems, but does not have any new developer facing files (it actually removes one). cc/ @wsouto, @dickeyxxx, @tyre, @ryanb, @josevalim, @maxim, @subdigital, @steveklabnik ATP Railties and Actionpack.
* | | | Move new CHANGELOG entry to the topRafael Mendonça França2012-12-101-9/+9
| | | |
* | | | Merge pull request #8476 from sheerun/fix/multipart-getRafael Mendonça França2012-12-103-1/+19
|\ \ \ \ | |/ / / |/| | | Prevent raising EOFError on multipart GET request.
| * | | Prevent raising EOFError on multipart GET request.Adam Stankiewicz2012-12-103-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such request can happen on Internet Explorer. When we redirect after multipart form submission, the request type is changed to GET, but Content-Type is preserved as multipart. GET request cannot have multipart body and that caused Rails to fail. It's similar fix to Rack's one: https://github.com/chneukirchen/rack/blob/8025a4ae9477d1e6231344c2b7d795aa9b3717b6/lib/rack/request.rb#L224
* | | | Revert "Omit directories from gemspec.files for RubyGems 2 compat."Jeremy Kemper2012-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Obviated by rubygems/rubygems@486ed83cc8e706069213c5d406122f4cfcca9e7f This reverts commit bb8923dee093b615615cdfb83b34d1b0bb254f25.
* | | | Revert "API reader should look elsewhere for helper instructions"Vijay Dev2012-12-091-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ba2d867b2961b5ef72aad353c2d647b04654cbe3. Reason: https://github.com/lifo/docrails/commit/ba2d867b2961b5ef72aad353c2d647b04654cbe3#commitcomment-2276670 [ci skip]
* | | | Omit directories from gemspec.files for RubyGems 2 compat.Jeremy Kemper2012-12-081-1/+1
| |/ / |/| | | | | | | | | | | | | | RG2 packager expects each spec.files path to be a file and bombs when it tries to tarball a dir. May revert if rubygems/rubygems#413 is accepted.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-12-082-2/+40
|\ \ \
| * | | API reader should look elsewhere for helper instructionsThiago Pinto2012-12-061-0/+24
| | | |
| * | | complementary options guidelines for f.file_field and file_field_tagThiago Pinto2012-12-062-0/+8
| | | |
| * | | adding example for f.file_inputThiago Pinto2012-12-061-0/+3
| | | |
| * | | adding example for f.file_inputThiago Pinto2012-12-061-0/+3
| | | |
| * | | correct bad jquery syntaxThiago Pinto2012-12-061-2/+2
| | | |
* | | | use _action callbacks in actionmailerFrancesco Rodriguez2012-12-081-5/+5
| | | |
* | | | add tests to aliased _filter callbacksFrancesco Rodriguez2012-12-071-0/+46
| | | |
* | | | use `_action` instead of `_filter` callbacksFrancesco Rodriguez2012-12-075-34/+32
| | | |
* | | | update documentation and code to use _action callbacksFrancesco Rodriguez2012-12-0713-25/+25
| | | |
* | | | fix prepend_before_filter documentation [ci skip]Francesco Rodriguez2012-12-071-3/+3
| | | |
* | | | Fix READMEDavid Heinemeier Hansson2012-12-071-1/+1
| | | |
* | | | Rename all action callbacks from *_filter to *_actionDavid Heinemeier Hansson2012-12-073-69/+118
| |/ / |/| |
* | | Revert "Invert precedence of content in ActionDispatch::Static"Andrew White2012-12-073-28/+12
| | | | | | | | | | | | This reverts commit c59734f756b79c39486c45273d2cc5d42cd0c864.
* | | Invert precedence of content in ActionDispatch::StaticAndrew White2012-12-063-12/+28
| |/ |/| | | | | | | | | | | | | | | | | This commit inverts the precedence in ActionDispatch::Static so that dynamic content will be served before static content. This is so that precompiled assets do not inadvertently get included when running in development mode - it should have no effect in production where static files are usually handled by the web server. Closes #6421
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:40:27 +0000