ruby-ldap 0.9.16 → 0.9.17

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzNiOGQzOTM3YzRjZjkxNWQyNjA4MThiMjY0NmM3NzUzM2E1YTYyZg==
-  data.tar.gz: !binary |-
-    NWNhZjFlM2I4ZWU0ZDMzOGJjZmQxOTY0ZDg4Y2NiYTQyMWMwNTZmMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Njg3ZDQ0MzkzNWJiNTM0ZTZiYmE1NzkwZDEzZTgzMDg5YWZmNTI1ZTVmOGU1
-    Mjk1M2FhMjc1MmMzYzk5YjRiNWM3MGU1YzdkOWM1YzVmNTg1MGY3N2ExYTgy
-    MzFlMTQwZTY3MzgyMWQzMzdlMjFkOGYwYTNjN2M3ZjYzYTE0ODE=
-  data.tar.gz: !binary |-
-    MTJlYjc0MzhjMjU3NWIwMTU2NTM3MzYyMjk5ZGM0YTMzNGExMGM1OTM2ODQ0
-    ZmZhM2NjNmE4ZjNiM2FiNDI2YzllZDU0OWRkNjJhZDgxNDQyNDcwYjljNjNk
-    N2VjNWY5NDg0ZjcwYTQ0YTQwNmJiYzlhNWZmOTc0ZWYzMzI2MzY=
+SHA1:
+  metadata.gz: c3a89e98ee493dd192900110043609702f6acab9
+  data.tar.gz: 4988a7cd01236d6c918f9d3dd3780a7325f12232
+SHA512:
+  metadata.gz: 013aa48ccd94301e1660376edd04230cf548de15e6d5f5a2b11f04d388304bb45cfb53fb824a649e844e2c9ba1769ae981aa0a041719b280ca75168f96a86865
+  data.tar.gz: 2d45dfb14d1913b0ecf26af6365397ebc3c1a1deb8187fed75b802f25a278a719b0582404c55ae2c34cc0c099b797f4e56bce3704c795a3e733b7e65bb7e527a

data/ChangeLog

@@ -1,3 +1,10 @@
+Fri Feb  6 08:51:09 UTC 2015 Alexey Chebotar <alexey.chebotar@gmail.com>
+  * Version 0.9.17
+  * Use ruby object to keep LDAP search result instead of libldap's data structure.
+  * Use macro Check_LDAPENTRY for assertion inside native extension codes.
+  * Remove assertion code from macro GET_LDAPENTRY_DATA.
+    Thanks to SUENAGA Hiroki.
+
 Fri Sep  6 07:04:07 UTC 2013 Alexey Chebotar <alexey.chebotar@gmail.com>
   * Version 0.9.16
   * Fixed undefined method 'each' in LDAP::LDIF.mods_to_ldif (GH-26).

data/NOTES

@@ -1,3 +1,12 @@
+0.9.17
+-----
+
+* Use ruby object to keep LDAP search result instead of libldap's data structure.
+* Use macro Check_LDAPENTRY for assertion inside native extension codes.
+* Remove assertion code from macro GET_LDAPENTRY_DATA (GH-31).
+  Thanks to SUENAGA Hiroki.
+
+
 0.9.16
 -----
 

data/README

@@ -265,6 +265,7 @@ This list maybe not correct. If you notice mistakes of this list, please point o
 * Pirmin Kalberer
 * Radek Hnilica
 * S. Potter
+* SUENAGA Hiroki
 * Tilo Sloboda
 * Usa Nakamura
 * Yuri Arabadji

data/conn.c

@@ -756,6 +756,7 @@ rb_ldap_conn_result2error (VALUE self, VALUE msg)
 
   GET_LDAP_DATA (self, ldapdata);
   Check_Kind (msg, rb_cLDAP_Entry);
+  Check_LDAPENTRY(msg);
   GET_LDAPENTRY_DATA (msg, edata);
 
   ldapdata->err = ldap_result2error (ldapdata->ldap, edata->msg, cdofree);
@@ -807,6 +808,7 @@ static VALUE
 rb_ldap_conn_invalidate_entry (VALUE msg)
 {
   RB_LDAPENTRY_DATA *edata;
+  Check_LDAPENTRY(msg);
   GET_LDAPENTRY_DATA (msg, edata);
   edata->ldap = NULL;
   edata->msg = NULL;

data/entry.c

@@ -8,6 +8,70 @@
 
 VALUE rb_cLDAP_Entry;
 
+static void
+rb_ldap_entry_mark(RB_LDAPENTRY_DATA *edata)
+{
+  rb_gc_mark(edata->dn);
+  rb_gc_mark(edata->attr);
+  /* 
+   * edata->ldap and edata->msg are managed in a block given by each search
+   * operation. ldap_msgfree should be called after ldap_search.
+   * they are just for C language interfaces, don't touch these members
+   * in ruby method implementation.
+   */
+}
+
+/*
+ * load libldap's value data structure into ruby array of string
+ */
+static VALUE
+rb_ldap_entry_load_val(LDAP *ldap, LDAPMessage *msg, char *c_attr)
+{
+  struct berval **bv;
+  VALUE vals;
+  int nvals;
+  int i;
+
+  bv = ldap_get_values_len(ldap, msg, c_attr);
+  if (bv == NULL)
+    return Qnil;
+
+  nvals = ldap_count_values_len(bv);
+  vals = rb_ary_new2(nvals);
+  for (i = 0; i < nvals; i++) {
+    rb_ary_push(vals, rb_tainted_str_new(bv[i]->bv_val, bv[i]->bv_len));
+  }
+  ldap_value_free_len(bv);
+
+  return vals;
+}
+
+/*
+ * load libldap's attributes data structure into ruby hash
+ */
+static VALUE
+rb_ldap_entry_load_attr(LDAP *ldap, LDAPMessage *msg)
+{
+  VALUE hash = rb_hash_new();
+  BerElement *ber = NULL;
+  char *c_attr;
+
+  for (c_attr = ldap_first_attribute(ldap, msg, &ber);
+    c_attr != NULL;
+    c_attr = ldap_next_attribute(ldap, msg, ber)) {
+    VALUE attr = rb_tainted_str_new2(c_attr);
+    VALUE vals = rb_ldap_entry_load_val(ldap, msg, c_attr);
+
+    rb_hash_aset(hash, attr, vals);
+    ldap_memfree(c_attr);
+  }
+
+#if !defined(USE_OPENLDAP1)
+  ber_free(ber, 0);
+#endif
+
+  return hash;
+}
 
 void
 rb_ldap_entry_free (RB_LDAPENTRY_DATA * edata)
@@ -22,10 +86,25 @@ rb_ldap_entry_new (LDAP * ldap, LDAPMessage * msg)
 {
   VALUE val;
   RB_LDAPENTRY_DATA *edata;
+  char *c_dn;
+
   val = Data_Make_Struct (rb_cLDAP_Entry, RB_LDAPENTRY_DATA,
-			  0, rb_ldap_entry_free, edata);
+			  rb_ldap_entry_mark, rb_ldap_entry_free, edata);
   edata->ldap = ldap;
   edata->msg = msg;
+
+  /* get dn */
+  c_dn = ldap_get_dn(ldap, msg);
+  if (c_dn) {
+    edata->dn = rb_tainted_str_new2(c_dn);
+    ldap_memfree(c_dn);
+  }
+  else {
+    edata->dn = Qnil;
+  }
+
+  /* get attributes */
+  edata->attr = rb_ldap_entry_load_attr(ldap, msg);
   return val;
 }
 
@@ -38,23 +117,10 @@ VALUE
 rb_ldap_entry_get_dn (VALUE self)
 {
   RB_LDAPENTRY_DATA *edata;
-  char *cdn;
-  VALUE dn;
 
   GET_LDAPENTRY_DATA (self, edata);
 
-  cdn = ldap_get_dn (edata->ldap, edata->msg);
-  if (cdn)
-    {
-      dn = rb_tainted_str_new2 (cdn);
-      ldap_memfree (cdn);
-    }
-  else
-    {
-      dn = Qnil;
-    }
-
-  return dn;
+  return edata->dn;
 }
 
 /*
@@ -70,34 +136,10 @@ VALUE
 rb_ldap_entry_get_values (VALUE self, VALUE attr)
 {
   RB_LDAPENTRY_DATA *edata;
-  char *c_attr;
-  struct berval **c_vals;
-  int i;
-  int count;
-  VALUE vals;
 
   GET_LDAPENTRY_DATA (self, edata);
-  c_attr = StringValueCStr (attr);
-
-  c_vals = ldap_get_values_len (edata->ldap, edata->msg, c_attr);
-  if (c_vals)
-    {
-      vals = rb_ary_new ();
-      count = ldap_count_values_len (c_vals);
-      for (i = 0; i < count; i++)
-	{
-	  VALUE str;
-	  str = rb_tainted_str_new (c_vals[i]->bv_val, c_vals[i]->bv_len);
-	  rb_ary_push (vals, str);
-	}
-      ldap_value_free_len (c_vals);
-    }
-  else
-    {
-      vals = Qnil;
-    }
 
-  return vals;
+  return rb_hash_aref(edata->attr, attr);
 }
 
 /*
@@ -111,28 +153,16 @@ VALUE
 rb_ldap_entry_get_attributes (VALUE self)
 {
   RB_LDAPENTRY_DATA *edata;
-  VALUE vals;
-  char *attr;
-  BerElement *ber = NULL;
+  VALUE attrs;
 
   GET_LDAPENTRY_DATA (self, edata);
 
-  vals = rb_ary_new ();
-  for (attr = ldap_first_attribute (edata->ldap, edata->msg, &ber);
-       attr != NULL;
-       attr = ldap_next_attribute (edata->ldap, edata->msg, ber))
-    {
-      rb_ary_push (vals, rb_tainted_str_new2 (attr));
-      ldap_memfree(attr);
-    }
-
-    #if !defined(USE_OPENLDAP1)
-    if( ber != NULL ){
-      ber_free(ber, 0);
-    }
-    #endif
+  attrs = rb_funcall(edata->attr, rb_intern("keys"), 0);
+  if (TYPE(attrs) != T_ARRAY) {
+    return Qnil;
+  }
 
-  return vals;
+  return attrs;
 }
 
 /*
@@ -144,21 +174,13 @@ rb_ldap_entry_get_attributes (VALUE self)
 VALUE
 rb_ldap_entry_to_hash (VALUE self)
 {
-  VALUE attrs = rb_ldap_entry_get_attributes (self);
-  VALUE hash = rb_hash_new ();
-  VALUE attr, vals;
-  int i;
-
-  Check_Type (attrs, T_ARRAY);
-  rb_hash_aset (hash, rb_tainted_str_new2 ("dn"),
-		rb_ary_new3 (1, rb_ldap_entry_get_dn (self)));
-  for (i = 0; i < RARRAY_LEN (attrs); i++)
-    {
-      attr = rb_ary_entry (attrs, i);
-      vals = rb_ldap_entry_get_values (self, attr);
-      rb_hash_aset (hash, attr, vals);
-    }
+  RB_LDAPENTRY_DATA *edata;
+  VALUE hash, dn_ary;
 
+  GET_LDAPENTRY_DATA (self, edata);
+  hash = rb_hash_dup(edata->attr);
+  dn_ary = rb_ary_new3(1, edata->dn);
+  rb_hash_aset(hash, rb_tainted_str_new2("dn"), dn_ary);
   return hash;
 }
 

data/rbldap.h

@@ -27,8 +27,8 @@
 
 #define RB_LDAP_MAJOR_VERSION 0
 #define RB_LDAP_MINOR_VERSION 9
-#define RB_LDAP_PATCH_VERSION 16
-#define RB_LDAP_VERSION "0.9.16"
+#define RB_LDAP_PATCH_VERSION 17
+#define RB_LDAP_VERSION "0.9.17"
 
 #define LDAP_GET_OPT_MAX_BUFFER_SIZE    (1024)	/* >= sizeof(LDAPAPIInfo) */
 
@@ -55,6 +55,8 @@ typedef struct rb_ldapentry_data
 {
   LDAP *ldap;
   LDAPMessage *msg;
+  VALUE dn;
+  VALUE attr;
 } RB_LDAPENTRY_DATA;
 
 typedef struct rb_ldapmod_data
@@ -161,7 +163,7 @@ VALUE rb_ldap_mod_vals (VALUE);
 
 #define Check_LDAPENTRY(obj) {\
   RB_LDAPENTRY_DATA *ptr; \
-  Data_Get_Struct(obj, struct rb_ldapmsg_data, ptr); \
+  Data_Get_Struct(obj, struct rb_ldapentry_data, ptr); \
   if( ! ptr->msg ){ \
     VALUE value = rb_inspect(obj); \
     rb_raise(rb_eLDAP_InvalidEntryError, "%s is not a valid entry", \
@@ -171,11 +173,6 @@ VALUE rb_ldap_mod_vals (VALUE);
 
 #define GET_LDAPENTRY_DATA(obj,ptr) { \
   Data_Get_Struct(obj, struct rb_ldapentry_data, ptr); \
-  if( ! ptr->msg ){ \
-    VALUE value = rb_inspect(obj); \
-    rb_raise(rb_eLDAP_InvalidEntryError, "%s is not a valid entry", \
-	     StringValuePtr(value)); \
-  }; \
 }
 
 #define GET_LDAPMOD_DATA(obj,ptr) {\

metadata

@@ -1,72 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ldap
 version: !ruby/object:Gem::Version
-  version: 0.9.16
+  version: 0.9.17
 platform: ruby
 authors:
 - Alexey Chebotar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies: []
-description: ! 'It provides the interface to some LDAP libraries (e.g. OpenLDAP, Netscape
-  SDK and Active Directory). The common API for application development is described
-  in RFC1823 and is supported by Ruby/LDAP.
-
-'
+description: |
+  It provides the interface to some LDAP libraries (e.g. OpenLDAP, Netscape SDK and Active Directory). The common API for application development is described in RFC1823 and is supported by Ruby/LDAP.
 email: alexey.chebotar@gmail.com
 executables: []
 extensions:
 - extconf.rb
 extra_rdoc_files: []
 files:
-- ChangeLog
 - COPYING
+- ChangeLog
 - FAQ
 - NOTES
 - README
 - TODO
-- test/ext.rb
-- test/compare.rb
-- test/bind-sasl.rb
-- test/misc1.rb
+- clientauth.c
+- conn.c
+- entry.c
+- extconf.rb
+- ldap.c
+- lib/ldap/control.rb
+- lib/ldap/ldif.rb
+- lib/ldap/schema.rb
+- misc.c
+- mod.c
+- rbldap.h
+- saslconn.c
+- sslconn.c
 - test/add.rb
-- test/tc_schema.rb
 - test/add2.rb
-- test/search.rb
 - test/add3.rb
-- test/modrdn.rb
+- test/bind-ldaps.rb
+- test/bind-sasl.rb
 - test/bind-ssl.rb
-- test/setup.rb
-- test/search3.rb
+- test/bind.rb
+- test/compare.rb
+- test/conf.rb
 - test/delete.rb
+- test/ext.rb
+- test/misc1.rb
+- test/misc2.rb
+- test/modrdn.rb
+- test/moz_cert.rb
+- test/search.rb
 - test/search2.rb
+- test/search3.rb
+- test/setup.rb
+- test/subschema.rb
 - test/tc_conn.rb
-- test/ts_ldap.rb
-- test/conf.rb
-- test/misc2.rb
-- test/bind-ldaps.rb
-- test/tc_search.rb
-- test/bind.rb
 - test/tc_ldif.rb
-- test/subschema.rb
-- test/moz_cert.rb
-- lib/ldap/schema.rb
-- lib/ldap/control.rb
-- lib/ldap/ldif.rb
-- extconf.rb
-- rbldap.h
+- test/tc_schema.rb
+- test/tc_search.rb
+- test/ts_ldap.rb
 - win/winlber.h
 - win/winldap.h
-- conn.c
-- sslconn.c
-- entry.c
-- clientauth.c
-- ldap.c
-- mod.c
-- saslconn.c
-- misc.c
 - win/wldap32.def
 homepage: http://ruby-ldap.sourceforge.net/
 licenses: []
@@ -77,18 +74,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ruby-ldap
-rubygems_version: 2.0.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby/LDAP is an extension module for Ruby
 test_files: []
+has_rdoc: true