uber_login 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmY5ZDRiZGZiNmViZTAyNzQwNDRjYWFlMjQyNjA4MzkxZjYyYjc0YQ==
+    ZGRhZTQ5MjJjMDllYzc1NWIyZGVlZDA5MzczZmMwYjA2YjJkMGZhNw==
   data.tar.gz: !binary |-
-    Y2Y0ZWEyMzhmZWQwMzQ2ZGIxY2MzZWFlMWY5YTgzZTIyMDc2YzNkMA==
+    MTdjMjU4OTM5ZGM2ZWE0NGFiZjcwZTU1ZGY0MGFjYzYzMGUxZDM4OA==
 SHA512:
   metadata.gz: !binary |-
-    YzQ3ZWFlMmNhNGIzZmY0N2M4ZmI2NzY2Yzk3NDg5ZmUyNGI0MzY1YjUyZjI4
-    NThhMjM3ZDI0ZTkyY2Q0ZDEzZmZhYjA0MzY3NTg4OGU2YzM3NDc4ZjMxNTJi
-    YjgwZTI3YWQ0Y2UzMDc4ZTNiMDYwM2Y2ZjBmNDYzNjA5NDYxNzQ=
+    ZmUxY2NmOWZkMTYwNDAxZjYyMzEwMTkxMzgwZmQ2MGZlMzNjZTNlMDhhYzJh
+    MDE0NTAzMjlkZGE5MjIwMzdjODJlMGRlMGQxNGYzN2Y2Yjk1NWY4ZjY0YTcw
+    ODNjZmVjYzVkNDAxMGE3ZDE0YWRlZGJlMDcyYWI5ZjU4MWU3M2M=
   data.tar.gz: !binary |-
-    MzBlM2Y3ZTMzYjcwYmQ5YjgwZjExOGVjODA4NjFlYjU3MWE4MDcyNDNiOTU3
-    ZTNmYTI2YWY4MjIyNTdhYWNlYThiZTk4MjI1MjYwNTU1YmIzNDZlMWVkYzli
-    OWJjODFjMDUxZWFmM2EyYjIxMDJiZDA1ZDkwNmJiNjNhMzc3ZTM=
+    YjU3MjE4MzkzNGI0NmM3N2FlNjcwN2QxNTJjYmJhODQ2NGQwMDgyN2ExMWEy
+    YTI1NWNmNjljYjNiM2QxYTBlMDk4NmRmZjJkZTZhZTUzZmRjZWY2MjM2OWQ3
+    NDJjNWY4YmZkYzM1MTI2ZWZlYjhkMTQ0MjdjMmQwODBkNDA0YWE=

data/lib/uber_login/version.rb

@@ -1,3 +1,3 @@
 module UberLogin
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/uber_login.rb

@@ -13,6 +13,7 @@ module UberLogin
 
   included do
     define_callbacks :login, :logout
+    @login_from_cookies = nil
   end
 
   ##
@@ -41,6 +42,7 @@ module UberLogin
   # If strong sessions are enabled session[+:ulogin+] is set to the same value that cookies[+:ulogin+] would have
   def login(user, remember = false)
     logout_all unless UberLogin.configuration.allow_multiple_login
+    @login_from_cookies = false
 
     run_callbacks :login do
       if strong_sessions or remember
@@ -80,6 +82,10 @@ module UberLogin
     cookie_manager.clear
   end
 
+  def login_from_cookies?
+    @login_from_cookies
+  end
+
   def persistent_login?
     cookie_manager.valid?
   end
@@ -108,6 +114,8 @@ module UberLogin
   # Attempts a login from the +:uid+ and +:ulogin+ cookies.
   def login_from_cookies
     if persistent_login?
+      @login_from_cookies = true
+
       run_callbacks :login do
         reset_session
         session[:uid] = cookies[:uid]

data/spec/uber_login_spec.rb

@@ -317,4 +317,51 @@ describe UberLogin do
       end
     end
   end
+
+  describe '#login_from_cookies?' do
+    context 'cookies are not set' do
+      context 'session is not set' do
+        context 'after a login' do
+          it 'be false' do
+            controller.login(user)
+            expect(controller.login_from_cookies?).to be_false
+          end
+        end
+
+        context 'other pages' do
+          it 'is nil' do
+            expect(controller.login_from_cookies?).to be_nil
+          end
+        end
+      end
+    end
+
+    context 'cookies[:uid] and cookies[:ulogin] are set' do
+      before {
+        cookies[:uid] = "100"
+        cookies[:ulogin] = "whatever:beef"
+        session[:uid] = nil
+      }
+
+      context 'the cookies are valid' do
+        before { UberLogin::CookieManager.any_instance.stub(:valid?).and_return true }
+
+        context 'on cookie login' do
+          it 'is true' do
+            controller.current_user
+            expect(controller.login_from_cookies?).to be_true
+          end
+        end
+      end
+
+      context 'the cookies are not valid' do
+        before { UberLogin::CookieManager.any_instance.stub(:valid?).and_return false }
+
+        it 'is nil' do
+          controller.current_user
+          expect(controller.login_from_cookies?).to be_nil
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uber_login
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Francesco Boffa