aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | pull `anchor` extraction upAaron Patterson2015-08-132-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | this way we don't have to mutate the options hash so far away from where the user passed it in
* | | | | Merge pull request #19683 from tristang/require-option-for-counter-cacheRafael Mendonça França2015-08-137-6/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Require explicit counter_cache option for has_many
| * | | | | Add tests for associations without counter_cacheTristan Gamilis2015-04-094-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assert that counter_cache behaviour is not used on belongs_to or has_many associations if the option is not given explicitly.
| * | | | | Require explicit counter_cache option for has_manyTristan Gamilis2015-04-073-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously has_many associations assumed a counter_cache was to be used based on the presence of an appropriately named column. This is inconsistent, since the inverse belongs_to association will not make this assumption. See issues #19042 #8446. This commit checks for the presence of the counter_cache key in the options of either the has_many or belongs_to association as well as ensuring that the *_count column is present.
* | | | | | raise if `anchor` is passed to `scope`Aaron Patterson2015-08-132-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `anchor` parameter [is overridden](https://github.com/rails/rails/blob/b4b4a611d0eb9aa1c640c5f521c6a43bf2a65bab/actionpack/lib/action_dispatch/routing/mapper.rb#L1528) unless it is directly passed to `match`, so setting it in a scope must be a mistake.
* | | | | | Merge pull request #19770 from vngrs/prevent_duplicated_where_clausesRafael Mendonça França2015-08-133-0/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Prevent duplicating `where` clauses
| * | | | | Prevent duplicating `where` clauses when model is extended from an abstract ↵Mehmet Emin İNAÇ2015-04-153-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class Fixes #19528 fix for mysql2 test better test
* | | | | | descriptive error message when fixtures contian a missing column.Yves Senn2015-08-134-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | Closes #21201.
* | | | | | Merge pull request #21120 from dhiachou/patch-1Robin Dupret2015-08-131-5/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | How to pass arguments to ActiveJob Jobs [ci skip]
| * | | | | | [ci skip] How to pass arguments to ActiveJob JobsDhia Eddine Chouchane2015-08-131-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A section explaining how to pass arguments to Jobs has been added. [ci skip] How to pass arguments to ActiveJob Jobs Removed the "how to pass arguments" from what you will know section [ci skip] improving Enqueue Job section Using GuestsCleanupJob rather than MyJob for coherence. [ci skip] Passing args section merged with enqueuing jobs Passing args is now explained through examples withing Enqueuing the Jobs section [ci skip] Unnecessary example removed [ci skip] Typo fixed (missing as)
* | | | | | | Merge pull request #21221 from alietz/doc-asset-pipeline-clarificationRobin Dupret2015-08-131-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Clarified asset pipeline guide
| * | | | | | | [ci skip] Clarified asset pipeline guideAndreas Lietz2015-08-131-4/+4
|/ / / / / / /
* | | | | | | implement `provider_job_id` for `queue_classic`.Yves Senn2015-08-135-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latest, currently unreleased, version of queue_classic is required for this to work. See https://github.com/QueueClassic/queue_classic/pull/262 for more details.
* | | | | | | Merge pull request #21025 from ronakjangir47/assertsKasper Timm Hansen2015-08-132-1/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added helper methods to stub any instance
| * | | | | | | Added helper methods to stub any instanceRonak Jangir2015-08-132-1/+18
| | | | | | | |
* | | | | | | | use `assert_not` instead of `refute` as mentioned in our guides.Yves Senn2015-08-137-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in the "Follow Coding Conventions" section in our contribution guide (http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#follow-the-coding-conventions) we favor `assert_not` over `refute`. While we don't usually make stylistic changes on it's own I opted to do it in this case. The reason being that test cases are usually copied as a starting point for new tests. This results in a spread of `refute` in files that have been using it already.
* | | | | | | | Merge pull request #21219 from repinel/assert-human-size-prefix-deprecatedYves Senn2015-08-131-8/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Assert that the `:prefix` option of `number_to_human_size` is deprecated
| * | | | | | | | Assert that the `:prefix` option of `number_to_human_size` is deprecatedRoque Pinel2015-08-121-8/+10
| | | | | | | | |
* | | | | | | | | Merge pull request #21021 from sgrif/sg-no-routes-commentSean Griffin2015-08-121-54/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Replace the giant comment in routes.rb with a link to the guides
| * | | | | | | | | Replace the giant comment in routes.rb with a link to the guidesSean Griffin2015-07-241-54/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comment not only serves no purpose, but in my experience is actively detrimental to new developers getting started with Rails. Expereinced developers just end up deleting this comment, and are annoyed that they had to take this step. I also spend a lot of time mentoring brand new developers, and a consistent theme I've seen is that this comment just ends up intimidating them, and making them think it's dangerous to edit this file. One of my students just said this (due to the number of comments which even new developers don't actually read, they just see it as a sign that this thing is "dangerous"). > I don't edit any file that Rails generates for me, until my instructor > says that it's OK to do so. Realistically, this comment adds 0 value. We have very good documentation, which we can just link to instead. If someone is truly new enough to benefit from this info, they presumably just ran `gem install rails`, and have an internet connection that they can use to read the routing guide. The choice of language here was very specific. I chose "the DSL available" over "what is possible", because a consistent theme I've noticed among my students is that they aren't aware that this is actually a Ruby file, and can write any Ruby code here that they want. This file is not the only offender, but is by far the biggest point of pain that I've seen, and felt it was a good spot to open this discussion.
* | | | | | | | | | Merge pull request #21217 from myrridin/myrridin-documentation-updatesZachary Scott2015-08-122-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ci skip] Documentation: Switch around a common phrase for readability
| * | | | | | | | | | [ci skip] Switch around a common idiom for readabilityThomas Hart II2015-08-052-4/+4
| | | | | | | | | | |
* | | | | | | | | | | remove the `add_request_method` methodAaron Patterson2015-08-121-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't like this method because it mutates the parameters. Now that the method is so small, just push it up to `initialize`
* | | | | | | | | | | Skip statement cache on through association readerRafael Mendonça França2015-08-1211-21/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the through class has default scopes we should skip the statement cache. Closes #20745.
* | | | | | | | | | | remove side effects in `normalize_defaults`Aaron Patterson2015-08-121-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now the `@defaults` variable doesn't need to be set before calling `normalize_defaults`
* | | | | | | | | | | remove unnecessary deletesAaron Patterson2015-08-121-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These three options are stored in the `scope` chain outside of the options hash. If they are in the options hash, then someone passed them in to `match` and they don't really do anything. So lets remove the code.
* | | | | | | | | | | pull `format` out of the options hashAaron Patterson2015-08-121-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove `format` from the options hash in the scope chain so that we don't need to remove it later
* | | | | | | | | | | pull `formatted` up the stackAaron Patterson2015-08-122-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this reduces the number of times we have to mutate the options hash.
* | | | | | | | | | | add a regression test for scoped `format` paramsAaron Patterson2015-08-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just ensures that `format` is applied to things inside the scope
* | | | | | | | | | | 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