signinable 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed8b7004a61e8356629c4043414ac984c2c220ad
-  data.tar.gz: 3c04410f2c4690f100c75990210f9adb0ff16fae
+  metadata.gz: f7f444bdf0cb1a270d31e004760a723d8e8ba48e
+  data.tar.gz: b40c23efac320454d30e10362c80d45bfcd22ca6
 SHA512:
-  metadata.gz: 99741bb1307f71aabad86d3b259917501d7db9f48c0d21c2375968bd178c17b6df4e52ce7580bb1e3b5175d84178d3454e7408ceb932ee17890c04f3d6a07a93
-  data.tar.gz: e2f1997057b4171c04482822bfa86fa1ceb6deb18924caab04da6eef02379b4ea64b15593323a3c978b63e4aaace9c954a5de6d4ecac865d4f6d9b867cc880cb
+  metadata.gz: 1a106fb31f69898db7a42b7ea6803171cd91f3400c9c08a7265089442d5aa8f32ec4ef8383a1a61ee66f5b0f97edca80eff6c61a1a3b9320e5a168fed72e5c23
+  data.tar.gz: 932903248820c31efa56fba59770723a8db7faa5c4a648a2860a07a0093815aa499043a1d2409ab7918cdf2842829233f8ecd646d7f11d36799c7c9d92e5dee3

data/lib/signinable/model_additions.rb

@@ -7,9 +7,9 @@ module Signinable
         cattr_accessor :signin_expiration
         cattr_accessor :signin_simultaneous
         cattr_accessor :signin_restrictions
-        self.signin_expiration = options[:expiration] || 2.hours
-        self.signin_simultaneous = options[:simultaneous] || true
-        self.signin_restrictions = (options[:restrictions] && options[:restrictions].is_a?(Array)) ? options[: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] : []
 
         has_many :signins, as: :signinable, dependent: :destroy
       end
@@ -29,7 +29,7 @@ module Signinable
           end
 
           return nil unless self.check_signin_permission(signin, ip, user_agent)
-          signin.update!(expiration_time: (Time.zone.now + self.signin_expiration)) unless self.signin_expiration == 0
+          signin.update!(expiration_time: (Time.zone.now + self.signin_expiration)) unless signin.expiration_time.nil? || self.signin_expiration == 0
           signin.signinable
         end
       end
@@ -50,11 +50,11 @@ module Signinable
       end
     end
 
-    def signin(ip, user_agent, referer)
+    def signin(ip, user_agent, referer, permanent = false)
       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 ? nil : (Time.zone.now + self.class.signin_expiration)
+      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
     end
 

data/lib/signinable/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: signinable
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Ivan Novozhenets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails