0
@@ -31,12 +31,13 @@ module Caboose
0
           has_many :flags, :foreign_key => "user_id", :order => "id desc"
0
           
0
           # User was responsible for creating this filth
0
-          has_many :flagged, :foreign_key => "user_id"
0
+          has_many :flaggings, :foreign_key => "flaggable_user_id", :class_name => "Flag"
0
           
0
           # Associate the flag back here
0
           # Flag.belongs_to :user
0
           # Flag.belongs_to :owner, :foreign_key => flaggable_user_id
0
-          ::Flag.class_eval "belongs_to :#{name.underscore}, :foreign_key => :user_id; belongs_to :owner, :foreign_key => :flaggable_user_id, :class_name => '#{name}'"
0
+          ::Flag.class_eval "belongs_to :#{name.underscore}, :foreign_key => :user_id; 
0
+            belongs_to :owner, :foreign_key => :flaggable_user_id, :class_name => '#{name}'"
0
         end
0
       end
0
       

0
@@ -1,24 +1,32 @@
0
 require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
0
 
0
+class User<ActiveRecord::Base; end
0
+
0
 class UserAssociationTest < Test::Unit::TestCase
0
-  
0
-  def test_craetes_user_association_in_flag
0
+  def test_creates_user_association_in_flag
0
     assert_nil Flag.reflect_on_association(:user)
0
     User.class_eval do
0
       can_flag
0
     end
0
     assert_not_nil Flag.reflect_on_association(:user)
0
   end
0
+end
0
+
0
+class User2<ActiveRecord::Base; set_table_name :users; end
0
+
0
+class UserFlagAssociationTest < Test::Unit::TestCase
0
   
0
   def test_creates_flaggable_associations_in_user
0
-    assert_nil User.reflect_on_association(:flaggable)
0
-    User.class_eval do 
0
+    assert_nil User2.reflect_on_association(:flaggable)
0
+    User2.class_eval do 
0
       can_flag
0
     end
0
-    assert_not_nil User.reflect_on_association(:flagged)
0
-    assert_equal :has_many, User.reflect_on_association(:flagged).macro
0
-    assert_not_nil User.reflect_on_association(:flags)
0
-    assert_equal :has_many, User.reflect_on_association(:flags).macro
0
+    assert_not_nil User2.reflect_on_association(:flaggings)
0
+    assert_equal :has_many, User2.reflect_on_association(:flaggings).macro
0
+    assert_nothing_raised { User2.new.flaggings }
0
+    assert_not_nil User2.reflect_on_association(:flags)
0
+    assert_equal :has_many, User2.reflect_on_association(:flags).macro
0
+    assert_nothing_raised { User2.new.flags }
0
   end
0
   
0
 end
0
\ No newline at end of file