simple_mobile_oauth 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dae4e339a5e998c95f6bfda287c99be2bdc272f
-  data.tar.gz: 38995f7cd9263b72f4598a966fb277c42813011e
+  metadata.gz: 186a40edb7005d3736a7ccbfe597b115a349feca
+  data.tar.gz: cae2e253cb2032529efa4bcfb82127133b06239e
 SHA512:
-  metadata.gz: 2e7f1c8907463723201d6b04445a5833e6a8f1ec214fe4d87efee3f2e734478e6d37cc5af44ba4d1a09889b6ee3656de2806b6c6afbf35eafff0764354e7586f
-  data.tar.gz: 4e15731713037c23788d34ba32fdd9b9cbc402d40b50af5671248ad6cdfe699385adc350da48e1ef85622372b97fa6ccbddd6f7ff6098c62df1c4428ea12333f
+  metadata.gz: 2441e0114f7a625a63c9c7baa3dd21bd4d9eac1dd76f2211337122383630d1f477bda0f4965bd9235fae971b4c9b5c4af8ee51622739f0e192a753dbd016ef3b
+  data.tar.gz: 0e4f3b0e9aadefedbc445e30e75ce795ac9e028e115d28bdcbd56680cc95c075176785d7ff4e2b6101ad31b8c4a7664a09de344316b951b218ba3bf2fa7e08c3

data/lib/simple_mobile_oauth/authenticator.rb

@@ -90,33 +90,33 @@ module SimpleMobileOauth
         user = _find_user_strategy(user_params)
         raise InvalidParamsError, 'could not find user from params given' unless user
         raise IdentityAlreadyBoundError, 'oauth identity exists with another user' \
-        if identity_already_bound_to_different_user?(identity_owner, user)
+          if identity_already_bound_to_different_user?(identity_owner, user)
 
           # So the identity owner and user found from param match
-          user
-        else
-          raise InvalidParamsError, 'missing user params' unless user_params
+        user
+      else
+        raise InvalidParamsError, 'missing user params' unless user_params
 
-          user = _find_user_strategy(user_params) || _build_user_strategy(user_params)
+        user = _find_user_strategy(user_params) || _build_user_strategy(user_params)
 
-          user.identities.build(identity_params)
-          user.save
-          user
-        end
+        user.identities.build(identity_params)
+        user.save
+        user
       end
+    end
 
-      private
+    private
 
-      def login_request?(identity_owner, user_params)
-        identity_owner && !user_params
-      end
+    def login_request?(identity_owner, user_params)
+      identity_owner && !user_params
+    end
 
-      def identity_already_bound_to_different_user?(identity_owner, user)
-        identity_owner && user && identity_owner != user
-      end
+    def identity_already_bound_to_different_user?(identity_owner, user)
+      identity_owner && user && identity_owner != user
+    end
 
-      def start_of_registration_process?(identity, user_params)
-        !identity && !user_params
-      end
+    def start_of_registration_process?(identity, user_params)
+      !identity && !user_params
     end
   end
+end

data/lib/simple_mobile_oauth/identifiable.rb

@@ -5,19 +5,5 @@ module SimpleMobileOauth
     included do
       has_many :identities, as: :identifiable
     end
-
-    def username
-      current_identity_info.try(:fetch, "nickname", "")
-    end
-
-    def avatar_url
-      current_identity_info.try(:fetch, "image", "")
-    end
-
-    private
-
-    def current_identity_info
-      identities.first.try(:info)
-    end
   end
 end

data/lib/simple_mobile_oauth/version.rb

@@ -1,3 +1,3 @@
 module SimpleMobileOauth
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/dummy/log/test.log

@@ -59,3 +59,39 @@ UserTest: test_has_many_identities
   SQL (1.0ms)  INSERT INTO "identities" ("created_at", "identifiable_id", "identifiable_type", "info", "provider", "uid", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", "2014-12-16 00:47:50.174806"], ["identifiable_id", 1], ["identifiable_type", "User"], ["info", "null"], ["provider", "provider"], ["uid", "abc"], ["updated_at", "2014-12-16 00:47:50.174806"]]
    (0.1ms)  RELEASE SAVEPOINT active_record_1
    (0.8ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+----------------------------------
+UserTest: test_creates_an_identity
+----------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (10.1ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2014-12-27 03:53:45.375459"], ["updated_at", "2014-12-27 03:53:45.375459"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  Identity Exists (0.4ms)  SELECT  1 AS one FROM "identities"  WHERE ("identities"."uid" = 'abc' AND "identities"."provider" = 'provider' AND "identities"."identifiable_type" = 'User') LIMIT 1
+  SQL (1.1ms)  INSERT INTO "identities" ("created_at", "identifiable_id", "identifiable_type", "info", "provider", "uid", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", "2014-12-27 03:53:45.499147"], ["identifiable_id", 1], ["identifiable_type", "User"], ["info", "null"], ["provider", "provider"], ["uid", "abc"], ["updated_at", "2014-12-27 03:53:45.499147"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (13.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------
+SimpleMobileOauthTest: test_truth
+---------------------------------
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+----------------------------------
+UserTest: test_creates_an_identity
+----------------------------------
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2014-12-27 03:54:33.860344"], ["updated_at", "2014-12-27 03:54:33.860344"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  Identity Exists (0.2ms)  SELECT  1 AS one FROM "identities"  WHERE ("identities"."uid" = 'abc' AND "identities"."provider" = 'provider' AND "identities"."identifiable_type" = 'User') LIMIT 1
+  SQL (1.5ms)  INSERT INTO "identities" ("created_at", "identifiable_id", "identifiable_type", "info", "provider", "uid", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["created_at", "2014-12-27 03:54:33.914630"], ["identifiable_id", 1], ["identifiable_type", "User"], ["info", "null"], ["provider", "provider"], ["uid", "abc"], ["updated_at", "2014-12-27 03:54:33.914630"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (18.7ms)  rollback transaction
+   (0.1ms)  begin transaction
+---------------------------------
+SimpleMobileOauthTest: test_truth
+---------------------------------
+   (0.1ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_mobile_oauth
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Lin He
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails