cleanup the debug output for ldap strategy

Merge branch 'master' of github.com:intridea/omniauth

Conflicts:
	oa-enterprise/lib/omniauth/strategies/ldap.rb

README.markdown

@@ -24,6 +24,8 @@ OmniAuth currently supports the following external providers:
   * GitHub
 * OpenID
 * Google Apps (via OpenID)
+* CAS (Central Authentication Service)
+* LDAP
 
 ## Usage
 

oa-enterprise/lib/omniauth/strategies/ldap.rb

@@ -7,7 +7,6 @@ class LDAP
       include OmniAuth::Strategy
 
       autoload :Adaptor, 'omniauth/strategies/ldap/adaptor'
-      puts Dir.entries(".")
       @@config   =  {'first_name' => 'givenName', 'last_name' => 'sn', 'email' => ['mail', "email", 'userPrincipalName'],
 										'phone' => ['telephoneNumber', 'homePhone', 'facsimileTelephoneNumber'],
 										'mobile_number' => ['mobile', 'mobileTelephoneNumber'],
@@ -45,7 +44,6 @@ def perform
       		@adaptor.bind(:bind_dn => request.POST['username'], :password => request.POST['password'])
       		@ldap_user_info = @adaptor.search(:filter => Net::LDAP::Filter.eq(@adaptor.uid, request.POST['username']),:limit => 1)
       		@user_info = self.class.map_user(@@config, @ldap_user_info)
-      		puts @user_info
 	        request.POST['auth'] = auth_hash
 	        @env['REQUEST_METHOD'] = 'GET'
 	        @env['PATH_INFO'] = "#{OmniAuth.config.path_prefix}/#{name}/callback"
@@ -82,8 +80,7 @@ def self.map_user mapper, object
 			        	pattern = key1.dup
 			        	value1.each_with_index do |v,i|
 			          	part = '';
-			          	v.each {|v1| puts v1.inspect; (part = object[v1.downcase.to_sym].to_s; break;) if object[v1.downcase.to_sym]}
-			          	puts part
+			          	v.each {|v1| (part = object[v1.downcase.to_sym].to_s; break;) if object[v1.downcase.to_sym]}
 			        		pattern.gsub!("%#{i}",part||'') 
 			        	end	
 			        	user[key] = pattern

oa-enterprise/lib/omniauth/strategies/ldap/adaptor.rb

@@ -124,7 +124,6 @@ def search(options={}, &block)
 					puts args.inspect
           attributes = {}
           execute(:search, args) do |entry|
-            puts entry.inspect
             entry.attribute_names.each do |name|
               attributes[name] = entry[name]
             end

oa-oauth/lib/omniauth/strategies/twitter.rb

@@ -33,7 +33,6 @@ def user_info
           'name' => user_hash['name'],
           'location' => user_hash['location'],
           'image' => user_hash['profile_image_url'],
-          'screen_name' => user_hash['screen_name'],
           'description' => user_hash['description'],
           'urls' => {'Website' => user_hash['url']}
         }