http-cookie 0.1.4 → 0.1.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c45ee093b1364bc1ce8c5c4120a4f4fae298a5e6
+  data.tar.gz: d007f3979523ad48a557281b99292d660a5d781b
+SHA512:
+  metadata.gz: 62257900f2b0e4ffad506bff326f11b724ebcb0f3495cdc156338188efc8db7c4bfb49d155ae43ea50889f5e0acb4059586f016a0c5fd84f659e58605b512d49
+  data.tar.gz: c3f9f8a5deafe3335063e8cf3b09d054da55d01729b47e7b55171e06585b8e270da021bcea1804132b0fabe855b90d3d21c2cc333913b7283c318167f799496b

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode

data/http-cookie.gemspec

@@ -25,5 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("domain_name", ["~> 0.5"])
   gem.add_development_dependency("bundler", [">= 1.2.0"])
   gem.add_development_dependency("test-unit", [">= 2.4.3"])
+  gem.add_development_dependency("rake", [">= 0.9.2.2"])
+  gem.add_development_dependency("rdoc", ["> 2.4.2"])
   gem.add_development_dependency("simplecov", [">= 0"])
 end

data/lib/http/cookie.rb

@@ -1,6 +1,6 @@
 require 'http/cookie/version'
 require 'time'
-require 'webrick/httputils'
+require 'uri'
 require 'domain_name'
 
 module HTTP
@@ -180,14 +180,14 @@ class HTTP::Cookie
       date ||= Time.now
 
       [].tap { |cookies|
-        set_cookie.split(/,(?=[^;,]*=)|,$/).each { |c|
+        # The expires attribute may include a comma in the value.
+        set_cookie.split(/,(?=[^;,]*=|\s*\z)/).each { |c|
           if c.bytesize > MAX_LENGTH
             logger.warn("Cookie definition too long: #{c}") if logger
             next
           end
 
-          cookie_elem = c.split(/;+/)
-          first_elem = cookie_elem.shift
+          first_elem, *cookie_elem = c.split(/;+/)
           first_elem.strip!
           key, value = first_elem.split(/\=/, 2)
 
@@ -202,7 +202,10 @@ class HTTP::Cookie
             pair.strip!
             key, value = pair.split(/=/, 2) #/)
             next unless key
-            value = WEBrick::HTTPUtils.dequote(value.strip) if value
+            case value # may be nil
+            when /\A"(.*)"\z/
+              value = $1.gsub(/\\(.)/, "\\1")
+            end
 
             case key.downcase
             when 'domain'

data/lib/http/cookie/version.rb

@@ -1,5 +1,5 @@
 module HTTP
   class Cookie
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/http/cookie_jar/cookiestxt_saver.rb

@@ -23,8 +23,8 @@ class HTTP::CookieJar::CookiestxtSaver < HTTP::CookieJar::AbstractSaver
 
   def default_options
     {
-      header: "# HTTP Cookie File",
-      linefeed: "\n",
+      :header => "# HTTP Cookie File",
+      :linefeed => "\n",
     }
   end
 

data/test/test_http_cookie.rb

@@ -48,10 +48,10 @@ class TestHTTPCookie < Test::Unit::TestCase
     dates.each do |date|
       cookie = "PREF=1; expires=#{date}"
       silently do
-        HTTP::Cookie.parse(cookie, :origin => url) { |c|
+        assert_equal 1, HTTP::Cookie.parse(cookie, :origin => url) { |c|
           assert c.expires, "Tried parsing: #{date}"
           assert_equal(true, c.expires < yesterday)
-        }
+        }.size
       end
     end
   end
@@ -61,10 +61,10 @@ class TestHTTPCookie < Test::Unit::TestCase
 
     uri = URI.parse 'http://example'
 
-    HTTP::Cookie.parse cookie_str, :origin => uri do |cookie|
+    assert_equal 1, HTTP::Cookie.parse(cookie_str, :origin => uri) { |cookie|
       assert_equal 'a', cookie.name
       assert_equal 'b', cookie.value
-    end
+    }.size
   end
 
   def test_parse_no_space
@@ -72,12 +72,12 @@ class TestHTTPCookie < Test::Unit::TestCase
 
     uri = URI.parse 'http://example'
 
-    HTTP::Cookie.parse cookie_str, :origin => uri do |cookie|
+    assert_equal 1, HTTP::Cookie.parse(cookie_str, :origin => uri) { |cookie|
       assert_equal 'foo',               cookie.name
       assert_equal 'bar',               cookie.value
       assert_equal '/',                 cookie.path
       assert_equal Time.at(1320539286), cookie.expires
-    end
+    }.size
   end
 
   def test_parse_too_long_cookie
@@ -95,63 +95,60 @@ class TestHTTPCookie < Test::Unit::TestCase
 
   def test_parse_quoted
     cookie_str =
-      "quoted=\"value\"; Expires=Sun, 06 Nov 2011 00:11:18 GMT; Path=/"
+      "quoted=\"value\"; Expires=Sun, 06 Nov 2011 00:11:18 GMT; Path=/; comment=\"comment is \\\"comment\\\"\""
 
     uri = URI.parse 'http://example'
 
-    HTTP::Cookie.parse cookie_str, :origin => uri do |cookie|
+    assert_equal 1, HTTP::Cookie.parse(cookie_str, :origin => uri) { |cookie|
       assert_equal 'quoted', cookie.name
       assert_equal '"value"', cookie.value
-    end
+      assert_equal 'comment is "comment"', cookie.comment
+    }.size
   end
 
   def test_parse_weird_cookie
     cookie = 'n/a, ASPSESSIONIDCSRRQDQR=FBLDGHPBNDJCPCGNCPAENELB; path=/'
     url = URI.parse('http://www.searchinnovation.com/')
-    HTTP::Cookie.parse(cookie, :origin => url) { |c|
+    assert_equal 1, HTTP::Cookie.parse(cookie, :origin => url) { |c|
       assert_equal('ASPSESSIONIDCSRRQDQR', c.name)
       assert_equal('FBLDGHPBNDJCPCGNCPAENELB', c.value)
-    }
+    }.size
   end
 
   def test_double_semicolon
     double_semi = 'WSIDC=WEST;; domain=.williams-sonoma.com; path=/'
     url = URI.parse('http://williams-sonoma.com/')
-    HTTP::Cookie.parse(double_semi, :origin => url) { |cookie|
+    assert_equal 1, HTTP::Cookie.parse(double_semi, :origin => url) { |cookie|
       assert_equal('WSIDC', cookie.name)
       assert_equal('WEST', cookie.value)
-    }
+    }.size
   end
 
   def test_parse_bad_version
     bad_cookie = 'PRETANET=TGIAqbFXtt; Name=/PRETANET; Path=/; Version=1.2; Content-type=text/html; Domain=192.168.6.196; expires=Friday, 13-November-2026  23:01:46 GMT;'
     url = URI.parse('http://localhost/')
-    HTTP::Cookie.parse(bad_cookie, :origin => url) { |cookie|
-      assert_nil(cookie.version)
-    }
+    assert_equal 0, HTTP::Cookie.parse(bad_cookie, :origin => url).size
   end
 
   def test_parse_bad_max_age
     bad_cookie = 'PRETANET=TGIAqbFXtt; Name=/PRETANET; Path=/; Max-Age=1.2; Content-type=text/html; Domain=192.168.6.196; expires=Friday, 13-November-2026  23:01:46 GMT;'
     url = URI.parse('http://localhost/')
-    HTTP::Cookie.parse(bad_cookie, :origin => url) { |cookie|
-      assert_nil(cookie.max_age)
-    }
+    assert_equal 0, HTTP::Cookie.parse(bad_cookie, :origin => url).size
   end
 
   def test_parse_date_fail
     url = URI.parse('http://localhost/')
 
-    dates = [ 
-              "20/06/95 21:07",
+    dates = [
+      "20/06/95 21:07",
     ]
 
     silently do
       dates.each do |date|
         cookie = "PREF=1; expires=#{date}"
-        HTTP::Cookie.parse(cookie, :origin => url) { |c|
+        assert_equal 1, HTTP::Cookie.parse(cookie, :origin => url) { |c|
           assert_equal(true, c.expires.nil?)
-        }
+        }.size
       end
     end
   end
@@ -626,4 +623,3 @@ class TestHTTPCookie < Test::Unit::TestCase
     }
   end
 end
-

data/test/test_http_cookie_jar.rb

@@ -1,4 +1,5 @@
 require File.expand_path('helper', File.dirname(__FILE__))
+require 'tmpdir'
 
 class TestHTTPCookieJar < Test::Unit::TestCase
   def setup
@@ -366,7 +367,7 @@ class TestHTTPCookieJar < Test::Unit::TestCase
 
     assert_equal(3, @jar.cookies(url).length)
 
-    Dir.tmpdir do |dir|
+    Dir.mktmpdir do |dir|
       @jar.save(File.join(dir, "cookies.txt"), :cookiestxt)
 
       jar = HTTP::CookieJar.new

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-cookie
 version: !ruby/object:Gem::Version
-  version: 0.1.4
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Akinori MUSHA
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domain_name
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,49 +30,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: 2.4.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby library to handle HTTP Cookies
@@ -89,6 +108,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,27 +129,26 @@ files:
 - test/test_http_cookie_jar.rb
 homepage: https://github.com/sparklemotion/http-cookie
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby library to handle HTTP Cookies
 test_files:
 - test/helper.rb