devise_sms_confirmable 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad0caa6d14ad6b8406d429dd6b95e6048095238dd92e2f430217748db18f8d5b
-  data.tar.gz: 847c743ab1ff45c74d69e7759d22ea705a793a1b407499f3437ca4de4936b602
+  metadata.gz: a7da634ddbe05a536e69cfc4223581ca87f6f22e7aa35e6bbaaa8f8927d16cce
+  data.tar.gz: e779c465edf5eda673f6a90cd50b5273309c903adaebc272e3a500df3526e50d
 SHA512:
-  metadata.gz: b28925a7656bdda3d2887051684f711b5e7397ec9bda1d8b536fb40a2b72cbba5388821b9985e7e3bcbc005ca98d71443e80f2d68a93163fbdbb6b93d0839e17
-  data.tar.gz: 40fec62988c8c698a690edbfe46409321ff778f559c4b32023840fed3baf7ef2a0ee892ed7900e1352a7b8f6331b94cf2711f31f08f65ac08cacf1595de2725a
+  metadata.gz: 85925719b646dd4e7482c4d1bc9b8889a7249416504e0884fbead9dc0b4b08499791061552250e5fa326d7789da8a7d108621e521f6c7f27b6a65e071fea60fc
+  data.tar.gz: d87a5c77aef9b90a4e07e29629cc91ce841395538d67e30b80b7ea507ef2686f6f8636c059f688181a2125389c977232d94579b01a59dd614bcb3f5ec5395d29

data/Gemfile.lock

@@ -1,56 +1,52 @@
 PATH
   remote: .
   specs:
-    devise_sms_confirmable (0.1.1)
+    devise_sms_confirmable (0.1.2)
       devise (>= 4.6.2)
-      railties (>= 5.1.0)
+      rails (~> 5.1.4)
       textris (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.1.7)
+      actionpack (= 5.1.7)
       nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    actionpack (5.1.7)
+      actionview (= 5.1.7)
+      activesupport (= 5.1.7)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.1.7)
+      activesupport (= 5.1.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.1.7)
+      activesupport (= 5.1.7)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activemodel (5.1.7)
+      activesupport (= 5.1.7)
+    activerecord (5.1.7)
+      activemodel (= 5.1.7)
+      activesupport (= 5.1.7)
+      arel (~> 8.0)
+    activesupport (5.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+    arel (8.0.0)
     bcrypt (3.1.13)
     builder (3.2.3)
     concurrent-ruby (1.1.5)
@@ -61,24 +57,27 @@ GEM
       railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.3)
     erubi (1.8.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
+    jwt (2.2.1)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    metaclass (0.0.4)
     method_source (0.9.2)
-    mimemagic (0.3.3)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
+    mocha (1.9.0)
+      metaclass (~> 0.0.1)
+    multipart-post (2.1.1)
     nio4r (2.4.0)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
@@ -87,49 +86,35 @@ GEM
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.1.7)
+      actioncable (= 5.1.7)
+      actionmailer (= 5.1.7)
+      actionpack (= 5.1.7)
+      actionview (= 5.1.7)
+      activejob (= 5.1.7)
+      activemodel (= 5.1.7)
+      activerecord (= 5.1.7)
+      activesupport (= 5.1.7)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.1.7)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    railties (5.1.7)
+      actionpack (= 5.1.7)
+      activesupport (= 5.1.7)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.18.1, < 2.0)
     rake (12.3.0)
     render_anywhere (0.0.12)
       rails (>= 3.0.7)
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -137,6 +122,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sqlite3 (1.4.1)
     textris (0.7.0)
       actionmailer (>= 4.0)
       activejob (>= 4.2)
@@ -145,11 +131,16 @@ GEM
       render_anywhere (~> 0.0)
     thor (0.20.3)
     thread_safe (0.3.6)
+    timecop (0.9.1)
+    twilio-ruby (5.25.2)
+      faraday (~> 0.9)
+      jwt (>= 1.5, <= 2.5)
+      nokogiri (>= 1.6, < 2.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     warden (1.2.8)
       rack (>= 2.0.6)
-    websocket-driver (0.7.1)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
 
@@ -158,9 +149,13 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  devise (>= 4.6.2)
   devise_sms_confirmable!
+  mocha
   rake
-  rspec
+  sqlite3
+  timecop
+  twilio-ruby
 
 BUNDLED WITH
    1.17.1

data/Rakefile

@@ -1,6 +1,10 @@
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require "rake/testtask"
 
-RSpec::Core::RakeTask.new(:spec)
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
 
-task :default => :spec
+task :default => :test

data/app/controllers/devise/sms_confirmations_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Devise::SmsConfirmationsController < DeviseController
+
   # GET /resource/sms_confirmation/new
   def new
     self.resource = resource_class.new

data/app/texters/devise/texter.rb

@@ -2,41 +2,51 @@
 
 if defined?(Textris)
   class Devise::Texter < Textris::Base
-    default from: Devise.sms_sender
+    default from: "+48666777888"
 
     def confirmation_instructions(record, token, opts={})
       @token = token
       @resource = record
 
-      text to: record.phone
+      headers = { to: @resource.phone }.merge(opts)
+
+      text to: headers[:to]
     end
 
     def reset_password_instructions(record, token, opts={})
       @token = token
       @resource = record
 
-      text to: record.phone
+      headers = { to: @resource.phone }.merge(opts)
+
+      text to: headers[:to]
     end
 
     def unlock_instructions(record, token, opts={})
       @token = token
       @resource = record
 
-      text to: record.phone
+      headers = { to: @resource.phone }.merge(opts)
+
+      text to: headers[:to]
     end
 
-    def email_changed(record, token, opts={})
+    def phone_changed(record, token, opts={})
       @token = token
       @resource = record
 
-      text to: record.phone
+      headers = { to: @resource.phone }.merge(opts)
+
+      text to: headers[:to]
     end
 
     def password_change(record, token, opts={})
       @token = token
       @resource = record
 
-      text to: record.phone
+      headers = { to: @resource.phone }.merge(opts)
+
+      text to: headers[:to]
     end
   end
 end

data/app/views/devise/texter/confirmation_instructions.text.erb

@@ -1,5 +1,4 @@
 Welcome <%= @phone %>!
 
 You can confirm your account phone number through the link below:
-
-<%= sms_confirmation_url(@resource, confirmation_token: @token) %>
+<%= session_url(@resource, confirmation_token: @token) %>

data/devise_sms_confirmable.gemspec

@@ -1,4 +1,3 @@
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "devise_sms_confirmable/version"
@@ -24,10 +23,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "devise", ">= 4.6.2"
-  spec.add_dependency("railties", ">= 5.1.0")
+  spec.add_dependency "rails", "~> 5.1.4"
   spec.add_dependency("textris", "~> 0.7")
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "devise", ">= 4.6.2"
+  spec.add_development_dependency "twilio-ruby"
+  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "timecop"
 end

data/lib/devise_sms_confirmable/models/sms_authenticatable.rb

@@ -2,7 +2,7 @@
 
 module Devise
   module Models
-    module SMSAuthenticatable
+    module SmsAuthenticatable
       extend ActiveSupport::Concern
 
       protected
@@ -13,7 +13,7 @@ module Devise
 
       def send_sms_devise_notification(notification, *args)
         message = devise_texter.send(notification, self, *args)
-        message.deliver_now
+        message.deliver
       end
     end
   end

data/lib/devise_sms_confirmable/models/sms_confirmable.rb

@@ -1,19 +1,34 @@
+require_relative 'sms_authenticatable'
+require_relative 'sms_validatable'
+
 module Devise
   module Models
     module SmsConfirmable
       extend ActiveSupport::Concern
+      include Devise::Models::SmsAuthenticatable
 
       included do
         before_create :generate_sms_confirmation_token, if: :sms_confirmation_required?
-        after_create :skip_reconfirmation_in_callback!, if: :send_sms_confirmation_notification?
+        after_create :skip_sms_reconfirmation_in_callback!, if: :send_sms_confirmation_notification?
+        before_update :postpone_phone_change_until_confirmation_and_regenerate_sms_confirmation_token, if: :postpone_phone_change?
+        after_update :send_phone_changed_notification, if: :send_phone_changed_notification?
+
         after_commit :send_on_create_sms_confirmation_instructions, on: :create, if: :send_sms_confirmation_notification?
         after_commit :send_sms_reconfirmation_instructions, on: :update, if: :sms_reconfirmation_required?
-        before_update :postpone_phone_change_until_confirmation_and_regenerate_confirmation_token, if: :postpone_phone_change?
+      end
+
+      def initialize(*args, &block)
+        @bypass_sms_confirmation_postpone = false
+        @skip_sms_reconfirmation_in_callback = false
+        @sms_reconfirmation_required = false
+        @skip_sms_confirmation_notification = false
+        @raw_sms_confirmation_token = nil
+        super
       end
 
       def self.required_fields(klass)
-        required_methods = [:sms_confirmed_at, :sms_confirmation_sent_at]
-        required_methods << :unconfirmed_phone if klass.reconfirmable
+        required_methods = [:sms_confirmed_at, :sms_confirmation_sent_at, :sms_confirmation_token]
+        required_methods << :unconfirmed_phone if klass.sms_reconfirmable
         required_methods
       end
 
@@ -21,18 +36,17 @@ module Devise
         pending_any_sms_confirmation do
           if sms_confirmation_period_expired?
             self.errors.add(:phone, :sms_confirmation_period_expired,
-                            period: Devise::TimeInflector.time_ago_in_words(self.class.confirm_within.ago))
+                            period: Devise::TimeInflector.time_ago_in_words(self.class.sms_confirm_within.ago))
             return false
           end
 
           self.sms_confirmed_at = Time.now.utc
 
           saved = if pending_sms_reconfirmation?
-                    skip_reconfirmation!
+                    skip_sms_reconfirmation!
                     self.phone = unconfirmed_phone
                     self.unconfirmed_phone = nil
 
-                    # We need to validate in such cases to enforce e-mail uniqueness
                     save(validate: true)
                   else
                     save(validate: args[:ensure_valid] == true)
@@ -49,40 +63,77 @@ module Devise
       end
 
       def send_sms_reconfirmation_instructions
-        @reconfirmation_required = false
+        @sms_reconfirmation_required = false
 
         unless @skip_confirmation_notification
           send_sms_confirmation_instructions
         end
       end
 
+      def skip_sms_confirmation_notification!
+        @skip_confirmation_notification = true
+      end
+
       def send_sms_confirmation_instructions
-        unless @raw_confirmation_token
-          generate_confirmation_token!
+        unless @raw_sms_confirmation_token
+          generate_sms_confirmation_token!
         end
 
-        opts = pending_reconfirmation? ? { to: unconfirmed_phone } : { }
-        send_sms_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
+        opts = pending_sms_reconfirmation? ? { to: unconfirmed_phone } : { }
+        send_sms_devise_notification(:confirmation_instructions, @raw_sms_confirmation_token, opts)
+      end
+
+      # Resend confirmation token.
+      # Regenerates the token if the period is expired.
+      def resend_sms_confirmation_instructions
+        pending_any_sms_confirmation do
+          send_sms_confirmation_instructions
+        end
+      end
+
+      def active_for_authentication?
+
+        super && (!sms_confirmation_required? || sms_confirmed? || sms_confirmation_period_valid?)
+      end
+
+      def send_phone_changed_notification
+        send_sms_devise_notification(:phone_changed, to: phone_before_last_save)
       end
 
-      def generate_confirmation_token!
+      def generate_sms_confirmation_token!
         generate_sms_confirmation_token && save(validate: false)
       end
 
       # override Devise::Models::Confirmable#pending_sms_reconfirmation?
       def pending_sms_reconfirmation?
-        self.class.reconfirmable && unconfirmed_phone.present?
+        self.class.sms_reconfirmable && unconfirmed_phone.present?
+      end
+
+      # If you don't want confirmation to be sent on create, neither a code
+      # to be generated, call skip_sms_confirmation!
+      def skip_sms_confirmation!
+        self.sms_confirmed_at = Time.now.utc
+      end
+
+      def skip_sms_reconfirmation!
+        @bypass_sms_confirmation_postpone = true
       end
 
-      # protected
+      protected
+
+      def skip_sms_reconfirmation_in_callback!
+        @skip_sms_reconfirmation_in_callback = true
+      end
 
       def devise_texter
         Devise.texter
       end
 
-      def send_sms_devise_notification(notification, *args)
-        message = devise_texter.send(notification, self, *args)
-        message.deliver_later
+      def sms_confirmation_period_valid?
+        return true if self.class.allow_sms_unconfirmed_access_for.nil?
+        return false if self.class.allow_sms_unconfirmed_access_for == 0.days
+
+        sms_confirmation_sent_at && sms_confirmation_sent_at.utc >= self.class.allow_sms_unconfirmed_access_for.ago
       end
 
       # A callback initiated after successfully confirming. This can be
@@ -91,7 +142,7 @@ module Devise
       #
       # Example:
       #
-      #   def after_confirmation
+      #   def after_sms_confirmation
       #     self.update_attribute(:invite_code, nil)
       #   end
       #
@@ -107,16 +158,16 @@ module Devise
       end
 
       def sms_confirmation_period_expired?
-        self.class.confirm_within && self.sms_confirmation_sent_at && (Time.now.utc > self.sms_confirmation_sent_at.utc + self.class.confirm_within)
+        self.class.sms_confirm_within && self.sms_confirmation_sent_at && (Time.now.utc > self.sms_confirmation_sent_at.utc + self.class.sms_confirm_within)
       end
 
       # Generates a new random token for confirmation, and stores
       # the time this token is being generated in sms_confirmation_sent_at
       def generate_sms_confirmation_token
-        if self.confirmation_token && !confirmation_period_expired?
-          @raw_confirmation_token = self.confirmation_token
+        if self.sms_confirmation_token && !sms_confirmation_period_expired?
+          @raw_sms_confirmation_token = self.sms_confirmation_token
         else
-          self.confirmation_token = @raw_confirmation_token = Devise.friendly_token
+          self.sms_confirmation_token = @raw_sms_confirmation_token = Devise.friendly_token
           self.sms_confirmation_sent_at = Time.now.utc
         end
       end
@@ -132,12 +183,13 @@ module Devise
       end
 
       def postpone_phone_change?
-        postpone = self.class.reconfirmable &&
+        postpone = self.class.sms_reconfirmable &&
             will_save_change_to_phone? &&
-            !@bypass_confirmation_postpone &&
+            !@bypass_sms_confirmation_postpone &&
             self.phone.present? &&
-            (!@skip_reconfirmation_in_callback || !self.phone_in_database.nil?)
-        @bypass_confirmation_postpone = false
+            (!@skip_sms_reconfirmation_in_callback || !self.phone_in_database.nil?)
+        @bypass_sms_confirmation_postpone = false
+
         postpone
       end
 
@@ -146,51 +198,58 @@ module Devise
       end
 
       def sms_reconfirmation_required?
-        self.class.reconfirmable && @reconfirmation_required && (self.phone.present? || self.unconfirmed_phone.present?)
+        self.class.sms_reconfirmable && @sms_reconfirmation_required && (self.phone.present? || self.unconfirmed_phone.present?)
       end
 
-      def postpone_phone_change_until_confirmation_and_regenerate_confirmation_token
-        @reconfirmation_required = true
+      def postpone_phone_change_until_confirmation_and_regenerate_sms_confirmation_token
+        @sms_reconfirmation_required = true
         self.unconfirmed_phone = self.phone
         self.phone = self.phone_in_database
-        self.confirmation_token = nil
+        self.sms_confirmation_token = nil
         generate_sms_confirmation_token
       end
 
+      # With reconfirmable, notify the original email when the user first
+      # requests the email change, instead of when the change is confirmed.
+      def send_phone_changed_notification?
+        self.class.sms_reconfirmable && self.class.send_phone_changed_notification && sms_reconfirmation_required?
+      end
+
       module ClassMethods
         def send_sms_confirmation_instructions(attributes={})
-          confirmable = find_by_unconfirmed_phone_with_errors(attributes) if reconfirmable
+          confirmable = find_by_unconfirmed_phone_with_errors(attributes) if sms_reconfirmable
           unless confirmable.try(:persisted?)
             confirmable = find_or_initialize_with_errors(sms_confirmation_keys, attributes, :not_found)
           end
-          confirmable.resend_confirmation_instructions if confirmable.persisted?
+          confirmable.resend_sms_confirmation_instructions if confirmable.persisted?
           confirmable
         end
 
-        def sms_confirm_by_token(confirmation_token)
-          confirmable = find_first_by_auth_conditions(confirmation_token: confirmation_token)
+        def sms_confirm_by_token(sms_confirmation_token)
+          confirmable = find_first_by_auth_conditions(sms_confirmation_token: sms_confirmation_token)
           unless confirmable
-            confirmation_digest = Devise.token_generator.digest(self, :confirmation_token, confirmation_token)
-            confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_digest)
+            confirmation_digest = Devise.token_generator.digest(self, :sms_confirmation_token, sms_confirmation_token)
+            confirmable = find_or_initialize_with_error_by(:sms_confirmation_token, confirmation_digest)
           end
 
           # TODO: replace above lines with
-          # confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
+          # confirmable = find_or_initialize_with_error_by(:sms_confirmation_token, sms_confirmation_token)
           # after enough time has passed that Devise clients do not use digested tokens
 
           confirmable.sms_confirm if confirmable.persisted?
           confirmable
         end
-      end
 
-      def find_by_unconfirmed_phone_with_errors(attributes = {})
-        attributes = attributes.slice(*sms_confirmation_keys).permit!.to_h if attributes.respond_to? :permit
-        unconfirmed_required_attributes = sms_confirmation_keys.map { |k| k == :phone ? :unconfirmed_phone : k }
-        unconfirmed_attributes = attributes.symbolize_keys
-        unconfirmed_attributes[:unconfirmed_phone] = unconfirmed_attributes.delete(:phone)
-        find_or_initialize_with_errors(unconfirmed_required_attributes, unconfirmed_attributes, :not_found)
-      end
+        def find_by_unconfirmed_phone_with_errors(attributes = {})
+          attributes = attributes.slice(*sms_confirmation_keys).permit!.to_h if attributes.respond_to? :permit
+          unconfirmed_required_attributes = sms_confirmation_keys.map { |k| k == :phone ? :unconfirmed_phone : k }
+          unconfirmed_attributes = attributes.symbolize_keys
+          unconfirmed_attributes[:unconfirmed_phone] = unconfirmed_attributes.delete(:phone)
+          find_or_initialize_with_errors(unconfirmed_required_attributes, unconfirmed_attributes, :not_found)
+        end
 
+        Devise::Models.config(self, :allow_sms_unconfirmed_access_for, :send_phone_changed_notification, :sms_confirmation_keys, :sms_reconfirmable, :sms_confirm_within)
+      end
     end
   end
 end

data/lib/devise_sms_confirmable/models/sms_validatable.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Devise
+  module Models
+    # Validatable creates all needed validations for a user phone and password.
+    # It's optional, given you may want to create the validations by yourself.
+    # Automatically validate if the phone is present, unique and its format is
+    # valid. Also tests presence of password, confirmation and length.
+    #
+    # == Options
+    #
+    # Validatable adds the following options to devise_for:
+    #
+    #   * +email_regexp+: the regular expression used to validate e164 format;
+    #
+    #
+    module SmsValidatable
+      # All validations used by this module.
+      VALIDATIONS = [:validates_presence_of, :validates_uniqueness_of, :validates_format_of,
+                     :validates_confirmation_of, :validates_length_of].freeze
+
+      def self.required_fields(klass)
+        []
+      end
+
+      def self.included(base)
+        base.extend ClassMethods
+        assert_validations_api!(base)
+
+        base.class_eval do
+          validates_presence_of   :phone, if: :phone_required?
+          validates_uniqueness_of :phone, allow_blank: true,  if: :will_save_change_to_phone?
+          validates_format_of     :phone, with: e164_phone_regexp, allow_blank: true, if: :will_save_change_to_phone?
+        end
+      end
+
+      def self.assert_validations_api!(base) #:nodoc:
+        unavailable_validations = VALIDATIONS.select { |v| !base.respond_to?(v) }
+
+        unless unavailable_validations.empty?
+          raise "Could not use :validatable module since #{base} does not respond " <<
+                    "to the following methods: #{unavailable_validations.to_sentence}."
+        end
+      end
+
+      protected
+
+      # Checks whether a password is needed or not. For validations only.
+      # Passwords are always required if it's a new record, or if the password
+      # or confirmation are being set somewhere.
+      def phone_required?
+        true
+      end
+
+      module ClassMethods
+        Devise::Models.config(self, :e164_phone_regexp)
+      end
+    end
+  end
+end

data/lib/devise_sms_confirmable/version.rb

@@ -1,3 +1,3 @@
 module DeviseSmsConfirmable
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/devise_sms_confirmable.rb

@@ -7,11 +7,15 @@ require 'devise_sms_confirmable/engine'
 
 module Devise
   mattr_accessor :sms_confirm_within
-  @@sms_confirm_within = 2.days
+  @@sms_confirm_within = nil
 
   mattr_accessor :sms_confirmation_keys
   @@sms_confirmation_keys = [:phone]
 
+  # Used to send notification to the original user phone when their phone is changed.
+  mattr_accessor :send_phone_changed_notification
+  @@send_phone_changed_notification = false
+
   mattr_accessor :parent_texter
   @@parent_texter = "Textris::Base"
 
@@ -19,6 +23,18 @@ module Devise
   mattr_accessor :sms_sender
   @@sms_sender = nil
 
+  mattr_accessor :e164_phone_regexp
+  @@e164_phone_regexp = /\A\+?[1-9]\d{1,14}\z/
+
+  # Defines if email should be sms_reconfirmable.
+  mattr_accessor :sms_reconfirmable
+  @@sms_reconfirmable = true
+
+  # Time interval you can access your account before confirming your account.
+  # nil - allows unconfirmed access for unlimited time
+  mattr_accessor :allow_sms_unconfirmed_access_for
+  @@allow_sms_unconfirmed_access_for = 0.days
+
   # Get the sms sender class from the texter reference object.
   def self.texter
     @@texter_ref.get

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_sms_confirmable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - matsutani
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.6.2
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.4
 - !ruby/object:Gem::Dependency
   name: textris
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.6.2
+- !ruby/object:Gem::Dependency
+  name: twilio-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -102,7 +158,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -113,8 +168,8 @@ files:
 - app/controllers/devise/sms_confirmations_controller.rb
 - app/texters/devise/texter.rb
 - app/views/devise/texter/confirmation_instructions.text.erb
-- app/views/devise/texter/email_changed.text.erb
 - app/views/devise/texter/password_change.text.erb
+- app/views/devise/texter/phone_changed.text.erb
 - app/views/devise/texter/reset_password_instructions.text.erb
 - app/views/devise/texter/unlock_instructions.text.erb
 - bin/console
@@ -124,6 +179,7 @@ files:
 - lib/devise_sms_confirmable/engine.rb
 - lib/devise_sms_confirmable/models/sms_authenticatable.rb
 - lib/devise_sms_confirmable/models/sms_confirmable.rb
+- lib/devise_sms_confirmable/models/sms_validatable.rb
 - lib/devise_sms_confirmable/rails/routes.rb
 - lib/devise_sms_confirmable/version.rb
 homepage: https://github.com/uuushiro/devise_sms_confirmable

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper