signinable 2.0.6 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 55794149ad1cc0c4a7be9a08d2cefbb0e1d10d61
-  data.tar.gz: e59d8ae956f9d4833c58ffb674358b1e4d4cba79
+SHA256:
+  metadata.gz: 8f6b4e11c8d02ff119c491cbcd8a21ac67cf1c14e8964d690c517facb547773a
+  data.tar.gz: '06836449980727858552681d9cbf919803e960f1dac59e214d10de82bc547dc5'
 SHA512:
-  metadata.gz: 8331f8045d7b3bbfeac9bc0c52239b0db9ee21e23a3616308dbc70a21bc6179e13b7894575c69fa55c8c119c302b37fec739d93badf0c74be57748d79404d0a6
-  data.tar.gz: 598d52c18fe092f3e59f6e781d9c34e9aeff4f5a81ac0825d25f616bf74c2fc929239f21f6bb9c4ab36841c69fec8d8dc3185b93c420b11ccaca0d076388c2c8
+  metadata.gz: 0673f78fb8302317f41fa5df6f0956069bf6a255fbab3e931fe2f3f4b17807b098f1efb09c2da2126345923c43b676a8384d1dfae73849014993fead611f9b6c
+  data.tar.gz: 258c6e565a86bbf68b303469af5bff069bf035edac10dcdb63421389b40f3db3e4c2b889fdac70ad871e0be1767f283db842a12305d36d011e15fa1dea239303

data/app/models/signin.rb

@@ -13,10 +13,12 @@ class Signin < ActiveRecord::Base
   end
 
   def expire!
-    update_attributes(expiration_time: Time.zone.now)
+    update!(expiration_time: Time.zone.now)
   end
 
   def expired?
     expiration_time && expiration_time <= Time.zone.now
   end
+
+  serialize :custom_data if ActiveRecord::Base.connection.instance_values['config'][:adapter].match('mysql')
 end

data/db/migrate/20140103165607_create_signins.rb

@@ -1,4 +1,5 @@
-class CreateSignins < ActiveRecord::Migration
+migration_kls = Rails::VERSION::MAJOR > 4 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class CreateSignins < migration_kls
   def self.up
     create_table :signins do |t|
       t.integer   :signinable_id, null: false

data/db/migrate/20180530131006_add_custom_data_to_sigins.rb

@@ -0,0 +1,13 @@
+migration_kls = Rails::VERSION::MAJOR > 4 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+
+class AddCustomDataToSigins < migration_kls
+  def change
+
+    if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
+      add_column :signins, :custom_data, :jsonb, null:false, default: {}
+    else
+      add_column :signins, :custom_data, :string, null:false, default: {}.to_json
+    end
+
+  end
+end

data/lib/signinable/model_additions.rb

@@ -14,7 +14,7 @@ module Signinable
         has_many :signins, as: :signinable, dependent: :destroy
       end
 
-      def authenticate_with_token(token, ip, user_agent)
+      def authenticate_with_token(token, ip, user_agent, skip_restrictions=[])
         if(signin = Signin.find_by_token(token))
           if self.signin_expiration.respond_to?(:call)
             self.signin_expiration = self.signin_expiration.call(signin.signinable)
@@ -28,18 +28,18 @@ module Signinable
             return nil unless signin == signin.signinable.last_signin
           end
 
-          return nil unless self.check_signin_permission(signin, ip, user_agent)
+          return nil unless self.check_signin_permission(signin, ip, user_agent, skip_restrictions)
           signin.update!(expiration_time: (Time.zone.now + self.signin_expiration)) unless signin.expiration_time.nil? || self.signin_expiration == 0
           signin.signinable
         end
       end
 
-      def check_signin_permission(signin, ip, user_agent)
-        signin_permitted?(signin, ip, user_agent)
+      def check_signin_permission(signin, ip, user_agent, skip_restrictions)
+        signin_permitted?(signin, ip, user_agent, skip_restrictions)
       end
 
       private
-      def signin_permitted?(signin, ip, user_agent)
+      def signin_permitted?(signin, ip, user_agent, skip_restrictions)
         restriction_fields = case
         when self.signin_restrictions.respond_to?(:call)
           self.signin_restrictions.call(signin.signinable)
@@ -49,7 +49,7 @@ module Signinable
           []
         end
 
-        restriction_fields.each do |field|
+        (restriction_fields - skip_restrictions).each do |field|
           if(local_variables.include?(field.to_sym) && signin.respond_to?("#{field}"))
             return false unless signin.send("#{field}") == eval("#{field}")
           end
@@ -59,17 +59,17 @@ module Signinable
       end
     end
 
-    def signin(ip, user_agent, referer, permanent = false)
+    def signin(ip, user_agent, referer, permanent = false, custom_data = {})
       if self.class.signin_expiration.respond_to?(:call)
         self.class.signin_expiration = self.class.signin_expiration.call(self)
       end
       expiration_time = (self.class.signin_expiration == 0 || permanent) ? nil : (Time.zone.now + self.class.signin_expiration)
-      Signin.create!(signinable: self, ip: ip, referer: referer, user_agent: user_agent, expiration_time: expiration_time).token
+      Signin.create!(custom_data: custom_data, signinable: self, ip: ip, referer: referer, user_agent: user_agent, expiration_time: expiration_time).token
     end
 
-    def signout(token, ip, user_agent)
+    def signout(token, ip, user_agent, skip_restrictions=[])
       if(signin = Signin.find_by_token(token))
-        return nil unless self.class.check_signin_permission(signin, ip, user_agent)
+        return nil unless self.class.check_signin_permission(signin, ip, user_agent, skip_restrictions)
         signin.expire!
 
         return true

data/lib/signinable/version.rb

@@ -1,3 +1,3 @@
 module Signinable
-  VERSION = "2.0.6"
+  VERSION = '2.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signinable
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.11
 platform: ruby
 authors:
 - Ivan Novozhenets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,6 +93,7 @@ files:
 - app/models/signin.rb
 - config/routes.rb
 - db/migrate/20140103165607_create_signins.rb
+- db/migrate/20180530131006_add_custom_data_to_sigins.rb
 - lib/signinable.rb
 - lib/signinable/engine.rb
 - lib/signinable/model_additions.rb
@@ -122,8 +123,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20140103165606_create_users.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -152,46 +151,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Token based signin
 test_files:
-- spec/dummy/app/models/user.rb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config.ru
+- spec/dummy/README.rdoc
+- spec/dummy/db/migrate/20140103165606_create_users.rb
+- spec/dummy/db/schema.rb
 - spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config.ru
-- spec/dummy/db/migrate/20140103165606_create_users.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/test.log
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
+- spec/dummy/app/models/user.rb
+- spec/dummy/Rakefile
+- spec/dummy/bin/rails
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rake
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/dummy/README.rdoc
-- spec/factories/signin.rb
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/support/utilities.rb
 - spec/factories/user.rb
+- spec/factories/signin.rb
+- spec/spec_helper.rb
 - spec/models/signin_spec.rb
 - spec/models/user_spec.rb
-- spec/spec_helper.rb
-- spec/support/utilities.rb

data/spec/dummy/log/test.log

@@ -1,5 +0,0 @@
-   (5.9ms)  SELECT sqlite_version(*)
-   (2.2ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
-   (0.9ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-   (0.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-Migrating to CreateUsers (20140103165606)