From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Wed, 25 Oct 2006 22:30:38 +0000 (+0000)
Subject: Rework cached? for get_cached replies to prevent warnings about redefined methods
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=d5c94ce03c4e0e5d8f888bef999471941048f682;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

Rework cached? for get_cached replies to prevent warnings about redefined methods
---

diff --git a/lib/rbot/httputil.rb b/lib/rbot/httputil.rb
index c1c8f4c1..d89fa2e9 100644
--- a/lib/rbot/httputil.rb
+++ b/lib/rbot/httputil.rb
@@ -354,18 +354,23 @@ class HttpUtil
     if expired?(uri, readtimeout, opentimeout)
       debug "Cache expired"
       bod = get(uri, readtimeout, opentimeout, max_redir, [noexpire])
-      def bod.cached?; false; end
+      bod.instance_variable_set(:@cached,false)
     else
       k = uri.to_s
       debug "Using cache"
       @cache[k][:count] += 1
       @cache[k][:last_use] = Time.now
       bod = @cache[k][:body]
-      def bod.cached?; true; end
+      bod.instance_variable_set(:@cached,true)
     end
     unless noexpire
       remove_stale_cache
     end
+    unless bod.respond_to?(:cached?)
+      def bod.cached?
+        return @cached
+      end
+    end
     return bod
   end