Fixing bang methods to work with jruby

morellon · Apr 14, 2010 · ac5f9f7 · aditya · Apr 19, 2010 · ac5f9f7
1 parent 64e0fc4
commit ac5f9f7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/lib/rrd.rb b/lib/rrd.rb
@@ -44,10 +44,12 @@ def bang(method, *args, &block)
 
   # Defining all bang methods
   BANG_METHODS.each do |bang_method|
-    define_method(bang_method) do |*args, &block|
-      method = bang_method.to_s.match(/^(.+)!$/)[1]
-      bang(method, *args, &block)
-    end
+    class_eval "
+      def #{bang_method}(*args, &block)
+        method = \"#{bang_method}\".match(/^(.+)!$/)[1]
+        bang(method, *args, &block)
+      end
+    "
   end
 end
 
diff --git a/lib/rrd/base.rb b/lib/rrd/base.rb
@@ -111,10 +111,12 @@ def bang(method, *args, &block)
 
     # Defining all bang methods
     BANG_METHODS.each do |bang_method|
-      define_method(bang_method) do |*args, &block|
-        method = bang_method.to_s.match(/^(.+)!$/)[1]
-        bang(method, *args, &block)
-      end
+      class_eval "
+        def #{bang_method}(*args, &block)
+          method = \"#{bang_method}\".match(/^(.+)!$/)[1]
+          bang(method, *args, &block)
+        end
+      "
     end
 
   end

diff --git a/lib/rrd/wrapper.rb b/lib/rrd/wrapper.rb
@@ -54,7 +54,7 @@ class << self
       begin
         attach_function :rrd_lastupdate_r, [:string, :pointer, :pointer, :pointer, :pointer], :int
       rescue Exception => e
-        puts "Please upgrade your rrdtool version to use last_update method"
+        warn "Please upgrade your rrdtool version to use last_update method"
       end
 
       attach_function :rrd_resize, [:int, :pointer], :int
@@ -231,7 +231,7 @@ def last_update(file)
 
         [["time"] + ds_names, [update_time]+values]
       ensure
-        free_pointers
+        # free_pointers
       end
 
       # Used to modify the number of rows in an RRA
@@ -291,10 +291,12 @@ def bang(method, *args, &block)
 
       # Defining all bang methods
       BANG_METHODS.each do |bang_method|
-        define_method(bang_method) do |*args, &block|
-          method = bang_method.to_s.match(/^(.+)!$/)[1]
-          bang(method, *args, &block)
-        end
+        class_eval "
+          def #{bang_method}(*args, &block)
+            method = \"#{bang_method}\".match(/^(.+)!$/)[1]
+            bang(method, *args, &block)
+          end
+        "
       end
 
       private