sjs/http-cookie
1
0
Fork 0
mirror of https://github.com/samsonjs/http-cookie.git synced 2026-03-25 08:55:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add 1.8 compatibility

Browse source
This commit is contained in:
Akinori MUSHA 2016-12-09 21:38:35 +09:00
parent 27a9027102
commit 56e0fd5175
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/http/cookie_jar/mozilla_store.rb
View file

@ -92,7 +92,7 @@ class HTTP::CookieJar
def initialize(options = nil)
super
@origin_attributes = URI.encode_www_form({}.tap { |params|
@origin_attributes = encode_www_form({}.tap { |params|
params['appId'] = @app_id if @app_id.nonzero?
params['inBrowserElement'] = 1 if @in_browser_element
})
@ -302,7 +302,7 @@ class HTTP::CookieJar
params = {}
params['appId'] = appId if appId.nonzero?
params['inBrowserElement'] = inBrowserElement if inBrowserElement.nonzero?
func.result = URI.encode_www_form(params)
func.result = encode_www_form(params)
}
@db.execute(<<-'SQL')
INSERT INTO moz_cookies
@ -319,20 +319,10 @@ class HTTP::CookieJar
@db.execute("ALTER TABLE moz_cookies ADD appId INTEGER DEFAULT 0")
@db.execute("ALTER TABLE moz_cookies ADD inBrowserElement INTEGER DEFAULT 0")
@db.create_function('SET_APP_ID', 1) { |func, originAttributes|
func.result =
if pair = URI.decode_www_form(originAttributes).assoc('appId')
pair.last.to_i
else
0
end
func.result = get_query_param(originAttributes, 'appId').to_i # nil.to_i == 0
}
@db.create_function('SET_IN_BROWSER', 1) { |func, originAttributes|
func.result =
if pair = URI.decode_www_form(originAttributes).assoc('inBrowserElement')
pair.last.to_i
else
0
end
func.result = get_query_param(originAttributes, 'inBrowserElement').to_i # nil.to_i == 0
}
@db.execute(<<-'SQL')
UPDATE moz_cookies SET appId = SET_APP_ID(originAttributes),
@ -399,6 +389,28 @@ class HTTP::CookieJar
self
end
if RUBY_VERSION >= '1.9'
def encode_www_form(enum)
URI.encode_www_form(enum)
end
def get_query_param(str, key)
URI.decode_www_form(str).find { |k, v|
break v if k == key
}
end
else
require 'cgi'
def encode_www_form(enum)
enum.map { |k, v| "#{CGI.escape(k)}=#{CGI.escape(v)}" }.join('&')
end
def get_query_param(str, key)
CGI.parse(str)[key].first
end
end
public
def add(cookie)