ruby-ldap 0.9.17 → 0.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3a89e98ee493dd192900110043609702f6acab9
-  data.tar.gz: 4988a7cd01236d6c918f9d3dd3780a7325f12232
+  metadata.gz: b6924c44fe913f0e2f2886a6d867e315a4c4d1d2
+  data.tar.gz: 78eb5ced76910731afc0ef06aed0f47440f5e943
 SHA512:
-  metadata.gz: 013aa48ccd94301e1660376edd04230cf548de15e6d5f5a2b11f04d388304bb45cfb53fb824a649e844e2c9ba1769ae981aa0a041719b280ca75168f96a86865
-  data.tar.gz: 2d45dfb14d1913b0ecf26af6365397ebc3c1a1deb8187fed75b802f25a278a719b0582404c55ae2c34cc0c099b797f4e56bce3704c795a3e733b7e65bb7e527a
+  metadata.gz: e8550110a3097ed2c36dc787dfe392de3c6b7bec9de5887729cff903ca390e82d34a3dd403098684d61f0db056ce637837a968ae1507f91467e705221daa3858
+  data.tar.gz: 3bff7856fbeec9d8b091d94571b9b396f110dfcfa8ed931fd26ef6e24d3db2ff4daa3bc43591b9221e0fbce3bdc582ee67dfab52b5baa0d8375b250b9a43d835

data/ChangeLog

@@ -1,3 +1,8 @@
+Fri Mar  4 11:17:21 UTC 2016 Alexey Chebotar <alexey.chebotar@gmail.com>
+  * Version 0.9.18
+  * backout issue32 to compile for ruby-1.8.x.
+    Thanks to SUENAGA Hiroki.
+
 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.

data/NOTES

@@ -1,3 +1,9 @@
+0.9.18
+-----
+* backout issue32 to compile for ruby-1.8.x.
+  Thanks to SUENAGA Hiroki.
+
+
 0.9.17
 -----
 

data/README

@@ -228,7 +228,7 @@ Here are some URLs that contain useful information about LDAP:
   * Netscape Communications
     http://developer.netscape.com/docs/manuals/communicator/ldap45.htm
   * Netscape Directory SDK
-    http://www.mozilla.org/directory/
+    https://wiki.mozilla.org/Directory
   * Active Directory Service Interfaces Overview
     http://www.microsoft.com/windows2000/techinfo/howitworks/activedirectory/
     adsilinks.asp

data/TODO

@@ -3,6 +3,9 @@
 To-do list
 ----------
 
+- Running tests:
+./test/test.sh /Users/bearded/.rvm/rubies/ruby-1.8.7-head/bin/ruby openldap2 /usr/libexec/slapd /etc/openldap/schema/
+
 - Support for more LDAPv3 controls and extensions.
 
 - DSML support.

data/entry.c

@@ -8,6 +8,7 @@
 
 VALUE rb_cLDAP_Entry;
 
+#if RUBY_VERSION_CODE >= 190
 static void
 rb_ldap_entry_mark(RB_LDAPENTRY_DATA *edata)
 {
@@ -72,6 +73,7 @@ rb_ldap_entry_load_attr(LDAP *ldap, LDAPMessage *msg)
 
   return hash;
 }
+#endif
 
 void
 rb_ldap_entry_free (RB_LDAPENTRY_DATA * edata)
@@ -86,13 +88,21 @@ rb_ldap_entry_new (LDAP * ldap, LDAPMessage * msg)
 {
   VALUE val;
   RB_LDAPENTRY_DATA *edata;
+#if RUBY_VERSION_CODE >= 190
   char *c_dn;
+#endif
 
+#if RUBY_VERSION_CODE >= 190
   val = Data_Make_Struct (rb_cLDAP_Entry, RB_LDAPENTRY_DATA,
 			  rb_ldap_entry_mark, rb_ldap_entry_free, edata);
+#else
+  val = Data_Make_Struct (rb_cLDAP_Entry, RB_LDAPENTRY_DATA,
+			  0, rb_ldap_entry_free, edata);
+#endif
   edata->ldap = ldap;
   edata->msg = msg;
 
+#if RUBY_VERSION_CODE >= 190
   /* get dn */
   c_dn = ldap_get_dn(ldap, msg);
   if (c_dn) {
@@ -105,6 +115,7 @@ rb_ldap_entry_new (LDAP * ldap, LDAPMessage * msg)
 
   /* get attributes */
   edata->attr = rb_ldap_entry_load_attr(ldap, msg);
+#endif
   return val;
 }
 
@@ -117,10 +128,29 @@ VALUE
 rb_ldap_entry_get_dn (VALUE self)
 {
   RB_LDAPENTRY_DATA *edata;
+#if RUBY_VERSION_CODE < 190
+  char *cdn;
+  VALUE dn;
+#endif
 
   GET_LDAPENTRY_DATA (self, edata);
 
+#if RUBY_VERSION_CODE < 190
+  cdn = ldap_get_dn (edata->ldap, edata->msg);
+  if (cdn)
+    {
+      dn = rb_tainted_str_new2 (cdn);
+      ldap_memfree (cdn);
+    }
+  else
+    {
+      dn = Qnil;
+    }
+
+  return dn;
+#else
   return edata->dn;
+#endif
 }
 
 /*
@@ -136,10 +166,40 @@ VALUE
 rb_ldap_entry_get_values (VALUE self, VALUE attr)
 {
   RB_LDAPENTRY_DATA *edata;
+#if RUBY_VERSION_CODE < 190
+  char *c_attr;
+  struct berval **c_vals;
+  int i;
+  int count;
+  VALUE vals;
+#endif
 
   GET_LDAPENTRY_DATA (self, edata);
+#if RUBY_VERSION_CODE < 190
+  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;
+#else
   return rb_hash_aref(edata->attr, attr);
+#endif
 }
 
 /*
@@ -153,16 +213,41 @@ VALUE
 rb_ldap_entry_get_attributes (VALUE self)
 {
   RB_LDAPENTRY_DATA *edata;
+#if RUBY_VERSION_CODE < 190
+  VALUE vals;
+  char *attr;
+  BerElement *ber = NULL;
+#else
   VALUE attrs;
+#endif
 
   GET_LDAPENTRY_DATA (self, edata);
 
+#if RUBY_VERSION_CODE < 190
+  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
+
+  return vals;
+#else
   attrs = rb_funcall(edata->attr, rb_intern("keys"), 0);
   if (TYPE(attrs) != T_ARRAY) {
     return Qnil;
   }
 
   return attrs;
+#endif
 }
 
 /*
@@ -174,13 +259,33 @@ rb_ldap_entry_get_attributes (VALUE self)
 VALUE
 rb_ldap_entry_to_hash (VALUE self)
 {
+#if RUBY_VERSION_CODE < 190
+  VALUE attrs = rb_ldap_entry_get_attributes (self);
+  VALUE hash = rb_hash_new ();
+  VALUE attr, vals;
+  int i;
+#else
   RB_LDAPENTRY_DATA *edata;
   VALUE hash, dn_ary;
+#endif
 
+#if RUBY_VERSION_CODE < 190
+  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);
+    }
+#else
   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);
+#endif
+
   return hash;
 }
 

data/extconf.rb

@@ -235,6 +235,7 @@ for l in [$libcrypto, $libssl, $libnsl, $libpthread, $libresolv,
 end
 
 have_func("ldap_init", 'ldap.h')
+have_func('rb_hash_dup')
 have_func("ldap_set_option")
 have_func("ldap_get_option")
 have_func("ldap_start_tls_s") if $use_openldap2
@@ -260,12 +261,12 @@ $defs << "-DRUBY_VERSION_CODE=#{RUBY_VERSION.gsub(/\D/, '')}"
 create_makefile("ldap")
 
 
-$slapd = ldap_with_config("slapd") || File.join($ldap_dir,"libexec","slapd")
+$slapd = ldap_with_config("slapd") || File.join("/usr","libexec","slapd")
 $schema_dir = ldap_with_config("schema-dir")
 if( !$schema_dir )
-  $schema_dir = File.join($ldap_dir,"etc","openldap","schema")
+  $schema_dir = File.join("/etc","openldap","schema")
   if( !File.exist?($schema_dir) )
-    $schema_dir = File.join($ldap_dir,"etc","openldap")
+    $schema_dir = File.join("/etc","openldap")
   end
 end
 

data/rbldap.h

@@ -27,8 +27,8 @@
 
 #define RB_LDAP_MAJOR_VERSION 0
 #define RB_LDAP_MINOR_VERSION 9
-#define RB_LDAP_PATCH_VERSION 17
-#define RB_LDAP_VERSION "0.9.17"
+#define RB_LDAP_PATCH_VERSION 18
+#define RB_LDAP_VERSION "0.9.18"
 
 #define LDAP_GET_OPT_MAX_BUFFER_SIZE    (1024)	/* >= sizeof(LDAPAPIInfo) */
 
@@ -55,8 +55,10 @@ typedef struct rb_ldapentry_data
 {
   LDAP *ldap;
   LDAPMessage *msg;
+#if RUBY_VERSION_CODE >= 190
   VALUE dn;
   VALUE attr;
+#endif
 } RB_LDAPENTRY_DATA;
 
 typedef struct rb_ldapmod_data
@@ -171,9 +173,20 @@ VALUE rb_ldap_mod_vals (VALUE);
   }; \
 }
 
+#if RUBY_VERSION_CODE < 190
 #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)); \
+  }; \
 }
+#else
+#define GET_LDAPENTRY_DATA(obj,ptr) { \
+  Data_Get_Struct(obj, struct rb_ldapentry_data, ptr); \
+}
+#endif
 
 #define GET_LDAPMOD_DATA(obj,ptr) {\
   Data_Get_Struct(obj, struct rb_ldapmod_data, ptr); \

data/test/add.rb

@@ -1,9 +1,8 @@
 # -*- ruby -*-
 # This file is a part of test scripts of LDAP extension module.
 
-$test = File.dirname($0)
-require "#{$test}/conf"
-require "./ldap"
+require './ldap'
+require './test/conf'
 
 conn = LDAP::Conn.new($HOST, $PORT)
 conn.bind('cn=root, dc=localhost, dc=localdomain','secret'){

data/test/add2.rb

@@ -1,9 +1,8 @@
 # -*- ruby -*-
 # This file is a part of test scripts of LDAP extension module.
 
-$test = File.dirname($0)
-require "#{$test}/conf"
-require "./ldap"
+require './ldap'
+require './test/conf'
 
 conn = LDAP::Conn.new($HOST, $PORT)
 conn.bind('cn=root, dc=localhost, dc=localdomain','secret'){

data/test/add3.rb

@@ -1,9 +1,8 @@
 # -*- ruby -*-
 # This file is a part of test scripts of LDAP extension module.
 
-$test = File.dirname($0)
-require "#{$test}/conf"
-require "./ldap"
+require './ldap'
+require './test/conf'
 
 $KCODE = "UTF8"
 

data/test/compare.rb

@@ -1,15 +1,13 @@
 # -*- ruby -*-
 # This file is a part of test scripts of LDAP extension module.
 
-$test = File.dirname($0)
-require "#{$test}/conf"
-require "./ldap"
+require './ldap'
+require './test/conf'
 
 LDAP::Conn.new($HOST, $PORT).bind{|conn|
   conn.perror("bind")
   begin
-    conn.compare("cn=Takaaki Tateishi, dc=localhost, dc=localdomain",
-		 "cn", "Takaaki Tateishi")
+    conn.compare("cn=Takaaki Tateishi, dc=localhost, dc=localdomain", "cn", "Takaaki Tateishi")
   rescue LDAP::ResultError
     exit(0)
   end

data/test/conf.rb

@@ -1,7 +1,5 @@
 # -*- ruby -*-
 
-require './ldap'
-
 $HOST = 'localhost'
 begin
   $PORT = ARGV[0].to_i || LDAP::LDAP_PORT

data/test/search.rb

@@ -5,16 +5,18 @@ $test = File.dirname($0)
 require "#{$test}/conf"
 require "./ldap"
 
-LDAP::Conn.new($HOST, $PORT).bind{|conn|
+LDAP::Conn.new($HOST, $PORT).bind do |conn|
   conn.perror("bind")
   begin
-    conn.search("dc=localhost, dc=localdomain",
-		LDAP::LDAP_SCOPE_SUBTREE,
-		"(objectclass=*)"){|e|
+    conn.search(
+      "dc=localhost, dc=localdomain",
+      LDAP::LDAP_SCOPE_SUBTREE,
+      "(objectclass=*)"
+    ) do |e|
       p e.vals("cn")
       p e.to_hash()
-    }
+    end
   rescue LDAP::ResultError => msg
     $stderr.print(msg)
   end
-}
+end

metadata

@@ -1,17 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ldap
 version: !ruby/object:Gem::Version
-  version: 0.9.17
+  version: 0.9.18
 platform: ruby
 authors:
 - Alexey Chebotar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2016-03-04 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:
@@ -84,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruby-ldap
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby/LDAP is an extension module for Ruby
 test_files: []
-has_rdoc: true