It's been a very busy few days, but I'm glad to say that the work on the Rails/Merb merge is going quite smoothly. Some things that have already happened:
- DHH has posted an outline of our plans to bring display/provides into Rails: http://tinyurl.com/providesinrails. The new API resolves some lingering issues I personally had with the provides/display version, and is still undergoing a bit of change.
- Michael Klishin (antares) has begun work to merge Extlib into ActiveSupport. There are already some obvious incompatibilities, so we will be doing both cleanup on the differences and selecting the fastest implementations. He has also begun porting LazyArray, the underpinnings of the DataMapper "kicker" technique, to ActiveSupport. I should note that Michael was instrumental in merging Merb and DataMapper's extensions into Extlib in the first place, so this should work out quite well.
- As DHH mentioned in his post, some work is also being done to work out a better API for the Merb router. While our API works fine, we're working together on an even better API for Rails3. One of the great things about working with the Rails team is being able to work with very talented API designers on some hard problems. To be clear, we will still support both Rails2's API and Merb1's API, because the Merb router, which is serving as the base for this work, decouples the code generation part from the DSL (so any DSL can be used to generate the structures that the router than converts into its compiled matching method).
- We have started discussing some other issues that could potentially break back-compat in Rails (like Merb's BlockAwareEnhancer for helpers that take blocks), and I'm happy to report that the conversations have been very productive. Being able to revisit issues that both groups addressed suboptimally in the past with a larger group is proving to be quite enlightening.
- I have personally begun work to unify the code in Rails that does content negotiation to always go through a single path. You can follow along at http://github.com/wycats/rails/commits/content_negotiation. I will be rebasing this remote branch against current rails master frequently (to keep it in sync with rails head) so you may need to reclone from time to time.
Happy holidays folks!