ldapmapper 1.0.1 → 1.1

data/lib/ldapmapper.rb

@@ -9,15 +9,8 @@
 # * Author:: Romain GEORGES 
 # * type:: class definition Ruby
 # * obj:: Generic LDAP class 
-# * VCS Version:: $Id$
+# * CVS Version:: $Id: ldapmapper.rb,v 1.1.1.1 2006/09/09 10:57:45 lecid Exp $
 #
-# === Websites : 
-# *   http://www.ultragreen.net
-# *   http://ldapmapper.rubyforge.org
-#
-# === Contact : 
-#   Romain GEORGES <romain@ultragreen.net>  
-# 
 # == Exemples :
 #
 #   #!/usr/local/bin/ruby
@@ -101,7 +94,7 @@ module Ldapmapper
   
   # identity lib
   # version of the library
-  LIB_VERSION='1.0.1'
+  LIB_VERSION='1.1'
   # name of the author
   AUTHOR='Romain GEORGES'
   # date of creation
@@ -115,25 +108,18 @@ module Ldapmapper
     # attributs for LDAP connection
     
     # hostname of the LDAP server
-    #  default : 'localhost'
     attr_accessor :host_ldap 
     # TCP/IP port of the LDAP server
-    #  default : 389
-    attr_accessor :port_ldap
+    attr_accessor :port_ldap 
     # LDAP scope for search
-    #  dafault : LDAP::LDAP_SCOPE_SUBTREE
     attr_accessor :scope_ldap 
     # current filter for search
-    #  default : '(objectClass=*)'
     attr_accessor :filter_ldap 
     # LDAP base DN for the instance
-    #  no default get by LDAP bind for ROOT DSE record
     attr_accessor :basedn_ldap 
     # credential for the instance
-    #  no default get by instance initializer
     attr_accessor :passdn_ldap 
     # LDAP rootdn for LDAP
-    #  default 'cn=root'
     attr_accessor :rootdn_ldap
     
     # constructor for LdapTemplate
@@ -164,16 +150,12 @@ module Ldapmapper
   class LdapMapper < LdapTemplate
     
     # DN binding point attribut
-    #   no default get by instance initializer
     attr_accessor :dn_ldap
     # Hash of attributes with optional or mandatory aspects in value
-    #  no default get by LDAP query on Schema
     attr_accessor :list_attributs_type
     # Array of objectclass for the current record
-    #  no default, could be empty for nonexistants mapping get by LDIF LDAP query    
     attr_accessor :list_objectclass
     # Hash of attributes in LDIF mapping, value should be an array in case of multivalue data
-    #  no default, could be empty for nonexistants mapping get by LDIF LDAP query
     attr_accessor :list_attributs
     
     # constructor with dn_ldap initialisation
@@ -202,13 +184,16 @@ module Ldapmapper
       @list_objectclass.push(_objectclass).uniq!
       @list_attributs_type = get_attributs_list(self.list_objectclass,self.host_ldap,self.port_ldap)
       @list_attributs = map_record(self.dn_ldap,self.host_ldap,self.port_ldap)
-      if not @list_attributs.nil? then
+      if not @list_attributs.nil? or @list_attributs.empty? then
         @list_attributs.each{|_key,_value|
           @list_attributs_type.each{|_attr,_trash|
-            if self.get_alias(_key).include?(_attr)
-              @list_attributs.delete(_key)
-              @list_attributs[_attr] = _value
-            end
+           @list_prov = self.get_alias(_key) 
+		if @list_prov then
+	            if self.get_alias(_key).include?(_attr) then
+        	      @list_attributs.delete(_key)
+              	      @list_attributs[_attr] = _value
+		    end	
+                end
           }
         }
       end
@@ -366,10 +351,8 @@ module Ldapmapper
 	   _table_res = _e.to_hash()['objectClass']
 	}
       }
+    ensure
       return _table_res
-    rescue
-      raise LdapmapperGetObjectclassesError
-      return Array::new
     end
   end
 
@@ -386,10 +369,8 @@ module Ldapmapper
       _conn.bind {
 	_my_basedn = _conn.root_dse[0]["namingContexts"].to_s
       }
+    ensure
       return _my_basedn
-    rescue
-      raise LdapmapperGetDSEError
-      return Array::new
     end
   end
 
@@ -406,10 +387,9 @@ module Ldapmapper
         _schema = _conn.schema()
 	_my_list_attributs = _schema.alias(_attribute)
       }
+      
+    ensure
       return _my_list_attributs
-    rescue 
-      raise LdapmapperGetSchemaError
-      return Array::new
     end
   end
 
@@ -430,10 +410,8 @@ module Ldapmapper
 	  _table_res.push(_e.dn)
 	}
       }
+    ensure
       return _table_res
-    rescue 
-      raise LdapmapperGetDnError
-      return Array::new
     end
     
   end
@@ -458,12 +436,10 @@ module Ldapmapper
 	  end
 	}
       }
+    ensure
       _my_list_attributs["dn"] = "MUST"
       _my_list_attributs["objectClass"] = "MUST"
       return _my_list_attributs      
-    rescue
-      raise LdapmapperGetSchemaError
-      return Hash::new
     end
   end
   
@@ -482,7 +458,6 @@ module Ldapmapper
 	}
       }
     rescue
-      raise LdapmapperGetLdifError
       return Hash::new
     end
   end
@@ -505,7 +480,6 @@ module Ldapmapper
 	_conn.add("#{_dn}", _data)
 	return true
       rescue LDAP::ResultError
-	raise LdapmapperAddLdifError
 	return false
       end
     }
@@ -530,7 +504,6 @@ module Ldapmapper
         _conn.add("#{_dn}", _data)
 	return true
       rescue LDAP::ResultError
-	raise LdapmapperModLdifError
         return false
       end
     }
@@ -546,23 +519,7 @@ module Ldapmapper
     puts "Date release : #{DATE}"
     puts "Observation : #{OBS}"
   end
-
-  # exceptions definitions 
-  # raise when a modification of a record failed
-  class LdapmapperModLdifError < Exception; end
-  # raise when an adding of a record failed
-  class LdapmapperAddLdifError < Exception; end
-  # raise when the retrieving of a record failed
-  class LdapmapperGetLdifError < Exception; end 
-   # raise when the retrieving of Schema's data failed
-  class LdapmapperGetSchemaError < Exception; end 
-  # raise when the browsing of an LDAP tree failed
-  class LdapmapperGetDnError < Exception; end  
-  # raise when the retrieving of root DSE record failed
-  class LdapmapperGetDSEError < Exception; end  
-  # raise when the retrieving of objectclasses list failed
-  class LdapmapperGetObjectclassesError < Exception; end  
-
+  
 end
 
 #==END==#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ldapmapper
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: "1.1"
 platform: ruby
 authors: 
 - Romain GEORGES