signinable 2.0.11 → 2.0.12

data/spec/factories/signins.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :signin do
+    ip { '127.0.0.1' }
+    signinable
+  end
+end

data/spec/factories/users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :user, aliases: [:signinable] do
+    name { 'test' }
+  end
+end

data/spec/models/signin_spec.rb

@@ -1,49 +1,51 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require 'rails_helper'
 
 describe Signin do
-  it "has a valid factory" do
-    signin = FactoryGirl.build(:signin)
-    signin.should be_valid
+  it 'has a valid factory' do
+    signin = build(:signin)
+    expect(signin).to be_valid
   end
 
-  context "is invalid without" do
-    it "a token" do
-      signin = FactoryGirl.create(:signin)
+  context 'is invalid without' do
+    it 'a token' do
+      signin = create(:signin)
       signin.token = nil
-      signin.should_not be_valid
+      expect(signin).to_not be_valid
     end
 
-    it "an ip" do
-      FactoryGirl.build(:signin, ip: nil).should_not be_valid
+    it 'an ip' do
+      expect(build(:signin, ip: nil)).to_not be_valid
     end
   end
 
-  it "should generate token on create" do
-    signin = FactoryGirl.create(:signin, token: nil)
-    signin.token.should_not be_nil
+  it 'should generate token on create' do
+    signin = create(:signin, token: nil)
+    expect(signin.token).to_not be_nil
   end
 
-  context "not valid with" do
-    it "wrong ip" do
-      FactoryGirl.build(:signin, ip: "123").should_not be_valid
+  context 'not valid with' do
+    it 'wrong ip' do
+      expect(build(:signin, ip: '123')).to_not be_valid
     end
   end
 
-  it "should expire" do
+  it 'should expire' do
     Timecop.freeze
     expiration_time = Time.zone.now + 1.hour
-    signin = FactoryGirl.create(:signin, expiration_time: expiration_time)
+    signin = create(:signin, expiration_time: expiration_time)
     Timecop.travel(expiration_time)
-    signin.should be_expired
+    expect(signin).to be_expired
     Timecop.return
   end
 
-  describe ".expire!" do
-    it "should set expiration_time to now" do
+  describe '.expire!' do
+    it 'should set expiration_time to now' do
       Timecop.freeze
-      signin = FactoryGirl.create(:signin, expiration_time: (Time.zone.now + 1.hour))
+      signin = create(:signin, expiration_time: (Time.zone.now + 1.hour))
       signin.expire!
-      signin.should be_expired
+      expect(signin).to be_expired
       Timecop.return
     end
   end

data/spec/models/user_spec.rb

@@ -1,131 +1,130 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require 'rails_helper'
 
 describe User do
+  let(:credentials) { ['127.0.0.1', 'user_agent'] }
+  let(:other_credentials) { ['127.0.0.2', 'user_agent2'] }
+  let(:user) { create(:user) }
+
   before :each do
     Timecop.freeze
-    User.signin_expiration = 2.hours
-    User.signin_simultaneous = true
-    User.signin_restrictions = []
-    @user = FactoryGirl.create(:user)
-    @credentials = ['127.0.0.1', 'user_agent']
-    @other_credentials = ['127.0.0.2', 'user_agent2']
   end
 
   after :each do
     Timecop.return
   end
 
-  describe ".signin" do
-    it "should create Signin" do
-      expect {
-        sign_in_user(@user, @credentials)
-      }.to change(Signin, :count).by(1)
+  describe '.signin' do
+    it 'should create Signin' do
+      expect do
+        sign_in_user(user, credentials)
+      end.to change(Signin, :count).by(1)
     end
 
-    it "should set expiration_time" do
-      signin = sign_in_user(@user, @credentials)
-      signin.expiration_time.to_i.should eq((Time.zone.now + User.signin_expiration).to_i)
+    it 'should set expiration_time' do
+      signin = sign_in_user(user, credentials)
+      expect(signin.expiration_time.to_i).to eq((Time.zone.now + User.signin_expiration).to_i)
     end
 
-    it "should not set expiration_time" do
-      User.signin_expiration = 0
-      signin = sign_in_user(@user, @credentials)
-      signin.expiration_time.should be_nil
+    it 'should not set expiration_time' do
+      allow(User).to receive(:signin_expiration).and_return(0)
+      signin = sign_in_user(user, credentials)
+      expect(signin.expiration_time).to be_nil
     end
   end
 
-  describe ".signout" do
-    it "should expire signin" do
-      signin = sign_in_user(@user, @credentials)
-      sign_out_user(signin, @credentials)
-      signin.reload
-      signin.should be_expired
+  describe '.signout' do
+    it 'should expire signin' do
+      signin = sign_in_user(user, credentials)
+      sign_out_user(signin, credentials)
+      expect(signin.reload).to be_expired
     end
 
-    context "should be allowed with" do
-      %w{ip user_agent}.each do |c|
+    context 'should be allowed with' do
+      %i[ip user_agent].each do |c|
         it "changed #{c} if not restricted" do
-          signin = sign_in_user(@user, @credentials)
-          sign_out_user(signin, @credentials).should be_true
+          signin = sign_in_user(user, credentials)
+          expect(sign_out_user(signin, credentials)).to be_truthy
         end
       end
     end
 
-    context "should not be allowed with" do
-      %w{ip user_agent}.each do |c|
+    context 'should not be allowed with' do
+      %i[ip user_agent].each do |c|
         it "changed #{c} if restricted" do
-          User.signin_restrictions = [c]
-          signin = sign_in_user(@user, @credentials)
-          sign_out_user(signin, @other_credentials).should be_nil
+          allow(User).to receive(:signin_restrictions).and_return([c])
+          signin = sign_in_user(user, credentials)
+          expect(sign_out_user(signin, other_credentials)).to be_nil
         end
       end
     end
   end
 
-  describe "#authenticate_with_token" do
-    context "expiration_time" do
-      it "should be changed after authentication" do
-        signin = sign_in_user(@user, @credentials)
+  describe '#authenticate_with_token' do
+    context 'expiration_time' do
+      it 'should be changed after authentication' do
+        signin = sign_in_user(user, credentials)
         old_time = signin.expiration_time
         new_time = signin.expiration_time - 1.hour
         Timecop.travel(new_time)
-        User.authenticate_with_token(signin.token, *@credentials)
+        User.authenticate_with_token(signin.token, *credentials)
         signin.reload
-        signin.expiration_time.to_i.should eq((new_time + User.signin_expiration).to_i)
+        expect(signin.expiration_time.to_i).to eq((new_time + User.signin_expiration).to_i)
       end
 
-      it "should not be changed after authentication" do
-        User.signin_expiration = 0
-        signin = sign_in_user(@user, @credentials)
+      it 'should not be changed after authentication' do
+        allow(User).to receive(:signin_expiration).and_return(0)
+        signin = sign_in_user(user, credentials)
         old_time = signin.expiration_time
         Timecop.travel(Time.zone.now + 1.hour)
-        User.authenticate_with_token(signin.token, *@credentials)
+        User.authenticate_with_token(signin.token, *credentials)
         signin.reload
-        signin.expiration_time.to_i.should eq(old_time.to_i)
+        expect(signin.expiration_time.to_i).to eq(old_time.to_i)
       end
     end
 
-    context "should allow signin with" do
-      it "not last token if simultaneous is permitted" do
-        signin1 = sign_in_user(@user, @credentials)
-        signin2 = sign_in_user(@user, @credentials)
-        User.authenticate_with_token(signin1.token, *@credentials).should eq(@user)
-        User.authenticate_with_token(signin2.token, *@credentials).should eq(@user)
+    context 'should allow signin with' do
+      it 'not last token if simultaneous is permitted' do
+        signin1 = sign_in_user(user, credentials)
+        signin2 = sign_in_user(user, credentials)
+        expect(User.authenticate_with_token(signin1.token, *credentials)).to eq(user)
+        expect(User.authenticate_with_token(signin2.token, *credentials)).to eq(user)
       end
 
-      it "valid token" do
-        signin = sign_in_user(@user, @credentials)
-        User.authenticate_with_token(signin.token, *@credentials).should eq(@user)
+      it 'valid token' do
+        signin = sign_in_user(user, credentials)
+        expect(User.authenticate_with_token(signin.token, *credentials)).to eq(user)
       end
 
-      %w{ip user_agent}.each do |c|
+      %i[ip user_agent].each do |c|
         it "changed #{c} if not restricted" do
-          signin = sign_in_user(@user, @credentials)
-          User.authenticate_with_token(signin.token, *@other_credentials).should eq(@user)
+          signin = sign_in_user(user, credentials)
+          expect(User.authenticate_with_token(signin.token, *other_credentials)).to eq(user)
         end
       end
     end
 
-    context "should not allow signin with" do
-      it "not last token if simultaneous not permitted" do
-        User.signin_simultaneous = false
-        signin1 = sign_in_user(@user, @credentials)
-        signin2 = sign_in_user(@user, @credentials)
-        User.authenticate_with_token(signin1.token, *@credentials).should be_nil
-        User.authenticate_with_token(signin2.token, *@credentials).should eq(@user)
+    context 'should not allow signin with' do
+      it 'not last token if simultaneous not permitted' do
+        allow(User).to receive(:simultaneous_signings).and_return(false)
+        signin1 = sign_in_user(user, credentials)
+        signin2 = sign_in_user(user, credentials)
+        expect(User.authenticate_with_token(signin1.token, *credentials)).to be_nil
+        expect(User.authenticate_with_token(signin2.token, *credentials)).to eq(user)
       end
 
-      it "expired token" do
-        signin = sign_in_user(@user, @credentials)
-        @user.signout(signin.token, *@credentials)
-        User.authenticate_with_token(signin.token, *@credentials).should be_nil
+      it 'expired token' do
+        signin = sign_in_user(user, credentials)
+        user.signout(signin.token, *credentials)
+        expect(User.authenticate_with_token(signin.token, *credentials)).to be_nil
       end
 
-      %w{ip user_agent}.each do |c|
+      %i[ip user_agent].each do |c|
         it "changed #{c} if restricted" do
-          User.signin_restrictions = [c]
-          signin = sign_in_user(@user, @credentials)
-          User.authenticate_with_token(signin.token, *@other_credentials).should be_nil
+          allow(User).to receive(:signin_restrictions).and_return([c])
+          signin = sign_in_user(user, credentials)
+          expect(User.authenticate_with_token(signin.token, *other_credentials)).to be_nil
         end
       end
     end

data/spec/rails_helper.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+ENV['RAILS_ENV'] ||= 'test'
+
+require File.expand_path('dummy/config/environment', __dir__)
+
+require 'spec_helper'
+require 'rspec/rails'
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = true
+
+  config.infer_spec_type_from_file_location!
+
+  config.filter_rails_from_backtrace!
+
+  config.include FactoryBot::Syntax::Methods
+end

data/spec/spec_helper.rb

@@ -1,18 +1,17 @@
-ENV['RAILS_ENV'] ||= 'test'
+# frozen_string_literal: true
 
-require File.expand_path('../dummy/config/environment', __FILE__)
-require 'rspec/rails'
-require 'rspec/autorun'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
+require 'pry'
 require 'timecop'
 
-Rails.backtrace_cleaner.remove_silencers!
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
 
-RSpec.configure do |config|
-  config.mock_with :rspec
-  config.use_transactional_fixtures = false
-  config.infer_base_class_for_anonymous_controllers = false
-  config.order = 'random'
+  config.shared_context_metadata_behavior = :apply_to_host_groups
 end

data/spec/support/utilities.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def sign_in_user(user, credentials)
   token = user.signin(*credentials, 'referer')
   Signin.find_by_token(token)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signinable
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Ivan Novozhenets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,16 +16,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,21 +135,27 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20140103165606_create_users.rb
 - spec/dummy/db/schema.rb
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/factories/signin.rb
-- spec/factories/user.rb
+- spec/factories/signins.rb
+- spec/factories/users.rb
 - spec/models/signin_spec.rb
 - spec/models/user_spec.rb
+- spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/utilities.rb
 homepage: https://github.com/novozhenets/signinable
 licenses: []
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -144,20 +164,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Token based signin
 test_files:
 - spec/dummy/config.ru
 - spec/dummy/README.rdoc
+- spec/dummy/db/test.sqlite3
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20140103165606_create_users.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/config/environment.rb
@@ -185,9 +207,12 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
+- spec/dummy/log/test.log
+- spec/dummy/log/development.log
+- spec/rails_helper.rb
 - spec/support/utilities.rb
-- spec/factories/user.rb
-- spec/factories/signin.rb
+- spec/factories/users.rb
+- spec/factories/signins.rb
 - spec/spec_helper.rb
 - spec/models/signin_spec.rb
 - spec/models/user_spec.rb

data/spec/factories/signin.rb

@@ -1,8 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :signin do
-    ip "127.0.0.1"
-    signinable
-  end
-end

data/spec/factories/user.rb

@@ -1,7 +0,0 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :user, :aliases => [:signinable] do
-    name "test"
-  end
-end