socialmux 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa22bc43651260b9bf9d759aa142da59a9fa4fd1
-  data.tar.gz: 754b6ce65db9e047bee072c3bb8ee7bf25e80692
+  metadata.gz: 273722f73520c74ccc345efd72915f9253d47906
+  data.tar.gz: da7149b36435bf62be3efc98e10339acb118b5d5
 SHA512:
-  metadata.gz: 9e1577953efccd53c0c0122168b226710ca7b179a0c988d9bac85d3ffa87ebc9d936f9f58e7350042a509da824c391e510bb508e94b4b3c268c9aaa0ead9b06a
-  data.tar.gz: 68c73b80c685a3b2a3e7d0fac80f43c726d78dea0bbed58d5d4a8b7cab80006dd4f55934b6dc9fed80977488a41ff98e356168267a0a32704fb92efce1f1710b
+  metadata.gz: 160acc3f4ca22bb8a51dc217988604ea13ff69f52c9c9cdd0c18b8be9c93be3885882eab8ea38b531b85fe930a78dbe1f20b25c2731b88eb0f7df5afbd939aed
+  data.tar.gz: da5563c484b3b3b20b48700690903140904bfd792d1cc936ad1b80d9b5d2083767c180b197cc14c9671d9ed3d68f4ce9de6ff2b638a36966c99cf8e8330c7164

data/lib/socialmux/event.rb

@@ -4,9 +4,16 @@ module Socialmux
     SIGN_UP = :sign_up
     TOUCHED_CURRENT_USER = :updated_current_user
     TOUCHED_EMAIL_USER = :updated_email_user
+    AUTHENTICATION_ALREADY_TAKEN = :authentication_already_taken
 
     def self.all
-      [ SIGN_IN, SIGN_UP, TOUCHED_CURRENT_USER, TOUCHED_EMAIL_USER ]
+      [
+        SIGN_IN,
+        SIGN_UP,
+        TOUCHED_CURRENT_USER,
+        TOUCHED_EMAIL_USER,
+        AUTHENTICATION_ALREADY_TAKEN
+      ]
     end
   end
 end

data/lib/socialmux/strategy.rb

@@ -20,6 +20,7 @@ module Socialmux
     end
 
     def result
+      authentication_already_taken ||
       returning_user ||
       augmented_current_user ||
       augmented_user_with_same_email ||
@@ -32,6 +33,13 @@ module Socialmux
 
     private
 
+    def authentication_already_taken
+      user = adapter.find_user_with_authentication(data)
+      if current_user && user && current_user != user
+        Result.new(nil, Event::AUTHENTICATION_ALREADY_TAKEN)
+      end
+    end
+
     def returning_user
       user = adapter.find_user_with_authentication(data)
       Result.new(user, Event::SIGN_IN) if user

data/lib/socialmux/version.rb

@@ -1,4 +1,4 @@
 module Socialmux
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 

data/spec/lib/strategy_spec.rb

@@ -30,7 +30,21 @@ module Socialmux
         strategy.stubs(:augment_user)
       end
 
+      context 'previous authentication is found, but linked to a user different than the one currently signed in' do
+        let(:current_user) { user }
+        let(:another_user) { stub('User') }
+
+        before do
+          adapter.stubs(:find_user_with_authentication).with(mapper).returns(another_user)
+        end
+
+        its(:user) { should be_nil }
+        its(:event) { should eq Event::AUTHENTICATION_ALREADY_TAKEN }
+      end
+
       context "previous authentication is found" do
+        let(:current_user) { nil }
+
         before do
           adapter.stubs(:find_user_with_authentication).with(mapper).returns(user)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socialmux
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler