Changeset 197

Timestamp:

11/20/04 14:42:52 (4 years ago)

Author:

ged

Message:

-- Moved over gameobject tests from trunk.
-- Added enough versioning stuff to get gameobject tests.

Location:

branches/simplest-thing

Files:

• lib/fm/gameobject.rb (modified) (11 diffs)
• tests/gameobject.tests.rb (added)

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

@@ -128 +128 @@
 
 
+    ### Versioning method -- return the subversion rev number for the object.
+    def self::rev
+        revno = self::const_get( :SVNRev )
+        if revno.match( /(\d+)/ )
+            return Integer($1)
+        else
+            return 0
+        end
+    end
+
+
     #############################################################
     ### I N S T A N C E   M E T H O D S
@@ -136 +147 @@
         super()
 
+        # Add unique ID and rev
         @id = self.class::makeObjectId( self )
+        @rev = self.class::rev
+
+        # Call setters for named arguments
         args.each {|method, value|
             self.send( "#{method}=", value )
@@ -147 +162 @@
         super
         @id = self.class::makeObjectId( self )
-        self.log.debug "Cloned #{self.class.name} #{original.muesid}."
+        self.log.debug "Cloned #{self.class.name} #{original.id}."
     end
 
@@ -157 +172 @@
     # The object's unique id
     attr_reader :id
+
+    # The revision number of the class from which the object was instantiated at
+    # the time of its creation or last upgrade.
+    attr_reader :rev
 
 
@@ -174 +193 @@
 
         rval << self.htmlObjectHeader( inline )
-        rval << self.htmlIvarSection( inline, "@muesid" )
+        rval << self.htmlIvarSection( inline, "@id" )
         rval << self.htmlObjectFooter( inline )
 
@@ -187 +206 @@
     ### Return an HTML fragment for the header part of the given object.
     def htmlObjectHeader( inline )
-        func = inline ? HTML::method(:span) : HTML::method(:div)
+        func = inline ?
+            FaerieMUD::HTML::method(:span) :
+            FaerieMUD::HTML::method(:div)
 
         # The outer object header
         return func.call( :class => "object-header" ) {
             [
-                HTML::span( :class => "object-class" ) {
+                FaerieMUD::HTML::span( :class => "object-class" ) {
                     self.class.name
                 },
-                HTML::span( :class => "object-id" ) {
-                    "#%s" % self.muesid
+                FaerieMUD::HTML::span( :class => "object-id" ) {
+                    "#%s" % self.id
                 },
-                HTML::span( :class => "object-class-version" ) {
-                    "(v%s)" % self.class.version.to_s
+                FaerieMUD::HTML::span( :class => "object-class-version" ) {
+                    "(v%d)" % self.class.rev
                 },
             ].join(" ")
@@ -208 +229 @@
     ### Return an HTML fragment for the footer part of the given object.
     def htmlObjectFooter( inline )
-        func = inline ? HTML::method(:span) : HTML::method(:div)
+        func = inline ?
+            FaerieMUD::HTML::method(:span) :
+            FaerieMUD::HTML::method(:div)
 
         return func.call( :class => "object-footer" ) {
-            HTML::span( :class => "object-contrib" ) {
+            FaerieMUD::HTML::span( :class => "object-contrib" ) {
                 "Authors: " +
                 self.class.authors.collect {|author,points|
-                    HTML::span( :class => "object-contrib-author" ) {author.to_s} +
+                    FaerieMUD::HTML::span(
+                        :class => "object-contrib-author" ) {author.to_s} +
                     ": " +
-                    HTML::span( :class => "object-contrib-points" ) {points.to_s}
+                    FaerieMUD::HTML::span(
+                        :class => "object-contrib-points" ) {points.to_s}
                 }.join("; ")
             }
@@ -238 +263 @@
             # Fetch the instance variable and turn it into HTML
             value = instance_variable_get( var )
-            html = HTML::convertObject( value, inline )
+            html = FaerieMUD::HTML::convertObject( value, inline )
             classes = []
 
@@ -247 +272 @@
             end
 
-            rval << HTML::ivarElement( var, html, inline, *classes )
+            rval << FaerieMUD::HTML::ivarElement( var, html, inline, *classes )
         }
 
@@ -259 +284 @@
     ### container will be a <div> element for block display.
     def htmlWrapper( content, inline=false )
-        func = inline ? HTML::method(:span) : HTML::method(:div)
+        func = inline ?
+            FaerieMUD::HTML::method(:span) :
+            FaerieMUD::HTML::method(:div)
 
         classes = [
@@ -266 +293 @@
         ].join(" ")
         return func.call(
-            :id => "oid-" + self.muesid,
+            :id => "oid-" + self.id,
             :class => classes ) {
             "\n" + content + "\n"