devision 0.0.2.5 → 0.0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa4060fe9c554b4206efc45e3ce9e3b384fbbbf5
-  data.tar.gz: ee75911c949a2d904a3a4b0f07f94055a5bde509
+  metadata.gz: 2dc3ceded7632311f14585905ef6a4c91275dab1
+  data.tar.gz: f8f86b4a364d2dc707e67f96471a7d8e25c41b09
 SHA512:
-  metadata.gz: ec371814cfcf088751d13577bd200f1f602cf75c0383413747e8454365cf20efe2fc8dd37bc26811e6a6d4f35b8b8515a9e4074c9f8c51786405f3aa6cc1289d
-  data.tar.gz: a310efb8d52376c97b82286fad23b3853052a37a8beb47f41e017a7586584f99c9a4fed62e54969c136b274ca0285e4a9e572def02dcf2be08ad7235c4facfde
+  metadata.gz: 1f7008856e374d058a4c8456c63769fd0f0f578be8ffd4b3f1a1c175eaf8c7bcfc77921bbb96cde2772effe95fbb302486179a3b476a7f137e2de200f039c955
+  data.tar.gz: 76884df834e5870bd47c29b5c73aa89b30e9ed5061a7fd3b5937eaad19a57054eb94f20e5079f5790c0fbdc4054dfb3dab7e0ec896d00ae25a1a8a7c2969d411

data/lib/devision/models/rememberable.rb

@@ -54,7 +54,7 @@ module Devision
       def forget_me!
         return unless persisted?
         self.remember_token = nil if respond_to?(:remember_token=)
-        self.remember_created_at = nil
+        self.remember_created_at = nil if self.class.expire_all_remember_me_on_sign_out
         save(validate: false)
       end
 
@@ -99,6 +99,17 @@ module Devision
 
       module ClassMethods
 
+        # create a cookie key using the record id and rememberable_value
+        def serialize_into_cookie(record)
+          [record.to_key, record.rememberable_value]
+        end
+
+        # Recreate the user based on the stored cookie
+        def serialize_from_cookie(id, rememberable_token_value)
+          record = to_adapter.get(id)
+          record if record && !record.remember_expired? && Devision.secure_compare(record.rememberable_value, rememberable_token_value)
+        end
+
         # Generate a token checking if one does not already exist in the database.
         def remember_token #:nodoc:
           loop do
@@ -107,7 +118,7 @@ module Devision
           end
         end
 
-        Devision::Models::Config.add_options(self, :remember_for, :extend_remember_period, :rememberable_options)
+        Devision::Models::Config.add_options(self, :remember_for, :extend_remember_period, :rememberable_options, :expire_all_remember_me_on_sign_out)
       end
     end
   end

data/lib/devision/models/validatable.rb

@@ -10,13 +10,18 @@ module Devision
       def self.included(base)
         base.extend(ClassMethods)
         base.class_eval do
-          validates_presence_of :email, if: :email_required?
-          validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
-          validates_format_of :email, with: email_regexp, allow_blank: true, if: :email_changed?
 
-          validates_presence_of :password, if: :password_required?
-          validates_confirmation_of :password, if: :password_required?
-          validates_length_of :password, within: password_length, allow_blank: true
+          if base.instance_methods.include?(:email)
+            validates_presence_of :email, if: :email_required?
+            validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
+            validates_format_of :email, with: email_regexp, allow_blank: true, if: :email_changed?
+          end
+
+          if base.instance_methods.included?(:password)
+            validates_presence_of :password, if: :password_required?
+            validates_confirmation_of :password, if: :password_required?
+            validates_length_of :password, within: password_length, allow_blank: true
+          end
         end
       end
 

data/lib/devision/version.rb

@@ -8,8 +8,8 @@ module Devision
     MAJOR = 0
     MINOR = 0
     PATCH = 2
-    PRE   = 5
+    PRE   = 7
 
-    STRING = [MAJOR,MINOR,PATCH,PRE].join('.').freeze
+    STRING = [MAJOR,MINOR,PATCH,PRE].compact.join('.').freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devision
 version: !ruby/object:Gem::Version
-  version: 0.0.2.5
+  version: 0.0.2.7
 platform: ruby
 authors:
 - John Faucett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler