shyouhei	2010-06-08 16:05:36 +0900 (Tue, 08 Jun 2010)

  New Revision: 28214

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

  Log:
    merge revision(s) 27487:
    * lib/net/imap (encode_utf7): encode & properly.  Thanks, Kengo
      Matsuyama.  [ruby-dev:38063]  backported from trunk.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/net/imap.rb
    branches/ruby_1_8_7/test/net/imap/test_imap.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28213)
+++ ruby_1_8_7/ChangeLog	(revision 28214)
@@ -1,3 +1,8 @@
+Tue Jun  8 15:45:52 2010  Shugo Maeda  <shugo@r...>
+
+	* lib/net/imap (encode_utf7): encode & properly.  Thanks, Kengo
+	  Matsuyama.  [ruby-dev:38063]  backported from trunk.
+
 Tue Jun  8 15:43:43 2010  Masaki Suketa <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c (ole_val2variant): fix the core dump
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28213)
+++ ruby_1_8_7/version.h	(revision 28214)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 278
+#define RUBY_PATCHLEVEL 279
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/net/imap.rb
===================================================================
--- ruby_1_8_7/lib/net/imap.rb	(revision 28213)
+++ ruby_1_8_7/lib/net/imap.rb	(revision 28214)
@@ -841,7 +841,7 @@
 
     # Encode a string from UTF-8 format to modified UTF-7.
     def self.encode_utf7(s)
-      return s.gsub(/(&)|([^\x20-\x25\x27-\x7e]+)/n) { |x|
+      return s.gsub(/(&)|([^\x20-\x7e]+)/u) { |x|
         if $1
           "&-"
         else
Index: ruby_1_8_7/test/net/imap/test_imap.rb
===================================================================
--- ruby_1_8_7/test/net/imap/test_imap.rb	(revision 28213)
+++ ruby_1_8_7/test/net/imap/test_imap.rb	(revision 28214)
@@ -8,4 +8,20 @@
     assert_equal("OK", r.name)
     assert_equal("NOMODSEQ", r.data.code.name)
   end
+
+  def test_encode_utf7
+    utf8 = "\357\274\241\357\274\242\357\274\243"
+    s = Net::IMAP.encode_utf7(utf8)
+    assert_equal("&,yH,Iv8j-", s)
+
+    utf8 = "\343\201\202&"
+    s = Net::IMAP.encode_utf7(utf8)
+    assert_equal("&MEI-&-", s)
+  end
+
+  def test_decode_utf7
+    s = Net::IMAP.decode_utf7("&,yH,Iv8j-")
+    utf8 = "\357\274\241\357\274\242\357\274\243"
+    assert_equal(utf8, s)
+  end
 end

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