devise-token_authenticatable 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18941e6181185c72c432e867d029915727854a34
-  data.tar.gz: 366abb9cb6ae2830ee8c8adee619f075d81ee943
+  metadata.gz: c1039c8f938eaa6427775e5d99c572814548eb7e
+  data.tar.gz: ca880f38634ca2474ca156d8ca401a3376b9ade5
 SHA512:
-  metadata.gz: 629be88bf004382d800360e5b08a795d318bf36b6f4870cafd51377d8a3ad350af6b08380973d2df9b87b792c1571682d084dcb0fafdf9a489e505e8bb95689f
-  data.tar.gz: e798e6b774cbbc0efcc1d1bb75de078f28c3e49a25c471a05d27ecf409d6ec724f60aa70c60cb74deacdd355dca71b265259c1299cf0938308d93ace6d01fb41
+  metadata.gz: 4711fd8ffad1960a8009b350da88414c8f165cf786cd5c9f90316f67159df29e9a38390a5c15cea4601be39824bd36f90bc6f21900ca0cb48c849bdbfd13ce28
+  data.tar.gz: b22e38559109eed66592e44edd00a0d9b853790f1059575751e2ba441b9e72e9d23d9b20b76f80a6b43b402ae8ce478eeffa682c48944213992695b51462d40d

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.9
   - 2.2.5
   - 2.3.1

data/README.md

@@ -29,6 +29,7 @@ Or install it yourself as:
 `~> 0.3`                        | `~> 3.4.0`
 `~> 0.4.0`, `< 0.4.9`           | `~> 3.5.0`, `< 3.5.2`
 `~> 0.4.9`                      | `~> 3.5.2`
+`~> 0.5.0`                      | `>= 4.0.0`, `< 4.2.0`
 
 ## Usage
 
@@ -47,7 +48,6 @@ This gem can be configured as shown in the following:
 ```ruby
 Devise::TokenAuthenticatable.setup do |config|
   # enables the expiration of a token after a specified amount of time,
-  # requires an additional field on the model: `authentication_token_created_at`
   # defaults to nil
   config.token_expires_in = 1.day
 

data/devise-token_authenticatable.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_dependency "devise",                         ">= 3.5.2", "< 4.0.0"
+  spec.add_dependency "devise",                         ">= 4.0.0", "< 4.2.0"
 
-  spec.add_development_dependency "rails",              "~> 4.1"
+  spec.add_development_dependency "rails",              "~> 4.2"
   spec.add_development_dependency "rspec-rails",        "~> 3.0"
   spec.add_development_dependency "pry",                "~> 0.10"
   spec.add_development_dependency "factory_girl_rails", "~> 4.4"

data/lib/devise/token_authenticatable/model.rb

@@ -53,19 +53,13 @@ module Devise
       end
 
       def self.required_fields(klass)
-        fields = [:authentication_token]
-
-        unless Devise::TokenAuthenticatable.token_expires_in.blank?
-          fields.push(:authentication_token_created_at)
-        end
-
-        fields
+        [:authentication_token, :authentication_token_created_at]
       end
 
       # Generate new authentication token (a.k.a. "single access token").
       def reset_authentication_token
         self.authentication_token = self.class.authentication_token
-        self.authentication_token_created_at = Time.now unless token_expires_in.blank?
+        self.authentication_token_created_at = Time.now
       end
 
       # Generate new authentication token and save the record.

data/lib/devise/token_authenticatable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module TokenAuthenticatable
-    VERSION = '0.4.10'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/spec/factories/admin.rb

@@ -10,7 +10,7 @@ FactoryGirl.define do
     end
 
     after(:create) do |u, evaluator|
-      u.confirm! if evaluator.confirm_account
+      u.confirm if evaluator.confirm_account
     end
 
     trait :with_reset_password_token do

data/spec/factories/user.rb

@@ -12,7 +12,7 @@ FactoryGirl.define do
     end
 
     after(:create) do |u, evaluator|
-      u.confirm! if evaluator.confirm_account
+      u.confirm if evaluator.confirm_account
     end
 
     trait :with_reset_password_token do

data/spec/models/devise/token_authenticatable/model_spec.rb

@@ -18,16 +18,8 @@ shared_examples "token authenticatable" do
         expect { subject }.to change { entity.authentication_token }
       end
 
-      context "token created at" do
-        it "should reset" do
-          swap Devise::TokenAuthenticatable, token_expires_in: 1.hour do
-            expect { subject }.to change { entity.authentication_token_created_at }
-          end
-        end
-
-        it "should not reset when token expires in not set" do
-          expect { subject }.to_not change { entity.authentication_token_created_at }
-        end
+      it "should reset token created at" do
+        expect { subject }.to change { entity.authentication_token_created_at }
       end
     end
 
@@ -58,16 +50,8 @@ shared_examples "token authenticatable" do
           expect { subject }.to change { entity.authentication_token }
         end
 
-        context "token created at" do
-          it "should set" do
-            swap Devise::TokenAuthenticatable, token_expires_in: 1.hour do
-              expect { subject }.to change { entity.authentication_token_created_at }
-            end
-          end
-
-          it "should not set when token expires in disabled" do
-            expect { subject }.to_not change { entity.authentication_token_created_at }
-          end
+        it "should set authentication token created at" do
+          expect { subject }.to change { entity.authentication_token_created_at }
         end
       end
     end
@@ -105,19 +89,11 @@ shared_examples "token authenticatable" do
     end
 
     describe "#required_fields" do
-      it "should contain the fields that Devise uses when token expires in disabled" do
+      it "should contain the fields that Devise uses" do
         expect(Devise::Models::TokenAuthenticatable.required_fields(described_class)).to eq([
-          :authentication_token
+          :authentication_token, :authentication_token_created_at
         ])
       end
-
-      it "should contain the fields that Devise uses" do
-        swap Devise::TokenAuthenticatable, token_expires_in: 1.hour do
-          expect(Devise::Models::TokenAuthenticatable.required_fields(described_class)).to eq([
-            :authentication_token, :authentication_token_created_at
-          ])
-        end
-      end
     end
 
   end

data/spec/support/rails_app/app/models/user.rb

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   devise  :database_authenticatable, :confirmable, :lockable, :recoverable,
           :registerable, :rememberable, :timeoutable, :token_authenticatable,
-          :trackable, :validatable
+          :trackable, :validatable, reconfirmable: false
 
   attr_accessor :other_key
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-token_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
 platform: ruby
 authors:
 - Sebastian Oelke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides authentication based on an authentication token for devise 3.2 and