cookie_store 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 806d7fee9bc861c73d9e390e0d3bfbc5c5ece797
-  data.tar.gz: 7b92809c676dccebd896f876bace50256576cde7
+  metadata.gz: 2fa62b0946bb98fb4646dd6d5a12cf0470ccca8c
+  data.tar.gz: 7c60534b13a7e21151635f0985083edba439215f
 SHA512:
-  metadata.gz: 1f7a35021d374cf51d8ac896870f15c9a97f2766edb56f1ab2dcfeb18dff50ad7224078ee616cf2f2f940968b9e14005099404373578cb424fdc1f28f228f209
-  data.tar.gz: aec3b0876c4df351a7bf1f0c6da82a7d103dc299e9a21a67d98c4ec663499b427803220c1467de5511a3c117521e918f65fbe16a60b76848259bec8ff25a1db9
+  metadata.gz: 4933dd902e5701f015ffc4f8b5c95ae869311505d3d3a054027c6aa31b96bb1b5d14751f751c2b6664e5c095faf1ae3912301b7640f5f18f70a20f59d1aa5385
+  data.tar.gz: fec53203a8553011616023c165ca20217dad219cce3c713e22ab28f791034112aca8335502e77e66f7653ec8344b5ffa7afe6df77e6356da67f85e29ad1c0956

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cookie_store (0.1.2)
+    cookie_store (0.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -52,3 +52,6 @@ DEPENDENCIES
   mocha
   rake
   webmock
+
+BUNDLED WITH
+   1.10.4

data/cookie_store.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "cookie_store"
-  s.version     = '0.1.3'
+  s.version     = '0.1.4'
   s.authors     = ["Jon Bracy"]
   s.email       = ["jonbracy@gmail.com"]
   s.homepage    = "https://github.com/malomalo/cookie_store"

data/lib/cookie_store.rb

@@ -14,15 +14,16 @@ class CookieStore
   # Read and set the cookie from the Set-Cookie header
   def set_cookie(request_uri, set_cookie_value)
     request_uri = URI.parse(request_uri)
-    cookie = CookieStore::Cookie.parse(request_uri, set_cookie_value)
-
-    # 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
+    CookieStore::Cookie.parse_cookies(request_uri, set_cookie_value).each 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
   
   def cookie_header_for(request_uri)

data/lib/cookie_store/cookie.rb

@@ -7,10 +7,11 @@ class CookieStore::Cookie
   IPADDR        = /\A#{URI::REGEXP::PATTERN::IPV4ADDR}\Z|\A#{URI::REGEXP::PATTERN::IPV6ADDR}\Z/
     
   TOKEN         = '[^(),\/<>@;:\\\"\[\]?={}\s]+'
-  VALUE         = "(?:#{TOKEN}|#{IPADDR}|#{QUOTED_TEXT})"
+  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+
@@ -24,6 +25,12 @@ class CookieStore::Cookie
       )
     ){0,1}
   }nx
+  COOKIES = %r{
+      #{TOKEN}=(?:"#{QUOTED_TEXT}"|#{VALUE})
+      (?:;\s+#{TOKEN}(?:=(?:"#{QUOTED_TEXT}"|(?:#{EXPIRES_AT_VALUE}|#{VALUE}))){0,1})*
+  }nx
+  
+
   
   # [String] The name of the cookie.
   attr_reader :name
@@ -179,6 +186,15 @@ 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
+  end
+  
   def self.parse(request_uri, set_cookie_value)
     uri = request_uri.is_a?(URI) ? request_uri : URI.parse(request_uri)
     data = COOKIE.match(set_cookie_value)

data/test/cookie_store/cookie_test.rb

@@ -331,6 +331,28 @@ class CookieStore::CookieTest < Minitest::Test
     cookie = CookieStore::Cookie.parse('http://google.com/test/this', 'foo=bar; Max-Age=3660')
     assert_equal 3660, cookie.max_age
   end
+
+  test "::parse_cookies with one cookie" do
+    cookies = CookieStore::Cookie.parse_cookies("http://google.com/test/this", "current_account_id=2449; path=/")
+
+    assert_equal "current_account_id",  cookies.first.name
+    assert_equal "2449",                cookies.first.value
+    assert_equal "/",                   cookies.first.path
+  end
+    
+  test "::parse_cookies with multiple cookies" do
+    cookies = CookieStore::Cookie.parse_cookies("http://google.com/test/this", "current_account_id=2449; path=/, _session=QUZwVE5jNjB; path=/test; expires=Wed, 13-Jan-2021 22:23:01 GMT; HttpOnly")
+
+    assert_equal "current_account_id",  cookies.first.name
+    assert_equal "2449",                cookies.first.value
+    assert_equal "/",                   cookies.first.path
+    
+    assert_equal "_session",            cookies[1].name
+    assert_equal "QUZwVE5jNjB",         cookies[1].value
+    assert_equal "/test",               cookies[1].path
+    assert_equal DateTime.new(2021, 1, 13, 22, 23, 1, 0), cookies[1].expires
+    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

data/test/cookie_store_test.rb

@@ -13,6 +13,13 @@ class CookieStoreTest < Minitest::Test
     store.set_cookie('http://127.0.0.1/test/this', 'foo=bar; Max-Age=3600')
   end
   
+  test "#set_cookie contains multiple cookies" do
+    store = CookieStore.new
+    store.expects(:add).times(2)
+    
+    store.set_cookie("http://google.com/test/this", "current_account_id=2449; path=/, _session=QUZwVE5jNjB; path=/test; expires=Wed, 13-Jan-2021 22:23:01 GMT; HttpOnly")
+  end
+  
   test "#set_cookie rejects cookies where the value for the Domain attribute contains no embedded dots" do
     store = CookieStore.new
     store.expects(:add).never

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cookie_store
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Ruby library to handle client-side HTTP cookies