From 10e9ca5c60a7be22d9159bc85404b392d497751d Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@idaemons.org>
Date: Thu, 14 Mar 2013 10:25:41 +0900
Subject: [PATCH] Add HTTP::Cookie#session? as an alias for #session.

---
 lib/http/cookie.rb       | 1 +
 lib/http/cookie_jar.rb   | 2 +-
 test/test_http_cookie.rb | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/http/cookie.rb b/lib/http/cookie.rb
index 79f830b..6f30477 100644
--- a/lib/http/cookie.rb
+++ b/lib/http/cookie.rb
@@ -340,6 +340,7 @@ class HTTP::Cookie
 
   alias secure? secure
   alias httponly? httponly
+  alias session? session
 
   def acceptable_from_uri?(uri)
     uri = URI(uri)
diff --git a/lib/http/cookie_jar.rb b/lib/http/cookie_jar.rb
index 0f68f4c..ad90623 100644
--- a/lib/http/cookie_jar.rb
+++ b/lib/http/cookie_jar.rb
@@ -175,7 +175,7 @@ class HTTP::CookieJar
     @jar.each do |domain, paths|
       paths.each do |path, hash|
         hash.delete_if { |cookie_name, cookie|
-          cookie.expired? or (session and cookie.session)
+          cookie.expired? || (session && cookie.session?)
         }
       end
     end
diff --git a/test/test_http_cookie.rb b/test/test_http_cookie.rb
index 42bdbf7..e1f7d18 100644
--- a/test/test_http_cookie.rb
+++ b/test/test_http_cookie.rb
@@ -212,7 +212,7 @@ class TestHTTPCookie < Test::Unit::TestCase
       'name=Akinori; max-age=',
     ].each { |str|
       cookie = HTTP::Cookie.parse(str, :origin => url).first
-      assert cookie.session, str
+      assert cookie.session?, str
     }
 
     [
@@ -220,7 +220,7 @@ class TestHTTPCookie < Test::Unit::TestCase
       'name=Akinori; max-age=3600',
     ].each { |str|
       cookie = HTTP::Cookie.parse(str, :origin => url).first
-      assert !cookie.session, str
+      assert !cookie.session?, str
     }
   end