aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #21214 from rodzyn/fewer_objects_and_refactoringRafael Mendonça França2015-08-121-6/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Fewer objects and refactoring
| * | | | | | | | Simplify codeMarcin Olichwirowicz2015-08-131-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are always responding with an array and using `any?`, we don't need to check if an array is empty
| * | | | | | | | Avoid unnecessary MatchData objectsMarcin Olichwirowicz2015-08-131-1/+1
| | | | | | | | |
* | | | | | | | | store `via` outside the options hashAaron Patterson2015-08-121-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we don't have to manually remove this from the options hash since the scope stores it outside of "options"
* | | | | | | | | don't mutate the caller's variablesAaron Patterson2015-08-121-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `options` reader from `Resource` because nobody needs to see that hash. Also remove mutations on the options hash in `apply_common_behavior_for` because leaving the side effects in that method makes it difficult to understand what is going on in the caller.
* | | | | | | | | store `:only` and `:except` outside the normal options hashAaron Patterson2015-08-121-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | these two keys have a different merge strategy, and they also just get removed from the options hash later in the code. If we store them in a separate place, then we don't need to remove them later
* | | | | | | | | add a regression test for adding arbitrary keys to `scope`Aaron Patterson2015-08-121-0/+15
|/ / / / / / / /
* | | | | | | | add a method to `Scope` for getting mapping optionsAaron Patterson2015-08-122-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eventually we don't want to expose the "options" hash from scope, only read values from it. Lets start by adding a reader method.
* | | | | | | | pull via checking up to via extractionAaron Patterson2015-08-121-11/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now we don't need to construct a Mapping object just to get an ArgumentError if there is no `via` parameter provided.
* | | | | | | | pull `via` all the way out of `add_route`Aaron Patterson2015-08-122-11/+20
| | | | | | | |
* | | | | | | | fix via handling when it's in a scopeAaron Patterson2015-08-121-1/+1
| | | | | | | |
* | | | | | | | add a test for adding "via" using `scope`Aaron Patterson2015-08-121-0/+9
| | | | | | | |
* | | | | | | | pull `via` extraction upAaron Patterson2015-08-122-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to try pulling this up further, and check `via` validity sooner. This way we don't have to do a bunch of processing on `options` hashes only to find out that the route is incorrect
* | | | | | | | simplify `split_constraints`Aaron Patterson2015-08-121-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we do the Regexp verification in a second method, then the `split_constraints` method gets much easier.
* | | | | | | | remove side effects from `normalize_format`Aaron Patterson2015-08-121-9/+13
| | | | | | | |
* | | | | | | | switch === to case / whenAaron Patterson2015-08-121-3/+4
| | | | | | | |
* | | | | | | | make `split_constraints` more functional.Aaron Patterson2015-08-121-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't want `split_constraints` to mutate any instance variables. That way it's easier to move the method around and understand what it does (it has no side effects)
* | | | | | | | make `constraints` more functionalAaron Patterson2015-08-121-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't want to rely on mutating ivars. This gives me more freedom when refactoring
* | | | | | | | Merge pull request #21211 from brooksreese/resrc_io_website_closedRafael Mendonça França2015-08-121-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [ci skip] Removed link to reSRC.io - site closed
| * | | | | | | | [ci skip] Removed link to reSRC.io - site closedBrooks Reese2015-08-121-1/+0
| | | | | | | | |
* | | | | | | | | Merge pull request #21210 from akihiro17/fix-rdoc-markupRafael Mendonça França2015-08-122-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Fix rdoc markup
| * | | | | | | | | [ci skip] Fix rdoc markupakihiro172015-08-122-2/+2
| | | | | | | | | |
* | | | | | | | | | docs, tiny rdoc markup fix. [ci skip]Yves Senn2015-08-121-1/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | `+` doesn't work around content with spaces fallback `<tt>`.
* | | | | | | | | Merge pull request #21205 from akihiro17/fix-docMatthew Draper2015-08-121-13/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ci skip] Fix the indentation
| * | | | | | | | | [ci skip] Fix the indentationakihiro172015-08-121-13/+13
| | | | | | | | | |
* | | | | | | | | | Merge pull request #21204 from brooksreese/ruby_v_before_tipMatthew Draper2015-08-121-5/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] Swap ruby -v and the installation tip
| * | | | | | | | | | [ci skip] Swap ruby -v and the installation tipBrooks Reese2015-08-111-5/+5
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | only call `split_constraints` onceAaron Patterson2015-08-111-4/+4
| | | | | | | | | |
* | | | | | | | | | only do is_a? checks on `options_constraints` onceAaron Patterson2015-08-111-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't need to do it so many times.
* | | | | | | | | | Mapping instances don't need `scope` anymoreAaron Patterson2015-08-111-3/+3
| | | | | | | | | |
* | | | | | | | | | pull scope[:constraints] upAaron Patterson2015-08-111-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we only need to call `split_constraints` possibly twice!
* | | | | | | | | | pull :format up a little bitAaron Patterson2015-08-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apparently `format` can also come from the scope options, so we need to extract it there too.
* | | | | | | | | | Merge pull request #21203 from denniss/issue-21199Sean Griffin2015-08-112-1/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Authorization scheme should be case insensitive. Fixes #21199
| * | | | | | | | | | Authorization scheme should be case insensitive. Fixes #21199Dennis Suratna2015-08-112-1/+9
| | | | | | | | | | |
* | | | | | | | | | | pull `to` upAaron Patterson2015-08-112-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this way we don't have to insert / delete it from the options hash so many times.
* | | | | | | | | | | push scope access up for modulesAaron Patterson2015-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eventually we'll remove the need to access `scope` inside the Mapping object.
* | | | | | | | | | | Merge pull request #21202 from rodzyn/rename_methodRafael Mendonça França2015-08-111-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename match_attribute_method? to matched_attribute_method
| * | | | | | | | | | | Rename match_attribute_method? to matched_attribute_methodMarcin Olichwirowicz2015-08-121-4/+4
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `match_attribute_method?` is a bit confusing because it suggest that a return value is a boolean which is not true.
* | | | | | | | | | | path is never nilAaron Patterson2015-08-111-1/+1
| | | | | | | | | | |
* | | | | | | | | | | split options hash and pass values downAaron Patterson2015-08-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `using_match_shorthand?` doesn't need to know that an options hash exists. Also use this opportunity to make the boolean logic a little more sane
* | | | | | | | | | | pull option duping upAaron Patterson2015-08-111-7/+6
| | | | | | | | | | |
* | | | | | | | | | | split paths by typeAaron Patterson2015-08-111-16/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this simplifies the "downstream" logic since we know we'll only be dealing with one particular type
* | | | | | | | | | | one fewer hash mutationAaron Patterson2015-08-111-3/+3
| | | | | | | | | | |
* | | | | | | | | | | push option decomposition up a bit moreAaron Patterson2015-08-112-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I think we can find the original place where `action` is added to the options hash now.
* | | | | | | | | | | push `action` option extraction up one frame.Aaron Patterson2015-08-111-3/+5
| | | | | | | | | | |
* | | | | | | | | | | pull up the "options.delete(:controller)" logicAaron Patterson2015-08-112-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we want to try to pull this logic up to where the user actually passed in "controller" so that it's close to the related call. That way when we're down the stack, we don't need to wonder "why are we doing this?"
* | | | | | | | | | | Merge pull request #21086 from bukue/add_break_sequence_option_to_word_wrapKasper Timm Hansen2015-08-113-5/+16
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Parametrize break sequence for word_wrap on ActionView Text Helpers
| * | | | | | | | | | | Sometimes you need a specific break sequence while using word wrap and as ↵Mauricio Gomez Aguinaga2015-08-113-5/+16
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | today the only option we have is "\n" and is hardcoded. With this change you will be able to specify any break sequence ("\r\n" for example) as an option. adding proper documentation for break_sequence in ActionView::Helpers::TextHelper.word_wrap adding some more documentation for word_wrap custom break sequence and making sure we use new hash syntax
* | | | | | | | | | | Merge pull request #21200 from mlbileschi/patch-1Rafael Mendonça França2015-08-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix comment about which mail headers are excluded
| * | | | | | | | | | | fix comment about which mail headers are excludedmlbileschi2015-08-111-1/+1
|/ / / / / / / / / / /