userbin 1.6.0 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a838f3a5b083d7baf4689189e9937242ee900f35
4
- data.tar.gz: 43613aa2135886c221fd39fc2753cd9aed44e8fb
3
+ metadata.gz: 9c4187739931daad2ab4737e663b9d048ab3728d
4
+ data.tar.gz: 0e22aae813008c87dce6625c8735ca819358cb1f
5
5
  SHA512:
6
- metadata.gz: 64882804d2c11cc349d85e92fcbde230106bdb40e75099f94cf33b67ad47904ec587094dc98b18b656b326230e981c535248ed7256f1c1af10c903911efd7e0e
7
- data.tar.gz: 89dcec756ea9f6856894071b1eae52f8017e48db7e6efb8484115d76cdf6bcd5e9eb0a12873137710a34e0fef44f242de67b702a4e0cfbf1cc760d1fb6029c31
6
+ metadata.gz: 3938f98100098d8b5b8f0048addfbbc89fc8204e4e68c83c57f8546565e63dfb84bf67cd2bd3f9cfa039d14d0adf5b809c66bcc7e5609025a441bd8172f9dccc
7
+ data.tar.gz: 046433d4a20b1a5c18fe719d4ada56b4d46dce15a0bcbc8610f22c6292e46f656141b4e1cab99876f7f9257b5b1405289beace703a3e0cf66a16ae43dea661cf
@@ -22,7 +22,12 @@ module Userbin
22
22
  # middleware in request.rb can access it
23
23
  RequestStore.store[:userbin] = self
24
24
 
25
- cookies = Userbin::CookieStore.new(request, response)
25
+ if response.class.name == 'ActionDispatch::Cookies::CookieJar'
26
+ cookies = Userbin::CookieStore::Rack.new(response)
27
+ else
28
+ cookies = Userbin::CookieStore::Base.new(request, response)
29
+ end
30
+
26
31
  @store = Userbin::TokenStore.new(cookies)
27
32
 
28
33
  @request_context = {
@@ -1,23 +1,48 @@
1
1
  module Userbin
2
- class CookieStore
3
- def initialize(request, response)
4
- @request = request
5
- @response = response
6
- end
2
+ module CookieStore
3
+ class Base
4
+ def initialize(request, response)
5
+ @request = request
6
+ @response = response
7
+ end
7
8
 
8
- def [](key)
9
- @request.cookies[key]
9
+ def [](key)
10
+ @request.cookies[key]
11
+ end
12
+
13
+ def []=(key, value)
14
+ @request.cookies[key] = value
15
+ if value
16
+ @response.set_cookie(key, value: value,
17
+ expires: Time.now + (20 * 365 * 24 * 60 * 60),
18
+ path: '/')
19
+ else
20
+ @response.delete_cookie(key)
21
+ end
22
+ end
10
23
  end
11
24
 
12
- def []=(key, value)
13
- @request.cookies[key] = value
14
- if value
15
- @response.set_cookie(key, value: value,
16
- expires: Time.now + (365 * 24 * 60 * 60),
17
- path: '/')
18
- else
19
- @response.delete_cookie(key)
25
+ class Rack
26
+ def initialize(cookies)
27
+ @cookies = cookies
28
+ end
29
+
30
+ def [](key)
31
+ @cookies[key]
32
+ end
33
+
34
+ def []=(key, value)
35
+ if value
36
+ @cookies[key] = {
37
+ value: value,
38
+ expires: Time.now + (20 * 365 * 24 * 60 * 60),
39
+ path: '/'
40
+ }
41
+ else
42
+ @cookies.delete(key)
43
+ end
20
44
  end
21
45
  end
46
+
22
47
  end
23
48
  end
@@ -1,7 +1,7 @@
1
1
  module Userbin
2
2
  module UserbinClient
3
3
  def userbin
4
- @userbin ||= Userbin::Client.new(request, response)
4
+ @userbin ||= env['userbin'] || Userbin::Client.new(request, response)
5
5
  end
6
6
  end
7
7
 
@@ -1,3 +1,3 @@
1
1
  module Userbin
2
- VERSION = "1.6.0"
2
+ VERSION = "1.6.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: userbin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
4
+ version: 1.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Johan