rldap 0.0.2 → 0.0.3

data/ext/constants.h

@@ -24,3 +24,8 @@ DEFINE_CONST(LDAP_OPERATIONS_ERROR);
 DEFINE_CONST(LDAP_PROTOCOL_ERROR);
 DEFINE_CONST(LDAP_TIMELIMIT_EXCEEDED);
 DEFINE_CONST(LDAP_SIZELIMIT_EXCEEDED);
+
+/* scopes */
+DEFINE_CONST(LDAP_SCOPE_SUBTREE);
+DEFINE_CONST(LDAP_SCOPE_ONE);
+DEFINE_CONST(LDAP_SCOPE_BASE);

data/ext/ldap.c

@@ -16,13 +16,11 @@ static VALUE eLDAP;
 
 typedef struct {
 	LDAP *ld;
-	char connection;
 } RLDAP_WRAP;
 
 typedef struct {
 	LDAP *ld;
 	LDAPMessage *mesg;
-	char freed;
 } RLDAP_MSG_WRAP;
 
 static RLDAP_WRAP *get_wrapper(VALUE obj)
@@ -42,14 +40,15 @@ static RLDAP_MSG_WRAP *get_msg_wrapper(VALUE obj)
 static void free_wrapper(RLDAP_WRAP *wrapper)
 {
 	ldap_memfree(wrapper->ld);
-	xfree(wrapper);
+	free(wrapper);
 }
 
 static void free_msg_wrapper(RLDAP_MSG_WRAP *wrapper)
 {
-	if (wrapper->freed == Qfalse)
+	if (wrapper->mesg != NULL)
 		ldap_msgfree(wrapper->mesg);
-	xfree(wrapper);
+	wrapper->ld = NULL;
+	free(wrapper);
 }
 
 static void rldap_raise(int errno)
@@ -76,7 +75,6 @@ static VALUE rldap_alloc(VALUE klass)
 	VALUE obj;
 
 	obj = Data_Make_Struct(klass, RLDAP_WRAP, 0, free_wrapper, wrapper);
-	wrapper->connection = Qfalse;
 
 	return obj;
 }
@@ -115,19 +113,44 @@ static VALUE rldap_start_tls(VALUE obj)
 		rldap_raise(retval);
 }
 
-static VALUE rldap_search(VALUE obj, VALUE rbase, VALUE rfilter)
+static VALUE rldap_search(int argc, VALUE *argv, VALUE obj)
 {
 	RLDAP_WRAP *wrapper;
 	char *base, *filter;
-	int retval, count, i;
+	int retval, count, i, scope;
 	LDAPMessage *res, *msg;
-	VALUE ary;
-
+	VALUE ary, rbase, rfilter, rscope;
+	ID iscope;
+	
+	rb_scan_args(argc, argv, "21", &rbase, &rfilter, &rscope);
+
+	switch(TYPE(rscope)) {
+		case T_NIL:
+			scope = LDAP_SCOPE_SUBTREE;
+			break;
+		case T_FIXNUM:
+			scope = FIX2INT(rscope);
+			break;
+		case T_SYMBOL:
+		case T_STRING:
+			iscope = rb_to_id(rscope);
+			if (iscope == rb_intern("subtree"))
+				scope = LDAP_SCOPE_SUBTREE;
+			if (iscope == rb_intern("base"))
+				scope = LDAP_SCOPE_BASE;
+			if (iscope == rb_intern("one"))
+				scope = LDAP_SCOPE_ONE;
+			break;
+		default:
+			rb_raise(rb_eTypeError, "not a valid scope");
+			break;
+	}
+	
 	wrapper = get_wrapper(obj);
 	base = StringValuePtr(rbase);
 	filter = StringValuePtr(rfilter);
 
-	retval = ldap_search_ext_s(wrapper->ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, NULL, 0, &res);
+	retval = ldap_search_ext_s(wrapper->ld, base, scope, filter, NULL, 0, NULL, NULL, NULL, 0, &res);
 
 	if (retval != LDAP_SUCCESS)
 		rldap_raise(retval);
@@ -149,6 +172,8 @@ static VALUE rldap_search(VALUE obj, VALUE rbase, VALUE rfilter)
 		msg = ldap_next_entry(wrapper->ld, msg);
 	}
 	
+	
+	
 	return ary;
 }
 
@@ -180,16 +205,9 @@ static VALUE rldap_set_option(VALUE obj, VALUE roption, VALUE rvalue)
 		return Qfalse;
 }
 
-static VALUE rldap_errno(VALUE obj)
+static VALUE rldap_set_version(VALUE obj, VALUE version)
 {
-	RLDAP_WRAP *wrapper;
-	int errno;
-	
-	wrapper = get_wrapper(obj);
-	
-	ldap_get_option(wrapper->ld, LDAP_OPT_RESULT_CODE, &errno);
-	
-	return INT2NUM(errno);
+	return rldap_set_option(obj, INT2FIX(LDAP_OPT_PROTOCOL_VERSION), version);
 }
 
 int rldap_errno_c(VALUE obj)
@@ -202,6 +220,35 @@ int rldap_errno_c(VALUE obj)
 	return errno;
 }
 
+static VALUE rldap_errno(VALUE obj)
+{
+	return INT2NUM(rldap_errno_c(obj));
+}
+
+static VALUE rldap_uri(VALUE obj)
+{
+	RLDAP_WRAP *wrapper;
+	char *uri;
+	VALUE ruri;
+	
+	wrapper = get_wrapper(obj);
+	ldap_get_option(wrapper->ld, LDAP_OPT_URI, &uri);
+	
+	return rb_str_new2(uri);
+}
+
+static VALUE rldap_inspect(VALUE obj)
+{
+	VALUE ruri, ret;
+	
+	ruri = rb_funcall(rldap_uri(obj), rb_intern("dump"), 0);
+	ret = rb_str_new2("#<LDAP @uri=");
+	rb_str_cat2(ret, StringValuePtr(ruri));
+	rb_str_cat2(ret, ">");
+	
+	return ret;
+}
+
 
 /* class LDAP::Message */
 
@@ -212,7 +259,6 @@ static VALUE ldapmessage2obj(LDAP* ld, LDAPMessage* msg)
 
 	obj = Data_Make_Struct(cLDAP_Message, RLDAP_MSG_WRAP, 0, free_msg_wrapper, wrapper);
 	wrapper->mesg = msg;
-	wrapper->freed = Qfalse;
 	wrapper->ld = ld;
 
 	return obj;
@@ -304,9 +350,12 @@ void Init_ldap()
 	rb_define_singleton_method(cLDAP, "err2string", rldap_err2string, 1);
 	rb_define_method(cLDAP, "initialize", rldap_initialize, -1);
 	rb_define_method(cLDAP, "start_tls", rldap_start_tls, 0);
-	rb_define_method(cLDAP, "search", rldap_search, 2);
+	rb_define_method(cLDAP, "search", rldap_search, -1);
 	rb_define_method(cLDAP, "set_option", rldap_set_option, 2);
+	rb_define_method(cLDAP, "version=", rldap_set_version, 1);
 	rb_define_method(cLDAP, "errno", rldap_errno, 0);
+	rb_define_method(cLDAP, "uri", rldap_uri, 0);
+	rb_define_method(cLDAP, "inspect", rldap_inspect, 0);
 	
 	rb_define_method(cLDAP_Message, "dn", rldap_msg_dn, 0);
 	rb_define_method(cLDAP_Message, "[]", rldap_msg_get_val, 1);

data/lib/ldap/version.rb

@@ -1,3 +1,3 @@
 class LDAP
-  Version = VERSION = '0.0.2'
+  Version = VERSION = '0.0.3'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Henrik Hodne