From d59a0ee5ca9f53efa240ae8a80caf623ea2d3b89 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@idaemons.org>
Date: Mon, 22 Oct 2012 00:50:05 +0900
Subject: [PATCH] Define a custom YAML encoder and decoder.

Drop support for deserializing YAML made with Mechanize <2.1.
---
 lib/http/cookie.rb | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/lib/http/cookie.rb b/lib/http/cookie.rb
index 6a35829..6c9e579 100644
--- a/lib/http/cookie.rb
+++ b/lib/http/cookie.rb
@@ -9,6 +9,13 @@ end
 
 # This class is used to represent an HTTP Cookie.
 class HTTP::Cookie
+  PERSISTENT_PROPERTIES = %w[
+    name        value
+    domain      for_domain  path
+    secure
+    expires     created_at  accessed_at
+  ]
+
   # In Ruby < 1.9.3 URI() does not accept an URI object.
   if RUBY_VERSION < "1.9.3"
     module URIFix
@@ -293,18 +300,31 @@ class HTTP::Cookie
     "#{@name}=#{@value}"
   end
 
+  # YAML serialization helper for Syck.
+  def to_yaml_properties
+    PERSISTENT_PROPERTIES.map { |name| "@#{name}" }
+  end
+
+  # YAML serialization helper for Psych.
+  def encode_with(coder)
+    PERSISTENT_PROPERTIES.each { |key|
+      coder[key.to_s] = instance_variable_get(:"@#{key}")
+    }
+  end
+
+  # YAML deserialization helper for Syck.
   def init_with(coder)
     yaml_initialize(coder.tag, coder.map)
   end
 
+  # YAML deserialization helper for Psych.
   def yaml_initialize(tag, map)
-    @for_domain = true    # for forward compatibility
     map.each { |key, value|
       case key
-      when 'domain'
-        self.domain = value # ditto
-      else
-        instance_variable_set(:"@#{key}", value)
+      when 'name'
+        @name = value
+      when *PERSISTENT_PROPERTIES
+        send(:"#{key}=", value)
       end
     }
   end