rrd-ffi 0.2.2 → 0.2.3

data/CHANGELOG.rdoc

@@ -9,6 +9,9 @@
 * TODO: Add memory leak test
 * TODO: Add tune methods to RRD::Base instance
 
+== 2010-05-18 version 0.2.3
+* Fixed Bang methods to work with jruby, ruby 1.8.6, ruby 1.9.1
+
 == 2010-03-23 version 0.2.2
 
 * Fixed memory leak on RRD::Wrapper (info, graph, last_update, fetch): works on librrd 1.4.2

data/lib/rrd.rb

@@ -27,8 +27,12 @@ module RRD
       used_flags << "--#{flag}".gsub(/_/, "-") if hash.delete(flag)
     end
     
-    line_params = Hash[*hash.reduce([]) { |result, (key,value)| result += ["--#{key}".gsub(/_/, "-"), value.to_s] }]
-    params = line_params.keys.sort.reduce([]) { |result, key| result += [key, line_params[key]] }
+    line_params = []
+    hash.each_pair { |key,value| line_params += ["--#{key}".gsub(/_/, "-"), value.to_s] }
+    line_params = Hash[*line_params]
+    
+    params = []
+    line_params.keys.sort.each { |key| params += [key, line_params[key]] }
     used_flags + params
   end
   
@@ -44,10 +48,12 @@ module RRD
 
   # 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
 

data/lib/rrd/base.rb

@@ -111,10 +111,12 @@ module RRD
  
     # 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

data/lib/rrd/version.rb

@@ -2,7 +2,7 @@ module RRD
   module Version  #:nodoc: all
     MAJOR = 0
     MINOR = 2
-    PATCH = 2
+    PATCH = 3
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/lib/rrd/wrapper.rb

@@ -54,7 +54,7 @@ module RRD
       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 @@ module RRD
 
         [["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 @@ module RRD
 
       # 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

data/rrd-ffi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rrd-ffi}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["morellon", "fnando", "rafaelrosafu", "dalcico"]
-  s.date = %q{2010-03-23}
+  s.date = %q{2010-05-18}
   s.description = %q{Provides bindings for many RRD functions (using ffi gem and librrd), as well as DSLs for graphic and rrd building. You must have librrd in your system!}
   s.email = %q{morellon@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rrd-ffi
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - morellon
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -03:00
+date: 2010-05-18 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency