http-cookie 0.1.0 → 0.1.1

data/lib/http/cookie.rb

@@ -342,6 +342,7 @@ class HTTP::Cookie
 
   def acceptable_from_uri?(uri)
     uri = URI(uri)
+    return false unless URI::HTTP === uri && uri.host
     host = DomainName.new(uri.host)
 
     # RFC 6265 5.3
@@ -359,11 +360,11 @@ class HTTP::Cookie
   end
 
   def valid_for_uri?(uri)
-    uri = URI(uri)
     if @domain.nil?
       raise "cannot tell if this cookie is valid because the domain is unknown"
     end
-    return false if secure? && uri.scheme != 'https'
+    uri = URI(uri)
+    return false if secure? && !(URI::HTTPS === uri)
     acceptable_from_uri?(uri) && HTTP::Cookie.normalize_path(uri.path).start_with?(@path)
   end
 

data/lib/http/cookie/version.rb

@@ -1,5 +1,5 @@
 module HTTP
   class Cookie
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/http/cookie_jar.rb

@@ -67,21 +67,19 @@ class HTTP::CookieJar
 
   # Iterates over all cookies that are not expired.
   #
-  # Available option keywords are below:
-  #
-  # * +uri+
-  #
-  #   Specify a URI/URL indicating the destination of the cookies
-  #   being selected.  Every cookie yielded should be good to send to
-  #   the given URI, i.e. cookie.valid_for_uri?(uri) evaluates to
-  #   true.
+  # An optional argument +uri+ specifies a URI/URL indicating the
+  # destination of the cookies being selected.  Every cookie yielded
+  # should be good to send to the given URI,
+  # i.e. cookie.valid_for_uri?(uri) evaluates to true.
   #
-  #   If (and only if) this option is given, last access time of each
-  #   cookie is updated to the current time.
+  # If (and only if) the +uri+ option is given, last access time of
+  # each cookie is updated to the current time.
   def each(uri = nil, &block)
     block_given? or return enum_for(__method__, uri)
 
     if uri
+      uri = URI(uri)
+      return self unless URI::HTTP === uri && uri.host
       block = proc { |cookie|
         yield cookie if cookie.valid_for_uri?(uri)
       }

data/lib/http/cookie_jar/abstract_store.rb

@@ -54,23 +54,23 @@ class HTTP::CookieJar::AbstractStore
 
   # Iterates over all cookies that are not expired.
   #
-  # Available option keywords are below:
+  # An optional argument +uri+ specifies a URI object indicating the
+  # destination of the cookies being selected.  Every cookie yielded
+  # should be good to send to the given URI,
+  # i.e. cookie.valid_for_uri?(uri) evaluates to true.
   #
-  # * +uri+
-  #
-  #   Specify a URI object indicating the destination of the cookies
-  #   being selected.  Every cookie yielded should be good to send to
-  #   the given URI, i.e. cookie.valid_for_uri?(uri) evaluates to
-  #   true.
-  #
-  #   If (and only if) this option is given, last access time of each
-  #   cookie is updated to the current time.
-  def each(options = nil, &block)
+  # If (and only if) the +uri+ option is given, last access time of
+  # each cookie is updated to the current time.
+  def each(uri = nil, &block)
     raise
     self
   end
   include Enumerable
 
+  def empty?
+    raise
+  end
+
   def clear
     raise
     self

data/lib/http/cookie_jar/hash_store.rb

@@ -51,7 +51,6 @@ class HTTP::CookieJar
 
     def each(uri = nil)
       if uri
-        uri = URI(uri)
         thost = DomainName.new(uri.host)
         tpath = HTTP::Cookie.normalize_path(uri.path)
         @jar.each { |domain, paths|
@@ -83,6 +82,7 @@ class HTTP::CookieJar
           }
         }
       end
+      self
     end
 
     def clear

data/test/test_http_cookie.rb

@@ -576,6 +576,7 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal false, cookie.valid_for_uri?(URI('http://www.example.com/dir/test.html'))
     assert_equal false, cookie.valid_for_uri?(URI('https://www.example.com/dir2/test.html'))
     assert_equal false, cookie.valid_for_uri?(URI('http://www.example.com/dir2/test.html'))
+    assert_equal false, cookie.valid_for_uri?(URI('file:///dir/test.html'))
 
     cookie = HTTP::Cookie.parse('a=b; path=/dir2/', :origin => URI('http://example.com/dir/file.html')).first
     assert_equal false, cookie.valid_for_uri?(URI('https://example.com/dir/test.html'))
@@ -586,6 +587,7 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal false, cookie.valid_for_uri?(URI('http://www.example.com/dir/test.html'))
     assert_equal false, cookie.valid_for_uri?(URI('https://www.example.com/dir2/test.html'))
     assert_equal false, cookie.valid_for_uri?(URI('http://www.example.com/dir2/test.html'))
+    assert_equal false, cookie.valid_for_uri?(URI('file:///dir/test.html'))
 
     cookie = HTTP::Cookie.parse('a=b; domain=example.com; path=/dir2/', :origin => URI('http://example.com/dir/file.html')).first
     assert_equal false, cookie.valid_for_uri?(URI('https://example.com/dir/test.html'))
@@ -596,15 +598,18 @@ class TestHTTPCookie < Test::Unit::TestCase
     assert_equal false, cookie.valid_for_uri?(URI('http://www.example.com/dir/test.html'))
     assert_equal true, cookie.valid_for_uri?(URI('https://www.example.com/dir2/test.html'))
     assert_equal true, cookie.valid_for_uri?(URI('http://www.example.com/dir2/test.html'))
+    assert_equal false, cookie.valid_for_uri?(URI('file:///dir2/test.html'))
 
     cookie = HTTP::Cookie.parse('a=b; secure', :origin => URI('https://example.com/dir/file.html')).first
     assert_equal true,  cookie.valid_for_uri?(URI('https://example.com/dir/test.html'))
     assert_equal false, cookie.valid_for_uri?(URI('http://example.com/dir/test.html'))
     assert_equal false, cookie.valid_for_uri?(URI('https://example.com/dir2/test.html'))
     assert_equal false, cookie.valid_for_uri?(URI('http://example.com/dir2/test.html'))
+    assert_equal false, cookie.valid_for_uri?(URI('file:///dir2/test.html'))
 
     cookie = HTTP::Cookie.parse('a=b', :origin => URI('https://example.com/')).first
     assert_equal true,  cookie.valid_for_uri?(URI('https://example.com'))
+    assert_equal false, cookie.valid_for_uri?(URI('file:///'))
   end
 
   def test_migration

data/test/test_http_cookie_jar.rb

@@ -270,6 +270,16 @@ class TestHTTPCookieJar < Test::Unit::TestCase
     assert_equal(0, @jar.cookies(url).length)
   end
 
+  def test_cookies_no_host
+    url = URI 'file:///path/'
+
+    assert_raises(ArgumentError) {
+      @jar.add(HTTP::Cookie.new(cookie_values(:origin => url)))
+    }
+
+    assert_equal(0, @jar.cookies(url).length)
+  end
+
   def test_clear
     url = URI 'http://rubyforge.org/'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-cookie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: