aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Tiny documentation fixes [ci skip]Robin Dupret2015-08-162-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add missing `def` and remove useless `do` keywords. * Move `:nodoc:` in front of the methods' definition so that methods under these ones are correctly visible on the API.
* | | | | move route allocation to a factory method on the mapping objectAaron Patterson2015-08-152-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I would like to change the signature of the Route constructor. Since the mapping object has all the data required to construct a Route object, move the allocation to a factory method.
* | | | | use the mapper to build the routing tableAaron Patterson2015-08-152-231/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should build the routes using the user facing API which is `Mapper`. This frees up the library internals to change as we see fit. IOW we shouldn't be testing internals.
* | | | | only process `via` onceAaron Patterson2015-08-151-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | we can directly turn it in to a regular expression here, so we don't need to test its value twice
* | | | | Fix test assign_parameter method signatureeileencodes2015-08-151-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops, I broke the build :( Fixes the method signature of `assign_parameters` which now takes 6 arguments instead of 4. We likely will end up chaning the method signature further so good to know this test is here.
* | | | Refactor how assign_parameters sets generated_path & query_string_keyseileencodes2015-08-151-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of a larger refactoring on controller tests. We needed to move these methods here so that we could get rid of the `|| key == :action || key == :controller` in `assign_parameters`. We know this is ugly and intend to fix it but for now `generate_extras` needs to be used in the two methods to access the path and the query_string_keys. We're adding `:controller` and `:action` to the `query_string_keys` because we always need a controller and action. If someone passed `action` or `controller` in in there test they are unambigious - we know they have to go into the query params.
* | | | Merge pull request #21248 from y-yagi/fix_deprecation_warning_in_aj_testRafael Mendonça França2015-08-151-1/+1
|\ \ \ \ | | | | | | | | | | use `average_scheduled_poll_interval` option instead of deprecated `poll_interval`
| * | | | use `average_scheduled_poll_interval` option instead of deprecated ↵yuuji.yaginuma2015-08-151-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `poll_interval` this removes the following warning: ``` DEPRECATION: `config.poll_interval = 0.5` will be removed in Sidekiq 4. Please update to `config.average_scheduled_poll_interval = 0.5`. ```
* | | | Merge pull request #21247 from maclover7/rdoc-to-mdRafael Mendonça França2015-08-151-37/+47
|\ \ \ \ | | | | | | | | | | Convert Releasing Rails guide to Markdown
| * | | | Convert Releasing Rails guide to Markdownmaclover72015-08-151-37/+47
| |/ / /
* | | | Merge pull request #21249 from rodzyn/initialize_symbolsRafael Mendonça França2015-08-151-2/+2
|\ \ \ \ | |/ / / |/| | | Initialize symbols instead of mapping to_sym on the set of strings
| * | | Initialize symbols instead of mapping to_sym on the set of stringsMarcin Olichwirowicz2015-08-151-2/+2
|/ / /
* | | only keep one hash of named routesAaron Patterson2015-08-145-19/+18
| | | | | | | | | | | | | | | The outer router object already keeps a hash of named routes, so we should just use that.
* | | Merge pull request #21240 from piton4eg/patch-5Claudio B.2015-08-141-10/+10
|\ \ \ | | | | | | | | Small fixes [ci skip]
| * | | Small fixes [ci skip]Alexey Markov2015-08-151-10/+10
| | | |
* | | | rm add_route2Aaron Patterson2015-08-144-49/+53
| | | | | | | | | | | | | | | | | | | | refactor the tests with a backwards compatible method call so we can rm add_route2 from the journey router
* | | | pass pass the mapping object down the add_route stackAaron Patterson2015-08-144-56/+73
| | | | | | | | | | | | | | | | | | | | then we can let the mapping object derive stuff that the Route object needs.
* | | | pass the mapping object to build_routeAaron Patterson2015-08-143-26/+15
| | | | | | | | | | | | | | | | | | | | now that we aren't doing options manipulations, we can just pass the mapping object down and read values from it.
* | | | remove `process_path`Aaron Patterson2015-08-141-6/+2
|/ / / | | | | | | | | | | | | since we've extracted the `to` initialization, there's no need for `process_path`
* | | explicitly return nil from `get_to_from_path`Aaron Patterson2015-08-141-3/+3
| | | | | | | | | | | | | | | | | | if `to` was initialized, this method would return, so we can eliminate the to ||= in the conditional. Finally, let's return a nil in the else block so that it's explicit that this method can return nil
* | | extract method on determining :to from the pathAaron Patterson2015-08-141-5/+9
| | | | | | | | | | | | Eventually we'll pull this up and delete `process_path`.
* | | deprecate passing a string for both the beginning path and :path optionAaron Patterson2015-08-142-2/+20
| | |
* | | rm path_params methodAaron Patterson2015-08-141-5/+1
| | | | | | | | | | | | | | | | | | We don't need a method for something like this. I want to pull this up the stack as well and move the module + :controller ArgumentError up the stack as well
* | | extract method on wildcard path parameter handlingAaron Patterson2015-08-141-6/+11
| | |
* | | pass the path ast downAaron Patterson2015-08-143-6/+4
| | | | | | | | | | | | | | | now we don't need to add it to a hash and delete it from the hash later just to pass it around
* | | pull up path parsingAaron Patterson2015-08-143-11/+12
| | | | | | | | | | | | | | | `add_route` needs the AST, so rather than shove it in a hash and delete later, lets move parsing up the stack so we can pass down later
* | | use predicate methods instead of hard coding verb stringsAaron Patterson2015-08-143-7/+7
| | | | | | | | | | | | | | | also change the feeler to subclass AD::Request so that it has all the methods that Request has
* | | remove hard coded regular expressionAaron Patterson2015-08-142-1/+5
| | |
* | | implement `requirements` in terms of routesAaron Patterson2015-08-141-1/+1
| | |
* | | implement the `asts` method in terms of paths / patternsAaron Patterson2015-08-141-12/+11
| | | | | | | | | | | | Eventually I want to eliminate the FakeSet test class
* | | extract ast finding to a methodAaron Patterson2015-08-141-9/+13
| | | | | | | | | | | | | | | I'm going to reimplement this using route objects, so it will be easier if we just change ast access to go through a method rather than hashes
* | | stop adding path_info to the conditions hashAaron Patterson2015-08-143-11/+9
| | | | | | | | | | | | we don't need to keep adding it and deleting if from hashes.
* | | pull up path normalization.Aaron Patterson2015-08-141-18/+18
| | | | | | | | | | | | | | | Eventually I want to pull up AST generation so that we don't have to add it to the `conditions` hash.
* | | Merge pull request #20647 from twalpole/method_source_dependencyRafael Mendonça França2015-08-142-0/+2
|\ \ \ | | | | | | | | Add method_source dependency to activesupport
| * | | Add method_source dependency to activesupportThomas Walpole2015-07-292-0/+2
| | | |
* | | | Remove install.rbRafael Mendonça França2015-08-141-13/+0
| | | | | | | | | | | | | | | | We already have rake install command that does the same thing.
* | | | Merge pull request #21234 from ↵Rafael Mendonça França2015-08-141-5/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ixkaito/version_is_needless_when_running_installrb Remove `version` argument in install.rb
| * | | | Remove `version` argument in install.rbKite2015-08-141-5/+2
| | | | |
* | | | | Merge pull request #21236 from jonatack/fix-middleware-deprecation-messagesKasper Timm Hansen2015-08-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix middleware deprecation message. Related to #21172.
| * | | | Fix middleware deprecation message. Related to #21172.Jon Atack2015-08-141-1/+1
|/ / / /
* | | | Merge pull request #21225 from brooksreese/sql_is_made_up_of_statementsClaudio B.2015-08-131-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] SQL is written using statements, not sentences
| * | | | [ci skip] SQL is written using statements, not sentencesBrooks Reese2015-08-131-1/+1
| | | | |
* | | | | `build_path` doesn't need the path variable anymoreAaron Patterson2015-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | It just constructs a Path::Pattern object with the AST that it already has
* | | | | remove StrexpAaron Patterson2015-08-138-115/+73
| | | | | | | | | | | | | | | | | | | | | | | | | This was a useless object. We can just directly construct a Path::Pattern object without a Strexp object.
* | | | | pass anchor directly to `Pattern`Aaron Patterson2015-08-137-50/+47
| | | | | | | | | | | | | | | | | | | | | | | | | the caller already has it, there is no reason to pack it in to an object and just throw that object away.
* | | | | we already have access to the AST, so just use itAaron Patterson2015-08-131-3/+3
| | | | |
* | | | | remove default arguments that aren't usedAaron Patterson2015-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | we always pass all parameters, so there is no reason to provide default arguments.
* | | | | pull up options_constrants extractionAaron Patterson2015-08-132-17/+16
| | | | |
* | | | | remove `as`Aaron Patterson2015-08-132-9/+8
| | | | | | | | | | | | | | | | | | | | the caller already has access to `as`, so we can stop passing it around.
* | | | | remove anchor from mappingAaron Patterson2015-08-132-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same value that is extracted from the options hash earlier is returned, so we don't need to pass it in in the first place. The caller already has the data, so stop passing it around.