0
@@ -1,3 +1,5 @@
0
+* Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. [Nicholas Seckar]
0
+
0
 *1.14.1* (April 6th, 2005)
0
 
0
 * Enable Limit/Offset in Calculations (closes #4558) [lmarlow@yahoo.com]

0
@@ -1000,7 +1000,7 @@
0
         # Nest the type name in the same module as this class.
0
         # Bar is "MyApp::Business::Bar" relative to MyApp::Business::Foo
0
         def type_name_with_module(type_name)
0
-          "#{self.name.sub(/(::)?[^:]+$/, '')}#{$1}#{type_name}"
0
+          (/^::/ =~ type_name) ? type_name : "#{parent.name}::#{type_name}"
0
         end
0
 
0
         def construct_finder_sql(options)

0
@@ -1257,6 +1257,11 @@
0
     assert_equal(%w( title ), topics(:first).attributes(:only => :title).keys)
0
     assert_equal(%w( title author_name type id approved ), topics(:first).attributes(:only => [ :title, :id, :type, :approved, :author_name ]).keys)
0
   end
0
+  
0
+  def test_type_name_with_module_should_handle_beginning
0
+    assert_equal 'ActiveRecord::Person', ActiveRecord::Base.send(:type_name_with_module, 'Person')
0
+    assert_equal '::Person', ActiveRecord::Base.send(:type_name_with_module, '::Person')
0
+  end
0
 
0
   # FIXME: this test ought to run, but it needs to run sandboxed so that it
0
   # doesn't b0rk the current test environment by undefing everything.