Changeset 227

Timestamp:

06/11/05 19:34:39 (3 years ago)

Author:

ged

Message:

- Moved #checkForHashArgs out of GameObject? into ArgCheckFunctions?.

Location:

trunk/lib/fm

Files:

• gameobject.rb (modified) (2 diffs)
• mixins.rb (modified) (3 diffs)

trunk/lib/fm/gameobject.rb

@@ -156 +156 @@
 
     # This must come after the declaration of the contributors method above.
-    contributors :ged
+    contributors :ged, :stillflame
 
     ### Initialize a new FaerieMUD::GameObject. Arguments in the 
@@ -339 +339 @@
     end
 
-
-    #######
-    private
-    #######
-
-    #################################################################
-    ### U T I L I T Y   F U N C T I O N S
-    #################################################################
-
-    ### Check to be sure the specified +args+ object is a Hash and contains
-    ### the given +keys+. Each key in +keys+ can be either a Symbol, a
-    ### String, or an Array of either.
-    def checkForHashArgs( args, *keys )
-        unless args.is_a?( Hash )
-            raise TypeError, 
-                "Arguments are not in Hash form.",
-                caller(1).find_all {|frame| /#{__FILE__}/ !~ frame}
-        end
-
-        unless keys.empty?
-            nicetrace = caller( 1 ).delete_if {|frame|
-                /#{__FILE__}:\d+:in/i =~ frame
-            }
-            keys.each {|required|
-                case required
-                when Symbol
-                    raise ArgumentError,
-                        "Missing required argument :#{required}",
-                        nicetrace unless
-                        args.key?( required )
-                when String
-                    raise ArgumentError,
-                        "Missing required argument :#{required}",
-                        nicetrace unless
-                        args.key?( required.intern )
-                when Array
-                    raise ArgumentError,
-                        "Missing required argument :#{requiredKey}",
-                        nicetrace unless
-                        required.
-                        collect {|ak| ak.to_s.intern }.
-                        find {|ak| args.keys.include?(ak) }
-                end
-
-            }
-        end
-
-        return true
-    end
-
-
 end # class FaerieMUD::GameObject
 

trunk/lib/fm/mixins.rb

@@ -5 +5 @@
 # Currently contains the following modules:
 #
+# [<tt>FaerieMUD::ArgCheckFunctions</tt>]
+#   Functions for checking arguments for types, signatures, and hash members.
+# 
 # [<tt>FaerieMUD::Propertied</tt>]
 #   Adds the ability to interact with FaerieMUD::Property objects to including
@@ -53 +56 @@
 
 require 'fm/exceptions'
-
 
 module FaerieMUD
@@ -181 +183 @@
         end
 
+
+        ### Check to be sure the specified +args+ object is a Hash and contains
+        ### the given +keys+. Each key in +keys+ can be either a Symbol, a
+        ### String, or an Array of either.
+        def checkForHashArgs( args, *keys )
+            unless args.is_a?( Hash )
+                raise TypeError, 
+                    "Arguments are not in Hash form.",
+                    caller(1).find_all {|frame| /#{__FILE__}/ !~ frame}
+            end
+
+            unless keys.empty?
+                nicetrace = caller( 1 ).delete_if {|frame|
+                    /#{__FILE__}:\d+:in/i =~ frame
+                }
+                keys.each {|required|
+                    case required
+                    when Symbol
+                        raise ArgumentError,
+                            "Missing required argument :#{required}",
+                            nicetrace unless
+                            args.key?( required )
+                    when String
+                        raise ArgumentError,
+                            "Missing required argument :#{required}",
+                            nicetrace unless
+                            args.key?( required.intern )
+                    when Array
+                        raise ArgumentError,
+                            "Missing required argument :#{requiredKey}",
+                            nicetrace unless
+                            required.
+                            collect {|ak| ak.to_s.intern }.
+                            find {|ak| args.keys.include?(ak) }
+                    end
+
+                }
+            end
+
+            return true
+        end
+
     end # module ArgCheckFunctions