Model Namespaces and HABTM

If you have a model under a namespace and try to set up any HABTM association with it, the join table that it tries to use by default strips out the namespace. Given all the rails 3 work to improve handling of namespaces controllers, helpers and models, I don't think this functionality is intended anymore.

Sample construction of namespaced models with HABTM:

class Contact < ActiveRecord::Base
  has_and_belongs_to_many :organizations
end

class Contact::Address < ActiveRecord::Base
  has_and_belongs_to_many :organizations
end

class Contact::Organization < ActiveRecord::Base
  has_and_belongs_to_many :addresses
  has_and_belongs_to_many :contacts
end

create_table :contacts
create_table :contact_addresses
create_table :contact_addresses_contact_organizations, :id => false do |t|
  t.references :address; t.references :organization
end
create_table :contact_organizations
create_table :contacts_contact_organizations, :id => false do |t|
  t.references :contact; t.references :organization
end

Because of a call to demodulize inside undecorated_table_name, the namespaces are stripped away and is the only reason the above does not work. Manually specifying :join_table shows perfect functionality.

irb(main):001:0> c = Contact.create
=> #<Contact id: 1>
irb(main):002:0> org = c.organizations.create
=> #<Contact::Organization id: 1>
irb(main):003:0> a = org.addresses.create
=> #<Contact::Address id: 1>
irb(main):004:0> c2 = Contact.create
=> #<Contact id: 2>
irb(main):005:0> c2.organizations << org
=> [#<Contact::Organization id: 1>]
irb(main):006:0> org2 = Contact::Organization.create
=> #<Contact::Organization id: 2>
irb(main):007:0> org2.addresses << a
=> [#<Contact::Address id: 1>]
irb(main):008:0> c2.organizations << org2
=> [#<Contact::Organization id: 1>, #<Contact::Organization id: 2>]

First thoughts for a solution is to rewrite join_table_name in activerecord/lib/active_record/associations.rb to do the same as undecorated_table_name sans the demodulize.