marcandre	2009-09-14 08:35:09 +0900 (Mon, 14 Sep 2009)

  New Revision: 24915

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24915

  Log:
    * lib/net/http.rb (each_*): return enumerator if no block present. Patch by Arthur Schreiber [ruby-core:18310]

  Modified files:
    trunk/ChangeLog
    trunk/lib/net/http.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24914)
+++ ChangeLog	(revision 24915)
@@ -1,3 +1,8 @@
+Mon Sep 14 08:33:11 2009  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* lib/net/http.rb (each_*): return enumerator if no block present.
+	  Patch by Arthur Schreiber [ruby-core:18310]
+
 Mon Sep 14 06:42:21 2009  Marc-Andre Lafortune  <ruby-core@m...>
 
 	* lib/cgi/cookie.rb (value): Keep CGI::Cookie#value in sync with the
Index: lib/net/http.rb
===================================================================
--- lib/net/http.rb	(revision 24914)
+++ lib/net/http.rb	(revision 24915)
@@ -1302,6 +1302,7 @@
 
     # Iterates for each header names and values.
     def each_header   #:yield: +key+, +value+
+      block_given? or return enum_for(__method__)
       @header.each do |k,va|
         yield k, va.join(', ')
       end
@@ -1311,13 +1312,15 @@
 
     # Iterates for each header names.
     def each_name(&block)   #:yield: +key+
+      block_given? or return enum_for(__method__)
       @header.each_key(&block)
     end
 
     alias each_key each_name
 
     # Iterates for each capitalized header names.
-    def each_capitalized_name(&block)   #:yield: +key+
+    def each_capitalized_name  #:yield: +key+
+      block_given? or return enum_for(__method__)
       @header.each_key do |k|
         yield capitalize(k)
       end
@@ -1325,6 +1328,7 @@
 
     # Iterates for each header values.
     def each_value   #:yield: +value+
+      block_given? or return enum_for(__method__)
       @header.each_value do |va|
         yield va.join(', ')
       end
@@ -1347,6 +1351,7 @@
 
     # As for #each_header, except the keys are provided in capitalized form.
     def each_capitalized
+      block_given? or return enum_for(__method__)
       @header.each do |k,v|
         yield capitalize(k), v.join(', ')
       end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/