entrance 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf82540ddfb80125f36cddf53e15a05698265e8
-  data.tar.gz: 415d40e4ed22c1f347fc39a282b28660e7d8db0a
+  metadata.gz: 5996654ada4c04abee0bd9be2fb49379d060b094
+  data.tar.gz: c1055a74b922e5680f4788a63efa5f064318e8c6
 SHA512:
-  metadata.gz: b23bd98581d46bae8f2a7c54bf435087d9c6e08c38b7ff7b048bac53e65a3ebc4da896b8766c0414447f796925cf835e95b973b4399596d2befab114cb246187
-  data.tar.gz: ce5bb8842a41955623317e48646dcb6351765c3605124bcd345e646f49b1e0493d2b31a6e9fe20a1dfc5b184beaafcb90781c53fe19e89f5aa49ccfe0dfcebcb
+  metadata.gz: 7cf71af823d741af14300925be03be29759eda16a6e46c9e49fd248d7da8cccdd2485e1951265c91a71177f55bf50bea728ef10372a2e29be0de134ee3aa177c
+  data.tar.gz: eeb59011f0fb6b7edc0134eab2f15e507f5be29860138130fcc09a24490debdf19e06e9ca9020d6a3b221df25b322542b5e0cd234f91bf95d8a5fb04bd7d2ed8

data/lib/entrance/addons/omniauth.rb

@@ -92,11 +92,15 @@ module Entrance
       def log(str)
         logger.info(str) rescue nil
       end
-      
+
       def omniauth_params
         @omniauth_params
       end
 
+      def model
+        ::Entrance.model
+      end
+
       def valid_user?(user)
         if user.respond_to?(:can_login?) and !user.can_login?
          return false
@@ -112,14 +116,14 @@ module Entrance
       def find_user_with_username(username)
         query = {}
         query[::Entrance.fields.username] = username # .to_s.downcase.strip
-        scoped_model.where(query).first
+        model.where(query).first
       end
 
       def find_user_with_provider_and_uid(provider, uid)
         query = {}
         query[::Entrance.fields.auth_provider] = provider
         query[::Entrance.fields.auth_uid] = uid
-        scoped_model.where(query).first
+        model.where(query).first
       end
 
       def set_auth_credentials(user, provider, uid)
@@ -136,7 +140,7 @@ module Entrance
         data = {}
         data[::Entrance.fields.name] = name
         data[::Entrance.fields.username] = email
-        user = scoped_model.new(data)
+        user = model.new(data)
         set_auth_credentials(user, provider, uid)
 
         if user.valid?
@@ -151,7 +155,7 @@ module Entrance
       # does not check if user is banned or not (the /callback route does that)
       def auth_or_create(auth, params = {})
         @omniauth_params = params
-        
+
         provider, uid = auth['provider'], auth['uid']
         info = auth['info'] || {}
 

data/lib/entrance/version.rb

@@ -1,7 +1,7 @@
 module Entrance
   MAJOR = 0
   MINOR = 6
-  PATCH = 1
+  PATCH = 2
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: entrance
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Tomás Pollak