knu	2010-01-18 04:12:10 +0900 (Mon, 18 Jan 2010)

  New Revision: 26339

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

  Log:
    * ext/digest/digest.c (rb_digest_instance_hexdigest_bang): Fix
      rdoc.
    
    * ext/digest/lib/digest.rb (Digest::Class.base64digest)
      (Digest::Instance#base64digest{,!}): New methods.

  Modified files:
    trunk/ChangeLog
    trunk/NEWS
    trunk/ext/digest/digest.c
    trunk/ext/digest/lib/digest.rb
    trunk/test/digest/test_digest.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26338)
+++ ChangeLog	(revision 26339)
@@ -1,3 +1,11 @@
+Mon Jan 18 03:59:57 2010  Akinori MUSHA  <knu@i...>
+
+	* ext/digest/digest.c (rb_digest_instance_hexdigest_bang): Fix
+	  rdoc.
+
+	* ext/digest/lib/digest.rb (Digest::Class.base64digest)
+	  (Digest::Instance#base64digest{,!}): New methods.
+
 Sun Jan 17 22:48:44 2010  Akinori MUSHA  <knu@i...>
 
 	* ext/digest/digest.c (rb_digest_instance_digest)
Index: ext/digest/digest.c
===================================================================
--- ext/digest/digest.c	(revision 26338)
+++ ext/digest/digest.c	(revision 26339)
@@ -234,8 +234,8 @@
  * call-seq:
  *     digest_obj.hexdigest! -> string
  *
- * Returns the resulting hash value and resets the digest to the
- * initial state.
+ * Returns the resulting hash value in a hex-encoded form and resets
+ * the digest to the initial state.
  */
 static VALUE
 rb_digest_instance_hexdigest_bang(VALUE self)
Index: ext/digest/lib/digest.rb
===================================================================
--- ext/digest/lib/digest.rb	(revision 26338)
+++ ext/digest/lib/digest.rb	(revision 26339)
@@ -28,6 +28,13 @@
     def self.file(name)
       new.file(name)
     end
+
+    # Returns the base64 encoded hash value of a given _string_.  The
+    # return value is properly padded with '=' and contains no line
+    # feeds.
+    def self.base64digest(str, *args)
+      [digest(str, *args)].pack('m0')
+    end
   end
 
   module Instance
@@ -42,6 +49,25 @@
       }
       self
     end
+
+    # If none is given, returns the resulting hash value of the digest
+    # in a base64 encoded form, keeping the digest's state.
+    #
+    # If a _string_ is given, returns the hash value for the given
+    # _string_ in a base64 encoded form, resetting the digest to the
+    # initial state before and after the process.
+    #
+    # In either case, the return value is properly padded with '=' and
+    # contains no line feeds.
+    def base64digest(str = nil)
+      [str ? digest(str) : digest].pack('m0')
+    end
+
+    # Returns the resulting hash value and resets the digest to the
+    # initial state.
+    def base64digest!
+      [digest!].pack('m0')
+    end
   end
 end
 
Index: NEWS
===================================================================
--- NEWS	(revision 26338)
+++ NEWS	(revision 26339)
@@ -114,6 +114,12 @@
       * respond_to? can be used to detect methods not implemented.
         For example, Process.respond_to?(:fork) returns false on Windows.
 
+* digest
+    * new methods:
+      * Digest::Class.base64digest
+      * Digest::Instance#base64digest
+      * Digest::Instance#base64digest!
+
 * rss
 
   * 0.2.4 -> 0.2.7.
Index: test/digest/test_digest.rb
===================================================================
--- test/digest/test_digest.rb	(revision 26338)
+++ test/digest/test_digest.rb	(revision 26339)
@@ -18,14 +18,22 @@
   Data2 = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
 
   def test_s_hexdigest
-    self.class::DATA.each do |str, digest|
-      assert_equal(digest, self.class::ALGO.hexdigest(str))
+    self.class::DATA.each do |str, hexdigest|
+      assert_equal(hexdigest, self.class::ALGO.hexdigest(str))
     end
   end
 
+  def test_s_base64digest
+    self.class::DATA.each do |str, hexdigest|
+      digest = [hexdigest].pack("H*")
+      assert_equal([digest].pack("m0"), self.class::ALGO.base64digest(str))
+    end
+  end
+
   def test_s_digest
-    self.class::DATA.each do |str, digest|
-      assert_equal([digest].pack("H*"), self.class::ALGO.digest(str))
+    self.class::DATA.each do |str, hexdigest|
+      digest = [hexdigest].pack("H*")
+      assert_equal(digest, self.class::ALGO.digest(str))
     end
   end
 

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