userbin 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a838f3a5b083d7baf4689189e9937242ee900f35
-  data.tar.gz: 43613aa2135886c221fd39fc2753cd9aed44e8fb
+  metadata.gz: 9c4187739931daad2ab4737e663b9d048ab3728d
+  data.tar.gz: 0e22aae813008c87dce6625c8735ca819358cb1f
 SHA512:
-  metadata.gz: 64882804d2c11cc349d85e92fcbde230106bdb40e75099f94cf33b67ad47904ec587094dc98b18b656b326230e981c535248ed7256f1c1af10c903911efd7e0e
-  data.tar.gz: 89dcec756ea9f6856894071b1eae52f8017e48db7e6efb8484115d76cdf6bcd5e9eb0a12873137710a34e0fef44f242de67b702a4e0cfbf1cc760d1fb6029c31
+  metadata.gz: 3938f98100098d8b5b8f0048addfbbc89fc8204e4e68c83c57f8546565e63dfb84bf67cd2bd3f9cfa039d14d0adf5b809c66bcc7e5609025a441bd8172f9dccc
+  data.tar.gz: 046433d4a20b1a5c18fe719d4ada56b4d46dce15a0bcbc8610f22c6292e46f656141b4e1cab99876f7f9257b5b1405289beace703a3e0cf66a16ae43dea661cf

data/lib/userbin/client.rb

@@ -22,7 +22,12 @@ module Userbin
       # middleware in request.rb can access it
       RequestStore.store[:userbin] = self
 
-      cookies = Userbin::CookieStore.new(request, response)
+      if response.class.name == 'ActionDispatch::Cookies::CookieJar'
+        cookies = Userbin::CookieStore::Rack.new(response)
+      else
+        cookies = Userbin::CookieStore::Base.new(request, response)
+      end
+
       @store = Userbin::TokenStore.new(cookies)
 
       @request_context = {

data/lib/userbin/support/cookie_store.rb

@@ -1,23 +1,48 @@
 module Userbin
-  class CookieStore
-    def initialize(request, response)
-      @request = request
-      @response = response
-    end
+  module CookieStore
+    class Base
+      def initialize(request, response)
+        @request = request
+        @response = response
+      end
 
-    def [](key)
-      @request.cookies[key]
+      def [](key)
+        @request.cookies[key]
+      end
+
+      def []=(key, value)
+        @request.cookies[key] = value
+        if value
+          @response.set_cookie(key, value: value,
+                                    expires: Time.now + (20 * 365 * 24 * 60 * 60),
+                                    path: '/')
+        else
+          @response.delete_cookie(key)
+        end
+      end
     end
 
-    def []=(key, value)
-      @request.cookies[key] = value
-      if value
-        @response.set_cookie(key, value: value,
-                                  expires: Time.now + (365 * 24 * 60 * 60),
-                                  path: '/')
-      else
-        @response.delete_cookie(key)
+    class Rack
+      def initialize(cookies)
+        @cookies = cookies
+      end
+
+      def [](key)
+        @cookies[key]
+      end
+
+      def []=(key, value)
+        if value
+          @cookies[key] = {
+            value: value,
+            expires: Time.now + (20 * 365 * 24 * 60 * 60),
+            path: '/'
+          }
+        else
+          @cookies.delete(key)
+        end
       end
     end
+
   end
 end

data/lib/userbin/support/rails.rb

@@ -1,7 +1,7 @@
 module Userbin
   module UserbinClient
     def userbin
-      @userbin ||= Userbin::Client.new(request, response)
+      @userbin ||= env['userbin'] || Userbin::Client.new(request, response)
     end
   end
 

data/lib/userbin/version.rb

@@ -1,3 +1,3 @@
 module Userbin
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: userbin
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Johan