Changeset 124

Timestamp:

03/28/2007 21:15:38 (20 months ago)

Author:

why

Message:

• Rakefile: win32 gems mis-named, tossin 404, fix from Lionel Orry.
  
• ext/hpricot_scan/hpricot_scan.java.rl: use the newer yield method from trunk.
  
• lib/hpricot/blankslate.rb: Builder conflict.
  

Location:

trunk

Files:

• Rakefile (modified) (1 diff)
• ext/hpricot_scan/hpricot_scan.java.rl (modified) (1 diff)
• lib/hpricot/blankslate.rb (modified) (2 diffs)

trunk/Rakefile

@@ -125 +125 @@
 Win32Spec.extensions = []
   
-WIN32_PKG_DIR = "#{PKG}-win32"
+WIN32_PKG_DIR = "#{PKG}-mswin32"
 
 desc "Package up the Win32 distribution."

trunk/ext/hpricot_scan/hpricot_scan.java.rl

@@ -201 +201 @@
     raw.setTaint(true);
   }
-  runtime.getCurrentContext().yield(ary, block);
+  block.yield(runtime.getCurrentContext(), ary);
 }
 

trunk/lib/hpricot/blankslate.rb

@@ -37 +37 @@
 module Kernel
   class << self
-    alias_method :blank_slate_method_added, :method_added
+    alias_method :hpricot_slate_method_added, :method_added
 
     # Detect method additions to Kernel and remove them in the
     # BlankSlate class.
     def method_added(name)
-      blank_slate_method_added(name)
+      hpricot_slate_method_added(name)
       return if self != Kernel
       Hpricot::BlankSlate.hide(name)
@@ -51 +51 @@
 class Object
   class << self
-    alias_method :blank_slate_method_added, :method_added
+    alias_method :hpricot_slate_method_added, :method_added
 
     # Detect method additions to Object and remove them in the
     # BlankSlate class.
     def method_added(name)
-      blank_slate_method_added(name)
+      hpricot_slate_method_added(name)
       return if self != Object
       Hpricot::BlankSlate.hide(name)