aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix a typo "devleopment" => "development"Rémy Coutable2015-01-251-1/+1
| | | [ci skip]
* Merge pull request #18680 from y-yagi/tmp_sessionsYves Senn2015-01-251-1/+1
|\ | | | | fix task description for tmp:create
| * fix task description for tmp:createyuuji.yaginuma2015-01-251-1/+1
|/
* remove trailing whitespace. [ci skip]Yves Senn2015-01-251-1/+1
|
* Merge pull request #18678 from bryanbibat/windows_binstubsYves Senn2015-01-251-0/+3
|\ | | | | Add tip for running binstubs on Windows [ci skip]
| * Add tip for running binstubs on Windows [ci skip]Bryan Bibat2015-01-251-0/+3
| | | | | | | | | | | | | | The default command prompt under Windows doesn't run binstubs correctly while PowerShell needs to find the location of the Ruby interpreter for it to work properly. Passing the binstubs manually to the interpreter solves this problem.
* | Merge pull request #18677 from yachibit/docs_for_datetime_selectAbdelkader Boudih2015-01-251-0/+2
|\ \ | |/ |/| Add missing options to `datetime_select` [ci skip]
| * Add missing options to `datetime_select` [ci skip]yachibit2015-01-251-0/+2
|/
* Expand the number of types which can use prepared statementsSean Griffin2015-01-243-6/+16
| | | | | | | | | | | | | | | | | This will allow all types which require no additional handling to use prepared statements. Specifically, this will allow for `true`, `false`, `Date`, `Time`, and any custom PG type to use prepared statements. This also revealed another source of nil columns in bind params, and an inconsistency in their use. The specific inconsistency comes from a nested query coming from a through association, where one of the inversed associations is not bi-directional. The stop-gap is to simply construct the column at the site it is being used. This should simply go away on its own once we use `Attribute` to represent them instead, since we already have all of the information we need.
* Don't mutate `where_values`Sean Griffin2015-01-241-1/+1
| | | | | | | | This is to help facilitate future refactorings, as the internal representation is changed. I'm planning on having `where_values` return an array that's computed on call, which means that mutation will have no affect. This is the only remaining place that was mutating (tested by replacing the method with calling `dup`)
* Don't rely on relation mutability when building through associationsSean Griffin2015-01-242-19/+25
| | | | | | | | | | | | | | | | | | | | | | Specifically, the issue is relying on `where_unscoping` mutating the where values. It does not, however, mutate the bind values, which could cause an error under certain circumstances. This was not exposed by the tests, since the only place which would have been affected is unscoping a boolean, which doesn't go through prepared statements. I had a hard time getting better test coverage to demonstrate the issue. This in turn, caused `merge` to go through proper logic, and try to clear out the binds associated with the unscoped relation, which then exposed a source of `nil` for the columns, as binds weren't expanding `{ "posts.id" => 1 }` to `{ "posts" => { "id" => 1 } }`. This has been fixed. The bulk of `create_binds` needed to be moved to a separate method, since the dot notation should not be expanded recursively. I'm pretty sure this removes a subtle quirk that a ton of code in `Relation::Merger` is working around, and I suspect that code can be greatly simplified. However, unraveling that rats nest is no small task.
* Don't duplicate `Relation::VALUE_METHODS` in `Relation::Merger`Sean Griffin2015-01-241-2/+1
|
* Merge pull request #18671 from yui-knk/fix/const_guideXavier Noria2015-01-241-2/+3
|\ | | | | [ci skip] Fix what is pushed to nesting about eval family
| * [ci skip] Fix what is pushed to nesting about eval familyyui-knk2015-01-241-2/+3
| |
* | Merge pull request #18670 from morgoth/fix-duplicating-errors-detailsYves Senn2015-01-242-2/+3
|\ \ | |/ |/| Fixed duplicating ActiveModel::Errors#details
| * Fixed duplicating ActiveModel::Errors#detailsWojciech Wnętrzak2015-01-242-2/+3
| |
* | Merge pull request #18663 from egilburg/reuse-attribute-assignmentSean Griffin2015-01-243-5/+17
|\ \ | |/ |/| Use attribute assignment module logic during ActiveModel initialization.
| * use attribute assignment module logic during active model initializationEugene Gilburg2015-01-233-5/+17
| |
* | Merge pull request #18474 from notEthan/pretty_print_inspectSean Griffin2015-01-232-0/+16
|\ \ | | | | | | | | | pretty_print will use #inspect if a subclass redefines it
| * | pretty_print will use #inspect if a subclass redefines itEthan2015-01-122-14/+29
| | |
* | | Fix test failure on PG caused by 7c6f3938dee47f093Sean Griffin2015-01-231-2/+2
| |/ |/|
* | Merge pull request #10776 from bogdan/assign-attributesSean Griffin2015-01-2310-60/+212
|\ \ | | | | | | | | | Extracted attributes assingment from ActiveRecord to ActiveModel
| * | ✂️ and 💅 for #10776Sean Griffin2015-01-234-49/+37
| | | | | | | | | | | | | | | Minor style changes across the board. Changed an alias to an explicit method declaration, since the alias will not be documented otherwise.
| * | Extracted `ActiveRecord::AttributeAssignment` to ↵Bogdan Gusiev2015-01-2310-56/+220
| | | | | | | | | | | | | | | | | | `ActiveModel::AttributesAssignment` Allows to use it for any object as an includable module.
* | | Move integer range validation to never raise on assignmentSean Griffin2015-01-234-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that this was originally added to normalize an error that would have otherwise come from the database (inconsistently), it's more natural for us to raise in `type_cast_for_database`, rather than `type_cast_from_user`. This way, things like numericality validators can handle it instead if the user chooses to do so. It also fixes an issue where assigning an out of range value would make it impossible to assign a new value later. This fixes several vague issues, none of which were ever directly reported, so I have no issue number to give. Places it was mentioned which I can remember: - https://github.com/thoughtbot/shoulda-matchers/blob/9ba21381d7caf045053a81f32df7de2f49687820/lib/shoulda/matchers/active_model/allow_value_matcher.rb#L261-L263 - https://github.com/rails/rails/issues/18653#issuecomment-71197026
* | | Errors raised in `type_cast_for_database` no longer raise on assignmentSean Griffin2015-01-234-3/+29
| | | | | | | | | | | | Fixes #18580.
* | | Don't remove join dependencies in `Relation#exists?`Sean Griffin2015-01-233-1/+13
| | | | | | | | | | | | Fixes #18632
* | | Merge pull request #18651 from mechanicles/use-public-sendRafael Mendonça França2015-01-231-2/+2
|\ \ \ | | | | | | | | Use 'public_send' over the 'send' method for object's properties and public methods.
| * | | Use 'public_send' over the 'send' method for object's properties.Santosh Wadghule2015-01-231-2/+2
| |/ /
* / / constants guide: make assumption explicit in an example [closes #18465] [ci ↵Xavier Noria2015-01-231-0/+10
|/ / | | | | | | skip]
* | Merge pull request #18643 from kaspth/renderer-normalize_keys-speedupRafael Mendonça França2015-01-221-9/+6
|\ \ | | | | | | Speed up ActionController::Renderer `normalize_keys` by ~28%.
| * | Speed up `normalize_keys` by removing dup step.Kasper Timm Hansen2015-01-221-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | Previously env was duplicated and then had it's keys mutated. This iterates through the hash twice. Using `transform_keys`, duplication and key mutation is a single iteration. `convert_symbols` was renamed to `http_header_format`.
* | | Merge pull request #18644 from rwarbelow/fix-wording-of-css-manifestZachary Scott2015-01-222-6/+4
|\ \ \ | |/ / |/| | fix wording of CSS manifest instructions [ci skip]
| * | fix wording of CSS manifest instructionsRachel Warbelow2015-01-222-6/+4
|/ /
* | Merge pull request #18641 from splattael/disable-ar-jdbc-masterRafael Mendonça França2015-01-221-1/+0
|\ \ | | | | | | Disable builds AR-JDBC against master
| * | Disable builds AR-JDBC against masterPeter Suschlik2015-01-221-1/+0
| | | | | | | | | | | | | | | | | | | | | Currently, bundling `activerecord-jdbc-adapter`'s master branch seems to be broken. See jruby/activerecord-jdbc-adapter#614 This commit partially reverts #12107
* | | Merge pull request #18642 from y-yagi/active_record_validations_guideAbdelkader Boudih2015-01-221-1/+1
|\ \ \ | | | | | | | | fix regexp for validate an integer in guides [ci skip]
| * | | fix regexp for validate an integer in guides [ci skip]yuuji.yaginuma2015-01-221-1/+1
| |/ /
* | | Merge pull request #18636 from josh/railties-remove-config-assetsRafael Mendonça França2015-01-222-22/+1
|\ \ \ | | | | | | | | Remove config.assets
| * | | Remove config.assetsJoshua Peek2015-01-212-22/+1
| | | | | | | | | | | | | | | | Provided by sprockets-rails plugin
* | | | Merge pull request #18546 from brainopia/action_view_renderRafael Mendonça França2015-01-2211-6/+273
|\ \ \ \ | |_|/ / |/| | | A shortcut to setup controller environment
| * | | Add ApplicationController.renderer initializer [ci skip]brainopia2015-01-221-0/+6
| | | |
| * | | Add ActionController::Base.renderbrainopia2015-01-223-0/+10
| | | |
| * | | Add ActionController::Rendererbrainopia2015-01-225-0/+216
| | | | | | | | | | | | | | | | Render arbitrary templates outside of controller actions
| * | | Add ActionController#build_with_envbrainopia2015-01-221-0/+6
| | | | | | | | | | | | | | | | | | | | To have an easier way to setup a controller instance with custom environment
| * | | Support `:assigns` option when rendering with controllers/mailers.brainopia2015-01-223-2/+18
| | | |
| * | | Add `ActionController::Metal#set_request!`brainopia2015-01-213-4/+17
| | | | | | | | | | | | | | | | | | | | Add `ActionController::Metal#set_request!` to set a request on controller instance without calling dispatch.
* | | | Merge pull request #18635 from ↵Yves Senn2015-01-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | BenMorganIO/use-two-spaces-instead-of-one-for-wrap-params use two spaces instead of one for include root in json
| * | | | use two spaces instead of one for include root in jsonBen A Morgan2015-01-211-1/+1
| | |/ / | |/| |
* | | | Merge pull request #18637 from diogobenica/masterArthur Nogueira Neves2015-01-211-1/+11
|\ \ \ \ | |/ / / |/| | | Add :formats to options list of render documentation.