signinable 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f444bdf0cb1a270d31e004760a723d8e8ba48e
-  data.tar.gz: b40c23efac320454d30e10362c80d45bfcd22ca6
+  metadata.gz: 55794149ad1cc0c4a7be9a08d2cefbb0e1d10d61
+  data.tar.gz: e59d8ae956f9d4833c58ffb674358b1e4d4cba79
 SHA512:
-  metadata.gz: 1a106fb31f69898db7a42b7ea6803171cd91f3400c9c08a7265089442d5aa8f32ec4ef8383a1a61ee66f5b0f97edca80eff6c61a1a3b9320e5a168fed72e5c23
-  data.tar.gz: 932903248820c31efa56fba59770723a8db7faa5c4a648a2860a07a0093815aa499043a1d2409ab7918cdf2842829233f8ecd646d7f11d36799c7c9d92e5dee3
+  metadata.gz: 8331f8045d7b3bbfeac9bc0c52239b0db9ee21e23a3616308dbc70a21bc6179e13b7894575c69fa55c8c119c302b37fec739d93badf0c74be57748d79404d0a6
+  data.tar.gz: 598d52c18fe092f3e59f6e781d9c34e9aeff4f5a81ac0825d25f616bf74c2fc929239f21f6bb9c4ab36841c69fec8d8dc3185b93c420b11ccaca0d076388c2c8

data/app/models/signin.rb

@@ -1,10 +1,12 @@
+require 'resolv'
+
 class Signin < ActiveRecord::Base
   belongs_to :signinable, polymorphic: true
 
   validates :token, presence: true
   validates :ip,
             presence: true,
-            format: { with: /\A([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}\z/ }
+            format: { with: Regexp.union(Resolv::IPv4::Regex, Resolv::IPv6::Regex) }
 
   before_validation on: :create do
     self.token = SecureRandom.urlsafe_base64(rand(50..100))

data/lib/signinable/model_additions.rb

@@ -9,7 +9,7 @@ module Signinable
         cattr_accessor :signin_restrictions
         self.signin_expiration = options.fetch(:expiration, 2.hours)
         self.signin_simultaneous = options.fetch(:simultaneous, true)
-        self.signin_restrictions = options.fetch(:restrictions, []).is_a?(Array) ? options[:restrictions] : []
+        self.signin_restrictions = options[:restrictions]
 
         has_many :signins, as: :signinable, dependent: :destroy
       end
@@ -40,7 +40,16 @@ module Signinable
 
       private
       def signin_permitted?(signin, ip, user_agent)
-        self.signin_restrictions.each do |field|
+        restriction_fields = case
+        when self.signin_restrictions.respond_to?(:call)
+          self.signin_restrictions.call(signin.signinable)
+        when self.signin_restrictions.is_a?(Array)
+          self.signin_restrictions
+        else
+          []
+        end
+
+        restriction_fields.each do |field|
           if(local_variables.include?(field.to_sym) && signin.respond_to?("#{field}"))
             return false unless signin.send("#{field}") == eval("#{field}")
           end

data/lib/signinable/version.rb

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

data/spec/dummy/log/test.log

@@ -0,0 +1,5 @@
+   (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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signinable
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Ivan Novozhenets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,8 @@ 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
@@ -179,6 +181,8 @@ test_files:
 - 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/public/500.html