ayumin	2011-09-25 21:05:02 +0900 (Sun, 25 Sep 2011)

  New Revision: 33329

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

  Log:
    * lib/yaml/dbm/dbm.rb: fix #update, add #key for using istead #index.
      [Bug #5305][ruby-dev:44485]

  Modified files:
    trunk/ChangeLog
    trunk/lib/yaml/dbm.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33328)
+++ ChangeLog	(revision 33329)
@@ -1,3 +1,8 @@
+Sun Sep 25 20:54:10 2011  Ayumu AIZAWA  <ayumu.aizawa@g...>
+
+	* lib/yaml/dbm/dbm.rb: fix #update, add #key for using istead #index.
+	  [Bug #5305][ruby-dev:44485]
+
 Sun Sep 25 16:54:33 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (require_enc): reject only loading from untrusted
Index: lib/yaml/dbm.rb
===================================================================
--- lib/yaml/dbm.rb	(revision 33328)
+++ lib/yaml/dbm.rb	(revision 33329)
@@ -57,10 +57,20 @@
     end
 
     # Deprecated, used YAML::DBM#key instead.
+    # ----
+    # Note:
+    # YAML::DBM#index makes warning from internal of ::DBM#index.
+    # It says 'DBM#index is deprecated; use DBM#key', but DBM#key
+    # behaves not same as DBM#index.
+    #
     def index( keystr )
         super( keystr.to_yaml )
     end
 
+    def key( keystr )
+        invert[keystr]
+    end
+
     # Returns an array containing the values associated with the given keys.
     def values_at( *keys )
         keys.collect { |k| fetch( k ) }
@@ -185,8 +195,8 @@
     #
     # Returns +self+.
     def update( hsh )
-        hsh.keys.each do |k|
-            self.store( k, hsh.fetch( k ) )
+        hsh.each_pair do |k,v|
+            self.store( k, v )
         end
         self
     end

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