wref 0.0.0 → 0.0.1

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
       rake
       rdoc
     json (1.7.1)
+    json (1.7.1-java)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -22,6 +23,7 @@ GEM
     rspec-mocks (2.8.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/wref.rb

@@ -1,7 +1,9 @@
+require "java" if RUBY_ENGINE == "jruby"
+
 #A simple weak-reference framework with mapping. Only handles the referencing of objects.
 #===Examples
 # user_obj = ob.get(:User, 1)
-# weak_ref = Wref(user_obj)
+# weak_ref = Wref.new(user_obj)
 # user_obj = nil
 # sleep 0.5
 # GC.start
@@ -21,20 +23,27 @@ class Wref
   
   #Initializes various variables.
   def initialize(obj)
-    @id = obj.__id__
-    
     if RUBY_ENGINE == "jruby"
-      require "java"
       @weakref = java.lang.ref.WeakReference.new(obj)
     else
+      @id = obj.__id__
       @class_name = obj.class.name.to_sym
+      ObjectSpace.define_finalizer(obj, self.method(:destroy))
       
-      if obj.respond_to?("__object_unique_id__")
+      if obj.respond_to?(:__object_unique_id__)
         @unique_id = obj.__object_unique_id__
       end
     end
   end
   
+  #Destroyes most variables on the object, releasing memory and returning 'Wref::Recycled' all the time.
+  def destroy
+    @id = nil
+    @class_name = nil
+    @unique_id = nil
+    @weakref = nil
+  end
+  
   #Returns the object that this weak reference holds or raises Wref::Recycled.
   # begin
   #   obj = wref.get
@@ -44,9 +53,8 @@ class Wref
   # end
   def get
     begin
-      raise Wref::Recycled if !@class_name or !@id
-      
       if RUBY_ENGINE == "jruby"
+        raise Wref::Recycled if !@weakref
         obj = @weakref.get
         
         if obj == nil
@@ -55,23 +63,22 @@ class Wref
           return obj
         end
       else
+        raise Wref::Recycled if !@class_name or !@id
         obj = ObjectSpace._id2ref(@id)
-      end
-      
-      #Some times this class-name will be nil for some reason - knj
-      obj_class_name = obj.class.name
-      
-      if !obj_class_name or @class_name != obj_class_name.to_sym or @id != obj.__id__
-        raise Wref::Recycled
-      end
-      
-      if @unique_id
-        if !obj.respond_to?("__object_unique_id__") or obj.__object_unique_id__ != @unique_id
+        
+        #Some times this class-name will be nil for some reason - knj
+        obj_class_name = obj.class.name
+        
+        if !obj_class_name or @class_name != obj_class_name.to_sym or @id != obj.__id__
           raise Wref::Recycled
         end
+        
+        if @unique_id
+          raise Wref::Recycled if !obj.respond_to?(:__object_unique_id__) or obj.__object_unique_id__ != @unique_id
+        end
+        
+        return obj
       end
-      
-      return obj
     rescue RangeError, TypeError
       raise Wref::Recycled
     end

data/spec/wref_spec.rb

@@ -2,20 +2,28 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Wref" do
   it "should not fail" do
-    str = "Test"
-    ref = Wref.new(str)
-    raise "Should have been alive but wasnt." if !ref.alive?
-    str = nil
-    GC.start
-    raise "Should have been GCed but wasnt." if ref.alive?
-    
-    
-    str = "Test"
-    map = Wref_map.new
-    map[5] = str
-    raise "Should have been valid but wasnt." if !map.valid?(5)
-    str = nil
-    GC.start
-    raise "Should habe been garbage collected but wasnt." if !map.valid?(5)
+    #This test does not work under JRuby.
+    if RUBY_ENGINE != "jruby"
+      str = "Test"
+      ref = Wref.new(str)
+      raise "Should have been alive but wasnt." if !ref.alive?
+      str = nil
+      
+      #In MRI we have to define another object finalizer, before the last will be finalized.
+      str2 = "Test 2"
+      ref2 = Wref.new(str2)
+      ref2 = nil
+      GC.start
+      raise "Should have been GCed but wasnt." if ref.alive?
+      
+      
+      str = "Test"
+      map = Wref_map.new
+      map[5] = str
+      raise "Should have been valid but wasnt." if !map.valid?(5)
+      str = nil
+      GC.start
+      raise "Should habe been garbage collected but wasnt." if !map.valid?(5)
+    end
   end
 end

data/wref.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wref}
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-10}
+  s.date = %q{2012-05-12}
   s.description = %q{Lightweight weak reference and weak hash that works in 1.9 and JRuby.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [

metadata

@@ -2,7 +2,7 @@
 name: wref
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 +02:00
+date: 2012-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4333171512268985658
+      hash: 3404293009183367169
       segments: 
       - 0
       version: "0"