signinable 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1da8211a792e1ff4e21a506ec01c0cad70f7d14
-  data.tar.gz: 5d1f20a9cadf7025aab7065dcac924902471d357
+  metadata.gz: c6aedbf478d474ba1c4eaea564eb5923f447d014
+  data.tar.gz: 1e679b63fc9ffc805c4ed762db8d56accf7d0bd5
 SHA512:
-  metadata.gz: 0a3c80990d4226d94cf73312230d08244b0937fced1f31c6bcfb0f4983161b6c29defab4b89ace141e42f2d6ad4903c88dac8a7ea98846ce3839a3d7944ab7ea
-  data.tar.gz: 795347736ef5aaeaa425eed3b086265add239d3847ced59bc1170445b4136ad9f97f6e809f550fd99eee4fc389ba15c80d4ba628b41c798942b5d7e7d00472b2
+  metadata.gz: 7da61b67ae30e1a09e5f023b30b7a757485e5ed72fa97b6eb2b0ada32986e75efa4c822a173dc796b47fbd9d27cc4410ece7fcf7638402515c86bf0d4fd478a3
+  data.tar.gz: 758f8ac930b49ade4264a7d9084d62104a1b700a80ba7e681c0c17a330aa6f9255fd467840a77b3fe31a2b45f2decb82307f6214093d9b8b004e8711a1380878

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
@@ -67,9 +67,9 @@ module Signinable
       Signin.create!(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.7"
+  VERSION = "2.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signinable
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Ivan Novozhenets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -158,40 +158,40 @@ signing_key:
 specification_version: 4
 summary: Token based signin
 test_files:
+- spec/spec_helper.rb
 - spec/dummy/app/models/user.rb
+- spec/dummy/bin/rake
 - 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/environment.rb
-- spec/dummy/config/environments/development.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/locales/en.yml
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config.ru
-- spec/dummy/db/migrate/20140103165606_create_users.rb
+- spec/dummy/Rakefile
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/db/migrate/20140103165606_create_users.rb
 - 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/dummy/Rakefile
 - spec/dummy/README.rdoc
-- spec/factories/signin.rb
-- spec/factories/user.rb
 - spec/models/signin_spec.rb
 - spec/models/user_spec.rb
-- spec/spec_helper.rb
 - spec/support/utilities.rb
+- spec/factories/signin.rb
+- spec/factories/user.rb