Changeset 232

Timestamp:

06/12/05 09:37:25 (3 years ago)

Author:

ged

Message:

• Fixes #11 -- def_traits now correctly adds methods to the calling class instead of FaerieMUD::ComposedObject? itself.

Location:

trunk

Files:

• lib/fm/composedobject.rb (modified) (2 diffs)
• tests/composedobject.tests.rb (modified) (4 diffs)

trunk/lib/fm/composedobject.rb

@@ -200 +200 @@
     # SVN Id
     SVNId = %q$Id$
-
-    # SVN URL
-    SVNURL = %q$URL$
 
     # The factor which is applied to traits' modifiers in the calculation of
@@ -368 +365 @@
 
         self.traitMap[ name ] = constituents
-        eval( self::buildTraitMethods(name, *constituents), nil, __FILE__, __LINE__ )
+        code = self::buildTraitMethods( name, *constituents )
+
+        module_eval( code )
     end
 

trunk/tests/composedobject.tests.rb

@@ -4 +4 @@
 # $Id$
 #
-# Copyright (c) 2003, 2004 The FaerieMUD Consortium.
+# Copyright (c) 2003, 2004, 2005 The FaerieMUD Consortium.
 # 
 
@@ -314 +314 @@
         }
         assert_respond_to testObj, :trait1, "Does not respond to trait1 accessor"
+        assert testClass::instance_methods(false).include?( "trait1" ),
+            "Trait method #trait1 should inhere in the subclass"
         assert_respond_to testObj, :trait2, "Does not respond to trait2 accessor"
+        assert testClass::instance_methods(false).include?( "trait2" ),
+            "Trait method #trait2 should inhere in the subclass"
         assert_respond_to testObj, :trait3, "Does not respond to trait3 accessor"
+        assert testClass::instance_methods(false).include?( "trait3" ),
+            "Trait method #trait3 should inhere in the subclass"
     end
 
@@ -360 +366 @@
         }
         assert_respond_to testObj, :trait1_2, "Does not respond to trait1_2 accessor"
+        assert testClass::instance_methods(false).include?( "trait1_2" ),
+            "Trait method #trait1_2 should inhere in the subclass"
         assert_respond_to testObj, :trait2_3, "Does not respond to trait2_3 accessor"
+        assert testClass::instance_methods(false).include?( "trait2_3" ),
+            "Trait method #trait2_3 should inhere in the subclass"
         assert_respond_to testObj, :trait3_1, "Does not respond to trait3_1 accessor"
+        assert testClass::instance_methods(false).include?( "trait3_1" ),
+            "Trait method #trait3_1 should inhere in the subclass"
         assert_respond_to testObj, :trait2_1, "Does not respond to trait2_1 accessor"
+        assert testClass::instance_methods(false).include?( "trait2_1" ),
+            "Trait method #trait2_1 should inhere in the subclass"
         assert_respond_to testObj, :trait3_2, "Does not respond to trait3_2 accessor"
+        assert testClass::instance_methods(false).include?( "trait3_2" ),
+            "Trait method #trait3_2 should inhere in the subclass"
         assert_respond_to testObj, :trait1_3, "Does not respond to trait1_3 accessor"
+        assert testClass::instance_methods(false).include?( "trait1_3" ),
+            "Trait method #trait1_3 should inhere in the subclass"
     end
 
@@ -406 +424 @@
         }
         assert_respond_to testObj, :trait1_2_3, "Does not respond to trait1_2_3 accessor"
+        assert testClass::instance_methods(false).include?( "trait1_2_3" ),
+            "Trait method #trait1_2_3 should inhere in the subclass"
         assert_respond_to testObj, :trait2_3_1, "Does not respond to trait2_3_1 accessor"
+        assert testClass::instance_methods(false).include?( "trait2_3_1" ),
+            "Trait method #trait2_3_1 should inhere in the subclass"
         assert_respond_to testObj, :trait3_1_2, "Does not respond to trait3_1_2 accessor"
+        assert testClass::instance_methods(false).include?( "trait3_1_2" ),
+            "Trait method #trait3_1_2 should inhere in the subclass"
 
         self.class.addSetupBlock {