cookie_store 0.1.4 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2fa62b0946bb98fb4646dd6d5a12cf0470ccca8c
-  data.tar.gz: 7c60534b13a7e21151635f0985083edba439215f
+SHA256:
+  metadata.gz: ed1b21def909112649960bb17b6e9f15291b27a45e1121111ba7fac8bc6944ca
+  data.tar.gz: 2c8066581ac182115e759ddf0421ce9e2a3ecc8c3bc6feab292efa9a2c9a3c16
 SHA512:
-  metadata.gz: 4933dd902e5701f015ffc4f8b5c95ae869311505d3d3a054027c6aa31b96bb1b5d14751f751c2b6664e5c095faf1ae3912301b7640f5f18f70a20f59d1aa5385
-  data.tar.gz: fec53203a8553011616023c165ca20217dad219cce3c713e22ab28f791034112aca8335502e77e66f7653ec8344b5ffa7afe6df77e6356da67f85e29ad1c0956
+  metadata.gz: 8db6b08273b5324d8866709e52af11eefe89538c891cf5d551160a51df4386a612defb0e8f560e55d406fcbbf15add61b415b56ffb2c933877d66e7ee557589d
+  data.tar.gz: 1049c26606be9fe1585377c983357958416bd842a4e36c41cac7107f8f58841fadd003e29cf2e98cef5ff6f1d67078f0af9461b58783a7f0f0e15632b4d6c63e

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  stream_parser:
+    name: CookieStore Test
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+
+      - uses: actions/checkout@v2
+
+      - run: bundle
+
+      - run: bundle exec rake test

data/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+*.gem
+.byebug_history
+Gemfile.lock
+coverage/

data/.tm_properties

@@ -0,0 +1 @@
+exclude = '{$exclude,log,tmp,.tm_properties,coverage}'

data/cookie_store.gemspec

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+require_relative 'lib/cookie_store/version'
 
 Gem::Specification.new do |s|
   s.name        = "cookie_store"
-  s.version     = '0.1.4'
+  s.version     = CookieStore::VERSION
   s.authors     = ["Jon Bracy"]
   s.email       = ["jonbracy@gmail.com"]
   s.homepage    = "https://github.com/malomalo/cookie_store"
@@ -14,8 +13,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency 'stream_parser', '>= 0.2'
+  
   # Developoment 
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'byebug'
   # s.add_development_dependency 'rdoc'
   # s.add_development_dependency 'sdoc'
   s.add_development_dependency 'minitest'
@@ -24,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'faker'
   s.add_development_dependency 'webmock'
   s.add_development_dependency 'activesupport'
+  s.add_development_dependency 'simplecov'
 end

data/lib/cookie_store.rb

@@ -1,6 +1,8 @@
 require 'uri'
 
 class CookieStore
+
+  autoload :CookieParser,     'cookie_store/cookie_parser'
   
   # Maximum number of bytes per cookie (RFC 6265 6.1 requires at least 4096)
   MAX_COOKIE_LENGTH = 4096
@@ -15,14 +17,14 @@ class CookieStore
   def set_cookie(request_uri, set_cookie_value)
     request_uri = URI.parse(request_uri)
     
-    CookieStore::Cookie.parse_cookies(request_uri, set_cookie_value).each do |cookie|
+    CookieStore::Cookie.parse_cookies(request_uri, set_cookie_value) do |cookie|
       # reject as per RFC2965 Section 3.3.2
       return if !cookie.request_match?(request_uri) || !(cookie.domain =~ /.+\..+/ || cookie.domain == 'localhost')
     
       # reject cookies over the max-bytes
       return if cookie.to_s.size > MAX_COOKIE_LENGTH
     
-      add(cookie) 
+      add(cookie)
     end
   end
   

data/lib/cookie_store/cookie.rb

@@ -1,37 +1,7 @@
 class CookieStore::Cookie
 
-  QUOTED_PAIR   = "\\\\[\\x00-\\x7F]"
-  LWS           = "\\r\\n(?:[ \\t]+)"
-  QDTEXT        = "[\\t\\x20-\\x21\\x23-\\x3A\\x3C-\\x7E\\x80-\\xFF]|(?:#{LWS})"
-  QUOTED_TEXT   = "(?:#{QUOTED_PAIR}|#{QDTEXT})*"
-  IPADDR        = /\A#{URI::REGEXP::PATTERN::IPV4ADDR}\Z|\A#{URI::REGEXP::PATTERN::IPV6ADDR}\Z/
-    
-  TOKEN         = '[^(),\/<>@;:\\\"\[\]?={}\s]+'
-  VALUE         = "(?:#{TOKEN}|#{IPADDR}|[^,;\\s]+)"
-  EXPIRES_AT_VALUE = '[A-Za-z]{3},\ \d{2}[-\ ][A-Za-z]{3}[-\ ]\d{4}\ \d{2}:\d{2}:\d{2}\ (?:[A-Z]{3}|[-+]\d{4})'
-  NUMERICAL_TIMEZONE = /[-+]\d{4}$/
-  
-
-  COOKIE    = /(?<name>#{TOKEN})=(?:"(?<quoted_value>#{QUOTED_TEXT})"|(?<value>#{VALUE}))(?<attributes>.*)/n
-  COOKIE_AV = %r{
-    ;\s+
-    (?<key>#{TOKEN})
-    (?:
-      =
-      (?:
-        "(?<quoted_value>#{QUOTED_TEXT})"
-        |
-        (?<value>#{EXPIRES_AT_VALUE}|#{VALUE})
-      )
-    ){0,1}
-  }nx
-  COOKIES = %r{
-      #{TOKEN}=(?:"#{QUOTED_TEXT}"|#{VALUE})
-      (?:;\s+#{TOKEN}(?:=(?:"#{QUOTED_TEXT}"|(?:#{EXPIRES_AT_VALUE}|#{VALUE}))){0,1})*
-  }nx
-  
+  IPADDR = /\A#{URI::REGEXP::PATTERN::IPV4ADDR}\Z|\A#{URI::REGEXP::PATTERN::IPV6ADDR}\Z/
 
-  
   # [String] The name of the cookie.
   attr_reader :name
   
@@ -87,7 +57,7 @@ class CookieStore::Cookie
   # [Time] Time when this cookie was first evaluated and created.
   attr_reader :created_at
   
-  def initialize(name, value, options={})
+  def initialize(name, value, attributes={})
     @name = name
     @value = value
     @secure = false
@@ -96,8 +66,12 @@ class CookieStore::Cookie
     @discard = false
     @created_at = Time.now
     
-    options.each do |attr_name, attr_value|
-      self.instance_variable_set(:"@#{attr_name}", attr_value)
+    @attributes = attributes
+
+    %i{name value domain path secure http_only version comment comment_url discard ports expires max_age created_at}.each do |attr_name|
+      if attributes.has_key?(attr_name)
+        self.instance_variable_set(:"@#{attr_name}", attributes[attr_name])
+      end
     end
   end
   
@@ -186,70 +160,28 @@ class CookieStore::Cookie
     ports.include?(request_port)
   end
   
-  def self.parse_cookies(request_uri, set_cookie_value)
-    uri = request_uri.is_a?(URI) ? request_uri : URI.parse(request_uri)
-    cookies = []
-    set_cookie_value.scan(COOKIES) do |cookie|
-      cookies << parse(uri, cookie)
-    end
-    cookies
+  def self.parse(request_uri, set_cookie_value)
+    parse_cookies(request_uri, set_cookie_value).first
   end
   
-  def self.parse(request_uri, set_cookie_value)
+  def self.parse_cookies(request_uri, set_cookie_value)
     uri = request_uri.is_a?(URI) ? request_uri : URI.parse(request_uri)
-    data = COOKIE.match(set_cookie_value)
-    options = {}
-    
-    if !data
-      raise Net::HTTPHeaderSyntaxError.new("Invalid Set-Cookie header format")
-    end
     
-    if data[:attributes]
-      data[:attributes].scan(COOKIE_AV) do |key, quoted_value, value|
-        value = quoted_value.gsub(/\\(.)/, '\1') if !value && quoted_value
+    cookies = []
+    CookieStore::CookieParser.parse(set_cookie_value) do |parsed|
+      parsed[:attributes][:domain]  ||= uri.host.downcase
+      parsed[:attributes][:path]    ||= uri.path
+
+      cookie = CookieStore::Cookie.new(parsed[:key], parsed[:value], parsed[:attributes])
 
-        # RFC 2109 4.1, Attributes (names) are case-insensitive
-        case key.downcase
-        when 'comment'
-          options[:comment] = value
-        when 'commenturl'
-          options[:comment_url] = value
-        when 'discard'
-          options[:discard] = true
-        when 'domain'
-          if value =~ IPADDR
-            options[:domain] = value
-          else
-            # As per RFC2965 if a host name contains no dots, the effective host name is
-            # that name with the string .local appended to it.
-            value = "#{value}.local" if !value.include?('.')
-            options[:domain] = (value.start_with?('.') ? value : ".#{value}").downcase
-          end
-        when 'expires'
-          if value.include?('-') && !value.match(NUMERICAL_TIMEZONE)
-            options[:expires] = DateTime.strptime(value, '%a, %d-%b-%Y %H:%M:%S %Z')
-          else
-            options[:expires] = DateTime.strptime(value, '%a, %d %b %Y %H:%M:%S %Z')
-          end
-        when 'max-age'
-          options[:max_age] = value.to_i
-        when 'path'
-          options[:path] = value
-        when 'port'
-          options[:ports] = value.split(',').map(&:to_i)
-        when 'secure'
-          options[:secure] = true
-        when 'httponly'
-          options[:http_only] = true
-        when 'version'
-          options[:version] = value.to_i
-        end
+      cookies << if block_given?
+        yield(cookie)
+      else
+        cookie
       end
     end
-    options[:domain]  ||= uri.host.downcase
-    options[:path]    ||= uri.path
-    
-    CookieStore::Cookie.new(data[:name], data[:value] || data[:quoted_value].gsub(/\\(.)/, '\1'), options)
+
+    cookies
   end
     
 end

data/lib/cookie_store/cookie_parser.rb

@@ -0,0 +1,110 @@
+require 'stream_parser'
+
+class CookieStore::CookieParser
+
+  include StreamParser
+    
+  NUMERICAL_TIMEZONE = /[-+]\d{4}\Z/
+  
+  def parse
+    cookie = {attributes: {}}
+    
+    @stack = [:cookie_name]
+    while !eos?
+      case @stack.last
+      when :cookie_name
+        scan_until(/\s*=\s*/)
+        if match == '='
+          @stack << :cookie_value
+          cookie[:key] = pre_match
+        end
+      when :cookie_value
+        scan_until(/\s*(['";]\s*|\Z)/)
+        if match.strip == '"' || match.strip == "'"
+          cookie[:value] = quoted_value(match.strip)
+          @stack.pop
+          @stack << :cookie_attributes
+        elsif match
+          cookie[:value] = pre_match
+          @stack.pop
+          @stack << :cookie_attributes
+        end
+      when :cookie_attributes
+        # RFC 2109 4.1, Attributes (names) are case-insensitive
+        scan_until(/[,=;]\s*/)
+        if match&.start_with?('=')
+          key = normalize_key(pre_match)
+          scan_until(key == :expires ? /\s*((?<!\w{3}),|['";])\s*/ : /\s*(['";,]\s*|\Z)/)
+          if match =~ /["']\s*\Z/
+            cookie[:attributes][key] = normalize_attribute_value(key, quoted_value(match.strip))
+          elsif match =~ /,\s*\Z/
+            cookie[:attributes][key] = normalize_attribute_value(key, pre_match)
+            yield(cookie)
+            cookie = {attributes: {}}
+            @stack.pop
+          else
+            cookie[:attributes][key] = normalize_attribute_value(key, pre_match)
+          end
+        elsif match&.start_with?(',')
+          yield(cookie)
+          cookie = {attributes: {}}
+          @stack.pop
+        else
+          cookie[:attributes][normalize_key(pre_match)] = true
+        end
+      end
+    end
+    
+    yield(cookie)
+  end
+  
+  def normalize_key(key)
+    key = key.downcase.gsub('-','_')
+    if key == 'port'
+      :ports
+    elsif key == 'httponly'
+      :http_only
+    elsif key == 'commenturl'
+      :comment_url
+    else
+      key.to_sym
+    end
+  end
+  
+  def normalize_attribute_value(key, value)
+    case key
+    when :domain
+      if value =~ CookieStore::Cookie::IPADDR
+        value
+      else
+        # As per RFC2965 if a host name contains no dots, the effective host
+        # name is that name with the string .local appended to it.
+        value = "#{value}.local" if !value.include?('.')
+        (value.start_with?('.') ? value : ".#{value}").downcase
+      end
+    when :expires
+      byebug if $debug
+      case value
+      when /\w{3}, \d{2}-\w{3}-\d{2} /
+        DateTime.strptime(value, '%a, %d-%b-%y %H:%M:%S %Z')
+      when /\w{3}, \d{2}-\w{3}-\d{4} /
+        DateTime.strptime(value, '%a, %d-%b-%Y %H:%M:%S %Z')
+      when /\w{3}, \d{2} \w{3} \d{2} /
+        DateTime.strptime(value, '%a, %d %b %y %H:%M:%S %Z')
+      when /\w{3}, \d{2} \w{3} \d{4} /
+        DateTime.strptime(value, '%a, %d %b %Y %H:%M:%S %Z')
+      else
+        DateTime.parse(value)
+      end
+    when :max_age
+      value&.to_i
+    when :ports
+      value.split(',').map(&:to_i)
+    when :version
+      value.to_i
+    else
+      value
+    end
+  end
+  
+end

data/lib/cookie_store/version.rb

@@ -0,0 +1,3 @@
+class CookieStore
+  VERSION = '0.2'
+end

data/test/cookie_store/cookie_test.rb

@@ -13,7 +13,7 @@ class CookieStore::CookieTest < Minitest::Test
   
   test "::new(name, value, options)" do
     #TODO: test all options are set
-    cookie = CookieStore::Cookie.new('foo', 'bar', :domain => 'test.com')
+    cookie = CookieStore::Cookie.new('foo', 'bar', domain: 'test.com')
 
     assert_equal 'test.com', cookie.domain
   end
@@ -27,7 +27,7 @@ class CookieStore::CookieTest < Minitest::Test
       '123.456.57.21'             => '123.456.57.21'
       #TODO: not sure how ipv6 works '[E3D7::51F4:9BC8:C0A8:6420]' => '[E3D7::51F4:9BC8:C0A8:6420]'
     }.each do |host, cookie_host|
-      cookie = CookieStore::Cookie.new('key', 'value', :domain => cookie_host)
+      cookie = CookieStore::Cookie.new('key', 'value', domain: cookie_host)
       assert_equal true, cookie.domain_match(host)
     end
     
@@ -43,7 +43,7 @@ class CookieStore::CookieTest < Minitest::Test
       '123.456.57.21'             => '.123.456.57.21'
       #TODO: not sure how ipv6 works '[E3D7::51F4:9BC8:C0A8:6420]' => '[E3D7::51F4:9BC8:C0A8:6421]'
     }.each do |host, cookie_host|
-      cookie = CookieStore::Cookie.new('key', 'value', :domain => cookie_host)
+      cookie = CookieStore::Cookie.new('key', 'value', domain: cookie_host)
       assert_equal false, cookie.domain_match(host)
     end
   end
@@ -55,7 +55,7 @@ class CookieStore::CookieTest < Minitest::Test
       '/test'                     => '/',
       '/this/is/my/url'           => '/this/is'
     }.each do |path, cookie_path|
-      cookie = CookieStore::Cookie.new('key', 'value', :path => cookie_path)
+      cookie = CookieStore::Cookie.new('key', 'value', path: cookie_path)
       assert_equal true, cookie.path_match(path)
     end
     
@@ -63,7 +63,7 @@ class CookieStore::CookieTest < Minitest::Test
       '/test'                     => '/rest',
       '/'                         => '/test'
     }.each do |path, cookie_path|
-      cookie = CookieStore::Cookie.new('key', 'value', :path => cookie_path)
+      cookie = CookieStore::Cookie.new('key', 'value', path: cookie_path)
       assert_equal false, cookie.path_match(path)
     end
   end
@@ -76,7 +76,7 @@ class CookieStore::CookieTest < Minitest::Test
   end
   
   test "::port_match(request_port) with ports attribute set" do
-    cookie = CookieStore::Cookie.new('key', 'value', :ports => [80, 8700])
+    cookie = CookieStore::Cookie.new('key', 'value', ports: [80, 8700])
     assert_equal true, cookie.port_match(8700)
     assert_equal false, cookie.port_match(87)
   end
@@ -97,14 +97,19 @@ class CookieStore::CookieTest < Minitest::Test
   
   test "#expires_at perfers max-age to expires" do
     travel_to Time.new(2013, 12, 13, 8, 26, 12, 0) do
-      cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Max-Age=3600 Expires="Wed, 13 Jan 2021 22:23:01 GMT"')
+      cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Max-Age=3600; Expires="Wed, 13 Jan 2021 22:23:01 GMT"')
       assert_equal Time.new(2013, 12, 13, 9, 26, 12, 0), cookie.expires_at
     end
   end
   
   test "#expires_at returns nil if no max-age or expires attribute" do
     cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar')
-    assert_equal nil, cookie.expires_at
+    assert_nil cookie.expires_at
+  end
+
+  test "date formats" do
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foor=bar; expires=Fri, 04-Jun-21 14:13:58 GMT; path=/;')
+    assert_equal DateTime.new(2021, 6, 04, 14, 13, 58, 0), cookie.expires_at
   end
   
   # CookieStore::Cookie.expired? =========================================================
@@ -188,13 +193,13 @@ class CookieStore::CookieTest < Minitest::Test
     assert_equal '/test',       cookie.path
     assert_equal false,         cookie.secure
     assert_equal false,         cookie.http_only
-    assert_equal nil,           cookie.comment
-    assert_equal nil,           cookie.comment_url
+    assert_nil                  cookie.comment
+    assert_nil                  cookie.comment_url
     assert_equal 1,             cookie.version
     assert_equal false,         cookie.discard
-    assert_equal nil,           cookie.ports
-    assert_equal nil,           cookie.expires
-    assert_equal nil,           cookie.max_age
+    assert_nil                  cookie.ports
+    assert_nil                  cookie.expires
+    assert_nil                  cookie.max_age
   end
   
   test "::parse a cookie with options" do
@@ -206,13 +211,13 @@ class CookieStore::CookieTest < Minitest::Test
     assert_equal '/',           cookie.path
     assert_equal false,         cookie.secure
     assert_equal true,          cookie.http_only
-    assert_equal nil,           cookie.comment
-    assert_equal nil,           cookie.comment_url
+    assert_nil                  cookie.comment
+    assert_nil                  cookie.comment_url
     assert_equal 1,             cookie.version
     assert_equal false,         cookie.discard
-    assert_equal nil,           cookie.ports
-    assert_equal nil,           cookie.expires
-    assert_equal nil,           cookie.max_age
+    assert_nil                  cookie.ports
+    assert_nil                  cookie.expires
+    assert_nil                  cookie.max_age
   end
 
   test "::parse normalizes the request domain" do
@@ -234,9 +239,9 @@ class CookieStore::CookieTest < Minitest::Test
   test "::parse a simple quoted cookie" do
     cookie = CookieStore::Cookie.parse('http://google.com/test', 'foo="b\"ar"')
 
-    assert_equal 'google.com', cookie.domain
-    assert_equal 'foo', cookie.name
-    assert_equal 'b"ar', cookie.value
+    assert_equal 'google.com',  cookie.domain
+    assert_equal 'foo',         cookie.name
+    assert_equal 'b"ar',        cookie.value
   end
   
   test "::parse domain attribute without leading ." do
@@ -312,6 +317,19 @@ class CookieStore::CookieTest < Minitest::Test
     cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires="Wed, 13 Jan 2021 22:23:01 GMT"')
     assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
     
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', "foo=bar; Expires='Wed, 13 Jan 2021 22:23:01 GMT'")
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+    
+    # Wed, 13 Jan 21 22:23:01 GMT format
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires=Wed, 13 Jan 21 22:23:01 GMT')
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+    
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires="Wed, 13 Jan 21 22:23:01 GMT"')
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+    
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', "foo=bar; Expires='Wed, 13 Jan 21 22:23:01 GMT'")
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+    
     # Wed, 13-Jan-2021 22:23:01 GMT format
     cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires=Wed, 13-Jan-2021 22:23:01 GMT')
     assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
@@ -319,12 +337,38 @@ class CookieStore::CookieTest < Minitest::Test
     cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires="Wed, 13-Jan-2021 22:23:01 GMT"')
     assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
 
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', "foo=bar; Expires='Wed, 13-Jan-2021 22:23:01 GMT'")
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+    
+    # Wed, 13-Jan-21 22:23:01 GMT format
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires=Wed, 13-Jan-21 22:23:01 GMT')
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+    
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires="Wed, 13-Jan-21 22:23:01 GMT"')
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', "foo=bar; Expires='Wed, 13-Jan-21 22:23:01 GMT'")
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+
     # Wed, 13 Jan 2021 22:23:01 -0000 format
     cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires=Wed, 13 Jan 2021 22:23:01 -0000')
     assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
 
     cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires="Wed, 13 Jan 2021 22:23:01 +0000"')
     assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', "foo=bar; Expires='Wed, 13 Jan 2021 22:23:01 +0000'")
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+    
+    # Wed, 13 Jan 21 22:23:01 -0000 format
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires=Wed, 13 Jan 21 22:23:01 -0000')
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Expires="Wed, 13 Jan 21 22:23:01 +0000"')
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
+
+    cookie = CookieStore::Cookie.parse('http://google.com/test/this', "foo=bar; Expires='Wed, 13 Jan 21 22:23:01 +0000'")
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookie.expires
   end
   
   test "::parse max_age attribute" do
@@ -354,7 +398,15 @@ class CookieStore::CookieTest < Minitest::Test
     assert_equal true,                  cookies[1].http_only
   end
   
-  # TODO: test expires_at, based on expires attribute
-  # TODO: test expires_at, based on max-age attribute
+  # CookieStore::Cookie parse invalid cookies =========================================================
+  test "unclosed quotes" do
+    assert_raises Net::HTTPHeaderSyntaxError do
+      CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Max-Age="3660')
+    end
+
+    assert_raises Net::HTTPHeaderSyntaxError do
+      CookieStore::Cookie.parse('http://google.com/test/this', "foo=bar; Max-Age='3660")
+    end
+  end
   
 end

data/test/test_helper.rb

@@ -6,6 +6,9 @@ lib = File.expand_path(File.join(root, 'lib'))
 
 $LOAD_PATH << lib
 
+require 'simplecov'
+SimpleCov.start
+
 require 'cookie_store'
 require "minitest/autorun"
 require 'minitest/unit'
@@ -13,12 +16,18 @@ require 'minitest/reporters'
 require 'faker'
 require 'webmock/minitest'
 require "mocha"
-require "mocha/mini_test"
+require "mocha/minitest"
 require 'active_support/time'
 require 'active_support/testing/time_helpers'
+require "byebug"
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 
+
+
+
+$debug = false
+
 # File 'lib/active_support/testing/declarative.rb', somewhere in rails....
 class Minitest::Test
   include ActiveSupport::Testing::TimeHelpers
@@ -36,4 +45,12 @@ class Minitest::Test
     end
   end
   
+  def debug
+    $debug = true
+        puts '=========================='
+    yield
+  ensure
+        puts '=========================='
+    $debug = false
+  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cookie_store
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: '0.2'
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: stream_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby library to handle client-side HTTP cookies
 email:
 - jonbracy@gmail.com
@@ -115,15 +157,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- ".tm_properties"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - cookie_store.gemspec
 - lib/cookie_store.rb
 - lib/cookie_store/cookie.rb
+- lib/cookie_store/cookie_parser.rb
 - lib/cookie_store/hash_store.rb
+- lib/cookie_store/version.rb
 - test/cookie_store/cookie_test.rb
 - test/cookie_store/hash_store_test.rb
 - test/cookie_store_test.rb
@@ -131,7 +177,7 @@ files:
 homepage: https://github.com/malomalo/cookie_store
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -146,9 +192,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A Ruby library to handle client-side HTTP cookies
 test_files:

data/Gemfile.lock

@@ -1,57 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cookie_store (0.1.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.1.8)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    ansi (1.4.3)
-    builder (3.2.2)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    faker (1.4.3)
-      i18n (~> 0.5)
-    i18n (0.6.11)
-    json (1.8.1)
-    metaclass (0.0.4)
-    minitest (5.5.0)
-    minitest-reporters (1.0.8)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    rake (10.4.2)
-    ruby-progressbar (1.7.0)
-    safe_yaml (1.0.4)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    webmock (1.20.4)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport
-  cookie_store!
-  faker
-  minitest
-  minitest-reporters
-  mocha
-  rake
-  webmock
-
-BUNDLED WITH
-   1.10.4