Changeset 217

Timestamp:

06/08/05 05:32:01 (3 years ago)

Author:

ged

Message:

- Added interface for CommandParser to get wordset for its collection of Verbs.
- Renamed #happen to #invoke

Location:

branches/simplest-thing

Files:

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

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

@@ -39 +39 @@
     SVNId = %q$Id$
 
-    # SVN URL
-    SVNURL = %q$URL$
+
+    ### Generate a default set of words for a verb which doesn't explicitly
+    ### provide them.
+    def self::generateWords
+        word = self.name.
+            sub( /^.*::/, '').
+            sub( /(\w+)Verb/, "\\1" ).
+            downcase
+        return [word]
+    end
 
 
@@ -47 +55 @@
     #################################################################
 
+    ### Set up the verb's internal structure
+    def initialize # :notnew:
+        super
+        @words = self.class.generateWords()
+    end
+
+
+    ######
+    public
+    ######
+
+    ### CommandParser interface: query the verb for the word/s which cause it to
+    ### be invoked. By default this returns the name of the verb class with the
+    ### 'verb' part removed.
+    attr_reader :words
+
+
     ### Event interface: "run" the verb, generating the event/s necessary to
     ### express the action in the game world. The given +instigator+, +origin+,
     ### and +target+ will be used when building event/s. See
     ### FaerieMUD::Event::new for definitions
-    def happen( instigator, origin, target=nil )
+    def invoke( instigator, origin, target=nil )
         raise NotImplementedError,
-            "Required method #happen not implemented in %s" %
+            "Required method #invoke not implemented in %s" %
             [self.class.name]
     end

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

@@ -4 +4 @@
 # $Id$
 #
-# Copyright (c) 2004 The FaerieMUD Consortium.
+# Copyright (c) 2004, 2005 The FaerieMUD Consortium.
 # 
 
@@ -26 +26 @@
     class TestInstigator < FaerieMUD::GameObject; end
     class TestOrigin < FaerieMUD::Locus; end
+
+    class TestVerb < FaerieMUD::Verb
+        
+    end
+
 
     def setup
@@ -56 +61 @@
 
     ### Event-generation interface
-    def test_50_happen
-        printTestHeader "FaerieMUD::Verb: Event-generation interface"
+    def test_50_invoke
+        printTestHeader "FaerieMUD::Verb: Event-generation interface: invoke"
         rval = nil
 
@@ -65 +70 @@
 
         # Should require an instigator and an origin
-        assert_raises( ArgumentError ) { derivObj.happen }
-        assert_raises( ArgumentError ) { derivObj.happen(@instigator) }
+        assert_raises( ArgumentError ) { derivObj.invoke }
+        assert_raises( ArgumentError ) { derivObj.invoke(@instigator) }
 
-        # Derivative classes should override #happen
+        # Derivative classes should override #invoke
         assert_raises( NotImplementedError ) {
-            derivObj.happen( @instigator, @origin )
+            derivObj.invoke( @instigator, @origin )
         }
     end
+
+
+    ### CommandParser interface
+    def test_60_words
+        printTestHeader "FaerieMUD::Verb: CommandParser interface: words"
+        rval = nil
+        verb = TestVerb::instance
+
+        assert_nothing_raised do
+            rval = verb.words
+        end
+
+        assert_instance_of Array, rval
+        assert_equal 1, rval.length
+        assert_equal 'test', rval.first
+    end
+
+
 end