add match_entry

Author: tonytonyjan

ext/rr3/match_entry.c

@@ -0,0 +1,31 @@
+#include <r3/r3.h>
+#include "match_entry.h"
+
+extern VALUE rb_mRr3;
+VALUE rb_cMatchEntry;
+
+void init_match_entry(){
+  rb_cMatchEntry = rb_define_class_under(rb_mRr3, "MatchEntry", rb_cObject);
+  rb_define_method(rb_cMatchEntry, "initialize", rb_match_entry_initialize, -1);
+  rb_define_attr(rb_cMatchEntry, "route_data", 1, 0);
+  rb_define_attr(rb_cMatchEntry, "path", 1, 0);
+  rb_define_attr(rb_cMatchEntry, "request_method", 1, 0);
+  rb_define_attr(rb_cMatchEntry, "host", 1, 0);
+  rb_define_attr(rb_cMatchEntry, "remote_addr", 1, 0);
+  rb_define_attr(rb_cMatchEntry, "vars", 1, 0);
+}
+
+static VALUE rb_match_entry_initialize(int argc, VALUE *argv, VALUE self){
+  VALUE opt;
+  rb_scan_args(argc, argv, "0:", &opt);
+  if(!NIL_P(opt)) rb_hash_foreach(opt, mass_assign_i, self);
+  return self;
+}
+
+static int mass_assign_i(VALUE key, VALUE value, VALUE self){
+  VALUE key_str = rb_id2str(SYM2ID(key));
+  char iv_str[100] = "@";
+  strncat(iv_str, RSTRING_PTR(key_str), RSTRING_LEN(key_str));
+  rb_iv_set(self, iv_str, value);
+  return ST_CONTINUE;
+}

ext/rr3/match_entry.h

@@ -0,0 +1,14 @@
+#ifndef MATCH_ENTRY
+#define MATCH_ENTRY 1
+
+#include <r3/r3.h>
+#include "ruby.h"
+
+void init_match_entry();
+
+// def initialize(options)
+static VALUE rb_match_entry_initialize(int argc, VALUE *argv, VALUE self);
+
+static int mass_assign_i(VALUE key, VALUE value, VALUE self);
+
+#endif /* MATCH_ENTRY */

ext/rr3/rr3.c

@@ -1,9 +1,11 @@
 #include "rr3.h"
 #include "tree.h"
+#include "match_entry.h"
 
 VALUE rb_mRr3;
 
 void Init_rr3(void){
   rb_mRr3 = rb_define_module("Rr3");
+  init_match_entry();
   init_tree();
 }

ext/rr3/tree.c

@@ -6,21 +6,20 @@ VALUE rb_cTree;
 
 void init_tree(){
   rb_cTree = rb_define_class_under(rb_mRr3, "Tree", rb_cObject);
-  rb_define_attr(rb_cTree, "root", 1, 0);
-  rb_define_method(rb_cTree, "initialize", rb_initialize, 1);
-  rb_define_method(rb_cTree, "insert_path", rb_insert_path, -1);
-  rb_define_method(rb_cTree, "compile!", rb_compile, 0);
-  rb_define_method(rb_cTree, "match", rb_match, 1);
-  rb_define_method(rb_cTree, "dump", rb_dump, 1);
+  rb_define_method(rb_cTree, "initialize", rb_tree_initialize, 1);
+  rb_define_method(rb_cTree, "insert_path", rb_tree_insert_path, -1);
+  rb_define_method(rb_cTree, "compile!", rb_tree_compile, 0);
+  rb_define_method(rb_cTree, "match", rb_tree_match, 1);
+  rb_define_method(rb_cTree, "dump", rb_tree_dump, 1);
 }
 
-static VALUE rb_initialize(VALUE self, VALUE size){
+static VALUE rb_tree_initialize(VALUE self, VALUE size){
   node *n = r3_tree_create(FIX2INT(size));
   rb_ivar_set(self, rb_intern("@root"), Data_Wrap_Struct(rb_cObject, NULL, release, n));
   return self;
 }
 
-static VALUE rb_insert_path(int argc, VALUE *argv, VALUE self){
+static VALUE rb_tree_insert_path(int argc, VALUE *argv, VALUE self){
   VALUE path, *data;
   Data_Make_Struct(rb_cObject, VALUE, NULL, -1, data);
   rb_scan_args(argc, argv, "11", &path, data);
@@ -33,7 +32,7 @@ static VALUE rb_insert_path(int argc, VALUE *argv, VALUE self){
   return Qnil;
 }
 
-static VALUE rb_compile(VALUE self){
+static VALUE rb_tree_compile(VALUE self){
   char *errstr = NULL;
   if(r3_tree_compile(root(self), &errstr) != 0){
     rb_raise(rb_eRuntimeError, "%s", errstr);
@@ -42,12 +41,13 @@ static VALUE rb_compile(VALUE self){
   return Qnil;
 }
 
-static VALUE rb_match(VALUE self, VALUE path){
+static VALUE rb_tree_match(VALUE self, VALUE path){
+  // match_entry *entry = match_entry_createl(RSTRING_PTR(path), RSTRING_LEN(path));
   node *matched_node = r3_tree_matchl(root(self), RSTRING_PTR(path), RSTRING_LEN(path), NULL); // TODO: support entry
   return matched_node ? *((VALUE*) matched_node->data) : Qfalse;
 }
 
-static VALUE rb_dump(VALUE self, VALUE level){
+static VALUE rb_tree_dump(VALUE self, VALUE level){
   r3_tree_dump(root(self), FIX2INT(level));
   return Qnil;
 }

ext/rr3/tree.h

@@ -2,20 +2,20 @@
 #define RR3_TREE 1
 
 #include <r3/r3.h>
-#include <ruby.h>
+#include "ruby.h"
 
 void init_tree();
 
 // def initialize(size)
-static VALUE rb_initialize(VALUE self, VALUE size);
+static VALUE rb_tree_initialize(VALUE self, VALUE size);
 // def insert_path(path, data = nil)
-static VALUE rb_insert_path(int argc, VALUE *argv, VALUE self);
+static VALUE rb_tree_insert_path(int argc, VALUE *argv, VALUE self);
 // def compile()
-static VALUE rb_compile(VALUE self);
+static VALUE rb_tree_compile(VALUE self);
 // def compile(path)
-static VALUE rb_match(VALUE self, VALUE path);
+static VALUE rb_tree_match(VALUE self, VALUE path);
 // def dump(level)
-static VALUE rb_dump(VALUE self, VALUE level);
+static VALUE rb_tree_dump(VALUE self, VALUE level);
 
 static void release(node *n);
 inline static node* root(VALUE self);

spec/match_entry_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Rr3::MatchEntry do
+  it '#initialize' do
+    x = Rr3::MatchEntry.new path: 'asdf', a: 123
+  end
+end

spec/rr3_spec.rb

@@ -1,4 +1,3 @@
-$: << File.expand_path('../../ext', __FILE__)
 require 'spec_helper'
 
 describe Rr3 do