cookiejar 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 97cc2e91638c2a60db2cc19a4ccf0ad0e2d97954
+  data.tar.gz: 8f4800820d1c7430437e4105dec116324f3db4ee
+SHA512:
+  metadata.gz: 8f42ea0a868ff3c9d17c141756b3f8596f23d0e00a233ca9c13090de983b97e0093e4a59aba121e875113dfef635c9994d0d8ba5d852fd3a4e2ff2dca82025d7
+  data.tar.gz: bb6215c18b5c5ac93523f6fa208ea8939904a75da4eeaa95c868022af83242998af70e627e3ffc2977b8869d742651b385e1ee47bdc12f7373dd34cce46a5592

data/LICENSE

@@ -0,0 +1,10 @@
+Copyright (c) 2009 - 2014, David Waite and Other Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.markdown

@@ -0,0 +1,17 @@
+Ruby CookieJar
+==============
+
+  **Git**:	[http://github.com/dwaite/cookiejar](http://github.com/dwaite/cookiejar)
+
+  **Author**:	David Waite 
+
+Synopsis
+--------
+
+The Ruby CookieJar is a library to help manage client-side cookies in pure Ruby. It enables parsing and setting of cookie headers, alternating between multiple 'jars' of cookies at one time (such as having a set of cookies for each browser or thread), and supports persistence of the cookies in a JSON string.
+
+Both Netscape/RFC 2109 cookies and RFC 2965 cookies are supported.
+
+COPYRIGHT
+---------
+The Ruby CookieJar is Copyright © 2009 David Waite. Licensing terms are given within the LICENSE file.

data/Rakefile

@@ -0,0 +1,31 @@
+require 'rake'
+
+require 'rake/clean'
+require 'rake/packagetask'
+require 'yard'
+require 'yard/rake/yardoc_task'
+
+require 'fileutils'
+include FileUtils
+
+# Default Rake task is to run all tests
+task :default => :test
+CLEAN << Rake::FileList['doc/**', '.yardoc']
+#Yard
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb']   # optional
+  t.options = ['--title', 'CookieJar, a HTTP Client Cookie Parsing Library',
+               '--main', 'README.markdown', '--files', 'LICENSE']
+end
+
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new do |t|
+#    t.libs << 'lib'
+#    t.pattern = 'test/**/*_test.rb'
+  end
+  task :test => :spec
+rescue LoadError
+  puts "Warning: unable to load rspec tasks"
+end

data/contributors.json

@@ -0,0 +1,14 @@
+[
+  {
+    "author": {
+      "github": "http://github.com/secobarbital",
+      "name":   "Seggy Umboh"
+    },
+    "contributions": [
+      "widen supported IP addresses",
+      "fix case-sensitivity issue with HTTP headers",
+      "correct issue when running under Ruby 1.8.x",
+      "made Jar act more like a browser (dropping cookies w/o exception)"
+    ]
+  }
+]

data/lib/cookiejar/cookie.rb

@@ -3,25 +3,25 @@ require 'uri'
 require 'cookiejar/cookie_validation'
 
 module CookieJar
-  
+
   # Cookie is an immutable object which defines the data model of a HTTP Cookie.
   # The data values within the cookie may be different from the
   # values described in the literal cookie declaration.
-  # Specifically, the 'domain' and 'path' values may be set to defaults 
+  # Specifically, the 'domain' and 'path' values may be set to defaults
   # based on the requested resource that resulted in the cookie being set.
   class Cookie
-  
+
     # [String] The name of the cookie.
     attr_reader :name
     # [String] The value of the cookie, without any attempts at decoding.
     attr_reader :value
-    
-    # [String] The domain scope of the cookie. Follows the RFC 2965 
+
+    # [String] The domain scope of the cookie. Follows the RFC 2965
     # 'effective host' rules. A 'dot' prefix indicates that it applies both
     # to the non-dotted domain and child domains, while no prefix indicates
     # that only exact matches of the domain are in scope.
     attr_reader :domain
-    
+
     # [String] The path scope of the cookie. The cookie applies to URI paths
     # that prefix match this value.
     attr_reader :path
@@ -35,7 +35,7 @@ module CookieJar
     # [Boolean] Popular browser extension to mark a cookie as invisible
     # to code running within the browser, such as JavaScript
     attr_reader :http_only
-    
+
     # [Fixnum] Version indicator, currently either
     # * 0 for netscape cookies
     # * 1 for RFC 2965 cookies
@@ -43,11 +43,11 @@ module CookieJar
     # [String] RFC 2965 field for indicating comment (or a location)
     # describing the cookie to a usesr agent.
     attr_reader :comment, :comment_url
-    # [Boolean] RFC 2965 field for indicating session lifetime for a cookie 
+    # [Boolean] RFC 2965 field for indicating session lifetime for a cookie
     attr_reader :discard
     # [Array<FixNum>, nil] RFC 2965 port scope for the cookie. If not nil,
     # indicates specific ports on the HTTP server which should receive this
-    # cookie if contacted. 
+    # cookie if contacted.
     attr_reader :ports
     # [Time] Time when this cookie was first evaluated and created.
     attr_reader :created_at
@@ -63,7 +63,7 @@ module CookieJar
         @created_at + @expiry
       end
     end
-    
+
     # Indicates whether the cookie is currently considered valid
     #
     # @param [Time] time to compare against, or 'now' if omitted
@@ -74,11 +74,11 @@ module CookieJar
 
     # Indicates whether the cookie will be considered invalid after the end
     # of the current user session
-    # @return [Boolean] 
+    # @return [Boolean]
     def session?
       @expiry == nil || @discard
     end
-    
+
     # Create a cookie based on an absolute URI and the string value of a
     # 'Set-Cookie' header.
     #
@@ -88,10 +88,12 @@ module CookieJar
     # @param set_cookie_value [String] HTTP value for the Set-Cookie header.
     # @return [Cookie] created from the header string and request URI
     # @raise [InvalidCookieError] on validation failure(s)
-    def self.from_set_cookie request_uri, set_cookie_value 
+    def self.from_set_cookie request_uri, set_cookie_value
       args = CookieJar::CookieValidation.parse_set_cookie set_cookie_value
-      args[:domain] = CookieJar::CookieValidation.determine_cookie_domain request_uri, args[:domain]
-      args[:path] = CookieJar::CookieValidation.determine_cookie_path request_uri, args[:path]
+      args[:domain] = CookieJar::CookieValidation.
+                        determine_cookie_domain request_uri, args[:domain]
+      args[:path] = CookieJar::CookieValidation.
+                        determine_cookie_path request_uri, args[:path]
       cookie = Cookie.new args
       CookieJar::CookieValidation.validate_cookie request_uri, cookie
       cookie
@@ -106,18 +108,20 @@ module CookieJar
     # @param set_cookie_value [String] HTTP value for the Set-Cookie2 header.
     # @return [Cookie] created from the header string and request URI
     # @raise [InvalidCookieError] on validation failure(s)
-    def self.from_set_cookie2 request_uri, set_cookie_value 
+    def self.from_set_cookie2 request_uri, set_cookie_value
       args = CookieJar::CookieValidation.parse_set_cookie2 set_cookie_value
-      args[:domain] = CookieJar::CookieValidation.determine_cookie_domain request_uri, args[:domain]
-      args[:path] = CookieJar::CookieValidation.determine_cookie_path request_uri, args[:path]
+      args[:domain] = CookieJar::CookieValidation.
+                        determine_cookie_domain request_uri, args[:domain]
+      args[:path] = CookieJar::CookieValidation.
+                        determine_cookie_path request_uri, args[:path]
       cookie = Cookie.new args
       CookieJar::CookieValidation.validate_cookie request_uri, cookie
       cookie
     end
-    
+
     # Returns cookie in a format appropriate to send to a server.
     #
-    # @param [FixNum] 0 version, 0 for Netscape-style cookies, 1 for 
+    # @param [FixNum] 0 version, 0 for Netscape-style cookies, 1 for
     #   RFC2965-style.
     # @param [Boolean] true prefix, for RFC2965, whether to prefix with
     # "$Version=<version>;". Ignored for Netscape-style cookies
@@ -140,6 +144,33 @@ module CookieJar
       end
     end
 
+
+    # Return a hash representation of the cookie.
+
+    def to_hash
+      result = {
+        :name => @name,
+        :value => @value,
+        :domain => @domain,
+        :path => @path,
+        :created_at => @created_at
+      }
+      {
+        :expiry => @expiry,
+        :secure => (true if @secure),
+        :http_only => (true if @http_only),
+        :version => (@version if version != 0),
+        :comment => @comment,
+        :comment_url => @comment_url,
+        :discard => (true if @discard),
+        :ports => @ports
+      }.each do |name, value|
+        result[name] = value if value
+      end
+
+      result
+    end
+
     # Determine if a cookie should be sent given a request URI along with
     # other options.
     #
@@ -156,47 +187,27 @@ module CookieJar
       # being sent over http, and it must not be a http_only cookie sent to
       # a script
       path_match   = uri.path.start_with? @path
-      secure_match = !(@secure && uri.scheme == 'http') 
+      secure_match = !(@secure && uri.scheme == 'http')
       script_match = !(script && @http_only)
       expiry_match = !expired?
       ports_match = ports.nil? || (ports.include? uri.port)
       path_match && secure_match && script_match && expiry_match && ports_match
     end
-    
+
     def decoded_value
       CookieJar::CookieValidation::decode_value value
     end
-    
+
     # Return a JSON 'object' for the various data values. Allows for
     # persistence of the cookie information
     #
-    # @param [Array] a options controlling output JSON text 
+    # @param [Array] a options controlling output JSON text
     #   (usually a State and a depth)
     # @return [String] JSON representation of object data
     def to_json *a
-      result = {
-        :json_class => self.class.name,
-        :name => @name,
-        :value => @value,
-        :domain => @domain,
-        :path => @path,
-        :created_at => @created_at
-      }
-      {
-        :expiry => @expiry,
-        :secure => (true if @secure),
-        :http_only => (true if @http_only),
-        :version => (@version if version != 0),
-        :comment => @comment,
-        :comment_url => @comment_url,
-        :discard => (true if @discard),
-        :ports => @ports
-      }.each do |name, value|
-        result[name] = value if value
-      end
-      result.to_json(*a)
+      to_hash.merge(:json_class => self.class.name).to_json(*a)
     end
-    
+
     # Given a Hash representation of a JSON document, create a local cookie
     # from the included data.
     #
@@ -218,7 +229,7 @@ module CookieJar
 
       self.new params
     end
-    
+
     # Compute the cookie search domains for a given request URI
     # This will be the effective host of the request uri, along with any
     # possibly matching dot-prefixed domains
@@ -231,22 +242,22 @@ module CookieJar
   protected
     # Call {from_set_cookie} to create a new Cookie instance
     def initialize args
-      
-      @created_at, @name, @value, @domain, @path, @secure, 
+
+      @created_at, @name, @value, @domain, @path, @secure,
       @http_only, @version, @comment, @comment_url, @discard, @ports \
       = args.values_at \
-      :created_at, :name, :value, :domain, :path, :secure, 
+      :created_at, :name, :value, :domain, :path, :secure,
       :http_only, :version, :comment, :comment_url, :discard, :ports
 
       @created_at ||= Time.now
-      @expiry     = args[:max_age]   || args[:expires_at] 
+      @expiry     = args[:max_age]   || args[:expires_at]
       @secure     ||= false
       @http_only  ||= false
       @discard    ||= false
-           
+
       if @ports.is_a? Integer
         @ports = [@ports]
       end
     end
   end
-end
+end

data/lib/cookiejar/cookie_validation.rb

@@ -5,7 +5,7 @@ module CookieJar
   class InvalidCookieError < StandardError
     # [Array<String>] the specific validation issues encountered
     attr_reader :messages
-    
+
     # Create a new instance
     # @param [String, Array<String>] the validation issue(s) encountered
     def initialize message
@@ -18,7 +18,7 @@ module CookieJar
      super message
     end
   end
-  
+
   # Contains logic to parse and validate cookie headers
   module CookieValidation
     module PATTERN
@@ -45,7 +45,7 @@ module CookieJar
     PARAM1 = /\A(#{PATTERN::TOKEN})(?:=#{PATTERN::VALUE1})?\Z/
     PARAM2 = Regexp.new "(#{PATTERN::TOKEN})(?:=(#{PATTERN::VALUE2}))?(?:\\Z|;)", '', 'n'
     # TWO_DOT_DOMAINS = /\A\.(com|edu|net|mil|gov|int|org)\Z/
-    
+
     # Converts the input object to a URI (if not already a URI)
     #
     # @param [String, URI] request_uri URI we are normalizing
@@ -53,7 +53,7 @@ module CookieJar
     def self.to_uri request_uri
       (request_uri.is_a? URI)? request_uri : (URI.parse request_uri)
     end
-    
+
     # Converts an input cookie or uri to a string representing the path.
     # Assume strings are already paths
     #
@@ -66,10 +66,10 @@ module CookieJar
         uri_or_path
       end
     end
-    
+
     # Converts an input cookie or uri to a string representing the domain.
     # Assume strings are already domains. Value may not be an effective host.
-    # 
+    #
     # @param [String, URI, Cookie] object containing the domain
     # @return [String] domain information.
     def self.to_domain uri_or_domain
@@ -81,7 +81,7 @@ module CookieJar
         uri_or_domain
       end
     end
-    
+
     # Compare a tested domain against the base domain to see if they match, or
     # if the base domain is reachable.
     #
@@ -91,11 +91,11 @@ module CookieJar
     def self.domains_match tested_domain, base_domain
       base = effective_host base_domain
       search_domains = compute_search_domains_for_host base
-      result = search_domains.find do |domain| 
-        domain == tested_domain  
+      result = search_domains.find do |domain|
+        domain == tested_domain
       end
     end
-    
+
     # Compute the reach of a hostname (RFC 2965, section 1)
     # Determines the next highest superdomain
     #
@@ -109,7 +109,7 @@ module CookieJar
         match[1]
       end
     end
-        
+
     # Compute the base of a path, for default cookie path assignment
     #
     # @param [String, URI, Cookie] path, or object holding path
@@ -117,7 +117,7 @@ module CookieJar
     def self.cookie_base_path path
       BASE_PATH.match(to_path path)[1]
     end
-    
+
     # Processes cookie path data using the following rules:
     # Paths are separated by '/' characters, and accepted values are truncated
     # to the last '/' character. If no path is specified in the cookie, a path
@@ -131,17 +131,17 @@ module CookieJar
     def self.determine_cookie_path request_uri, cookie_path
       uri = to_uri request_uri
       cookie_path = to_path cookie_path
-      
+
       if cookie_path == nil || cookie_path.empty?
         cookie_path = cookie_base_path uri.path
       end
       cookie_path
     end
-    
+
     # Given a URI, compute the relevant search domains for pre-existing
     # cookies. This includes all the valid dotted forms for a named or IP
     # domains.
-    # 
+    #
     # @param [String, URI] request_uri requested uri
     # @return [Array<String>] all cookie domain values which would match the
     #   requested uri
@@ -150,7 +150,7 @@ module CookieJar
       host = uri.host
       compute_search_domains_for_host host
     end
-    
+
     # Given a host, compute the relevant search domains for pre-existing
     # cookies
     #
@@ -169,7 +169,7 @@ module CookieJar
       end
       result
     end
-    
+
     # Processes cookie domain data using the following rules:
     # Domains strings of the form .foo.com match 'foo.com' and all immediate
     # subdomains of 'foo.com'. Domain strings specified of the form 'foo.com' are
@@ -189,7 +189,7 @@ module CookieJar
     def self.determine_cookie_domain request_uri, cookie_domain
       uri = to_uri request_uri
       domain = to_domain cookie_domain
-    
+
       if domain == nil || domain.empty?
         domain = effective_host uri.host
       else
@@ -197,11 +197,11 @@ module CookieJar
         if domain =~ IPADDR || domain.start_with?('.')
           domain
         else
-          ".#{domain}" 
+          ".#{domain}"
         end
       end
     end
-    
+
     # Compute the effective host (RFC 2965, section 1)
     #
     # Has the added additional logic of searching for interior dots specifically, and
@@ -212,15 +212,15 @@ module CookieJar
     def self.effective_host host_or_uri
       hostname = to_domain host_or_uri
       hostname = hostname.downcase
-    
+
       if /.[\.:]./.match(hostname) || hostname == '.local'
         hostname
       else
         hostname + '.local'
       end
     end
-    
-    # Check whether a cookie meets all of the rules to be created, based on 
+
+    # Check whether a cookie meets all of the rules to be created, based on
     # its internal settings and the URI it came from.
     #
     # @param [String,URI] request_uri originally requested URI
@@ -234,12 +234,12 @@ module CookieJar
       request_secure = (uri.scheme == 'https')
       cookie_host = cookie.domain
       cookie_path = cookie.path
-      
+
       errors = []
-    
+
       # From RFC 2965, Section 3.3.2 Rejecting Cookies
-    
-      # A user agent rejects (SHALL NOT store its information) if the 
+
+      # A user agent rejects (SHALL NOT store its information) if the
       # Version attribute is missing. Note that the legacy Set-Cookie
       # directive will result in an implicit version 0.
       unless cookie.version
@@ -247,7 +247,7 @@ module CookieJar
       end
 
       # The value for the Path attribute is not a prefix of the request-URI
-      unless request_path.start_with? cookie_path 
+      unless request_path.start_with? cookie_path
         errors << "Path is not a prefix of the request uri path"
       end
 
@@ -256,7 +256,7 @@ module CookieJar
         cookie_host == '.local' #is the domain cookie for local addresses
         errors << "Domain format is illegal"
       end
-    
+
       # The effective host name that derives from the request-host does
       # not domain-match the Domain attribute.
       #
@@ -266,7 +266,7 @@ module CookieJar
       unless domains_match cookie_host, uri
         errors << "Domain is inappropriate based on request URI hostname"
       end
-    
+
       # The Port attribute has a "port-list", and the request-port was
       # not in the list.
       unless cookie.ports.nil? || cookie.ports.length != 0
@@ -275,24 +275,24 @@ module CookieJar
         end
       end
 
-      raise (InvalidCookieError.new errors) unless errors.empty?
+      raise InvalidCookieError.new(errors) unless errors.empty?
 
       # Note: 'secure' is not explicitly defined as an SSL channel, and no
       # test is defined around validity and the 'secure' attribute
       true
     end
-    
+
     # Break apart a traditional (non RFC 2965) cookie value into its core
     # components. This does not do any validation, or defaulting of values
     # based on requested URI
-    # 
+    #
     # @param [String] set_cookie_value a Set-Cookie header formatted cookie
     #   definition
     # @return [Hash] Contains the parsed values of the cookie
     def self.parse_set_cookie set_cookie_value
       args = { }
-      params=set_cookie_value.split /;\s*/
-      
+      params=set_cookie_value.split(/;\s*/)
+
       first=true
       params.each do |param|
         result = PARAM1.match param
@@ -308,7 +308,12 @@ module CookieJar
         else
           case key
           when :expires
-            args[:expires_at] = Time.parse keyvalue
+            begin
+              args[:expires_at] = Time.parse keyvalue
+            rescue ArgumentError
+              raise unless $!.message == "time out of range"
+              args[:expires_at] = Time.at(0x7FFFFFFF)
+            end
           when *[:domain, :path]
             args[key] = keyvalue
           when :secure
@@ -323,7 +328,7 @@ module CookieJar
       args[:version] = 0
       args
     end
-    
+
     # Parse a RFC 2965 value and convert to a literal string
     def self.value_to_string value
       if /\A"(.*)"\Z/.match value
@@ -333,7 +338,7 @@ module CookieJar
         value
       end
     end
-    
+
     # Attempt to decipher a partially decoded version of text cookie values
     def self.decode_value value
       if /\A"(.*)"\Z/.match value
@@ -342,11 +347,11 @@ module CookieJar
         CGI.unescape value
       end
     end
-      
-    # Break apart a RFC 2965 cookie value into its core components. 
+
+    # Break apart a RFC 2965 cookie value into its core components.
     # This does not do any validation, or defaulting of values
     # based on requested URI
-    # 
+    #
     # @param [String] set_cookie_value a Set-Cookie2 header formatted cookie
     #   definition
     # @return [Hash] Contains the parsed values of the cookie
@@ -360,7 +365,7 @@ module CookieJar
           raise InvalidCookieError.new "Invalid Set-Cookie2 header '#{set_cookie_value}'"
         end
         index+=md.offset(0)[1]
-        
+
         key = md[1].downcase.to_sym
         keyvalue = md[2] || md[3]
         if first
@@ -382,7 +387,7 @@ module CookieJar
             args[:version] = keyvalue.to_i
           when :port
             # must be in format '"port,port"'
-            ports = keyvalue.split /,\s*/
+            ports = keyvalue.split(/,\s*/)
             args[:ports] = ports.map do |portstr| portstr.to_i end
           else
             raise InvalidCookieError.new "Unknown cookie parameter '#{key}'"
@@ -393,8 +398,8 @@ module CookieJar
       if args[:version] != 1
         raise InvalidCookieError.new "Set-Cookie2 declares a non RFC2965 version cookie"
       end
-      
+
       args
-    end    
+    end
   end
 end

data/lib/cookiejar/jar.rb

@@ -1,23 +1,23 @@
 require 'cookiejar/cookie'
- 
+
 module CookieJar
-  # A cookie store for client side usage. 
+  # A cookie store for client side usage.
   # - Enforces cookie validity rules
   # - Returns just the cookies valid for a given URI
   # - Handles expiration of cookies
-  # - Allows for persistence of cookie data (with or without session) 
+  # - Allows for persistence of cookie data (with or without session)
   #
   #--
   #
   # Internal format:
-  # 
+  #
   # Internally, the data structure is a set of nested hashes.
   # Domain Level:
   # At the domain level, the hashes are of individual domains,
   # down-cased and without any leading period. For instance, imagine cookies
   # for .foo.com, .bar.com, and .auth.bar.com:
   #
-  #   { 
+  #   {
   #     "foo.com"      : (host data),
   #     "bar.com"      : (host data),
   #     "auth.bar.com" : (host data)
@@ -25,7 +25,7 @@ module CookieJar
   #
   # Lookups are done both for the matching entry, and for an entry without
   # the first segment up to the dot, ie. for /^\.?[^\.]+\.(.*)$/.
-  # A lookup of auth.bar.com would match both bar.com and 
+  # A lookup of auth.bar.com would match both bar.com and
   # auth.bar.com, but not entries for com or www.auth.bar.com.
   #
   # Host Level:
@@ -39,47 +39,49 @@ module CookieJar
   #
   # Paths are given a straight prefix string comparison to match.
   # Further filters <secure, http only, ports> are not represented in this
-  # heirarchy. 
+  # heirarchy.
   #
   # Cookies returned are ordered solely by specificity (length) of the
   # path.
   class Jar
     # Create a new empty Jar
     def initialize
-  	  @domains = {}
+      @domains = {}
     end
-    
+
     # Given a request URI and a literal Set-Cookie header value, attempt to
-    # add the cookie to the cookie store.
-    # 
+    # add the cookie(s) to the cookie store.
+    #
     # @param [String, URI] request_uri the resource returning the header
     # @param [String] cookie_header_value the contents of the Set-Cookie
     # @return [Cookie] which was created and stored
     # @raise [InvalidCookieError] if the cookie header did not validate
-    def set_cookie request_uri, cookie_header_value
-    	cookie = Cookie.from_set_cookie request_uri, cookie_header_value
-    	add_cookie cookie
+    def set_cookie request_uri, cookie_header_values
+      cookie_header_values.split(/, (?=[\w]+=)/).each do |cookie_header_value|
+        cookie = Cookie.from_set_cookie request_uri, cookie_header_value
+        add_cookie cookie
+      end
     end
 
     # Given a request URI and a literal Set-Cookie2 header value, attempt to
     # add the cookie to the cookie store.
-    # 
+    #
     # @param [String, URI] request_uri the resource returning the header
     # @param [String] cookie_header_value the contents of the Set-Cookie2
     # @return [Cookie] which was created and stored
     # @raise [InvalidCookieError] if the cookie header did not validate
     def set_cookie2 request_uri, cookie_header_value
-    	cookie = Cookie.from_set_cookie2 request_uri, cookie_header_value
-    	add_cookie cookie
+      cookie = Cookie.from_set_cookie2 request_uri, cookie_header_value
+      add_cookie cookie
     end
-    
+
     # Given a request URI and some HTTP headers, attempt to add the cookie(s)
     # (from Set-Cookie or Set-Cookie2 headers) to the cookie store. If a
-    # cookie is defined (by equivalent name, domain, and path) via Set-Cookie 
+    # cookie is defined (by equivalent name, domain, and path) via Set-Cookie
     # and Set-Cookie2, the Set-Cookie version is ignored.
     #
     # @param [String, URI] request_uri the resource returning the header
-    # @param [Hash<String,[String,Array<String>]>] http_headers a Hash 
+    # @param [Hash<String,[String,Array<String>]>] http_headers a Hash
     #   which may have a key of "Set-Cookie" or "Set-Cookie2", and values of
     #   either strings or arrays of strings
     # @return [Array<Cookie>,nil] the cookies created, or nil if none found.
@@ -93,7 +95,7 @@ module CookieJar
         rescue InvalidCookieError
         end
       end
-      
+
       set_cookie2_key = http_headers.keys.detect { |k| /\ASet-Cookie2\Z/i.match k }
       cookies += gather_header_values(http_headers[set_cookie2_key]) do |value|
         begin
@@ -101,7 +103,7 @@ module CookieJar
         rescue InvalidCookieError
         end
       end
-      
+
       # build the list of cookies, using a Jar. Since Set-Cookie2 values
       # come second, they will replace the Set-Cookie versions.
       jar = Jar.new
@@ -109,65 +111,68 @@ module CookieJar
         jar.add_cookie cookie
       end
       cookies = jar.to_a
-      
+
       # now add them all to our own store.
       cookies.each do |cookie|
         add_cookie cookie
       end
       cookies
     end
-    
+
     # Add a pre-existing cookie object to the jar.
     #
     # @param [Cookie] cookie a pre-existing cookie object
     # @return [Cookie] the cookie added to the store
     def add_cookie cookie
       domain_paths = find_or_add_domain_for_cookie cookie
-  	  add_cookie_to_path domain_paths, cookie
-  	  cookie
-  	end
-  	
-  	# Return an array of all cookie objects in the jar
-  	#
-  	# @return [Array<Cookie>] all cookies. Includes any expired cookies
-  	# which have not yet been removed with expire_cookies
-  	def to_a
-  	  result = []
-  	  @domains.values.each do |paths|
-  	    paths.values.each do |cookies|
-  	      cookies.values.inject result, :<<
-	      end
+      add_cookie_to_path domain_paths, cookie
+      cookie
+    end
+
+    # Return an array of all cookie objects in the jar
+    #
+    # @return [Array<Cookie>] all cookies. Includes any expired cookies
+    # which have not yet been removed with expire_cookies
+    def to_a
+      result = []
+      @domains.values.each do |paths|
+        paths.values.each do |cookies|
+          cookies.values.inject result, :<<
+        end
       end
       result
-	  end
-	  
-	  # Return a JSON 'object' for the various data values. Allows for
+    end
+
+    # Return a JSON 'object' for the various data values. Allows for
     # persistence of the cookie information
     #
-    # @param [Array] a options controlling output JSON text 
+    # @param [Array] a options controlling output JSON text
     #   (usually a State and a depth)
-    # @return [String] JSON representation of object data 
-	  def to_json *a
-	    {
-	      'json_class' => self.class.name,
-	      'cookies' => (to_a.to_json *a)
-      }.to_json *a
+    # @return [String] JSON representation of object data
+    def to_json *a
+      {
+        'json_class' => self.class.name,
+        'cookies' => to_a.to_json(*a)
+      }.to_json(*a)
     end
-    
+
     # Create a new Jar from a JSON-backed hash
     #
     # @param o [Hash] the expanded JSON object
     # @return [CookieJar] a new CookieJar instance
     def self.json_create o
+      if o.is_a? String
+        o = JSON.parse(o)
+      end
       if o.is_a? Hash
         o = o['cookies']
       end
-      cookies = o.inject [] do |result, cookie_json|
+      cookies = o.inject([]) do |result, cookie_json|
         result << (Cookie.json_create cookie_json)
       end
       self.from_a cookies
     end
-    
+
     # Create a new Jar from an array of Cookie objects. Expired cookies
     # will still be added to the archive, and conflicting cookies will
     # be overwritten by the last cookie in the array.
@@ -198,7 +203,7 @@ module CookieJar
         paths.empty?
       end
     end
-    
+
     # Given a request URI, return a sorted list of Cookie objects. Cookies
     # will be in order per RFC 2965 - sorted by longest path length, but
     # otherwise unordered.
@@ -210,26 +215,26 @@ module CookieJar
     #   if true
     # @return [Array<Cookie>] cookies which should be sent in the HTTP request
     def get_cookies request_uri, opts = { }
-  	  uri = to_uri request_uri
-    	hosts = Cookie.compute_search_domains uri
-	
-    	results = []
-    	hosts.each do |host|
-    	  domain = find_domain host
-    	  domain.each do |path, cookies|
-    		  if uri.path.start_with? path
-      		  results += cookies.values.select do |cookie|
-        			cookie.should_send? uri, opts[:script]
-        		end
-        	end
-      	end
+      uri = to_uri request_uri
+      hosts = Cookie.compute_search_domains uri
+
+      results = []
+      hosts.each do |host|
+        domain = find_domain host
+        domain.each do |path, cookies|
+          if uri.path.start_with? path
+            results += cookies.values.select do |cookie|
+              cookie.should_send? uri, opts[:script]
+            end
+          end
+        end
+      end
+      #Sort by path length, longest first
+      results.sort do |lhs, rhs|
+        rhs.path.length <=> lhs.path.length
       end
-    	#Sort by path length, longest first
-    	results.sort do |lhs, rhs|
-    	  rhs.path.length <=> lhs.path.length
-    	end
     end
-    
+
     # Given a request URI, return a string Cookie header.Cookies will be in
     # order per RFC 2965 - sorted by longest path length, but otherwise
     # unordered.
@@ -242,44 +247,43 @@ module CookieJar
     # @return String value of the Cookie header which should be sent on the
     #   HTTP request
     def get_cookie_header request_uri, opts = { }
-    	cookies = get_cookies request_uri, opts
-    	version = 0
-    	ver = [[],[]]
-    	cookies.each do |cookie|
-    	  ver[cookie.version] << cookie
-	    end
-	    if (ver[1].empty?)
-	      # can do a netscape-style cookie header, relish the opportunity
-    	  cookies.map do |cookie|
-    	    cookie.to_s
-  	    end.join ";"
-	    else
-	      # build a RFC 2965-style cookie header. Split the cookies into
-	      # version 0 and 1 groups so that we can reuse the '$Version' header
-	      result = ''
-	      unless ver[0].empty?
-	        result << '$Version=0;'
-  	      result << ver[0].map do |cookie|
-  	        (cookie.to_s 1,false)
-	        end.join(';')
-	        # separate version 0 and 1 with a comma
-	        result << ','
+      cookies = get_cookies request_uri, opts
+      version = 0
+      ver = [[],[]]
+      cookies.each do |cookie|
+        ver[cookie.version] << cookie
+      end
+      if (ver[1].empty?)
+        # can do a netscape-style cookie header, relish the opportunity
+        cookies.map do |cookie|
+          cookie.to_s
+        end.join ";"
+      else
+        # build a RFC 2965-style cookie header. Split the cookies into
+        # version 0 and 1 groups so that we can reuse the '$Version' header
+        result = ''
+        unless ver[0].empty?
+          result << '$Version=0;'
+          result << ver[0].map do |cookie|
+            (cookie.to_s 1,false)
+          end.join(';')
+          # separate version 0 and 1 with a comma
+          result << ','
         end
         result << '$Version=1;'
-	      ver[1].map do |cookie|
-	        result << (cookie.to_s 1,false)
+        ver[1].map do |cookie|
+          result << (cookie.to_s 1,false)
         end
-	      result
+        result
       end
     end
 
-  protected  
+  protected
 
     def gather_header_values http_header_value, &block
       result = []
-      http_header_value
       if http_header_value.is_a? Array
-        http_header_value.each do |value| 
+        http_header_value.each do |value|
           result << block.call(value)
         end
       elsif http_header_value.is_a? String
@@ -287,22 +291,22 @@ module CookieJar
       end
       result.compact
     end
-  
+
     def to_uri request_uri
       (request_uri.is_a? URI)? request_uri : (URI.parse request_uri)
     end
-    
+
     def find_domain host
-    	@domains[host] || {}
+      @domains[host] || {}
     end
 
     def find_or_add_domain_for_cookie cookie
-    	@domains[cookie.domain] ||= {}
+      @domains[cookie.domain] ||= {}
     end
-	
+
     def add_cookie_to_path paths, cookie
-    	path_entry = (paths[cookie.path] ||= {})
-    	path_entry[cookie.name] = cookie
+      path_entry = (paths[cookie.path] ||= {})
+      path_entry[cookie.name] = cookie
     end
   end
-end
+end

data/{test/cookie_test.rb → spec/cookie_spec.rb}

@@ -163,7 +163,7 @@ describe Cookie do
       end
       it "should automatically deserialize to a cookie" do
         json = "{\"json_class\":\"CookieJar::Cookie\",\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2009-09-11 19:10:00 -0600\",\"secure\":true}" 
-        c = JSON.parse json
+        c = JSON.parse json, :create_additions => true
         c.should be_a Cookie
         CookieValidation.validate_cookie 'https://localhost/', c
       end

data/{test/cookie_validation_test.rb → spec/cookie_validation_spec.rb}

@@ -236,4 +236,9 @@ describe CookieValidation do
       end
     end
   end
+  describe '#parse_set_cookie' do
+    it "should max out at 2038 on 32bit systems" do
+      CookieValidation.parse_set_cookie("TRACK_USER_P=98237480810003948000782774;expires=Sat, 30-Jun-2040 05:39:49 GMT;path=/")[:expires_at].to_i.should >= 0x7FFFFFFF
+    end
+  end  
 end

data/{test/jar_test.rb → spec/jar_spec.rb}

@@ -17,6 +17,10 @@ describe Jar do
       jar.set_cookie 'http://auth.foo.com/', 'foo=bar'
       jar.set_cookie 'http://auth.foo.com/', 'auth=135121...;domain=foo.com'    
     end
+    it "should allow me to set multiple cookies in 1 header" do
+      jar = Jar.new
+      jar.set_cookie 'http://foo.com/', 'my_cookie=123456; Domain=foo.com; expires=Thu, 31 Dec 2037 23:59:59 GMT; Path=/, other_cookie=helloworld; Domain=foo.com; expires=Thu, 31 Dec 2037 23:59:59 GMT, last_cookie=098765'
+    end
   end
   describe '.get_cookies' do
     it "should let me read back cookies which are set" do
@@ -27,6 +31,11 @@ describe Jar do
       jar.set_cookie 'http://auth.foo.com/', 'auth=135121...;domain=foo.com'
       jar.get_cookies('http://foo.com/').should have(3).items
     end
+    it "should let me read back a multiple cookies from 1 header" do
+      jar = Jar.new
+      jar.set_cookie 'http://foo.com/', 'my_cookie=123456; Domain=foo.com; expires=Thu, 31 Dec 2037 23:59:59 GMT; Path=/, other_cookie=helloworld; Domain=foo.com; expires=Thu, 31 Dec 2037 23:59:59 GMT, last_cookie=098765'
+      jar.get_cookie_header('http://foo.com/').should == 'last_cookie=098765;my_cookie=123456;other_cookie=helloworld'
+    end
     it "should return cookies longest path first" do
       jar = Jar.new
       uri = 'http://foo.com/a/b/c/d' 
@@ -200,7 +209,7 @@ describe Jar do
       it "should deserialize a JSON array to a jar" do
         json = "[{\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2028-11-01 12:00:00 GMT\",\"secure\":true}]" 
         array = JSON.parse json
-        
+       
         jar = Jar.json_create array
         jar.get_cookies('https://localhost/').should have(1).items
       end
@@ -214,7 +223,7 @@ describe Jar do
       
       it "should automatically deserialize to a jar" do
         json = "{\"json_class\":\"CookieJar::Jar\",\"cookies\":[{\"name\":\"foo\",\"value\":\"bar\",\"domain\":\"localhost.local\",\"path\":\"\\/\",\"created_at\":\"2009-09-11 12:51:03 -0600\",\"expiry\":\"2028-11-01 12:00:00 GMT\",\"secure\":true}]}" 
-        jar = JSON.parse json
+        jar = JSON.parse json, :create_additions => true
         jar.get_cookies('https://localhost/').should have(1).items  
       end
     end

metadata

@@ -1,72 +1,99 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cookiejar
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - David Waite
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-06-14 00:00:00 -06:00
-default_executable: 
-dependencies: []
-
+date: 2014-02-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: Allows for parsing and returning cookies in Ruby HTTP client code
 email: david@alkaline-solutions.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- LICENSE
+- README.markdown
+- Rakefile
+- contributors.json
+- lib/cookiejar.rb
 - lib/cookiejar/cookie.rb
 - lib/cookiejar/cookie_validation.rb
 - lib/cookiejar/jar.rb
-- lib/cookiejar.rb
-- test/cookie_test.rb
-- test/cookie_validation_test.rb
-- test/jar_test.rb
-has_rdoc: true
-homepage: http://alkaline-solutions.com
-licenses: []
-
+- spec/cookie_spec.rb
+- spec/cookie_validation_spec.rb
+- spec/jar_spec.rb
+homepage: https://alkaline-solutions.com
+licenses:
+- BSD-2-Clause
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --title
+rdoc_options:
+- "--title"
 - CookieJar -- Client-side HTTP Cookies
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1050474939376950864
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 3
 summary: Client-side HTTP Cookie library
 test_files: []
-
+has_rdoc: