Permalink
Browse files

Use conditional to avoid warnings.

  • Loading branch information...
miloops committed Oct 14, 2010
1 parent 8669933 commit 0873d1e944147b0f4b15e742fa9df0776a024d51
Showing with 36 additions and 35 deletions.
  1. +0 −1 Gemfile
  2. +36 −34 activesupport/lib/active_support/weak_hash.rb
View
@@ -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"
@@ -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'

0 comments on commit 0873d1e

Please sign in to comment.