aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Removing without_thor_debugArun Agrawal2014-01-111-13/+3
| | | | | | | | | | | | | | | | | | | | a1d0c0fa3d8ca97edc8f2a1d6ba96af19221dbad as bundler 1.5.2 is out now
* | | | Ensure Active Record connection consistencyschneems2014-01-092-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Active Record can be configured via the environment variable `DATABASE_URL` or by manually injecting a hash of values which is what Rails does, reading in `database.yml` and setting Active Record appropriately. Active Record expects to be able to use `DATABASE_URL` without the use of Rails, and we cannot rip out this functionality without deprecating. This presents a problem though when both config is set, and a `DATABASE_URL` is present. Currently the `DATABASE_URL` should "win" and none of the values in `database.yml` are used. This is somewhat unexpected to me if I were to set values such as `pool` in the `production:` group of `database.yml` they are ignored. There are many ways that active record initiates a connection today: - Stand Alone (without rails) - `rake db:<tasks>` - ActiveRecord.establish_connection - With Rails - `rake db:<tasks>` - `rails <server> | <console>` - `rails dbconsole` We should make all of these behave exactly the same way. The best way to do this is to put all of this logic in one place so it is guaranteed to be used. Here is my prosed matrix of how this behavior should work: ``` No database.yml No DATABASE_URL => Error ``` ``` database.yml present No DATABASE_URL => Use database.yml configuration ``` ``` No database.yml DATABASE_URL present => use DATABASE_URL configuration ``` ``` database.yml present DATABASE_URL present => Merged into `url` sub key. If both specify `url` sub key, the `database.yml` `url` sub key "wins". If other paramaters `adapter` or `database` are specified in YAML, they are discarded as the `url` sub key "wins". ``` ### Implementation Current implementation uses `ActiveRecord::Base.configurations` to resolve and merge all connection information before returning. This is achieved through a utility class: `ActiveRecord::ConnectionHandling::MergeAndResolveDefaultUrlConfig`. To understand the exact behavior of this class, it is best to review the behavior in activerecord/test/cases/connection_adapters/connection_handler_test.rb though it should match the above proposal.
* | | | MySQL version 4.1 was EOL on December 31, 2009Zachary Scott2014-01-081-1/+1
| | | | | | | | | | | | | | | | We should at least recommend modern versions of MySQL to users.
* | | | add a more restricted codepath for templates fixes #13390Aaron Patterson2014-01-081-8/+26
| | | |
* | | | Move finish_template as the last public method in the generatorMehdi Lahmam2014-01-081-4/+4
| | | |
* | | | Fix rdoc markup [ci skip]Carlos Antonio da Silva2014-01-061-1/+1
| | | | | | | | | | | | | | | | Wrapping symbols with + does not work, we must use <tt> instead.
* | | | Change all "can not"s to the correct "cannot".T.J. Schuck2014-01-031-1/+1
| | | |
* | | | Use DATABASE_URL by defaultschneems2014-01-0211-11/+11
| | | | | | | | | | | | See https://github.com/rails/rails/pull/13463#issuecomment-31480799 for full conversation.
* | | | Automatically maintain test database schemaJon Leighton2014-01-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move check from generated helper to test_help.rb, so that all applications can benefit * Rather than just raising when the test schema has pending migrations, try to load in the schema and only raise if there are pending migrations afterwards * Opt out of the check by setting config.active_record.maintain_test_schema = false * Deprecate db:test:* tasks. The test helper is now fully responsible for maintaining the test schema, so we don't need rake tasks for this. This is also a speed improvement since we're no longer reloading the test database on every call to "rake test".
* | | | Reverse 821525e and wrap run_generator callAndrew White2014-01-021-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.1.0 includes the json gem 1.8.1 by default so we need bundler 1.5.1 for `bundle install` to work. To fix this reverse the downgrade to 1.3.5 and wrap the `run_generator` call with a block that resets `THOR_DEBUG`.
* | | | Move default production database to URL sub keyschneems2014-01-0110-11/+21
| | | | | | | | | | | | | | | | By using the URL sub key in the `database.yml` by default we are exposing the ability to set other attributes such as `pool` or `reap_frequency` without need of modifying the URL to contain non-connection specific information.
* | | | Fix comment syntaxBrian Cardarella2013-12-311-1/+1
| | | | | | | | | | | | | | | | The code syntax in the comment example is invalid
* | | | rbconfig is not used in these filesArun Agrawal2013-12-262-2/+0
| | | | | | | | | | | | | | | | remove unused requires
* | | | Improve font of some code in API documentation [ci skip]Chun-wei Kuo2013-12-263-12/+12
| | | | | | | | | | | | | | | | | | | | * Add "<tt>" or "+" to improve font of some code and filenames in API documentation * Does not contain wording changes
* | | | Merge pull request #13471 from schneems/schneems/better-secrets-error-messageJosé Valim2013-12-241-1/+1
|\ \ \ \ | | | | | | | | | | Better missing `secret_key_base` error message
| * | | | Better missing `secret_key_base` error messageschneems2013-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the error was: ``` RuntimeError: You must set secret_key_base in your app's config ``` Will now be: ``` RuntimeError: Missing `secret_key_base` for 'production' environment, set this value in `config/secrets.yml` ```
* | | | | Only build a ConnectionSpecification if requiredJosé Valim2013-12-241-1/+1
| | | | |
* | | | | Use the new Resolver API in dbconsoleJosé Valim2013-12-231-3/+2
| | | | |
* | | | | Add examples and namespace ENV options with "RAILS_"José Valim2013-12-2312-13/+25
| | | | |
* | | | | Do not store production information in .yml filesJosé Valim2013-12-2312-40/+36
|/ / / / | | | | | | | | | | | | Instead, read information from environment variables.
* | | | Add comments with urls for email previewsAndrew White2013-12-221-0/+2
| | | |
* | | | `html` and `text` templates for mailers by defaultKassio Borges2013-12-205-7/+20
| | | |
* | | | Bump Jbuilder version to 2.0.0Pavel Pravosud2013-12-201-1/+1
| | | |
* | | | Merge pull request #13415 from schneems/schneems/database-no-usernameYves Senn2013-12-192-4/+18
|\ \ \ \ | | | | | | | | | | Do not expect database user with app name to exist
| * | | | Do not expect database user with app name to existschneems2013-12-192-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default when creating a project with `--database=postgresql` the `config/database.yml` file that is generated has a user specified that is the same as the app name ``` development: adapter: postgresql encoding: unicode database: <%= app_name %>_development pool: 5 username: <%= app_name %> password: ``` This is counterintuitive and would rarely be valid. By default postgres creates a user with the current user name (http://www.postgresql.org/docs/9.3/static/database-roles.html) "it will have the same name as the operating system user that initialized the database cluster": ``` $ whoami schneems ``` If the `username` is left out postgresql will assume that you wish to log in as the default user ``` $ psql -c '\du' List of roles Role name | Attributes | Member of -----------+------------------------------------------------+----------- schneems | Superuser, Create role, Create DB, Replication | {} ``` A good sensible default then for auto generated `database.yml` files is to remove the `username`, and have postgres attempt to connect to the database as the currently logged in user. Instead of submitting with a blank password, don't submit a password.
* | | | | Use sass-rails 4.0.1Takayuki Matsubara2013-12-201-1/+1
| | | | |
* | | | | Merge pull request #13326 from schneems/schneems/add-asset-flagGuillermo Iguaran2013-12-191-0/+5
|\ \ \ \ \ | | | | | | | | | | | | Flag `config.assets.raise_runtime_errors` in dev
| * | | | | Flag `config.assets.raise_runtime_errors` in devschneems2013-12-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default `config.assets.raise_runtime_errors` should be set to `true` in development for new apps. Source: https://github.com/rails/sprockets-rails/pull/100
* | | | | | Make `rails runner` command options more obviousschneems2013-12-191-5/+14
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're surrounding the options in angle brackets `<>` as is convention in `curl`: ``` $ curl --help Usage: curl [options...] <url> ``` And then in square brackets `[]` with bars `|` as in `tar`: ``` $ tar --help ... Create: tar -c [options] [<file> | <dir> | @<archive> | -C <dir> ] ``` To further clarify that the command can be used with both, we now show examples: ``` Examples: rails runner 'puts Rails.env' This runs the code `puts Rails.env` after loading the app rails runner path/to/filename.rb This runs the Ruby file located at `path/to/filename.rb` after loading the app ``` This format was taken from the `find` man pages: ``` EXAMPLES The following examples are shown as given to the shell: find / \! -name "*.c" -print Print out a list of all the files whose names do not end in .c. find / -newer ttt -user wnj -print Print out a list of all the files owned by user ``wnj'' that are newer than the file ttt. ``` The the text at the bottom is also shifted to improve readability.
* | | | | Make possible to use symbol as the verifier nameRafael Mendonça França2013-12-191-1/+1
| | | | |
* | | | | Change the message verifier argument to verifier_nameRafael Mendonça França2013-12-191-6/+6
| | | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-12-201-1/+1
|\ \ \ \ \
| * | | | | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-031-1/+1
| | | | | |
* | | | | | Merge pull request #13366 from vipulnsward/minitest-namespace-changeGodfrey Chan2013-12-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change all `MiniTest` to `Minitest`
| * | | | | | Change all `MiniTest` to `Minitest` since, `MiniTest` namespace has been ↵Vipul A M2013-12-181-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | renamed to `Minitest` Ref: https://github.com/seattlerb/minitest/blob/master/History.txt
* / | | | | make clear that config/secrets.yml passes through ERB and therefore supports ENVXavier Noria2013-12-181-0/+6
|/ / / / /
* | | | | Its beta1 all aroundDavid Heinemeier Hansson2013-12-171-1/+1
| | | | |
* | | | | Remove the navigator for now. Its ugly and it promises more than it can ↵David Heinemeier Hansson2013-12-171-6/+1
| | | | | | | | | | | | | | | | | | | | deliver. These other views (properties, routes) are not designed to be loaded in isolation
* | | | | Add mailer previews feature based on mail_view gemAndrew White2013-12-179-2/+213
| | | | |
* | | | | Add an application controller for internal controllersAndrew White2013-12-173-18/+23
| | | | |
* | | | | fixed rails dbconsole to support ENV['DATABASE_URL'].Huiming Teo2013-12-161-8/+5
| |/ / / |/| | |
* | | | Merge pull request #13298 from rails/secret_tokensGuillermo Iguaran2013-12-134-8/+40
|\ \ \ \ | | | | | | | | | | Create config/secrets.yml file for store of tokens
| * | | | Add comment about secret_key_base in secrets.ymlGuillermo Iguaran2013-12-131-0/+12
| | | | |
| * | | | Rename tokens.yml to secrets.ymlGuillermo Iguaran2013-12-124-3/+3
| | | | |
| * | | | Load secret_key_base from tokens.yml, fallback to config.secret_key_baseGuillermo Iguaran2013-12-122-6/+29
| | | | |
| * | | | Remove secret_token.rbGuillermo Iguaran2013-12-121-12/+0
| | | | |
| * | | | Add config/tokens.yml templateGuillermo Iguaran2013-12-122-0/+9
| | | | |
* | | | | Correct comment in databases/postgresql.ymlDV Suresh2013-12-121-1/+1
|/ / / /
* | | | Revert "Rename not Ruby files to .tt"Santiago Pastorino2013-12-1016-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bd360ad3c1d59273bf96ea01b17cf04285816dc2. Reverting this for now until we fix the Thor related issue
* | | | Rename not Ruby files to .ttSantiago Pastorino2013-12-1016-0/+0
| | | |