authenticate 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7228f6e2ad7a6120f39b3a4af880c800bbed56b
-  data.tar.gz: 777e5b64fbd3ce703579d50c69283c0d661596ae
+  metadata.gz: ea02dca780db9b1997f303292607eb14b4bd8f1f
+  data.tar.gz: 40d0f2e1d7fb0deb3e05efab7660c4d3a0cd7bc1
 SHA512:
-  metadata.gz: 61e7ac6c14efb4722861c3cc95bdb49d09732dd674bec1a44dd8070a1a4dbe6bb7aae1f93dcc0034c78ad62369b508b38e96b0ca8d7549aa70cebc30bd3e90fc
-  data.tar.gz: c4ec2869d1c4aa5b108655533d6151ed5539d72a1a7efd8d4cc6213aa58f2c0a17af04e5c4f1b97cc2d2fe569c4149419f2d3973af10220c87ccc415c0c8d997
+  metadata.gz: 1f966853f7b47fa644004698d7e19eb4de73632bed219782a432d3ca0177da920ee16849fbad7d1642ab6bd69fe83378a7e013e6ad9e26b91f0faf7b913a65f2
+  data.tar.gz: 7573e19a7a40e352f41b7f7c4cf79010924459ee8b8e0725aa0c58cdef24f74c29277ab018b1746af87cda851263aec565bb12235f0947b3966e3a684743ba75

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Authenticate Changelog
 
+## [0.4.0] - June 2, 2016
+
+Install generator User:  ActiveRecord::Base for Rails 4 apps, ApplicationRecord for rails 5 (issue #2).
+
+[0.4.0]: https://github.com/tomichj/authenticate/compare/v0.3.3...v0.4.0
+
+
+
 ## [0.3.3] - April 29, 2016
 
 Password change uses active record's dirty bit to detect that password was updated. 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authenticate (0.3.2)
+    authenticate (0.4.0)
       bcrypt (~> 3.1)
       email_validator (~> 1.6)
       rails (>= 4.0, < 5.1)
@@ -56,7 +56,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     coderay (1.1.1)
-    concurrent-ruby (1.0.1)
+    concurrent-ruby (1.0.2)
     database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     email_validator (1.6.0)

data/README.md

@@ -343,7 +343,6 @@ module LoginCount
 end
 
 # config/initializers/authenticate.rb
-# You could also just `include LoginCount` in your user model.
 Authenticate.configuration do |config|
   config.modules = [LoginCount]
 end

data/lib/authenticate/version.rb

@@ -1,3 +1,3 @@
 module Authenticate
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/generators/authenticate/install/install_generator.rb

@@ -31,7 +31,9 @@ module Authenticate
         if File.exist? model_path
           inject_into_class(model_path, model_class_name, "  include Authenticate::User\n\n")
         else
-          copy_file 'user.rb', 'app/models/user.rb'
+          @model_base_class = model_base_class
+          # copy_file 'user.rb', 'app/models/user.rb'
+          template 'user.rb.erb', 'app/models/user.rb'
         end
       end
 
@@ -156,6 +158,10 @@ module Authenticate
       def self.next_migration_number(dir)
         ActiveRecord::Generators::Base.next_migration_number(dir)
       end
+
+      def model_base_class
+        (Rails.version >= '5.0.0') ? 'ApplicationRecord' : 'ActiveRecord::Base'
+      end
     end
   end
 end

data/lib/generators/authenticate/install/templates/user.rb.erb

@@ -0,0 +1,3 @@
+class User < <%= @model_base_class %>
+  include Authenticate::User
+end

data/spec/features/brute_force_spec.rb

@@ -3,9 +3,8 @@ require 'support/features/feature_helpers'
 
 feature 'visitor has consecutive bad logins' do
   before do
-    # puts Authenticate.configuration.max_consecutive_bad_logins_allowed.inspect
-    # puts Authenticate.configuration.bad_login_lockout_period.inspect
     @user = create(:user)
+    Authenticate.configuration.max_consecutive_bad_logins_allowed = 2
   end
 
   scenario 'less than max bad logins does not lock account' do

data/spec/features/max_session_lifetime_spec.rb

@@ -10,7 +10,7 @@ feature 'visitor has consecutive bad logins' do
     sign_in_with @user.email, @user.password
     expect_user_to_be_signed_in
 
-    Timecop.travel 10.minutes do
+    Timecop.travel 1.minutes do
       visit root_path
       expect_user_to_be_signed_in
     end
@@ -20,7 +20,7 @@ feature 'visitor has consecutive bad logins' do
     sign_in_with @user.email, @user.password
     expect_user_to_be_signed_in
 
-    Timecop.travel 21.minutes do
+    Timecop.travel 2.days do
       visit root_path
       expect(current_path).to eq sign_in_path
       expect_user_to_be_signed_out

data/spec/features/timeoutable_spec.rb

@@ -4,13 +4,14 @@ require 'support/features/feature_helpers'
 feature 'visitor session time' do
   before do
     @user = create(:user)
+    Authenticate.configuration.timeout_in = 10.minutes
   end
 
   scenario 'visitor logs in, subsequent click within timeout' do
     sign_in_with @user.email, @user.password
     expect_user_to_be_signed_in
 
-    Timecop.travel 10.minutes do
+    Timecop.travel 5.minutes do
       visit root_path
       expect_user_to_be_signed_in
     end
@@ -20,7 +21,7 @@ feature 'visitor session time' do
     sign_in_with @user.email, @user.password
     expect_user_to_be_signed_in
 
-    Timecop.travel 21.minutes do
+    Timecop.travel 11.minutes do
       visit root_path
       expect(current_path).to eq sign_in_path
       expect_user_to_be_signed_out

data/spec/model/timeoutable_spec.rb

@@ -6,14 +6,14 @@ describe Authenticate::Model::Timeoutable do
 
   it 'does not timeout while last_access_at is valid' do
     Timecop.freeze do
-      subject.last_access_at = 10.minutes.ago
+      subject.last_access_at = 1.minutes.ago
       expect(subject.timedout?).to be_falsey
     end
   end
 
   it 'does timeout when last_access_at is stale' do
     Timecop.freeze do
-      subject.last_access_at = 46.minutes.ago
+      subject.last_access_at = 1.days.ago
       expect(subject.timedout?).to be_truthy
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authenticate
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Tomich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -247,7 +247,7 @@ files:
 - lib/generators/authenticate/install/templates/db/migrate/add_authenticate_timeoutable_to_users.rb
 - lib/generators/authenticate/install/templates/db/migrate/add_authenticate_to_users.rb
 - lib/generators/authenticate/install/templates/db/migrate/create_users.rb
-- lib/generators/authenticate/install/templates/user.rb
+- lib/generators/authenticate/install/templates/user.rb.erb
 - lib/generators/authenticate/routes/USAGE
 - lib/generators/authenticate/routes/routes_generator.rb
 - lib/generators/authenticate/routes/templates/routes.rb

data/lib/generators/authenticate/install/templates/user.rb

@@ -1,3 +0,0 @@
-class User < ActiveRecord::Base
-  include Authenticate::User
-end