Fix for last method in ruby bindings -- Hiroyuki Ikezoe

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1700 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/bindings/ruby/main.c b/bindings/ruby/main.c
index d18b905..551203b 100644 (file)
--- a/bindings/ruby/main.c
+++ b/bindings/ruby/main.c
@@ -309,7 +309,7 @@ VALUE rb_rrd_last(
     string_arr_delete(a);
 
     RRD_CHECK_ERROR
     string_arr_delete(a);
 
     RRD_CHECK_ERROR

-        return rb_funcall(rb_cTime, rb_intern("at"), 1, INT2FIX(last));
+        return rb_funcall(rb_cTime, rb_intern("at"), 1, UINT2NUM(last));

 }
 
 void Init_RRD(
 }
 
 void Init_RRD(

diff --git a/bindings/ruby/test.rb b/bindings/ruby/test.rb
index 4853326..3d0b95f 100755 (executable)
--- a/bindings/ruby/test.rb
+++ b/bindings/ruby/test.rb
@@ -8,12 +8,13 @@ require "RRD"
 
 name = "test"
 rrd = "#{name}.rrd"
 
 name = "test"
 rrd = "#{name}.rrd"

-start = Time.now.to_i
+start_time = Time.now.to_i
+end_time = start_time.to_i + 300 * 300

 
 puts "creating #{rrd}"
 RRD.create(
     rrd,
 
 puts "creating #{rrd}"
 RRD.create(
     rrd,

-    "--start", "#{start - 1}",
+    "--start", "#{start_time - 1}",

     "--step", "300",
        "DS:a:GAUGE:600:U:U",
     "DS:b:GAUGE:600:U:U",
     "--step", "300",
        "DS:a:GAUGE:600:U:U",
     "DS:b:GAUGE:600:U:U",


@@ -21,13 +22,13 @@ RRD.create(
 puts
 
 puts "updating #{rrd}"
 puts
 
 puts "updating #{rrd}"

-start.to_i.step(start.to_i + 300 * 300, 300) { |i|
+start_time.step(end_time, 300) { |i|

     RRD.update(rrd, "#{i}:#{rand(100)}:#{Math.sin(i / 800) * 50 + 50}")
 }
 puts
 
 puts "fetching data from #{rrd}"
     RRD.update(rrd, "#{i}:#{rand(100)}:#{Math.sin(i / 800) * 50 + 50}")
 }
 puts
 
 puts "fetching data from #{rrd}"

-(fstart, fend, data) = RRD.fetch(rrd, "--start", start.to_s, "--end", (start + 300 * 300).to_s, "AVERAGE")
+(fstart, fend, data) = RRD.fetch(rrd, "--start", start_time.to_s, "--end", end_time.to_s, "AVERAGE")

 puts "got #{data.length} data points from #{fstart} to #{fend}"
 puts
 
 puts "got #{data.length} data points from #{fstart} to #{fend}"
 puts
 


@@ -35,7 +36,7 @@ puts "generating graph #{name}.png"
 RRD.graph(
    "#{name}.png",
     "--title", " RubyRRD Demo", 
 RRD.graph(
    "#{name}.png",
     "--title", " RubyRRD Demo", 

-    "--start", "#{start+3600}",
+    "--start", "#{start_time+3600}",

     "--end", "start + 1000 min",
     "--interlace", 
     "--imgformat", "PNG",
     "--end", "start + 1000 min",
     "--interlace", 
     "--imgformat", "PNG",


@@ -48,5 +49,12 @@ RRD.graph(
     "LINE3:line#ff0000")
 puts
 
     "LINE3:line#ff0000")
 puts
 

+# last method test
+if end_time != RRD.last("#{rrd}").to_i
+    puts "last method expects #{Time.at(end_time)}."
+    puts "                But #{RRD.last("#{rrd}")} returns."
+end
+puts
+

 print "This script has created #{name}.png in the current directory\n";
 print "This demonstrates the use of the TIME and % RPN operators\n";
 print "This script has created #{name}.png in the current directory\n";
 print "This demonstrates the use of the TIME and % RPN operators\n";