simple_token_authentication 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc9c3c84827bba7367ebae956b4570eeb08c121c
-  data.tar.gz: 59f9d3ef5ebdd6293a72d5fe1d0032a3154b1ece
+  metadata.gz: 545e7e240740cd272bcb2a7be4dbd76caf150f53
+  data.tar.gz: cd43f4c512387a046aa9d289c94fa71b407b662e
 SHA512:
-  metadata.gz: 80c26958d4e2bea406c1d383aa4d1bdc3272f8bb51b988130927bc8a8b1853279ccb92757a0956b491e85cdbfdd4771f78d6331c8b097f949b31cf6894cc9249
-  data.tar.gz: acb6c207ac94633f6ee5df3355768cd153c012566d8045af01bc4d1a9d7ad625d33208d926c04b279320834988cd7948730fdce07ce760cdfb56fa2a832c5e0b
+  metadata.gz: bd62a1b560a22a3df914fad7277f7bed251fad0a8ae897b6606dd860b1ea6043f3a5eb509df7ed564463907a44b9c952a149f0431e3db30052f0cce8b930b579
+  data.tar.gz: 55b2d9b3f649b0969a86d10bfad2539e0ae138243930114488af9e24cb0c757d4c2296721c735469310ec1d4334a66ecb09a49b0dc6fb6dd83ae75292c65a17a

data/lib/simple_token_authentication/token_authentication_handler.rb

@@ -59,8 +59,7 @@ module SimpleTokenAuthentication
 
       # The finder method should be compatible with all the model adapters,
       # namely ActiveRecord and Mongoid in all their supported versions.
-      record = nil
-      record = identifier_param_value && entity.model.where(entity.identifier => identifier_param_value).first
+      identifier_param_value && entity.model.find_for_authentication(entity.identifier => identifier_param_value)
     end
 
     # Private: Take benefit from Devise case-insensitive keys

data/lib/simple_token_authentication/version.rb

@@ -1,3 +1,3 @@
 module SimpleTokenAuthentication
-  VERSION = "1.10.1"
+  VERSION = "1.11.0"
 end

data/spec/configuration/header_names_option_spec.rb

@@ -24,14 +24,14 @@ describe 'Simple Token Authentication' do
         # given one *c*orrect record (which is supposed to get signed in)
         @charles_record = double()
         [user, admin].each do |model|
-          allow(model).to receive(:where).with(email: 'charles@example.com').and_return([@charles_record])
+          allow(model).to receive(:find_for_authentication).with(email: 'charles@example.com').and_return(@charles_record)
         end
         allow(@charles_record).to receive(:authentication_token).and_return('ch4rlEs_toKeN')
 
         # and one *w*rong record (which should not be signed in)
         @waldo_record = double()
         [user, admin].each do |model|
-          allow(model).to receive(:where).with(email: 'waldo@example.com').and_return([@waldo_record])
+          allow(model).to receive(:find_for_authentication).with(email: 'waldo@example.com').and_return(@waldo_record)
         end
         allow(@waldo_record).to receive(:authentication_token).and_return('w4LdO_toKeN')
 
@@ -401,12 +401,12 @@ describe 'Simple Token Authentication' do
 
       # given one *c*orrect record (which is supposed to get signed in)
       @charles_record = double()
-      allow(user).to receive(:where).with(email: 'charles@example.com').and_return([@charles_record])
+      allow(user).to receive(:find_for_authentication).with(email: 'charles@example.com').and_return(@charles_record)
       allow(@charles_record).to receive(:authentication_token).and_return('ch4rlEs_toKeN')
 
       # and one *w*rong record (which should not be signed in)
       @waldo_record = double()
-      allow(user).to receive(:where).with(email: 'waldo@example.com').and_return([@waldo_record])
+      allow(user).to receive(:find_for_authentication).with(email: 'waldo@example.com').and_return(@waldo_record)
       allow(@waldo_record).to receive(:authentication_token).and_return('w4LdO_toKeN')
 
       # given a controller class which acts as token authentication handler

data/spec/lib/simple_token_authentication/token_authentication_handler_spec.rb

@@ -213,8 +213,9 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
         it 'returns the proper record if any' do
           # let's say there is a record
           record = double()
-          allow(@entity).to receive_message_chain(:model, :where).with(email: 'alice@example.com')
-          .and_return([record])
+          allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+          .with(email: 'alice@example.com')
+          .and_return(record)
 
           expect(subject.new.send(:find_record_from_identifier, @entity)).to eq record
         end
@@ -231,11 +232,13 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
           # let's say there is a record...
           record = double()
           # ...whose identifier is downcased...
-          allow(@entity).to receive_message_chain(:model, :where).with(email: 'alice@example.com')
-          .and_return([record])
+          allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+          .with(email: 'alice@example.com')
+          .and_return(record)
           # ...not upcased
-          allow(@entity).to receive_message_chain(:model, :where).with(email: 'AliCe@ExampLe.Com')
-          .and_return([])
+          allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+          .with(email: 'AliCe@ExampLe.Com')
+          .and_return(nil)
 
           expect(subject.new.send(:find_record_from_identifier, @entity)).to be_nil
         end
@@ -259,8 +262,9 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
         it 'returns the proper record if any' do
           # let's say there is a record
           record = double()
-          allow(@entity).to receive_message_chain(:model, :where).with(email: 'alice@example.com')
-          .and_return([record])
+          allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+          .with(email: 'alice@example.com')
+          .and_return(record)
 
           expect(subject.new.send(:find_record_from_identifier, @entity)).to eq record
         end
@@ -277,12 +281,13 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
           # let's say there is a record...
           record = double()
           # ...whose identifier is downcased...
-          allow(@entity).to receive_message_chain(:model, :where)
-          allow(@entity).to receive_message_chain(:model, :where).with(email: 'alice@example.com')
-          .and_return([record])
+          allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+          allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+          .with(email: 'alice@example.com')
+          .and_return(record)
           # ...not upcased
-          allow(@entity).to receive_message_chain(:model, :where).with(email: 'AliCe@ExampLe.Com')
-          .and_return([])
+          allow(@entity).to receive_message_chain(:model, :find_for_authentication).with(email: 'AliCe@ExampLe.Com')
+          .and_return(nil)
 
           expect(subject.new.send(:find_record_from_identifier, @entity)).to eq record
         end
@@ -312,8 +317,9 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
           it 'returns the proper record if any' do
             # let's say there is a record
             record = double()
-            allow(@entity).to receive_message_chain(:model, :where).with(phone_number: 'alice@example.com')
-            .and_return([record])
+            allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+            .with(phone_number: 'alice@example.com')
+            .and_return(record)
 
             expect(subject.new.send(:find_record_from_identifier, @entity)).to eq record
           end
@@ -330,11 +336,13 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
             # let's say there is a record...
             record = double()
             # ...whose identifier is downcased...
-            allow(@entity).to receive_message_chain(:model, :where).with(phone_number: 'alice@example.com')
-            .and_return([record])
+            allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+            .with(phone_number: 'alice@example.com')
+            .and_return(record)
             # ...not upcased
-            allow(@entity).to receive_message_chain(:model, :where).with(phone_number: 'AliCe@ExampLe.Com')
-            .and_return([])
+            allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+            .with(phone_number: 'AliCe@ExampLe.Com')
+            .and_return(nil)
 
             expect(subject.new.send(:find_record_from_identifier, @entity)).to be_nil
           end
@@ -358,8 +366,9 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
           it 'returns the proper record if any' do
             # let's say there is a record
             record = double()
-            allow(@entity).to receive_message_chain(:model, :where).with(phone_number: 'alice@example.com')
-            .and_return([record])
+            allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+            .with(phone_number: 'alice@example.com')
+            .and_return(record)
 
             expect(subject.new.send(:find_record_from_identifier, @entity)).to eq record
           end
@@ -376,12 +385,14 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
             # let's say there is a record...
             record = double()
             # ...whose identifier is downcased...
-            allow(@entity).to receive_message_chain(:model, :where)
-            allow(@entity).to receive_message_chain(:model, :where).with(phone_number: 'alice@example.com')
-            .and_return([record])
+            allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+            allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+            .with(phone_number: 'alice@example.com')
+            .and_return(record)
             # ...not upcased
-            allow(@entity).to receive_message_chain(:model, :where).with(phone_number: 'AliCe@ExampLe.Com')
-            .and_return([])
+            allow(@entity).to receive_message_chain(:model, :find_for_authentication)
+            .with(phone_number: 'AliCe@ExampLe.Com')
+            .and_return(nil)
 
             expect(subject.new.send(:find_record_from_identifier, @entity)).to eq record
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_token_authentication
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Gonzalo Bulnes Guilpain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -132,6 +132,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: 
 email:
 - gon.bulnes@gmail.com
@@ -198,7 +212,7 @@ files:
 - spec/support/specs_for_token_authentication_handler_interface.rb
 homepage: https://github.com/gonzalo-bulnes/simple_token_authentication
 licenses:
-- GPLv3
+- GPL-3.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -216,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple (but safe) token authentication for Rails apps or API with Devise.