statsrb 0.1.3 → 0.1.4

data/ext/statsrb/statsrb.c

@@ -3,6 +3,52 @@
 #include <string.h>
 #include <stdlib.h>
 
+/**
+ * Retrieves internal data based on specified filters.
+ * @param namespace [String]
+ * @param limit [Number]
+ * @param start_time [Number]
+ * @param end_time [Number]
+ * @return [Array] An array of data hashes.
+ */
+static VALUE statsrb_get(VALUE self, VALUE query_ns, VALUE query_limit, VALUE query_start, VALUE query_end) {
+  VALUE statsrb_data = rb_iv_get(self, "@data");
+  VALUE statsrb_event = rb_hash_new();
+  int data_length = RARRAY_LEN(statsrb_data);
+  int i = 0;
+  int count = 0;
+  int tmp_ts;
+
+  VALUE filtered_data = rb_ary_new();
+  VALUE tmp_ns;
+
+  // @data hash key symbols.
+  VALUE statsrb_key_ts = rb_iv_get(self, "@key_ts");
+  VALUE statsrb_key_ns = rb_iv_get(self, "@key_ns");
+  VALUE statsrb_key_v = rb_iv_get(self, "@key_v");
+
+  // Convert into an int that ruby understands.
+  int limit = NUM2INT(query_limit);
+  int qstart = NUM2INT(query_start);
+  int qend = NUM2INT(query_end);
+
+  for (i = 0; i < data_length; i++) {
+    tmp_ts = NUM2INT(rb_hash_aref(rb_ary_entry(statsrb_data, i), statsrb_key_ts));
+    tmp_ns = rb_hash_aref(rb_ary_entry(statsrb_data, i), statsrb_key_ns);
+    if (rb_str_equal(query_ns, tmp_ns)
+        && (qstart == 0 || tmp_ts >= qstart)
+        && (qend == 0 || tmp_ts <= qend)) {
+      rb_hash_aset(statsrb_event, statsrb_key_ts, rb_hash_aref(rb_ary_entry(statsrb_data, i), statsrb_key_ts));
+      rb_hash_aset(statsrb_event, statsrb_key_ns, rb_hash_aref(rb_ary_entry(statsrb_data, i), statsrb_key_ns));
+      rb_hash_aset(statsrb_event, statsrb_key_v, rb_hash_aref(rb_ary_entry(statsrb_data, i), statsrb_key_v));
+      rb_ary_push(filtered_data, statsrb_event);
+      count++;
+    }
+  }
+
+  return filtered_data;
+}
+
 /**
  * Locates data from a specified file and loads into @data.
  * @param filepath [String]
@@ -12,7 +58,7 @@
  * @param end_time [Number]
  * @return [Statsrb] A reference to the object.
  */
-static VALUE statsrb_query(VALUE self, VALUE logfile, VALUE query_ns, VALUE query_limit, VALUE query_start, VALUE query_end) {
+static VALUE statsrb_read(VALUE self, VALUE logfile, VALUE query_ns, VALUE query_limit, VALUE query_start, VALUE query_end) {
   FILE * file;
   int line_size = 256;
   char *line = (char *) malloc(line_size);
@@ -39,13 +85,13 @@ static VALUE statsrb_query(VALUE self, VALUE logfile, VALUE query_ns, VALUE quer
   file = fopen(filepath, "r");
   if (file == NULL) {
     fprintf(stderr, "File error: could not open file %s for reading.", filepath);
-    return;
+    return self;
   }
 
   int count = 0;
 
   while (NULL != fgets(line, line_size, file) && count < limit) {
-    // strstr doesn't work with newline chars. 
+    // strstr doesn't work with newline chars.
     size_t len = strlen(line) - 1;
     if (line[len] == '\n');
         line[len] = '\0';
@@ -66,7 +112,7 @@ static VALUE statsrb_query(VALUE self, VALUE logfile, VALUE query_ns, VALUE quer
         VALUE statsrb_str_ns = rb_str_new2(strtok(NULL, "\t"));
         //strtok(NULL, "\t");
         int statsrb_v = atoi(strtok(NULL, "\0"));
-  
+
         // @TODO this should really query the namespace exactly instead of just relying on strstr.
         //if (rb_str_cmp(query_ns, statsrb_str_empty) == 0 || rb_str_cmp(query_ns, statsrb_str_ns) == 0) {
         if (statsrb_ts && (statsrb_v || statsrb_v == 0)) {
@@ -155,7 +201,7 @@ static VALUE statsrb_write(VALUE self, VALUE logfile, VALUE mode) {
   int line_size = 256;
   int tmp_ts, tmp_v;
   const char *tmp_ns = (char *) malloc(line_size);
-  
+
   // @data hash key symbols.
   VALUE statsrb_key_ts = rb_iv_get(self, "@key_ts");
   VALUE statsrb_key_ns = rb_iv_get(self, "@key_ns");
@@ -164,7 +210,7 @@ static VALUE statsrb_write(VALUE self, VALUE logfile, VALUE mode) {
   file = fopen(filepath, filemode);
   if (file==NULL) {
     fprintf(stderr, "File error: could not open file %s mode %s.", filepath, filemode);
-    return;
+    return self;
   }
 
   // Iterate through the data array, writing the data as we go.
@@ -222,7 +268,12 @@ static VALUE statsrb_split_write(VALUE self, VALUE logdir, VALUE mode) {
     //fputs (RSTRING_PTR(rb_obj_as_string(INT2NUM(RARRAY_LEN(tmp_data)))),stderr);
     rb_iv_set(tmp, "@data", tmp_data);
 
-    // @todo, throw an exception if no trailing slash... or add one
+    // If there is no trailing slash on the log dir, add one.
+    const char *filepath = RSTRING_PTR(logdir);
+    size_t len = strlen(filepath);
+    if (filepath[len - 1] != '/') {
+      logdir = rb_str_plus(logdir, rb_str_new2("/"));
+    }
     statsrb_write(tmp, rb_str_plus(logdir, rb_ary_entry(ns_list, i)), mode);
   }
 
@@ -393,7 +444,7 @@ static VALUE statsrb_rack_call(VALUE self, VALUE env) {
       VALUE tmp = rb_obj_dup(self);
       VALUE tmp_data = rb_ary_new();
       rb_iv_set(tmp, "@data", tmp_data);
-      statsrb_query(tmp, rb_str_plus(rb_iv_get(self, "@split_file_dir"), statsrb_ns), statsrb_ns, INT2NUM(query_limit), INT2NUM(query_start), INT2NUM(query_end));
+      statsrb_read(tmp, rb_str_plus(rb_iv_get(self, "@split_file_dir"), statsrb_ns), statsrb_ns, INT2NUM(query_limit), INT2NUM(query_start), INT2NUM(query_end));
       statsrb_sort(tmp);
 
       int i, data_length = RARRAY_LEN(tmp_data);
@@ -408,7 +459,7 @@ static VALUE statsrb_rack_call(VALUE self, VALUE env) {
           rb_ary_push(body, rb_str_new(",", 1));
         }
         rb_ary_push(body, rb_str_new("\n", 1));
-      } 
+      }
       rb_ary_resize(tmp_data, 0);
     }
     rb_ary_push(body, rb_str_new("]}", 2));
@@ -454,7 +505,7 @@ static VALUE statsrb_push(VALUE self, VALUE timestamp, VALUE namespace, VALUE va
 
   return self;
 }
- 
+
 /**
  * Class constructor, sets up an instance variable.
  */
@@ -485,7 +536,9 @@ void Init_statsrb(void) {
 
   // Instance methods and properties.
   rb_define_method(klass, "initialize", statsrb_constructor, 0);
-  rb_define_method(klass, "query", statsrb_query, 5);
+  rb_define_method(klass, "query", statsrb_read, 5);
+  rb_define_method(klass, "read", statsrb_read, 5);
+  rb_define_method(klass, "get", statsrb_get, 4);
   rb_define_method(klass, "sort", statsrb_sort, 0);
   rb_define_method(klass, "write", statsrb_write, 2);
   rb_define_method(klass, "split_write", statsrb_split_write, 2);

data/test/test_statsrb.rb

@@ -0,0 +1,89 @@
+require 'minitest/autorun'
+require 'statsrb'
+
+class TestStatsrb < MiniTest::Test
+
+  attr_accessor :tmpfile
+
+  def setup
+    @s = Statsrb.new
+    @tmpfile = "/tmp/test.statsrb"
+  end
+
+  def teardown
+    File.delete @tmpfile unless !File.exists? @tmpfile
+  end
+
+  # Provides test data.
+  def get_data
+    [[123, "test1", 33],
+    [321, "test1", 34],
+    [222, "test1", 35],
+    [111, "test2", 36],
+    [432, "test2", 37]]
+  end
+
+  # Stores the data in the current object.
+  def push_data
+    get_data.each do |value|
+      @s.push value[0], value[1], value[2]
+    end
+  end
+
+  # Writes the data to a temp file.
+  def write_data
+    @s.write @tmpfile, "w+"
+  end
+
+  # Tests that the data was indeed pushed.
+  def test_push_data
+    push_data
+    assert_equal @s.data.length, get_data.length
+  end
+  
+  # Tests that we can filter the in-memory data.
+  def test_get_data
+    push_data
+    t = @s.get "test2", 100, 0, 0
+    assert_equal(t.length, 2);
+  end
+
+  # Tests that we can sort the data.
+  def test_sort_data
+    current = 0
+    push_data
+    @s.sort
+    @s.data.each do |value|
+      assert value[:ts] > current
+      current = value[:ts]
+    end
+  end
+
+  # Tests that we can write the data to a file.
+  def test_write_data
+    push_data
+    write_data
+    data = get_data
+    file_data = File.read(@tmpfile).split "\n"
+
+    assert_equal file_data.length, data.length
+    count = 0
+    file_data.each do |value|
+      parts = value.split "\t"
+      assert_equal parts[0], data[count][0].to_s
+      assert_equal parts[1], data[count][1].to_s
+      assert_equal parts[2], data[count][2].to_s
+      count = count + 1
+    end
+  end
+
+  # Tests that we can read data from a file.
+  def test_read_data
+    push_data
+    write_data
+    @s.read @tmpfile, "test1", 100, 0, 0
+    assert_equal @s.data.length, 3
+    @s.read @tmpfile, "test2", 100, 0, 0
+    assert_equal @s.data.length, 2
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statsrb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,8 @@ bindir: bin
 cert_chain: []
 date: 2013-06-08 00:00:00.000000000 Z
 dependencies: []
-description: A ruby stats repository.
+description: A Ruby time series stats repository using flat file storage, providing
+  a Ruby API as well as a Rack compatible REST API.
 email: email@kevinhankens.com
 executables: []
 extensions:
@@ -21,9 +22,11 @@ files:
 - lib/statsrb.rb
 - ext/statsrb/statsrb.c
 - ext/statsrb/extconf.rb
+- test/test_statsrb.rb
 homepage: https://github.com/kevinhankens/statsrb
-licenses: []
-post_install_message: 
+licenses:
+- ! "MIT\t"
+post_install_message: ! 'Please view documentation at: https://github.com/kevinhankens/statsrb'
 rdoc_options: []
 require_paths:
 - lib
@@ -44,6 +47,7 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Statsrb
-test_files: []
+summary: A Ruby time series stats repository.
+test_files:
+- test/test_statsrb.rb
 has_rdoc: