http-cookie 1.0.0.pre5 → 1.0.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1408cc3e70e90afc3e4b6d551ba267d7200c10d2
-  data.tar.gz: 16c472328a43e4dff5a38950c1e00e9b94752f55
+  metadata.gz: 552b1f843786c58092655dff1e2587bafd65c995
+  data.tar.gz: ead56fc0cdda0ee554a8826eaab35e4b665c7e8a
 SHA512:
-  metadata.gz: 9975b81bc25d42bb7c66bda5b5ae295d5ed81221837dcd5671fecd93ae6ae696f2dc33351fc90587d00b300e3acd7aaefadc7e97d468246a4e2b91726c06f838
-  data.tar.gz: 3ba7482d059551e5b11a929c53f5f79a45953ac09c32282dfa80f5c99f05a742569dc40a592fe0f48858fc31f846853a34f2909b6cbf6f2c22f74717b2278865
+  metadata.gz: ab0a84bce856ce0bde5b0200fe311c06875b9507a88c8829ff4e2a43db33a482ffc04ffbfb102caf30ca2af1528b2d1d42e6728ec2a4604aac7dc4107786da2d
+  data.tar.gz: 4747df38af92f497d315840aa706742d5ac8b3514247f3b85955b7d9f8df696689349c4d7cf8bdbd4f81de1b16e4bf16f671c13df0860b3513c56b7a94268b61

data/lib/http/cookie.rb

@@ -170,7 +170,7 @@ class HTTP::Cookie
       raise ArgumentError, "wrong number of arguments (#{args.size} for 1-3)"
     end
     for_domain = false
-    origin = nil
+    max_age = origin = nil
     attr_hash.each_pair { |key, val|
       skey = key.to_s.downcase
       if skey.sub!(/\?\z/, '')
@@ -181,18 +181,20 @@ class HTTP::Cookie
         for_domain = !!val
       when 'origin'
         origin = val
+      when 'max_age'
+        # Let max_age take precedence over expires
+        max_age = val if val
       else
         setter = :"#{skey}="
-        send(setter, val) if respond_to?(setter)
+        __send__(setter, val) if respond_to?(setter)
       end
     }
     if @name.nil? || @value.nil?
       raise ArgumentError, "at least name and value must be specified"
     end
     @for_domain = for_domain
-    if origin
-      self.origin = origin
-    end
+    self.origin = origin if origin
+    self.max_age = max_age if max_age
   end
 
   autoload :Scanner, 'http/cookie/scanner'

data/lib/http/cookie/version.rb

@@ -1,5 +1,5 @@
 module HTTP
   class Cookie
-    VERSION = "1.0.0.pre5"
+    VERSION = "1.0.0.pre6"
   end
 end

data/lib/http/cookie_jar/yaml_saver.rb

@@ -11,19 +11,42 @@ class HTTP::CookieJar::YAMLSaver < HTTP::CookieJar::AbstractSaver
   def load(io, jar)
     begin
       data = YAML.load(io)
-    rescue ArgumentError
-      @logger.warn "unloadable YAML cookie data discarded" if @logger
-      return
+    rescue ArgumentError => e
+      case e.message
+      when %r{\Aundefined class/module Mechanize::}
+        # backward compatibility with Mechanize::Cookie
+        begin
+          io.rewind # hopefully
+          yaml = io.read
+          # a gross hack
+          yaml.gsub!(%r{^(    [^ ].*:) !ruby/object:Mechanize::Cookie$}, "\\1")
+          data = YAML.load(yaml)
+        rescue Errno::ESPIPE
+          @logger.warn "could not rewind the stream for conversion" if @logger
+        rescue ArgumentError
+        end
+      end
     end
 
-    unless data.instance_of?(Array)
+    case data
+    when Array
+      data.each { |cookie|
+        jar.add(cookie)
+      }
+    when Hash
+      # backward compatibility with Mechanize::Cookie
+      data.each { |domain, paths|
+        paths.each { |path, names|
+          names.each { |cookie_name, cookie_hash|
+            cookie = HTTP::Cookie.new(cookie_hash)
+            jar.add(cookie)
+          }
+        }
+      }
+    else
       @logger.warn "incompatible YAML cookie data discarded" if @logger
       return
     end
-
-    data.each { |cookie|
-      jar.add(cookie)
-    }
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-cookie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre5
+  version: 1.0.0.pre6
 platform: ruby
 authors:
 - Akinori MUSHA