simple_token_authentication 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b03d7c4181d9b49529232f123b1808777ae5ec90
-  data.tar.gz: 4353f4f11e3460fdcff2fcb347493a4f99aad30d
+  metadata.gz: 19bdc71bf599ca78fa43979491d19560223b0470
+  data.tar.gz: e27f8869c38ebfa7401e33106696cf235dc087d3
 SHA512:
-  metadata.gz: aa498468bc95566d8ca4617a224c46cff942c8a3b5aa1c017491ccf8acf2559b5658b4f1ca1b3ce0103c08078aa1cf7284f3f79f693e6c2b63753bc7f7688d38
-  data.tar.gz: d5daa1bd3f516d6be6fe97c78d9898f24c7ec6f22558d3c908db3690ef0e15be4c444ee990f0b14288849e0fd4ab780b5375db56844b897c24edf22ffd5841c9
+  metadata.gz: ffb75249d436ef31b3979e5e704f086d8d7b4bdf42459a6bd3744a9e6528123030172e0d2cee85edd60de380a0a9fccb2a537d1cf30904ff4f5138820e777173
+  data.tar.gz: aa3d0ec11b451b69a0e486783ef4dda9ca97322b2bf5e7521c3f5456b3ddb492855b5f011fb72c9e31adb2b9dd10ae5797285770e5afe0306c44cbd187639927

data/Appraisals

@@ -0,0 +1,10 @@
+appraise 'rails_4_devise_3' do
+  gem 'devise', '~> 3.2'
+end
+
+appraise 'ruby_1.9.3_rails_3.2' do
+  gem 'actionmailer', '>= 3.2.6', '< 4'
+  gem 'mime-types', '< 3'
+  gem 'tins', '< 1.7.0'
+end
+

data/CHANGELOG.md

@@ -0,0 +1,273 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.13.0] - 2016-04-20
+
+### Added
+
+- Support for Devise 4
+- This change log : )
+
+### Changed
+
+- The [Travis CI build matrix][matrix] to improve the regression testing coverage
+- The migration suggestion to make it safer - by @halilim
+
+  [matrix]: https://github.com/gonzalo-bulnes/simple_token_authentication/blob/v1.13.0/.travis.yml
+
+## [1.12.0] - 2016-01-06
+
+### Added
+
+- [Rails Metal][rails-metal] support, using the public adapter interface : ) - @singfoom
+
+  [rails-metal]: http://weblog.rubyonrails.org/2008/12/17/introducing-rails-metal
+
+## [1.11.0] - 2015-12-14
+
+### Added
+
+- Support for the [Devise custom finders][devise-custom-finders], _Simple Token Authentication_ now uses the customizable [`find_for_authentication`][find-for-authentication] method to retrieve records. - @lowjoel
+
+### Changed
+
+- The license identifier format to match the [SPDX][spdx] guidelines
+
+  [devise-custom-finders]: https://github.com/plataformatec/devise/wiki/How-To:-Allow-users-to-sign-in-using-their-username-or-email-address#tell-devise-to-use-username-in-the-authentication_keys
+  [find-for-authentication]: https://github.com/plataformatec/devise/blob/v3.2/lib/devise/models/authenticatable.rb#L222-L243
+  [spdx]: https://spdx.org/licenses
+
+## [1.10.1] - 2015-11-10
+
+### Added
+
+- The `NoAdapterAvailableError` now provides details about its cause and hints to solve it.
+- A **Testing** section to the [`README`][testing] - John Mosesman
+
+  [testing]: https://github.com/gonzalo-bulnes/simple_token_authentication/tree/v1.12.0#testing
+
+### Fixed
+
+- An unnecessary Ruby 2.0 requirement caused by an indirect dependency, let's keep backward compatibility as long as possible
+- A couple of typos - @eliotsykes and @jtperreault
+
+## [1.10.0] - 2015-06-03
+
+### Added
+
+- The **fallback** option, and support for the `fallback: :exception` which mimics the Devise behaviour when authentication fails
+
+### Changed
+
+- The **fallback_to_devise** option to `fallback: :devise` and `fallback: :none` to get more flexibility and be able to support `fallback: :exception`. The older syntax is not officially deprecated, but using the **fallback** option is completely equivalent, and recommended.
+
+## [1.9.1] - 2015-04-28
+
+### Fixed
+
+- The Mongoid adapter loading (which I did break when refactoring **v1.9.0**) - fixed with help from @krsyoung
+
+## [1.9.0] - 2015-04-24
+
+### Added
+
+- More filters to scope `acts_as_token_authentication_handler_for`: `:if` and `:unless`, expected to be used with a Proc.
+- Alias names for _token authenticatable_ classes can now be defined (in the token authentication handlers declarations): e.g. `acts_as_token_authentication_handler_for Vehicle::User, as: pilot`
+
+### Fixed
+
+- Errors defining namespaced classes as _token authenticatable_, by allowing _aliases_ to be defined for them - with help from @joshblour, @jessesandford, @ivan-kolmychek and @bbuchalter
+
+## [1.8.0] - 2015-02-21
+
+### Added
+
+- Custom **identifiers** option, using other fileds than `:email` to identify records is now possible. When this option is in use, the default _header names_ are updated acordingly. - @nicolo
+- The **skip_devise_trackable** option - @nMustaki
+
+### Fixed
+
+- A typo - @joelparkerhenderson
+
+## [1.7.0] - 2014-11-27
+
+### Added
+
+- [Rails API][rails-api] support, controllers which inherit from `ActionController::API` can now be _token Authentication handlers_! - with help from @DeepAnchor
+- Integration with [Devise case-insensitive keys][case], keys configured to be case insensitive in Devise are now automatically case insensitive in _Simple Token Authentication_ as well - @munkius
+- Some important inline documentation
+
+  [case]: https://github.com/plataformatec/devise/blob/v3.4.1/lib/generators/templates/devise.rb#L45-L48
+  [rails-api]: https://github.com/rails-api/rails-api
+
+## [1.6.0] - 2014-10-24
+
+### Added
+
+- Mongoid support, using the adapter interface : )
+
+## [1.5.2] - 2014-10-21
+
+### Added
+
+- Public specification of the adapter interface
+- Documentation about the new specs and how to contribute
+
+### Fixed
+
+- The option **header_names** can now also be used to set a single custom header, either for the identifier (e.g. `user_email`) or the token (e.g. `user_token`). Previously, setting both at once was required.
+- Memoization implementation error in several class methods. The bug didn't modify the public behaviour of the gem, but did create bunches of instances of `EntityManager` and `FallbackAuthenticationHandler` without necessity.
+
+### Removed
+
+- The Cucumber features, in favor of faster and more flexible RSpec specs
+
+### Changed
+
+- The internal syntax for the **fallabck_to_devise** option is now `fallback: :devise` and `fallback: :none` for added flexibility. The change is transparent for end users, and will only be made official if new fallback mechanisms are introduced.
+- Refactored heavily the code base to allow the introduction of the RSpec test suite, contributing should now be a lot easier
+- Optional dependencies (e.g. ActiveRecord, ActionController) are now encapsulated into independent adapters
+
+## [1.5.1] - 2014-09-18
+
+### Added
+
+- Support for Devise 3.3 - @prabode
+
+## [1.5.0] - 2014-05-31
+
+### Added
+
+- Support for multiple Devise scopes per _token authentication handler_, a single controller can now independently handle token authentication for `User` and `AdminUser` for example - @donbobka
+
+## [1.4.0] - 2014-05-24
+
+### Added
+
+- Filters to scope `acts_as_token_authentication_handler_for`: `:only` and `:except`, so token authentication handling can be restricted to a set of controller actions - @donbobka
+
+### Changed
+
+- The authentication token condition of existence for improved readability - @lenart
+
+## [1.3.0] - 2014-05-17
+
+### Added
+
+- The **fallback_to_devise** option allows to disable the default fallback to Devise authentication when token authentication fails - @donbobka
+
+### Security
+
+- Add documentation: the fallback to Devise MUST be disabled when CSRF protection is disabled (often the case for API controllers)
+
+## [1.2.1] - 2014-04-26
+
+### Fixed
+
+- The integration with Devise trackable, the sign in count is no longer increased when token authentication succeeds - @adamniedzielski
+- A typo - @nickveys
+
+## [1.2.0] - 2014-02-24
+
+### Added
+
+- Configuration framework, allows _Simple Token Authentication_ to be configured using an initializer - @krsyoung and @joel
+- The **sign_in_token** option allows to create persistent sessions when token authentiation succeeds (can be used to sign in users from a link in an e-mail, for example) - @krsyoung
+- The **header_names** option allows to define custom names for HTTP headers, e.g. `X-User-Authentication-Token`
+
+## [1.1.1] - 2014-02-20
+
+### Fixed
+
+- The Travis CI build is now testing the correct release, I did make a mistake when releasing **v1.1.0**
+
+## [1.1.0] - 2014-02-20
+
+### Added
+
+- Add support for multiple _token authenticatable_ classes, any model known to Devise can now be made _token authenticatable_, not only `User` - @invernizzi
+
+
+## [1.0.1] - 2014-01-26
+
+### Changed
+
+- Nothing, this is a replacement for **v1.0.0** (because I messed up with Rubygems)
+
+## [1.0.0] - 2014-01-26 [YANKED]
+
+### Added
+
+- A test suite, using Cucumber : )
+
+## [1.0.0.pre.5] - 2014-01-09
+
+### Fixed
+
+- Authentication was required as soon as the gem was loaded - reported by @pdobb and @AhmedAttyah
+
+## Changed
+
+- Use the Bundler-friendly format for version numbers instead of follwing strictly the Semantic Versionning specification
+
+## [1.0.0-beta.4] - 2013-12-26
+
+### Fixed
+
+- The user record is now fetched using `find_by_email` when `find_by` is not present (Rails 3.2) - with help from @AhmedAttyah
+
+## [1.0.0-beta.3] - 2013-12-17
+
+### Fixed
+
+- Redundant dependencies: _Simple Token Authentication_ only depends on ActionMailer and ActiveRecord, not Rails
+
+## [1.0.0-beta.2] - 2013-12-16
+
+### Added
+
+- Explicit dependency on Devise
+
+## 1.0.0-beta - 2013-12-16
+
+### Added
+
+- Documentation
+
+## Previously
+
+This [gist][gist] did refactor the Jose Valim's code into an `ActiveSupport::Concern`.
+
+[gist]: https://gist.github.com/gonzalo-bulnes/7659739
+[1.13.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.12.0...v1.13.0
+[1.12.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.11.0...v1.12.0
+[1.11.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.10.1...v1.11.0
+[1.10.1]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.10.0...v1.10.1
+[1.10.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.9.1...v1.10.0
+[1.9.1]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.9.0...v1.9.1
+[1.9.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.8.0...v1.9.0
+[1.8.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.7.0...v1.8.0
+[1.7.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.6.0...v1.7.0
+[1.6.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.5.2...v1.6.0
+[1.5.2]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.5.1...v1.5.2
+[1.5.1]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.5.0...v1.5.1
+[1.5.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.4.0...v1.5.0
+[1.4.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.3.0...v1.4.0
+[1.3.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.2.1...v1.3.0
+[1.2.1]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.1.1...v1.2.0
+[1.1.1]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.0.0.pre.5...v1.0.0
+[1.0.0.pre.5]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.0.0-beta.4...v1.0.0.pre.5
+[1.0.0-beta.4]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.0.0-beta.3...v1.0.0-beta.4
+[1.0.0-beta.3]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.0.0-beta.2...v1.0.0-beta.3
+[1.0.0-beta.2]: https://github.com/gonzalo-bulnes/simple_token_authentication/compare/v1.0.0-beta...v1.0.0-beta.2
+
+## Inspiration
+
+Thanks to @nTraum for pointing me at http://keepachangelog.com and to @olivierlacan for writing it in the first place!
+

data/README.md

@@ -10,7 +10,7 @@ Simple Token Authentication
 
 Token authentication support has been removed from [Devise][devise] for security reasons. In [this gist][original-gist], Devise's [José Valim][josevalim] explains how token authentication should be performed in order to remain safe.
 
-This gem packages the content of the gist.
+This gem packages the content of the gist and provides a set of convenient options for increased flexibility.
 
   [devise]: https://github.com/plataformatec/devise
   [original-gist]: https://gist.github.com/josevalim/fb706b1e933ef01e4fb6
@@ -58,10 +58,10 @@ class User < ActiveRecord::Base
 end
 ```
 
-If the model or models you chose have no `:authentication_token` attribute, add them one (with an index):
+If the model or models you chose have no `:authentication_token` attribute, add them one (with a unique index):
 
 ```bash
-rails g migration add_authentication_token_to_users authentication_token:string:index
+rails g migration add_authentication_token_to_users "authentication_token:string{30}:uniq"
 rake db:migrate
 ```
 
@@ -284,18 +284,19 @@ Any question? Please don't hesitate to open a new issue to get help. I keep ques
   [open-questions]: https://github.com/gonzalo-bulnes/simple_token_authentication/issues?labels=question&page=1&state=open
   [faq]: https://github.com/gonzalo-bulnes/simple_token_authentication/issues?direction=desc&labels=question&page=1&sort=comments&state=closed
 
-### Changelog
+### Change Log
 
-Releases are commented to provide a brief [changelog][changelog].
+Releases are commented to provide a [brief change log][releases], details can be found in the [`CHANGELOG`][changelog] file.
 
-  [changelog]: https://github.com/gonzalo-bulnes/simple_token_authentication/releases
+  [releases]: https://github.com/gonzalo-bulnes/simple_token_authentication/releases
+  [changelog]: ./CHANGELOG.md
 
 Development
 -----------
 
 ### Testing and documentation
 
-This gem development has been test-driven since `v1.0.0`. Until `v1.5.1`, the gem behaviour was described using [Cucumber][cucumber] and [RSpec][rspec] in a dummy app generated by [Aruba][aruba]. Since `v1.5.2` it is described using Rspec alone.
+This gem development has been test-driven since `v1.0.0`. Until `v1.5.1`, the gem behaviour was described using [Cucumber][cucumber] and [RSpec][rspec] in a dummy app generated by [Aruba][aruba]. Since `v1.5.2` it is described using Rspec alone and [Appraisal][appraisal] is used since `v1.13.0` for [regression testing][regression].
 
 RSpec [tags][tags] are used to categorize the spec examples.
 
@@ -305,8 +306,10 @@ The `private` or `protected` specs are written for development purpose only. Bec
 
 Run `rake spec:public` to print the gem public documentation.
 
+  [appraisal]: https://github.com/thoughtbot/appraisal
   [aruba]: https://github.com/cucumber/aruba
   [cucumber]: https://github.com/cucumber/cucumber-rails
+  [regression]: https://github.com/gonzalo-bulnes/simple_token_authentication/wiki/Regression-Testing
   [rspec]: https://www.relishapp.com/rspec/rspec-rails/docs
   [tags]: https://www.relishapp.com/rspec/rspec-core/v/3-1/docs/command-line/tag-option
   [travis]: https://travis-ci.org/gonzalo-bulnes/simple_token_authentication/builds

data/gemfiles/rails_4_devise_3.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "devise", "~> 3.2"
+
+gemspec :path => "../"

data/gemfiles/ruby_1.9.3_rails_3.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "actionmailer", ">= 3.2.6", "< 4"
+gem "mime-types", "< 3"
+gem "tins", "< 1.7.0"
+
+gemspec :path => "../"

data/lib/simple_token_authentication/acts_as_token_authenticatable.rb

@@ -35,9 +35,8 @@ module SimpleTokenAuthentication
       self.class.where(authentication_token: token).count == 0
     end
 
-    # Private: Get one (always the same) object which behaves as a token generator
     def token_generator
-      @token_generator ||= TokenGenerator.new
+      TokenGenerator.instance
     end
 
     module ClassMethods

data/lib/simple_token_authentication/devise_fallback_handler.rb

@@ -1,5 +1,6 @@
 module SimpleTokenAuthentication
   class DeviseFallbackHandler
+    include Singleton
 
     # Fallback to the Devise authentication strategies.
     def fallback!(controller, entity)

data/lib/simple_token_authentication/exception_fallback_handler.rb

@@ -1,6 +1,8 @@
 module SimpleTokenAuthentication
   class ExceptionFallbackHandler
-    # Notifies the failure of authentication to Warden in the same DEvise does.
+    include Singleton
+
+    # Notifies the failure of authentication to Warden in the same Devise does.
     # Does result in an HTTP 401 response in a Devise context.
     def fallback!(controller, entity)
       throw(:warden, scope: entity.name_underscore.to_sym) if controller.send("current_#{entity.name_underscore}").nil?

data/lib/simple_token_authentication/sign_in_handler.rb

@@ -1,5 +1,7 @@
 module SimpleTokenAuthentication
   class SignInHandler
+    include Singleton
+
     # Devise sign in is performed through a controller
     # which includes Devise::Controllers::SignInOut
     def sign_in(controller, record, *args)

data/lib/simple_token_authentication/token_authentication_handler.rb

@@ -74,14 +74,12 @@ module SimpleTokenAuthentication
       identifier_value
     end
 
-    # Private: Get one (always the same) object which behaves as a token comprator
     def token_comparator
-      @@token_comparator ||= TokenComparator.new
+      TokenComparator.instance
     end
 
-    # Private: Get one (always the same) object which behaves as a sign in handler
     def sign_in_handler
-      @@sign_in_handler ||= SignInHandler.new
+      SignInHandler.instance
     end
 
     module ClassMethods
@@ -114,9 +112,9 @@ module SimpleTokenAuthentication
           class_variable_get(:@@fallback_authentication_handler)
         else
           if options[:fallback] == :exception
-            class_variable_set(:@@fallback_authentication_handler, ExceptionFallbackHandler.new)
+            class_variable_set(:@@fallback_authentication_handler, ExceptionFallbackHandler.instance)
           else
-            class_variable_set(:@@fallback_authentication_handler, DeviseFallbackHandler.new)
+            class_variable_set(:@@fallback_authentication_handler, DeviseFallbackHandler.instance)
           end
         end
       end

data/lib/simple_token_authentication/token_comparator.rb

@@ -2,6 +2,7 @@ require 'devise'
 
 module SimpleTokenAuthentication
   class TokenComparator
+    include Singleton
 
     # Compare two String instances
     #

data/lib/simple_token_authentication/token_generator.rb

@@ -2,6 +2,8 @@ require 'devise'
 
 module SimpleTokenAuthentication
   class TokenGenerator
+    include Singleton
+
     def generate_token
       Devise.friendly_token
     end

data/lib/simple_token_authentication/version.rb

@@ -1,3 +1,3 @@
 module SimpleTokenAuthentication
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

data/spec/lib/simple_token_authentication/acts_as_token_authenticatable_spec.rb

@@ -2,8 +2,10 @@ require 'spec_helper'
 
 
 class DummyTokenGenerator
-  def initialize(args={})
-    @tokens_to_be_generated = args[:tokens_to_be_generated]
+  include Singleton
+
+  def tokens_to_be_generated=(tokens)
+    @tokens_to_be_generated = tokens
   end
 
   def generate_token
@@ -69,8 +71,6 @@ describe 'A token authenticatable class (or one of its children)' do
 
             def initialize(args={})
               @authentication_token = args[:authentication_token]
-              @token_generator = DummyTokenGenerator.new(
-                  tokens_to_be_generated: TOKENS_IN_USE + ['Dist1nCt-Tok3N'])
             end
 
             def authentication_token=(value)
@@ -87,7 +87,9 @@ describe 'A token authenticatable class (or one of its children)' do
             end
 
             def token_generator
-              @token_generator
+              token_generator = DummyTokenGenerator.instance
+              token_generator.tokens_to_be_generated = TOKENS_IN_USE + ['Dist1nCt-Tok3N']
+              token_generator
             end
           end
         end

data/spec/lib/simple_token_authentication/devise_fallback_handler_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 
 describe SimpleTokenAuthentication::DeviseFallbackHandler do
 
-  it_behaves_like 'an authentication handler'
+  let(:devise_fallback_handler) { SimpleTokenAuthentication::DeviseFallbackHandler.instance }
+
+  it_behaves_like 'an authentication handler', SimpleTokenAuthentication::DeviseFallbackHandler.instance
 
   it_behaves_like 'a fallback handler'
 
@@ -17,7 +19,7 @@ describe SimpleTokenAuthentication::DeviseFallbackHandler do
 
       # delegating consists in sending the message
       expect(controller).to receive(:authenticate_user!)
-      response = subject.authenticate_entity!(controller, entity)
+      response = devise_fallback_handler.authenticate_entity!(controller, entity)
 
       # and returning the response
       expect(response).to eq 'Devise response.'
@@ -31,9 +33,9 @@ describe SimpleTokenAuthentication::DeviseFallbackHandler do
       allow(@entity).to receive_message_chain(:name_underscore).and_return('entity')
       controller = double()
 
-      expect(subject).to receive(:authenticate_entity!).with(controller, entity)
+      expect(devise_fallback_handler).to receive(:authenticate_entity!).with(controller, entity)
 
-      subject.send(:fallback!, controller, entity)
+      devise_fallback_handler.send(:fallback!, controller, entity)
     end
   end
 end

data/spec/lib/simple_token_authentication/exception_fallback_handler_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe SimpleTokenAuthentication::ExceptionFallbackHandler do
 
+  let(:exception_fallback_handler) { SimpleTokenAuthentication::ExceptionFallbackHandler.instance }
+
   it_behaves_like 'a fallback handler'
 
   describe '#fallback!' do
@@ -17,7 +19,7 @@ describe SimpleTokenAuthentication::ExceptionFallbackHandler do
       end
 
       it 'delegates exception throwing to Warden', private: true do
-        expect{ subject.fallback!(@controller, @entity) }.to throw_symbol(:warden, scope: :entity)
+        expect{ exception_fallback_handler.fallback!(@controller, @entity) }.to throw_symbol(:warden, scope: :entity)
       end
     end
 
@@ -32,7 +34,7 @@ describe SimpleTokenAuthentication::ExceptionFallbackHandler do
       end
 
       it 'does not throw any exception', private: true do
-        expect{ subject.fallback!(@controller, @entity) }.not_to throw_symbol(:warden, scope: :entity)
+        expect{ exception_fallback_handler.fallback!(@controller, @entity) }.not_to throw_symbol(:warden, scope: :entity)
       end
     end
   end

data/spec/lib/simple_token_authentication/sign_in_handler_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe SimpleTokenAuthentication::SignInHandler do
 
+  let(:sign_in_handler) { SimpleTokenAuthentication::SignInHandler.instance }
+
   it_behaves_like 'a sign in handler'
 
   describe '#sign_in' do
@@ -13,7 +15,7 @@ describe SimpleTokenAuthentication::SignInHandler do
 
       # delegating consists in sending the message
       expect(controller).to receive(:sign_in)
-      response = subject.sign_in(controller, :record, option: 'some_value')
+      response = sign_in_handler.sign_in(controller, :record, option: 'some_value')
 
       # and returning the response
       expect(response).to eq 'Devise response.'
@@ -24,8 +26,8 @@ describe SimpleTokenAuthentication::SignInHandler do
       allow(controller).to receive(:sign_in).with(:record)
       allow(controller).to receive(:integrate_with_devise_trackable!)
 
-      expect(subject).to receive(:integrate_with_devise_trackable!).with(controller)
-      subject.sign_in(controller, :record)
+      expect(sign_in_handler).to receive(:integrate_with_devise_trackable!).with(controller)
+      sign_in_handler.sign_in(controller, :record)
     end
   end
 
@@ -43,7 +45,7 @@ describe SimpleTokenAuthentication::SignInHandler do
         allow(controller).to receive(:env).and_return(env)
         expect(env).to receive(:[]=).with('devise.skip_trackable', true)
 
-        subject.send :integrate_with_devise_trackable!, controller
+        sign_in_handler.send :integrate_with_devise_trackable!, controller
       end
     end
 
@@ -60,7 +62,7 @@ describe SimpleTokenAuthentication::SignInHandler do
         allow(controller).to receive(:env).and_return(env)
         expect(env).to receive(:[]=).with('devise.skip_trackable', false)
 
-        subject.send :integrate_with_devise_trackable!, controller
+        sign_in_handler.send :integrate_with_devise_trackable!, controller
       end
     end
   end

data/spec/lib/simple_token_authentication/token_authentication_handler_spec.rb

@@ -11,7 +11,7 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
     SimpleTokenAuthentication.send(:remove_const, :SomeClass)
   end
 
-  it_behaves_like 'a token authentication handler'
+  it_behaves_like 'a token authentication handler', lambda { described_class.new }
 
   let(:subject) { described_class }
 
@@ -112,44 +112,14 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
 
   describe '.fallback_handler' do
 
-    before(:each) do
-      allow(SimpleTokenAuthentication::DeviseFallbackHandler).to receive(:new)
-        .and_return('a DeviseFallbackHandler instance')
-      allow(SimpleTokenAuthentication::ExceptionFallbackHandler).to receive(:new)
-        .and_return('an ExceptionFallbackHandler instance')
-    end
-
     context 'when the Devise fallback is enabled', fallback_option: true do
 
       before(:each) do
         @options = { fallback: :devise }
       end
 
-      context 'when called for the first time' do
-
-        it 'creates a new DeviseFallbackHandler instance', private: true do
-          expect(SimpleTokenAuthentication::DeviseFallbackHandler).to receive(:new)
-          expect(subject.send(:fallback_handler, @options)).to eq 'a DeviseFallbackHandler instance'
-        end
-      end
-
-      context 'when a DeviseFallbackHandler instance was already created' do
-
-        before(:each) do
-          subject.send(:fallback_handler, @options)
-          # let's make any new DeviseFallbackHandler distinct from the first
-          allow(SimpleTokenAuthentication::DeviseFallbackHandler).to receive(:new)
-          .and_return('another DeviseFallbackHandler instance')
-        end
-
-        it 'returns that instance', private: true do
-          expect(subject.send(:fallback_handler, @options)).to eq 'a DeviseFallbackHandler instance'
-        end
-
-        it 'does not create a new DeviseFallbackHandler instance', private: true do
-          expect(SimpleTokenAuthentication::DeviseFallbackHandler).not_to receive(:new)
-          expect(subject.send(:fallback_handler, @options)).not_to eq 'another DeviseFallbackHandler instance'
-        end
+      it 'returns a DeviseFallbackHandler instance', private: true do
+        expect(subject.send(:fallback_handler, @options)).to be_kind_of SimpleTokenAuthentication::DeviseFallbackHandler
       end
     end
 
@@ -159,31 +129,8 @@ describe 'Any class which includes SimpleTokenAuthentication::TokenAuthenticatio
         @options = { fallback: :exception }
       end
 
-      context 'when called for the first time' do
-
-        it 'creates a new ExceptionFallbackHandler instance', private: true do
-          expect(SimpleTokenAuthentication::ExceptionFallbackHandler).to receive(:new)
-          expect(subject.send(:fallback_handler, @options)).to eq 'an ExceptionFallbackHandler instance'
-        end
-      end
-
-      context 'when a ExceptionFallbackHandler instance was already created' do
-
-        before(:each) do
-          subject.send(:fallback_handler, @options)
-          # let's make any new ExceptionFallbackHandler distinct from the first
-          allow(SimpleTokenAuthentication::ExceptionFallbackHandler).to receive(:new)
-          .and_return('another ExceptionFallbackHandler instance')
-        end
-
-        it 'returns that instance', private: true do
-          expect(subject.send(:fallback_handler, @options)).to eq 'an ExceptionFallbackHandler instance'
-        end
-
-        it 'does not create a new ExceptionFallbackHandler instance', private: true do
-          expect(SimpleTokenAuthentication::ExceptionFallbackHandler).not_to receive(:new)
-          expect(subject.send(:fallback_handler, @options)).not_to eq 'another ExceptionFallbackHandler instance'
-        end
+      it 'returns a ExceptionFallbackHandler instance', private: true do
+        expect(subject.send(:fallback_handler, @options)).to be_kind_of SimpleTokenAuthentication::ExceptionFallbackHandler
       end
     end
   end

data/spec/lib/simple_token_authentication/token_comparator_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe SimpleTokenAuthentication::TokenComparator do
 
+  let(:token_comparator) { described_class.instance }
+
   it_behaves_like 'a token comparator'
 
   it 'delegates token comparison to Devise.secure_compare', private: true do
@@ -11,7 +13,7 @@ describe SimpleTokenAuthentication::TokenComparator do
 
     # delegating consists in sending the message
     expect(Devise).to receive(:secure_compare)
-    response = subject.compare('A_raNd0MtoKeN', 'ano4heR-Tok3n')
+    response = token_comparator.compare('A_raNd0MtoKeN', 'ano4heR-Tok3n')
 
     # and returning the response
     expect(response).to eq 'Devise.secure_compare response.'

data/spec/lib/simple_token_authentication/token_generator_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe SimpleTokenAuthentication::TokenGenerator do
 
+  let(:token_generator) { SimpleTokenAuthentication::TokenGenerator.instance }
+
   it_behaves_like 'a token generator'
 
   it 'delegates token generation to Devise.friendly_token', private: true do
@@ -11,7 +13,7 @@ describe SimpleTokenAuthentication::TokenGenerator do
 
     # delegating consists in sending the message
     expect(Devise).to receive(:friendly_token)
-    response = subject.generate_token
+    response = token_generator.generate_token
 
     # and returning the response
     expect(response).to eq 'FRi3ndlY_TokeN'

data/spec/support/spec_for_authentication_handler_interface.rb

@@ -1,6 +1,4 @@
-RSpec.shared_examples 'an authentication handler' do
-
-  let(:authentication_handler) { described_class.new() }
+RSpec.shared_examples 'an authentication handler' do |authentication_handler|
 
   it 'responds to :authenticate_entity!', private: true do
     expect(authentication_handler).to respond_to :authenticate_entity!

data/spec/support/spec_for_fallback_handler_interface.rb

@@ -1,8 +1,12 @@
 RSpec.shared_examples 'a fallback handler' do
 
-  let(:fallback_handler) { described_class.new() }
+  let(:fallback_handler) { described_class.instance }
 
   it 'responds to :fallback!', private: true do
     expect(fallback_handler).to respond_to :fallback!
   end
+
+  it 'is a kind of Singleton', private: true  do
+    expect(fallback_handler).to be_kind_of(Singleton)
+  end
 end

data/spec/support/spec_for_sign_in_handler_interface.rb

@@ -1,8 +1,12 @@
 RSpec.shared_examples 'a sign in handler' do
 
-  let(:sign_in_handler) { described_class.new() }
+  let(:sign_in_handler) { described_class.instance }
 
   it 'responds to :sign_in', private: true do
     expect(sign_in_handler).to respond_to :sign_in
   end
+
+  it 'is a kind of Singleton', private: true  do
+    expect(sign_in_handler).to be_kind_of(Singleton)
+  end
 end

data/spec/support/spec_for_token_comparator_interface.rb

@@ -1,8 +1,12 @@
 RSpec.shared_examples 'a token comparator' do
 
-  let(:token_comparator) { described_class.new() }
+  let(:token_comparator) { described_class.instance }
 
   it 'responds to :compare', public: true do
     expect(token_comparator).to respond_to :compare
   end
+
+  it 'is a kind of Singleton', private: true  do
+    expect(token_comparator).to be_kind_of(Singleton)
+  end
 end

data/spec/support/spec_for_token_generator_interface.rb

@@ -1,8 +1,13 @@
 RSpec.shared_examples 'a token generator' do
 
-  let(:token_generator) { described_class.new() }
+  let(:token_generator) { described_class.instance }
 
   it 'responds to :generate_token', public: true do
     expect(token_generator).to respond_to :generate_token
   end
+
+  it 'is a kind of Singleton', public: true  do
+    expect(token_generator).to be_kind_of(Singleton)
+  end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_token_authentication
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Gonzalo Bulnes Guilpain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -54,16 +54,22 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -133,19 +139,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: tins
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: '2.0'
 description: 
 email:
 - gon.bulnes@gmail.com
@@ -153,10 +159,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Appraisals
+- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
 - doc/README.md
+- gemfiles/rails_4_devise_3.gemfile
+- gemfiles/ruby_1.9.3_rails_3.2.gemfile
 - lib/simple_token_authentication.rb
 - lib/simple_token_authentication/acts_as_token_authenticatable.rb
 - lib/simple_token_authentication/acts_as_token_authentication_handler.rb
@@ -237,39 +247,42 @@ signing_key:
 specification_version: 4
 summary: Simple (but safe) token authentication for Rails apps or API with Devise.
 test_files:
-- spec/spec_helper.rb
-- spec/support/spec_for_authentication_handler_interface.rb
-- spec/support/spec_for_token_comparator_interface.rb
-- spec/support/spec_for_token_generator_interface.rb
-- spec/support/specs_for_token_authentication_handler_interface.rb
-- spec/support/spec_for_entities_manager_interface.rb
-- spec/support/spec_for_configuration_option_interface.rb
-- spec/support/spec_for_adapter.rb
-- spec/support/dummy_classes_helper.rb
-- spec/support/spec_for_fallback_handler_interface.rb
-- spec/support/spec_for_sign_in_handler_interface.rb
-- spec/configuration/skip_devise_trackable_option_spec.rb
-- spec/configuration/sign_in_token_option_spec.rb
+- spec/configuration/action_controller_callbacks_options_spec.rb
 - spec/configuration/fallback_to_devise_option_spec.rb
 - spec/configuration/header_names_option_spec.rb
-- spec/configuration/action_controller_callbacks_options_spec.rb
-- spec/lib/simple_token_authentication_spec.rb
-- spec/lib/simple_token_authentication/devise_fallback_handler_spec.rb
-- spec/lib/simple_token_authentication/entities_manager_spec.rb
-- spec/lib/simple_token_authentication/sign_in_handler_spec.rb
-- spec/lib/simple_token_authentication/adapter_spec.rb
-- spec/lib/simple_token_authentication/token_generator_spec.rb
-- spec/lib/simple_token_authentication/exception_fallback_handler_spec.rb
+- spec/configuration/sign_in_token_option_spec.rb
+- spec/configuration/skip_devise_trackable_option_spec.rb
+- spec/lib/simple_token_authentication/acts_as_token_authenticatable_spec.rb
 - spec/lib/simple_token_authentication/acts_as_token_authentication_handler_spec.rb
-- spec/lib/simple_token_authentication/adapters/rails_api_adapter_spec.rb
+- spec/lib/simple_token_authentication/adapter_spec.rb
+- spec/lib/simple_token_authentication/adapters/active_record_adapter_spec.rb
+- spec/lib/simple_token_authentication/adapters/mongoid_adapter_spec.rb
 - spec/lib/simple_token_authentication/adapters/rails_adapter_spec.rb
+- spec/lib/simple_token_authentication/adapters/rails_api_adapter_spec.rb
 - spec/lib/simple_token_authentication/adapters/rails_metal_adapter_spec.rb
-- spec/lib/simple_token_authentication/adapters/mongoid_adapter_spec.rb
-- spec/lib/simple_token_authentication/adapters/active_record_adapter_spec.rb
-- spec/lib/simple_token_authentication/errors_spec.rb
-- spec/lib/simple_token_authentication/token_comparator_spec.rb
-- spec/lib/simple_token_authentication/acts_as_token_authenticatable_spec.rb
-- spec/lib/simple_token_authentication/entity_spec.rb
 - spec/lib/simple_token_authentication/configuration_spec.rb
+- spec/lib/simple_token_authentication/devise_fallback_handler_spec.rb
+- spec/lib/simple_token_authentication/entities_manager_spec.rb
+- spec/lib/simple_token_authentication/entity_spec.rb
+- spec/lib/simple_token_authentication/errors_spec.rb
+- spec/lib/simple_token_authentication/exception_fallback_handler_spec.rb
+- spec/lib/simple_token_authentication/sign_in_handler_spec.rb
 - spec/lib/simple_token_authentication/token_authentication_handler_spec.rb
+- spec/lib/simple_token_authentication/token_comparator_spec.rb
+- spec/lib/simple_token_authentication/token_generator_spec.rb
+- spec/lib/simple_token_authentication_spec.rb
+- spec/spec_helper.rb
+- spec/support/dummy_classes_helper.rb
+- spec/support/spec_for_adapter.rb
+- spec/support/spec_for_authentication_handler_interface.rb
+- spec/support/spec_for_configuration_option_interface.rb
+- spec/support/spec_for_entities_manager_interface.rb
+- spec/support/spec_for_fallback_handler_interface.rb
+- spec/support/spec_for_sign_in_handler_interface.rb
+- spec/support/spec_for_token_comparator_interface.rb
+- spec/support/spec_for_token_generator_interface.rb
+- spec/support/specs_for_token_authentication_handler_interface.rb
+- gemfiles/rails_4_devise_3.gemfile
+- gemfiles/ruby_1.9.3_rails_3.2.gemfile
+- Appraisals
 has_rdoc: