From 0873d1e944147b0f4b15e742fa9df0776a024d51 Mon Sep 17 00:00:00 2001
From: Emilio Tagua <miloops@gmail.com>
Date: Thu, 14 Oct 2010 13:35:05 -0300
Subject: Use conditional to avoid warnings.

---
 Gemfile                                       |  1 -
 activesupport/lib/active_support/weak_hash.rb | 70 ++++++++++++++-------------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 59f8771a0b..4e13331626 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,7 +53,6 @@ end
 
 platforms :jruby do
   gem "ruby-debug", ">= 0.10.3"
-  gem "weakling", :git => "git://github.com/headius/weakling.git"
 
   gem "activerecord-jdbcsqlite3-adapter"
 
diff --git a/activesupport/lib/active_support/weak_hash.rb b/activesupport/lib/active_support/weak_hash.rb
index c6bf098074..171e38f9d8 100644
--- a/activesupport/lib/active_support/weak_hash.rb
+++ b/activesupport/lib/active_support/weak_hash.rb
@@ -1,46 +1,48 @@
 module ActiveSupport
-  class WeakHash
-    def initialize(cache = Hash.new)
-      @cache = cache
-      @key_map = {}
-      @rev_cache = Hash.new{|h,k| h[k] = {}}
-      @reclaim_value = lambda do |value_id|
-        if value = @rev_cache.delete(value_id)
-          value.each_key{|key| @cache.delete key}
+  if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    WeakHash = ::Weakling::WeakHash
+  else
+    class WeakHash
+      def initialize(cache = Hash.new)
+        @cache = cache
+        @key_map = {}
+        @rev_cache = Hash.new{|h,k| h[k] = {}}
+        @reclaim_value = lambda do |value_id|
+          if value = @rev_cache.delete(value_id)
+            value.each_key{|key| @cache.delete key}
+          end
         end
       end
-    end
 
-    def [](key)
-      value_id = @cache[key]
-      value_id && ObjectSpace._id2ref(value_id)
-    rescue RangeError
-      nil
-    end
+      def [](key)
+        value_id = @cache[key]
+        value_id && ObjectSpace._id2ref(value_id)
+      rescue RangeError
+        nil
+      end
 
-    def []=(key, value)
-      key2 = case key
-             when Fixnum, Symbol, true, false, nil
-               key
-             else
-               key.dup
-             end
+      def []=(key, value)
+        key2 = case key
+               when Fixnum, Symbol, true, false, nil
+                 key
+               else
+                 key.dup
+               end
 
-      @rev_cache[value.object_id][key2] = true
-      @cache[key2] = value.object_id
-      @key_map[key.object_id] = key2
+        @rev_cache[value.object_id][key2] = true
+        @cache[key2] = value.object_id
+        @key_map[key.object_id] = key2
 
-      ObjectSpace.define_finalizer(value, @reclaim_value)
-    end
+        ObjectSpace.define_finalizer(value, @reclaim_value)
+      end
 
-    def clear
-      @cache.clear
-    end
+      def clear
+        @cache.clear
+      end
 
-    def delete(key)
-      @cache.delete(key)
+      def delete(key)
+        @cache.delete(key)
+      end
     end
   end
 end
-
-ActiveSupport::WeakHash = ::Weakling::WeakHash if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-- 
cgit v1.2.3