aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16027 from tgxworld/template_assertionsYves Senn2014-08-141-0/+9
|\ | | | | Fixes to ActionController::TemplateAssertions
| * Fix assert_template for files.Guo Xiang Tan2014-08-141-0/+9
| | | | | | | | | | The test was not failing for `assert_template file: nil` when a file has been rendered.
* | ask the scope object if it is a resource_method_scopeAaron Patterson2014-08-131-10/+13
| |
* | ask the scope for the action nameAaron Patterson2014-08-131-14/+18
| |
* | reduce calls to scope_levelAaron Patterson2014-08-131-1/+5
| | | | | | | | | | this will help us to encapsulate magical symbols so hopefully we can eliminate hardcoded magic symbols
* | change to attr_readerAaron Patterson2014-08-131-5/+1
| |
* | scope_level is no longer a hash key, just use the ivarAaron Patterson2014-08-131-4/+9
| |
* | move the scope level key fully inside the scope objectAaron Patterson2014-08-131-1/+5
| |
* | move scope_level to a method on the scope objectAaron Patterson2014-08-131-7/+20
| | | | | | | | now we don't have to have a hard coded key
* | only look up scope level onceAaron Patterson2014-08-131-6/+7
| | | | | | | | avoid hash lookups and remove depency on the instance
* | only test `prefix` onceAaron Patterson2014-08-131-2/+4
| | | | | | | | we don't need to repeat if statements
* | pass consistent parameters to canonical_action?Aaron Patterson2014-08-131-5/+5
| | | | | | | | | | now we only have to look up @scope[:scope_level] once per call to canonical_action? and we don't have a variable named "flag"
* | fewer operations on the options hashAaron Patterson2014-08-131-10/+10
| | | | | | | | | | since we pass `as` down, then we won't have to do an insert / delete dance with the options hash
* | this should be accessing the hash, not calling a methodAaron Patterson2014-08-131-1/+1
| |
* | [ci skip] correct default cache store classAditya Kapoor2014-08-131-1/+1
|/
* use 'based on' instead of 'based off' [ci skip]Akshay Vishnoi2014-08-122-2/+2
|
* Merge pull request #16440 from tgxworld/pass_log_in_blockSantiago Pastorino2014-08-091-4/+6
|\ | | | | Pass block for logging.
| * Pass block for logging.Guo Xiang Tan2014-08-091-4/+6
| | | | | | | | This follows the good practice listed on http://guides.rubyonrails.org/debugging_rails_applications.html#impact-of-logs-on-performance.
* | Revert "Merge pull request #16434 from strzalek/cookies-digest-config-option"Santiago Pastorino2014-08-081-8/+2
| | | | | | | | | | | | | | This reverts commit 705977620539e2be6548027042f33175ebdc2505, reversing changes made to dde91e9bf5ab246f0f684b40288b272f4ba9a699. IT BROKE THE BUILD!!!
* | Add config option for cookies digestŁukasz Strzałkowski2014-08-081-2/+8
| | | | | | | | | | | | You can now configure custom digest for cookies in the same way as `serializer`: config.action_dispatch.cookies_digest = \SHA256'
* | Retrieve source code for the entire stack traceRyan Dao2014-08-088-69/+109
|/ | | | | | Provide the ability to extract the source code of the entire exception stack trace, not just the frame raising the error. This improves debugging capability of the error page, especially for framework-related errors.
* Remove ActionController::RaiseActionExceptions.Guo Xiang Tan2014-08-071-34/+0
| | | | | The latest modification to the code was done in https://github.com/rails/rails/commit/5e3517ea. In Rails 3.2, `ActionController#rescue_action` was deprecated and `rescue_action_without_handler` is no longer being used.
* refactor Redirecting so we do not need a controller instanceAaron Patterson2014-08-062-10/+7
|
* avoid testing only_pathAaron Patterson2014-08-042-2/+5
| | | | | we know that this call only wants the path returned, so lets call a method that returns the path.
* Regenerate sid when sbdy tries to fixate the sessionSantiago Pastorino2014-08-041-3/+3
| | | | | | Fixed broken test. Thanks Stephen Richards for reporting.
* Using no_result_var in Journey's parser generatorJack Danger Canty2014-08-032-43/+33
| | | | | | | | | | | Previously the generated parser had an intermediate local variable `result` that really useful if you're building up a stateful object but Journey always discards the result argument to the reduce functions. This produces a simpler parser for anybody who actually wants to read the thing. Sadly, there's no real performance speedup with this change.
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-08-021-1/+2
|\ | | | | | | | | Conflicts: guides/source/testing.md
| * copy edits[ci skip]Vijay Dev2014-08-021-3/+1
| |
| * Performed Returns true if redirect/render has happenedGaurish Sharma2014-07-191-1/+4
| |
* | just set the host, no need for another hash allocation / merge!Aaron Patterson2014-08-011-1/+1
| |
* | always return a string from find_script_nameAaron Patterson2014-08-012-7/+9
| | | | | | | | this allows us to avoid nil checks on the return value
* | use `get` instead of accessing the named routes internalsAaron Patterson2014-07-311-1/+1
| |
* | invert check so we fail fasterAaron Patterson2014-07-311-1/+1
| | | | | | | | | | there's no reason to to_sym the string if it doesn't match the regexp anyway
* | do a hash lookup for collision detectionAaron Patterson2014-07-312-1/+5
| | | | | | | | hash lookup should be faster than searching an array.
* | Realign assignments :scissors:Carlos Antonio da Silva2014-07-311-5/+5
| |
* | Do not reassign variable when mutation is happeningCarlos Antonio da Silva2014-07-311-8/+5
| | | | | | | | | | These methods mutate the path variable/argument so there is no need to reassign it every time.
* | Only concatenate path if it was given rather than converting blindlyCarlos Antonio da Silva2014-07-311-1/+1
| |
* | Rename variable to better show its intentCarlos Antonio da Silva2014-07-311-12/+12
| |
* | Simplify conditionalCarlos Antonio da Silva2014-07-311-3/+2
| |
* | Push options check up so we can simplify internal methodsCarlos Antonio da Silva2014-07-311-13/+10
| |
* | Simplify code branch, remove #tapCarlos Antonio da Silva2014-07-311-7/+6
| |
* | Avoid a new hash objectCarlos Antonio da Silva2014-07-311-1/+1
| |
* | remove useless deupAaron Patterson2014-07-301-1/+1
| | | | | | | | | | every call to default_resources_path_names allocates a new hash, no need to dup
* | push options inside the scope objectAaron Patterson2014-07-301-4/+9
| |
* | turn scope in to a linked listAaron Patterson2014-07-301-15/+36
| | | | | | | | this makes scope rollback much easier
* | remove alias_method_chainAaron Patterson2014-07-301-4/+2
| | | | | | | | we can `super` in to the previous implementation.
* | avoid instrospection on the moduleAaron Patterson2014-07-301-1/+2
| | | | | | | | | | we already know what helpers are path helpers, so just iterate through that list and define the helpers with warnings
* | fix variable nameAaron Patterson2014-07-301-3/+3
| |
* | split path_helpers and url_helpersAaron Patterson2014-07-301-18/+25
| | | | | | | | | | this lets us avoid hard coding a regexp for separating path and url helpers in the clear! method.
* | `add` will remove the method if it exists alreadyAaron Patterson2014-07-301-1/+0
| |