Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | ask the strexp for the ast | Aaron Patterson | 2014-05-29 | 2 | -3/+7 | |
| | | | | | | ||||||
| * | | | | | remove dead code | Aaron Patterson | 2014-05-29 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | disconnect path from the instance | Aaron Patterson | 2014-05-29 | 1 | -6/+6 | |
| | | | | | | ||||||
| * | | | | | reuse the ast we already made | Aaron Patterson | 2014-05-29 | 1 | -9/+10 | |
| | | | | | | ||||||
| * | | | | | use a parser to extract the group parts from the path | Aaron Patterson | 2014-05-29 | 3 | -5/+9 | |
| | | | | | | ||||||
| * | | | | | pass the parsed parameters through the methods so we don't reparse or | Aaron Patterson | 2014-05-29 | 1 | -38/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | require caching code | |||||
| * | | | | | Merge branch 'master' into mapper | Aaron Patterson | 2014-05-29 | 22 | -73/+148 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update url to rake docs [ci skip] Name#model_name doesn't return a String object Result sets never override a model's column type [ci skip] Make last note show up in postgresql guide. Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581. Add @senny's changed from #14741, including code font for `resources` options, and wrapped to 80 chars. [ci skip] Use github url for homepage of log4r [ci skip] Remove TODO. Ensure we always use instances of the adapter specific column class Fix indentation from 1b4b26f [ci skip] [ci skip] Improve form_helpers.md guide. Clear inflections after test. Remove unnecessary include for integration tests. Added documentation for the :param option for resourceful routing | |||||
| * | | | | | | "controllers" should be a valid path name | Aaron Patterson | 2014-05-29 | 2 | -1/+11 | |
| | | | | | | | ||||||
| * | | | | | | controllers with slash names are also not supported, so we can reuse the message | Aaron Patterson | 2014-05-28 | 1 | -6/+2 | |
| | | | | | | | ||||||
| * | | | | | | only validate controllers | Aaron Patterson | 2014-05-28 | 1 | -15/+17 | |
| | | | | | | | ||||||
| * | | | | | | golf down a bit | Aaron Patterson | 2014-05-28 | 1 | -8/+4 | |
| | | | | | | | ||||||
| * | | | | | | only error handling between controller and action is the same | Aaron Patterson | 2014-05-28 | 1 | -18/+16 | |
| | | | | | | | ||||||
| * | | | | | | add a test for controllers without colons | Aaron Patterson | 2014-05-28 | 1 | -0/+10 | |
| | | | | | | | ||||||
| * | | | | | | move nil check to a method that yields to a block if the value is not nil | Aaron Patterson | 2014-05-28 | 1 | -17/+16 | |
| | | | | | | | ||||||
| * | | | | | | translate action / controller to the desired object | Aaron Patterson | 2014-05-28 | 1 | -12/+11 | |
| | | | | | | | ||||||
| * | | | | | | only one nil check on the action variable | Aaron Patterson | 2014-05-28 | 1 | -10/+8 | |
| | | | | | | | ||||||
| * | | | | | | change to case / when on types | Aaron Patterson | 2014-05-28 | 1 | -8/+7 | |
| | | | | | | | ||||||
| * | | | | | | only do one nil check against the controller | Aaron Patterson | 2014-05-28 | 1 | -9/+9 | |
| | | | | | | | ||||||
| * | | | | | | extract controller and action parsing to a method | Aaron Patterson | 2014-05-28 | 1 | -19/+26 | |
| | | | | | | | ||||||
| * | | | | | | we don't need the call to presence. that is my present, to you! | Aaron Patterson | 2014-05-28 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | swtich to returning early if to responds to call | Aaron Patterson | 2014-05-28 | 1 | -35/+32 | |
| | | | | | | | ||||||
| * | | | | | | return early if we have a valid controller name | Aaron Patterson | 2014-05-28 | 1 | -5/+5 | |
| | | | | | | | ||||||
| * | | | | | | trade 2 is_a? checks for a nil check | Aaron Patterson | 2014-05-28 | 1 | -2/+4 | |
| | | | | | | | ||||||
| * | | | | | | invert logic to remove nil? and exclude? checks (use ruby rather than AS ↵ | Aaron Patterson | 2014-05-28 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | when possible | |||||
| * | | | | | | fewer blank? calls | Aaron Patterson | 2014-05-28 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | reduce action.blank? calls | Aaron Patterson | 2014-05-28 | 1 | -4/+6 | |
| | | | | | | | ||||||
| * | | | | | | reduce blank? checks | Aaron Patterson | 2014-05-28 | 1 | -4/+9 | |
| | | | | | | | ||||||
| * | | | | | | extract controller checks to methods | Aaron Patterson | 2014-05-28 | 1 | -19/+26 | |
| | | | | | | | ||||||
| * | | | | | | set defaults at the top so we can avoid the ||= test | Aaron Patterson | 2014-05-28 | 1 | -6/+9 | |
| | | | | | | | ||||||
| * | | | | | | add a test for existing mapper functionality | Aaron Patterson | 2014-05-28 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not sure if this is actually used, but I'm adding a test to define the behavior | |||||
* | | | | | | | Merge pull request #15414 from akshay-vishnoi/doc_changes | Rafael Mendonça França | 2014-05-29 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [ci skip] Include ActiveModel::Model in a class instead of inheriting | |||||
| * | | | | | | | [ci skip] Include ActiveModel::Model in a class instead of inheriting | Akshay Vishnoi | 2014-05-30 | 1 | -2/+3 | |
|/ / / / / / / | ||||||
* | | | | | | | Generated engines don't include bin/rake, fixes #15409 [ci skip] | Zachary Scott | 2014-05-29 | 1 | -5/+5 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #15413 from sgrif/sg-i-wish-i-could | Rafael Mendonça França | 2014-05-29 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't reference comments that do not exist | |||||
| * | | | | | | | Don't reference comments that do not exist | Sean Griffin | 2014-05-29 | 1 | -2/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #15412 from sgrif/sg-serialized-type-cast-for-write | Rafael Mendonça França | 2014-05-29 | 6 | -86/+47 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move `type_cast_for_write` behavior over to the serialized type object | |||||
| * | | | | | | | Move `type_cast_for_write` behavior over to the serialized type object | Sean Griffin | 2014-05-29 | 6 | -86/+47 | |
|/ / / / / / / | ||||||
* | | | | | | | Add missing period from 4b802bc [ci skip] | Zachary Scott | 2014-05-29 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #15411 from nathany/patch-1 | Zachary Scott | 2014-05-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix broken link in Rails 3.0 release_notes [ci skip] | |||||
| * | | | | | | | Fix broken link in Rails 3.0 release_notes | Nathan Youngman | 2014-05-29 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #15398 from sgrif/sg-serialized-types | Yves Senn | 2014-05-29 | 10 | -50/+52 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Refactor serialized types to be partially defined as custom properties | |||||
| * | | | | | | Refactor serialized types to be partially defined as custom properties | Sean Griffin | 2014-05-29 | 10 | -50/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the methods defined in `AttributeMethods::Serialization` can be refactored onto this type as well, but this is a reasonable small step. Removes the `Type` class, and the need for `decorate_columns` to handle serialized types. | |||||
* | | | | | | | Update url to rake docs [ci skip] | Zachary Scott | 2014-05-29 | 2 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #15407 from ShunsukeAida/correct_model_name_example | Arthur Nogueira Neves | 2014-05-29 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | fixed ActiveModel documentation [ci skip] | |||||
| * | | | | | | Name#model_name doesn't return a String object | ShunsukeAida | 2014-05-30 | 2 | -2/+2 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #15406 from sgrif/sg-column-type-override | Rafael Mendonça França | 2014-05-29 | 3 | -1/+51 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Result sets never override a model's column type | |||||
| * | | | | | | Result sets never override a model's column type | Sean Griffin | 2014-05-29 | 3 | -1/+51 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL and PostgreSQL provide a column type override in order to properly type cast computed columns included in a result set. This should never override the known types of full fledged columns. In addition to messing up computed properties, this would have led to inconsistent behavior between a record created with `new`, and a record created with `last` on the mysql adapter in the following cases: - `tinyint(1)` with `emulate_booleans` set to `false` - `text`, `string`, `binary`, and `decimal` columns | |||||
* | | | | | | Merge pull request #15061 from tgxworld/remove_unnecessary_include | Matthew Draper | 2014-05-29 | 3 | -8/+0 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Remove unnecessary include for integration tests. | |||||
| * | | | | | | Remove unnecessary include for integration tests. | Guo Xiang Tan | 2014-05-11 | 3 | -8/+0 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #15397 from sgrif/sg-column-class | Yves Senn | 2014-05-29 | 5 | -6/+15 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Ensure we always use instances of the adapter specific column class |