weakling 0.0.2 → 0.0.3

data/Rakefile

@@ -2,19 +2,27 @@ require 'ant'
 
 directory "pkg/classes"
 
+desc "Clean up build artifacts"
 task :clean do
   rm_rf "pkg/classes"
   rm_rf "lib/refqueue.jar"
 end
 
+desc "Compile the extension"
 task :compile => "pkg/classes" do |t|
   ant.javac :srcdir => "ext", :destdir => t.prerequisites.first,
     :source => "1.5", :target => "1.5", :debug => true,
     :classpath => "${java.class.path}:${sun.boot.class.path}"
 end
 
+desc "Build the jar"
 task :jar => :compile do
   ant.jar :basedir => "pkg/classes", :destfile => "lib/refqueue.jar", :includes => "**/*.class"
 end
  
 task :package => :jar
+
+desc "Run the specs"
+task :spec => :jar do
+  ruby "-S", "spec", "spec"
+end

data/ext/org/jruby/ext/RefQueueLibrary.java

@@ -7,11 +7,11 @@ import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyException;
 import org.jruby.RubyKernel;
+import org.jruby.RubyModule;
 import org.jruby.RubyObject;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyClass;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
@@ -28,13 +28,15 @@ import org.jruby.runtime.load.Library;
  */
 public class RefQueueLibrary implements Library {
     public void load(Ruby runtime, boolean wrap) throws IOException {
+        // only used for RefError
         RubyKernel.require(runtime.getKernel(), runtime.newString("weakref"), Block.NULL_BLOCK);
 
-        RubyClass weakrefClass = (RubyClass)runtime.getClassFromPath("WeakRef");
+        RubyModule weaklingModule = runtime.getOrCreateModule("Weakling");
+        RubyClass weakrefClass = runtime.defineClassUnder("WeakRef", runtime.getObject(), WEAKREF_ALLOCATOR, weaklingModule);
         weakrefClass.setAllocator(WEAKREF_ALLOCATOR);
         weakrefClass.defineAnnotatedMethods(WeakRef.class);
 
-        RubyClass refQueueClass = runtime.defineClassUnder("RefQueue", runtime.getObject(), REFQUEUE_ALLOCATOR, weakrefClass);
+        RubyClass refQueueClass = runtime.defineClassUnder("RefQueue", runtime.getObject(), REFQUEUE_ALLOCATOR, weaklingModule);
         refQueueClass.defineAnnotatedMethods(RefQueue.class);
     }
     
@@ -117,8 +119,8 @@ public class RefQueueLibrary implements Library {
             super(runtime, klazz);
         }
 
-        @JRubyMethod(name = "__getobj__")
-        public IRubyObject getobj() {
+        @JRubyMethod(name = "get")
+        public IRubyObject get() {
             IRubyObject obj = ref.get();
 
             if (obj == null) {
@@ -129,27 +131,11 @@ public class RefQueueLibrary implements Library {
             return obj;
         }
 
-        @JRubyMethod(name = "__setobj__")
-        public IRubyObject setobj(IRubyObject obj) {
-	        return getRuntime().getNil();
-	    }
-
-        // This is only here to replace the "new" in JRuby's weakref, which
-        // doesn't really need to be there.
-        @JRubyMethod(name = "new", required = 1, optional = 1, meta = true)
-        public static IRubyObject newInstance(IRubyObject clazz, IRubyObject[] args) {
-            WeakRef weakRef = (WeakRef)((RubyClass)clazz).allocate();
-
-            weakRef.callInit(args, Block.NULL_BLOCK);
-
-            return weakRef;
-        }
-
         @JRubyMethod(name = "initialize", frame = true, visibility = Visibility.PRIVATE)
         public IRubyObject initialize(ThreadContext context, IRubyObject obj) {
             ref = new RubyWeakReference(obj, this);
 
-            return RuntimeHelpers.invokeSuper(context, this, obj, Block.NULL_BLOCK);
+            return context.getRuntime().getNil();
         }
 
         @JRubyMethod(name = "initialize", frame = true, visibility = Visibility.PRIVATE)
@@ -159,7 +145,7 @@ public class RefQueueLibrary implements Library {
             }
             ref = new RubyWeakReference(obj, this, ((RefQueue)queue).getQueue());
 
-            return RuntimeHelpers.invokeSuper(context, this, obj, Block.NULL_BLOCK);
+            return context.getRuntime().getNil();
         }
 
         @JRubyMethod(name = "weakref_alive?")

data/lib/weakling.rb

@@ -1,4 +1,2 @@
-require 'weakref'
 require 'refqueue'
-
 require 'weakling/collections.rb'

data/lib/weakling/collections.rb

@@ -1,41 +1,48 @@
-require 'weakref'
 require 'refqueue'
 
-class WeakRef::IdHash
-  def initialize
-    @hash = Hash.new
-    @queue = WeakRef::RefQueue.new
-  end
+module Weakling
+  class IdHash
+    include Enumerable
+    
+    def initialize
+      @hash = Hash.new
+      @queue = Weakling::RefQueue.new
+    end
 
-  class IdWeakRef < WeakRef
-    attr_accessor :id
-    def initialize(obj, queue)
-      super(obj, queue)
-      @id = obj.__id__
+    class IdWeakRef < Weakling::WeakRef
+      attr_accessor :id
+      def initialize(obj, queue)
+        super(obj, queue)
+        @id = obj.__id__
+      end
     end
-  end
 
-  def [](id)
-    _cleanup
-    if wr = @hash[id]
-      return wr.__getobj__ rescue nil
+    def [](id)
+      _cleanup
+      if wr = @hash[id]
+        return wr.get rescue nil
+      end
+
+      return nil
     end
 
-    return nil
-  end
+    def add(object)
+      _cleanup
+      wr = IdWeakRef.new(object, @queue)
 
-  def add(object)
-    _cleanup
-    wr = IdWeakRef.new(object, @queue)
+      @hash[wr.id] = wr
 
-    @hash[wr.id] = wr
+      return wr.id
+    end
 
-    return wr.id
-  end
+    def _cleanup
+      while ref = @queue.poll
+        @hash.delete(ref.id)
+      end
+    end
 
-  def _cleanup
-    while ref = @queue.poll
-      @hash.delete(ref.id)
+    def each
+      @hash.each {|id, wr| obj = wr.get rescue nil; yield [id,obj] if obj}
     end
   end
-end
+end

data/weakling.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{weakling}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.authors = ["Charles Oliver Nutter"]
   s.date = Time.now.strftime('YYYY-MM-DD')
   s.description = "A modified WeakRef impl for JRuby plus some weakref-related tools"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 2
-  version: 0.0.2
+    - 3
+  version: 0.0.3
 platform: ruby
 authors: 
   - Charles Oliver Nutter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 23:20:24.678000 -05:00
+date: 2010-03-22 17:23:45.218000 -05:00
 default_executable: 
 dependencies: []