uber_login 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGZjMzFmM2JhZGY0ZmJlZGE5MWY5ODc0ZWY4OTE1MDI4MjdkMTc0OA==
+    MWU0YWFkMDg3NjA3MzFiM2QxN2Y3NmQzODBlOTFjMDIxZGY1YzliYg==
   data.tar.gz: !binary |-
-    MWQ3YTdhYzI1MzU2YTFlZjQxMjFhYzk4NjI2NTgyZDA5Y2E4MDVkNw==
+    ZGYxZmFmZjA0ZGEzOGIzY2RmODVmODczOWQ5OTc0MzlmYTM5NGQ4NQ==
 SHA512:
   metadata.gz: !binary |-
-    MmIyNGE2MzhkYmE3NmI1OTk5MWU0OTM2Y2RmYTI3NWYzNDI2YzUxNDNmNTQy
-    MmUxZTdhNjRiMDU0NmJjNDY5NjMxZGZlZWVkNTRmZDQwN2RjNGZmMWE5Mzcz
-    YzU2NGRkZGQ0NGI5MWVmNTUzM2RjOGFkNzFiYWQzOGFjNmExYWI=
+    Mzc4YWVjYzM0ZmQ5N2YyMDdlOWYxOTMzMjAwMDVlNmIwNzdiODk4YjRmNjQ4
+    ZDhhY2FmZjg1ZmIwZDA4MDQyNGVjMjExMTE1MGQxMDE3Zjg2ZTQ3NjllMzE4
+    OGJjMWEwMjhlZjM5ZjUzYWFhNDM1Y2NhOTM3ZDY5NjE4NzQ0ZGY=
   data.tar.gz: !binary |-
-    MWEyNzkzODc4ZGFiMGE3MDlkYTQyMWUxMDFjNTNhNTYwZWQyNTM0ODY5YzNk
-    ZTNhNjkxZDc3YmJmNGI2NTkxZDRmYTk1MTVmNmNlYmMwNzZlNzNmM2E2MjA1
-    MmE5MTQ4OWZlZDgxNDk1Njc0NzVmMjJlZTAwN2IwZTBhZTI0OTE=
+    Mjc0NGNiMGM4ZmU3ZTEzNjExOWQ2NGU4M2QyODExYTNhNGJkYzEwNWU2N2Yz
+    ZGZiMWY2ZWVjZTU0MDY5MTRiNzk2YWM0NzEzNTZlMWJiNTdhOWI2YjQ0ZWYx
+    YTA5YTc2NTFmYmJkZTAyMDJhNDU5ZTc5MDc3NGVlM2UzNTU4MTI=

data/lib/uber_login/version.rb

@@ -1,3 +1,3 @@
 module UberLogin
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/uber_login.rb

@@ -37,10 +37,14 @@ module UberLogin
   # Clears session[:uid]
   # If remember cookies were set they're cleared and the token is
   # removed from the database.
-  def logout
-    session.delete(:uid)
-    delete_from_database if cookies[:uid]
-    cookie_manager.clear
+  def logout(sequence = nil)
+    if sequence
+      delete_from_database(sequence)
+    else
+      session.delete(:uid)
+      delete_from_database if cookies[:uid]
+      cookie_manager.clear
+    end
   end
 
   ##
@@ -113,9 +117,10 @@ module UberLogin
   end
 
   ##
-  # Removes a LoginToken with +uid+ and +sequence+ taken from the cookies
-  def delete_from_database
-    sequence = cookie_manager.sequence
+  # Removes a LoginToken with current +uid+ and given +sequence+
+  # If +sequence+ is nil it is taken from the cookies.
+  def delete_from_database(sequence = nil)
+    sequence = sequence || cookie_manager.sequence
     token = LoginToken.find_by(uid: cookies[:uid], sequence: sequence)
     token.destroy
   end

data/spec/uber_login_spec.rb

@@ -47,29 +47,56 @@ describe UberLogin do
   end
 
   describe '#logout' do
-    it 'deletes session[:uid]' do
-      controller.login(user)
-      controller.logout
-      expect(session[:uid]).to be_nil
+    context 'sequence is nil' do
+      it 'deletes session[:uid]' do
+        controller.login(user)
+        controller.logout
+        expect(session[:uid]).to be_nil
+      end
+
+      context 'persistent login was made' do
+        before { controller.login(user, true) }
+
+        it 'deletes session[:uid]' do
+          controller.logout
+          expect(session[:uid]).to be_nil
+        end
+
+        it 'deletes login cookies' do
+          controller.logout
+          expect(cookies[:uid]).to be_nil
+          expect(cookies[:ulogin]).to be_nil
+        end
+
+        it 'deletes a LoginToken row' do
+          expect {
+            controller.logout
+          }.to change{ LoginToken.count }.by -1
+        end
+      end
     end
 
-    context 'persistent login was made' do
+    context 'sequence is not nil' do
       before { controller.login(user, true) }
 
-      it 'deletes session[:uid]' do
-        controller.logout
-        expect(session[:uid]).to be_nil
+      it 'does not clear session[:uid]' do
+        controller.logout('sequence')
+        expect(session[:uid]).to_not be_nil
       end
 
-      it 'deletes login cookies' do
-        controller.logout
-        expect(cookies[:uid]).to be_nil
-        expect(cookies[:ulogin]).to be_nil
+      it 'does not clear cookies[:uid]' do
+        controller.logout('sequence')
+        expect(cookies[:uid]).to_not be_nil
+      end
+
+      it 'does not clear cookies[:ulogin]' do
+        controller.logout('sequence')
+        expect(cookies[:ulogin]).to_not be_nil
       end
 
       it 'deletes a LoginToken row' do
         expect {
-          controller.logout
+          controller.logout('sequence')
         }.to change{ LoginToken.count }.by -1
       end
     end

metadata

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