Changeset 180

Timestamp:

11/17/04 21:29:13 (4 years ago)

Author:

ged

Message:

-- Added initial implementation of FaerieMUD::Verb.

Location:

branches/simplest-thing

Files:

• lib/fm/event.rb (modified) (2 diffs)
• lib/fm/verb.rb (added)
• tests/event.tests.rb (modified) (7 diffs)
• tests/locus.tests.rb (modified) (1 diff)
• tests/verb.tests.rb (added)

branches/simplest-thing/lib/fm/event.rb

@@ -53 +53 @@
     #############################################################
 
+    # Who, What, Where, and to Whom?
+
     def initialize( args={} )
-        checkForHashArgs( args, :instigator, :origin )
+        checkForHashArgs( args, :instigator, :origin, :verb )
         super
     end
@@ -68 +70 @@
     # The origin Locus of the event -- a FaerieMUD::Locus object.
     attr_accessor :origin
+
+    # The verb that generated the event.
+    attr_accessor :verb
 
     # The intended target of the event -- may be either +nil+ or a

branches/simplest-thing/tests/event.tests.rb

@@ -36 +36 @@
     class TestEntity < FaerieMUD::Entity; end
     class TestLocus < FaerieMUD::Locus; end
+    class TestVerb < FaerieMUD::Verb; end
 
     module Complex; end
@@ -48 +49 @@
         @entity = TestEntity::new
         @locus = TestLocus::new
+        @verb = TestVerb::new
+        super
     end
 
     # Discard testing objects
     def teardown
+        super
         @entity = @locus = nil
     end
@@ -71 +75 @@
         assert_raises( ArgumentError ) {
             derivClass = Class::new( FaerieMUD::Event )
-            derivObject = derivClass::new( :origin => @locus )
+            derivObject = derivClass::new(
+                :origin => @locus,
+                :verb => @verb
+                )
         }
 
@@ -77 +84 @@
         assert_raises( ArgumentError ) {
             derivClass = Class::new( FaerieMUD::Event )
-            derivObject = derivClass::new( :instigator => @entity )
+            derivObject = derivClass::new(
+                :instigator => @entity,
+                :verb => @verb
+                )
+        }
+
+        # Instantiation requires a :verb
+        assert_raises( ArgumentError ) {
+            derivClass = Class::new( FaerieMUD::Event )
+            derivObject = derivClass::new(
+                :instigator => @entity,
+                :origin => @locus
+                )
         }
 
@@ -83 +102 @@
         assert_nothing_raised {
             derivClass = Class::new( FaerieMUD::Event )
-            derivObject = derivClass::new( :instigator => @entity, :origin => @locus )
+            derivObject = derivClass::new( 
+                :instigator => @entity,
+                :origin => @locus,
+                :verb => @verb
+                )
         }
 
@@ -96 +119 @@
         # Simple 1-deep inheritance
         assert_nothing_raised {
-            ev = MyEvent::new( :instigator => @entity, :origin => @locus )
+            ev = MyEvent::new(
+                :instigator => @entity,
+                :origin => @locus,
+                :verb => @verb
+                )
             rval = ev.handlerNames
         }
@@ -106 +133 @@
         # Complex 2-deep with mixin
         assert_nothing_raised {
-            ev = YourEvent::new( :instigator => @entity, :origin => @locus )
+            ev = YourEvent::new(
+                :instigator => @entity,
+                :origin => @locus,
+                :verb => @verb
+                )
             rval = ev.handlerNames
         }

branches/simplest-thing/tests/locus.tests.rb

@@ -36 +36 @@
             args[:instigator] ||= FaerieMUD::Locus::new
             args[:origin] ||= args[:instigator]
+            args[:verb] ||= FaerieMUD::Verb::new
             super( args )
         end