Changeset ac39a3b330cbf7c4b65ba907783364b63fb109b3

Timestamp:

04/12/07 14:35:45 (3 years ago)

Author:

Giuseppe Bilotta <giuseppe.bilotta@…>

Children:

5f58c780eea198c68e8b9528c9c07cca0f401257

Parents:

bf03d9f2b695772212abee81d405483c5c374633

git-committer:

Giuseppe Bilotta <giuseppe.bilotta@gmail.com> 1176374145 +0000

Message:

Module\#define_structure method: define a new Struct only if doesn't exist already or if the attribute list changed

Files:

• ChangeLog (modified) (2 diffs)
• data/rbot/plugins/bans.rb (modified) (1 diff)
• data/rbot/plugins/games/quiz.rb (modified) (1 diff)
• data/rbot/plugins/games/roulette.rb (modified) (1 diff)
• data/rbot/plugins/quotes.rb (modified) (1 diff)
• data/rbot/plugins/script.rb (modified) (1 diff)
• data/rbot/plugins/seen.rb (modified) (1 diff)
• data/rbot/plugins/url.rb (modified) (1 diff)
• lib/rbot/core/utils/extends.rb (modified) (1 diff)
• lib/rbot/core/utils/utils.rb (modified) (1 diff)

ChangeLog

@@ +1 @@
+2007-04-12  Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
+
+        * Basic class extensions: Module#define_structure() method. Syntax:
+                define_structure :SomeName, :attr_a, :attr_b
+        is equivalent to
+                SomeName = Struct.new("SomeName", :attr_a, :attr_b)
+        except that the new Struct is not created if it already exists and the
+        attributes list is the same.
+
 2007-03-31  Dmitry Kim <dmitry.kim@gmail.com>
 
@@ -13 +22 @@
         encodings support), please use get_partial() or get_request() instead.
         * Utils: http_get() method has been removed (long obsoleted by
-        HttpUtil)
+        HttpUtil)
         * different plugins: modified to accomodate for HttpUtil changes.
 

data/rbot/plugins/bans.rb

@@ -33 +33 @@
 #   * add proper auth management
 
-OnJoinAction = Struct.new("OnJoinAction", :host, :action, :channel, :reason)
-BadWordAction = Struct.new("BadWordAction", :regexp, :action, :channel, :timer, :reason)
-WhitelistEntry = Struct.new("WhitelistEntry", :host, :channel)
-
+define_structure :OnJoinAction, :host, :action, :channel, :reason
+define_structure :BadWordAction, :regexp, :action, :channel, :timer, :reason
+define_structure :WhitelistEntry, :host, :channel
 
 class BansPlugin < Plugin

data/rbot/plugins/games/quiz.rb

@@ -28 +28 @@
 
 # Class for storing question/answer pairs
-QuizBundle = Struct.new( "QuizBundle", :question, :answer )
+define_structure :QuizBundle, :question, :answer
 
 # Class for storing player stats
-PlayerStats = Struct.new( "PlayerStats", :score, :jokers, :jokers_time )
+define_structure :PlayerStats, :score, :jokers, :jokers_time
 # Why do we still need jokers_time? //Firetech
 

data/rbot/plugins/games/roulette.rb

@@ -1 @@
-RouletteHistory = Struct.new("RouletteHistory", :games, :shots, :deaths, :misses, :wins)
+define_structure :RouletteHistory, :games, :shots, :deaths, :misses, :wins
 
 class RoulettePlugin < Plugin

data/rbot/plugins/quotes.rb

@@ -1 +1 @@
 # GB: Ok, we *really* need to switch to db for this plugin too
 
-Quote = Struct.new("Quote", :num, :date, :source, :quote)
+define_structure :Quote, :num, :date, :source, :quote
 
 class QuotePlugin < Plugin

data/rbot/plugins/script.rb

@@ -14 +14 @@
 # like normal rbot plugins. 
 
-
-Command = Struct.new( "Command", :code, :nick, :created, :channel )
-
+define_structure :Command, :code, :nick, :created, :channel
 
 class ScriptPlugin < Plugin

data/rbot/plugins/seen.rb

@@ -1 @@
-Saw = Struct.new("Saw", :nick, :time, :type, :where, :message)
+define_structure :Saw, :nick, :time, :type, :where, :message
 
 class SeenPlugin < Plugin

data/rbot/plugins/url.rb

@@ -1 @@
-Url = Struct.new("Url", :channel, :nick, :time, :url, :info)
+define_structure :Url, :channel, :nick, :time, :url, :info
 
 class ::UrlLinkError < RuntimeError

lib/rbot/core/utils/extends.rb

@@ -13 +13 @@
 # Please note that global symbols have to be prefixed by :: because this plugin
 # will be read into an anonymous module
+
+# Extensions to the Module class
+#
+class ::Module
+
+  # Many plugins define Struct objects to hold their data. On rescans, lots of
+  # warnings are echoed because of the redefinitions. Using this method solves
+  # the problem, by checking if the Struct already exists, and if it has the
+  # same attributes
+  #
+  def define_structure(name, *members)
+    sym = name.to_sym
+    if Struct.const_defined?(sym)
+      kl = Struct.const_get(sym)
+      if kl.new.members.map { |member| member.intern } == members.map
+        debug "Struct #{sym} previously defined, skipping"
+        const_set(sym, kl)
+        return
+      end
+    end
+    debug "Defining struct #{sym} with members #{members.inspect}"
+    const_set(sym, Struct.new(name.to_s, *members))
+  end
+end
 
 

lib/rbot/core/utils/utils.rb

@@ -547 +547 @@
     end
 
-
   end
 end