aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix the tests (I have actually verified that these are also the 'right' ↵Jon Leighton2010-10-036-24/+24
| | | | fixes, rather than just making the tests pass again)
* Add support for table aliasing, with a test that needs aliasing in order to ↵Jon Leighton2010-10-027-15/+75
| | | | work correctly. This test incidentally provides a more complicated test case (4 inner joins, 2 using polymorphism).
* Integrate nested support into ThroughAssociationScope, using my concept of ↵Jon Leighton2010-10-025-59/+107
| | | | generating a 'chain' of reflections to be joined. It seems to work at the moment, all existing tests are passing. There may be further complications as we add more test cases for nested associations, though.
* Started implementing nested :through associations by using the existing ↵Jon Leighton2010-10-014-32/+60
| | | | structure of ThroughAssociationScope rather than layering a module over the top
* Prevent ↵Jon Leighton2010-09-301-2/+2
| | | | test_has_many_through_a_has_many_through_association_on_through_reflection failing for me due to ordering of the results
* Merge branch 'master' into nested_has_many_through_2Jon Leighton2010-09-30166-849/+1536
|\
| * Fix 'rake db:create' is ignore encoding when using postgres [#5717 ↵yalab2010-09-301-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * no need to check for nilNeeraj Singh2010-09-301-1/+1
| |
| * assert on empty array is always true. fixing test.Neeraj Singh2010-09-301-1/+1
| |
| * Revert "removing crazy finalizer code until there is proof that we need it"José Valim2010-09-301-0/+11
| | | | | | | | This reverts commit a40e3c1a9604ab3737ad2465c8f6a6db0fe0cc78.
| * Add more information to comments.José Valim2010-09-301-3/+5
| |
| * Merge remote branch 'drogus/engines'José Valim2010-09-3011-47/+289
| |\
| | * Try to guess application's directory while trying to run the server, but ↵Piotr Sarnacki2010-09-301-0/+5
| | | | | | | | | | | | only if config.ru is not present in current dir
| | * Moved Rails::RoutesReloader to Rails::Application::RoutesReloaderPiotr Sarnacki2010-09-303-56/+57
| | |
| | * Allow running generators for Engine with usage of other application.Piotr Sarnacki2010-09-301-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | After that commit, developers can set ENGINE_PATH in ENGINE/scripts/rails file and load application's ./script/rails (most of the time it will be dummy application used for testing). When running ./script/rails g it will use application to boot up, but then it will use Engine's root and configuration for generators.
| | * Added config.app_generators to allow configuring application's generators ↵Piotr Sarnacki2010-09-305-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from railties. With config.generators becomes a way to configure generators for current instance only. For example: module Blog class Engine < Rails::Engine config.generators do |g| g.orm :active_record end config.app_generators do |g| g.test_framework :rspec end end end such definition sets :active_record as orm for engine and :rspec as test_framework for application. The values set with app_generators can be overwritten in application using config.generators as you would normally do: module MyApp class Application < Rails::Application config.generators do |g| g.test_framework :test_unit end end end
| | * Move routes_reloader to a class: RoutesReloaderPiotr Sarnacki2010-09-303-23/+57
| | |
| | * Properly reload routes defined in class definitionPiotr Sarnacki2010-09-304-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes it's easier to define routes inside Engine or Application class definition (e.g. one file applications). The problem with such case is that if there is a plugin that has config/routes.rb file, it will trigger routes reload on application. Since routes definition for application is not in config/routes.rb file routes_reloader will fail to reload application's routes properly. With this commit you can pass routes definition as a block to routes method, which will allow to properly reload it: class MyApp::Application < Rails::Application routes do resources :users end end
| | * Allow mounting engines at '/'Piotr Sarnacki2010-09-302-17/+78
| | | | | | | | | | | | | | | Without that commit script_name always become '/', which results in paths like //posts/1 instead of /posts/1
| | * Do not overwrite _railtie method on namespace while creating isolated engine ↵Piotr Sarnacki2010-09-302-12/+33
| |/ | | | | | | | | | | | | | | | | or application. In order to run Engine as standalone application, you will need Rails::Application instance in the same namespace that engine one. It's very important to leave _railtie bound to whatever used "namespace" method first.
| * Use .find here as it is simpler and faster.José Valim2010-09-301-1/+1
| |
| * avoid creating a block if possibleAaron Patterson2010-09-291-2/+2
| |
| * fixing regexp warningsAaron Patterson2010-09-291-1/+1
| |
| * tag value can be false, so nil? check is necessaryAaron Patterson2010-09-291-1/+1
| |
| * double negative is not goodNeeraj Singh2010-09-301-1/+1
| |
| * another case of extra nil? checkNeeraj Singh2010-09-301-1/+1
| |
| * no need to check for nil?Neeraj Singh2010-09-301-2/+2
| |
| * no need to check for nil?Neeraj Singh2010-09-301-1/+1
| |
| * no need of nil checkNeeraj Singh2010-09-301-1/+1
| |
| * no need of nil checkNeeraj Singh2010-09-291-1/+1
| |
| * removing crazy finalizer code until there is proof that we need itAaron Patterson2010-09-291-9/+0
| |
| * removing useless codeAaron Patterson2010-09-291-1/+0
| |
| * dry up method checking in the request objectAaron Patterson2010-09-291-10/+9
| |
| * reduce function calls on ArrayAaron Patterson2010-09-291-3/+2
| |
| * removing more lolinjectAaron Patterson2010-09-291-8/+7
| |
| * removing lollerjectAaron Patterson2010-09-291-1/+1
| |
| * self is implied, so remove selfAaron Patterson2010-09-291-1/+1
| |
| * dry up method missingAaron Patterson2010-09-291-5/+2
| |
| * oops, missed a uniqAaron Patterson2010-09-291-1/+1
| |
| * dry up action_methodsAaron Patterson2010-09-291-4/+4
| |
| * fixing space errorAaron Patterson2010-09-291-1/+1
| |
| * Use detect instead select to avoid "sh: [mysqldump]: command not found".Emilio Tagua2010-09-291-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Merge remote branch 'miloops/warnings'José Valim2010-09-296-9/+17
| |\
| | * We can't assign @view_context_class here, define super() in test instead if ↵Emilio Tagua2010-09-292-1/+2
| | | | | | | | | | | | we want to avoid warnings.
| | * _ is not a valid scheme name character, \w includes it and also is redundant ↵Emilio Tagua2010-09-292-1/+8
| | | | | | | | | | | | | | | | | | with \d. 'The scheme name consists of a letter followed by any combination of letters, digits, and the plus ("+"), period ("."), or hyphen ("-") characters; and is terminated by a colon (":").'
| | * Remove redundant conditional.Emilio Tagua2010-09-291-5/+1
| | |
| | * Don't try to interpolate string if there's no interpolation point at all.Emilio Tagua2010-09-291-1/+1
| | |
| | * Test correct method behaviour.Emilio Tagua2010-09-292-2/+6
| | |
| | * Initialize @view_context_class and cache view_context_class value.Emilio Tagua2010-09-291-1/+1
| | |
| * | Merge branch 'master' of github.com:lifo/docrailsXavier Noria2010-09-298-120/+167
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 18:03:20 +0000