aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Hook ThroughAssociationScope up to use the AliasTracker classJon Leighton2010-10-131-9/+30
| | | | | | | | | | | | |
| * | | | | | | | | | | | Some small tweaks on the last commitJon Leighton2010-10-122-19/+12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Extract aliasing code from JoinDependency and JoinAssociation into a ↵Jon Leighton2010-10-122-41/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | separate AliasTracker class. This can then be used by ThroughAssociationScope as well.
| * | | | | | | | | | | | Add a commented, failing test for using a habtm in a has many through ↵Jon Leighton2010-10-125-55/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association. I want to refactor how aliasing works first.
| * | | | | | | | | | | | Add test_has_many_through_has_one_through_with_has_many_source_reflectionJon Leighton2010-10-122-1/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵Jon Leighton2010-10-125-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and modifying ThroughAssociationScope to make it work correctly.
| * | | | | | | | | | | | Rename some tests for consistencyJon Leighton2010-10-121-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add test_has_many_through_has_one_throughJon Leighton2010-10-122-2/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | Support has_one through assocs as the source associationJon Leighton2010-10-127-20/+71
| | | | | | | | | | | | |
| * | | | | | | | | | | | A load of tests that need to be writtenJon Leighton2010-10-121-0/+63
| | | | | | | | | | | | |
| * | | | | | | | | | | | Refactoring to remove duplication introduced by the last commitJon Leighton2010-10-101-160/+145
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add support for nested through associations in JoinAssociation. Hence ↵Jon Leighton2010-10-0911-94/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored.
| * | | | | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-0690-1040/+990
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Refactoring JoinDependency and friends. This improves the code (IMO) ↵Jon Leighton2010-10-0610-209/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including adding some explanatory comments, but more importantly structures it in such a way as to allow a JoinAssociation to produce an arbitrary number of actual joins, which will be necessary for nested has many through support. Also added 3 tests covering functionality which existed but was not previously covered.
| * | | | | | | | | | | | | A failing test for a nested has many through association loaded via ↵Jon Leighton2010-10-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foo.joins(:bar)
| * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Initial nested_has_many_through support [#1152]Bodaniel Jeanes2010-09-2610-15/+220
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵John Mileham2011-03-033-25/+80
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counting.
* | | | | | | | | | | | | | only compute path.to_s onceAaron Patterson2011-03-021-1/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | remove to_s implementation so that inspect is helpfulAaron Patterson2011-03-021-1/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | * LocalCache strategy is now a real middleware class, not an anonymous classAaron Patterson2011-03-022-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | posing for pictures.
* | | | | | | | | | | | | | No need of instance variableDalibor Nasevic2011-03-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6502 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | | | | | | | | | | | | require deprecation so that we can deprecate methods!Aaron Patterson2011-03-021-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | anonymous classes have blank names on ruby 1.8Aaron Patterson2011-03-021-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | make sure string keys are always looked up from the class cacheAaron Patterson2011-03-022-2/+28
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Ruby 1.8: Y U NO FUN?Aaron Patterson2011-03-021-1/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | use newer class cache apiAaron Patterson2011-03-021-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | adding deprecation noticies to deprecated class cache methodsAaron Patterson2011-03-023-7/+41
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | adding backwards compat for class cache references. <3<3Aaron Patterson2011-03-023-8/+25
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Fix Action caching bug where an action that has a non-cacheable response ↵Cheah Chu Yeow2011-03-022-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always renders a nil response body. It now correctly renders the response body. Note that only GET and HTTP 200 responses can be cached. [#6480 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | | | | | | | | | | | | Fixed typos in asset_host_testDalibor Nasevic2011-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6501 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | | | | | | | | | | | | yo dawg, directly use the class cache rather than the cache of the cacheAaron Patterson2011-03-012-6/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | refactor Reference to a ClassCache object, fix lazy lookup in Middleware so ↵Aaron Patterson2011-03-017-19/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that anonymous classes are supported
* | | | | | | | | | | | | | initialize ivarsAaron Patterson2011-03-011-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Move ActiveModel::AttributeMethods#attribute_methods_generated? to ↵Alexander Uvarov2011-03-014-28/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord, so it's flexible now [#6428 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | | | | | | | | | | | | | Enumerable gives us include?, so remove include?Aaron Patterson2011-03-011-4/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | prefer composition over inheritance with AD::MSAaron Patterson2011-03-013-9/+42
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | fixing test case test on 1.9.3devAaron Patterson2011-03-011-0/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Remove warnings about redefined test methodsSam Elliott2011-03-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6490 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | | | | | | | | | | | | Revert "compute ext in initialize, and use an attr_reader"Aaron Patterson2011-02-281-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2dbb73bdda3b81947fd112486ac4285fb1a6e3a9. Conflicts: actionpack/lib/action_dispatch/middleware/static.rb
* | | | | | | | | | | | | | no need to pass a regex to Regexp.compileAaron Patterson2011-02-281-4/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | compute ext in initialize, and use an attr_readerAaron Patterson2011-02-281-7/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fuuu'Aaron Patterson2011-02-2831-1083/+1200
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fuuu: Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations Rewrote AssociationPreload.
| * | | | | | | | | | | | | Move JoinDependency and friends from ↵Jon Leighton2011-02-2811-626/+618
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations
| * | | | | | | | | | | | | Rewrote AssociationPreload.Jon Leighton2011-02-2821-458/+583
| | | | | | | | | | | | | |