devise_phone 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba70efaa41c822a55c473273003fab714655425
-  data.tar.gz: 5eef525f0108e55d151300cbc95f219957090137
+  metadata.gz: 247614aea59c90856236ad68b9e082a51bee8e7f
+  data.tar.gz: eb4f3309cbe2481c05161005194083e5c9293f07
 SHA512:
-  metadata.gz: 81d10fcad4e73bb4c966570e9bd97129215b1316765fb260f2f770e5ea34915df1517dd39f7c2a70c3d836a39e407c3cca297e44a4976a6fdea5566d9fbd9242
-  data.tar.gz: 9a442c35d66d3d582690aef094c955b56a8512d5516792551abd3fc1fa8194d5f5571cc6f9781b2f34f01a3124a862011b16e0b97db332fbe4a6b837b728e590
+  metadata.gz: c41bfd45c319e8b3053e8da035fc69f48707fdfd83686f9ea8095c2ccab627853a73077462410e57d3eb64c28bddf79a34f6b15c7d5290fc7081be18ce029269
+  data.tar.gz: 2208150b39a3810ec53145976a274aa865c66d450e2e88abd21aa3971a3b5cd9e78b3521dad203334e7188d154a1ff36b3996c23535ddbbb2ee11405774f7fd0

data/Gemfile.lock

@@ -6,3 +6,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+
+BUNDLED WITH
+   1.10.3

data/README.rdoc

@@ -1,40 +1,54 @@
-= devise_sms_confirmation
+= devise_phone
 
-Devise Phone is a snap-in for Devise that will make any resource activable via SMS.
-The user will receive an SMS with a token that can be entered on the site to activate the account.
-Ask the user his phone (and phone confirmation to double check) on registration and the token will be sended automagically.
-
-== Installation for Rails >= 3.0 and Devise >= 1.1
-
-Install DevisePhone gem, it will also install dependencies (such as devise and warden):
-
-  gem install devise_phone
+The user will receive an SMS with a token that can be entered on the site to activate the phone number.
+Ask the user his phone and the token will be sended automagically.
 
 Add DevisePhone to your Gemfile (and Devise and TwilioRuby if you weren't using them):
 
-  gem 'devise', 			'~> 3.4.1'
-  gem 'twilio-ruby', 	'~> 4.2.0'
-  gem 'devise_phone', '~> 0.0.1'
+  gem 'devise'
+  gem 'twilio-ruby'
+  gem 'devise_phone'
 
 === Automatic installation
 
+Run: 
+	rails generate devise:install
+	rails generate devise MODEL
+	rails generate devise:views MODEL
+before installing devise_phone in your Rails app
+
 Run the following generator to add DevisePhone’s configuration option in the Devise configuration file (config/initializers/devise.rb) and the sms sender class in your lib folder:
 
   rails generate devise_phone:install
 
-When you are done, you are ready to add DevisePhone to any of your Devise models using the following generator:
+When you are done, you are ready to add DevisePhone to any of your Devise models using the following generator: 
 
   rails generate devise_phone MODEL
 
 Replace MODEL by the class name you want to add DevisePhone, like User, Admin, etc. This will add the :phone flag to your model's Devise modules. The generator will also create a migration file (if your ORM support them). Continue reading this file to understand exactly what the generator produces and how to use it.
 
+In your config/environments, please specify your twilio_sid, twilio_token, and twilio_phone_number:
+
+	config.twilio = {
+    sid:          'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+    token:        'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+    phone_number: '123455678',
+  }
+
+To specify the message body, in devise.en.yml add:
+
+en:
+	devise:
+		phone:
+		      message_body: "Hi! This is Company Name. Your verification code is %{verification_code}."
+
 == Configuring views
 
 All the views are packaged inside the gem. If you'd like to customize the views, invoke the following generator and it will copy all the views to your application:
 
   rails generate devise_phone:views
 
-You can also use the generator to generate scoped views:
+You can also use the generator to generate scoped views: (This might not work yet)
 
   rails generate devise_phone:views users
 
@@ -42,30 +56,40 @@ Please refer to {Devise's README}[http://github.com/plataformatec/devise] for mo
 
 == Usage
 
-The model is specular to the Devise's own Confirmable model. It only requires the user to supply a valid phone number.
+Don't forget to add phone_number as one of the permitted parameters. This is an example of doing so:
+
+	class ApplicationController < ActionController::Base
+	  # Prevent CSRF attacks by raising an exception.
+	  # For APIs, you may want to use :null_session instead.
+	  protect_from_forgery with: :exception
+
+	  before_filter :configure_permitted_parameters
 
-On registration it will send an SMS with a token to be inserted to complete activation process.
-By default users MUST activate by SMS before entering.
-If you want something more "relaxed" just override <tt>sms_confirmation_required?</tt> in your model and make it your way.
-You can use the convenience filter <tt>require_sms_activated!</tt> in your controller to block sms-unactive users from specific pages.
+	  protected
 
-== Controller filter
+	  # my custom fields are :name, :heard_how
+	  def configure_permitted_parameters
+	    devise_parameter_sanitizer.for(:sign_up) do |u|
+	      u.permit(:phone_number,
+	        :email, :password, :password_confirmation)
+	    end
+	    devise_parameter_sanitizer.for(:account_update) do |u|
+	      u.permit(:phone_number,
+	        :email, :password, :password_confirmation, :current_password)
+	    end
+	  end
+	end
 
-DevisePhone extends your controllers with a <tt>require_sms_activated!</tt> method. Use it to restrict part of the site to "confirmed users" only
+The resend verification code button can be inserted to any page just by using:
+	<%= render 'devise/phone/resend_code' %>
 
-== I18n
+The activate phone field and button can be inserted to any page just by using:
+	<%= render 'devise/phone/activate_phone' %>
 
-DevisePhone installs a localizable file in your config/locales folder.
 
 == Contributing to devise_phone
 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* email htheodore@gmail.com
 
 == Copyright
 

data/app/controllers/devise/phone_verifications_controller.rb

@@ -1,45 +1,38 @@
 class Devise::PhoneVerificationsController < DeviseController
 
   # GET /resource/phone_verification/new
-  def new
-    build_resource({})
-    render :new
-  end
+  # def new
+  #   build_resource({})
+  #   render :new
+  # end
 
   # POST /resource/phone_verification
-  def create
-
-    self.send_verification_code
-
-    # self.resource = resource_class.send_verification_code
-    
-    # if resource.errors.empty?
-    #   set_flash_message :notice, :send_token, :phone => self.resource.phone
-    #   redirect_to new_session_path(resource_name)
-    # else
-    #   render :new
-    # end
-  end
+  # def create
+  # end
   
-  # GET /resource/phone_verification/insert
-  def insert
-    build_resource({})
+  # GET /resource/phone_verification/send_code
+  def send_code
+    current_user.generate_verification_code_and_send_sms
+    # render nothing: true
+    respond_to do |format|
+      msg = { :status => "ok", :message => "SMS sent!" }
+      format.json  { render :json => msg } # don't do msg.to_json
+    end
   end
   
-  # GET or POST /resource/phone_verification/consume?sms_token=abcdef
-  def consume
-    
-    self.verify_phone_number_with_code_entered(params[:code_entered])
-
-    # self.resource = resource_class.verify_phone_number_with_code_entered(params[:code_entered])
-
-    # if resource.errors.empty?
-    #   set_flash_message :notice, :confirmed
-    #   sign_in_and_redirect(resource_name, resource)
-    # else
-    #   render :new
-    # end
-
+  # GET or POST /resource/phone_verification/verify_code
+  def verify_code
+    verify_success = current_user.verify_phone_number_with_code_entered(params[:code_entered])
+    # render nothing: true
+    respond_to do |format|
+      if verify_success
+        message_response = "verification successful"
+      else
+        message_response = "verification fail"
+      end
+      msg = { :status => "ok", :message => message_response }
+      format.json  { render :json => msg } # don't do msg.to_json
+    end
   end
   
   protected

data/app/views/devise/phone/_activate_phone.html.erb

@@ -0,0 +1,7 @@
+<%= form_for(resource, :as => resource_name, :url => verify_code_user_phone_verification_path(resource_name), :html => { :method => :post }, remote: true) do |f| %>
+  
+  <p><%=label_tag :code_entered %><br />
+  <%=text_field_tag :code_entered, "" %></p>
+ 
+  <p><%= f.submit "Activate" %></p>
+<% end %>

data/app/views/devise/phone/_resend_code.html.erb

@@ -0,0 +1,6 @@
+<%= form_for(resource, :as => resource_name, :url => send_code_user_phone_verification_path(resource_name), :html => { :method => :get }, remote: true) do |f| %>
+  <%= devise_error_messages! %>
+
+  <%= f.submit "Resend Phone Verification Code" %>
+  
+<% end %>

data/config/locales/en.yml

@@ -1,15 +1,15 @@
 en:
   errors:
      messages:
-       no_phone_associated: "No phone associated"
-       sms_already_confirmed: "This token has been already used"
-       sms_token_invalid: "was not locked"
-  devise:
-    sms_activations:
-      send_token: 'An activation token was sent by SMS to %{phone}.'
-      sms_token_invalid: 'The sms token provided is not valid!'
-      confirmed: 'Your account has been activated. You are now signed in.'
-      sms_activation_required: 'SMS Activation is required'
-      sms_body: 'Your Activation Token is %{sms_confirmation_token}.'
-      unconfirmed_sms: 'Your account need to be activated with an SMS token'
+       empty_phone_number_field: "Phone number field is empty"
+       phone_verification_not_needed: "Phone number is already verified"
+       # sms_token_invalid: "was not locked"
+  # devise:
+  #   sms_activations:
+  #     send_token: 'An activation token was sent by SMS to %{phone}.'
+  #     sms_token_invalid: 'The sms token provided is not valid!'
+  #     confirmed: 'Your account has been activated. You are now signed in.'
+  #     sms_activation_required: 'SMS Activation is required'
+  #     sms_body: 'Your Activation Token is %{sms_confirmation_token}.'
+  #     unconfirmed_sms: 'Your account need to be activated with an SMS token'
       

data/lib/devise_phone.rb

@@ -10,22 +10,6 @@ require 'devise_phone/controllers/helpers'
 require 'devise_phone/rails'
 
 module Devise
-  # mattr_accessor :sms_confirm_within
-  # @@sms_confirm_within = 2.days
-  # mattr_accessor :sms_confirmation_keys
-  # @@sms_confirmation_keys = [:email]
-  
-  # Get the sms sender class from the mailer reference object.
-  def self.sms_sender
-    @@sms_sender_ref.get
-  end
-
-  # Set the smser reference object to access the smser.
-  def self.sms_sender=(class_name)
-    @@sms_sender_ref = ActiveSupport::Dependencies.reference(class_name)
-  end
-  
-  self.sms_sender = "Devise::SmsSender"
 end
 
 Devise.add_module :phone, :model => "models/phone", :controller => :phone_verifications, :route => :phone_verification

data/lib/devise_phone/controllers/helpers.rb

@@ -1,12 +1,3 @@
 module DevisePhone::Controllers::Helpers
-  protected
-  
-  # Convenience helper to check if user has confirmed the token (and the phone) or not.
-  def require_sms_activated!
-    if(send(:"authenticate_#{resource_name}!"))
-      res=send(:"current_#{resource_name}")
-      fail!(:sms_activation_required) if (!res) || (!res.sms_confirmed?)
-    end
-  end
 end
 ActionController::Base.send :include, DevisePhone::Controllers::Helpers

data/lib/devise_phone/routes.rb

@@ -2,10 +2,10 @@ module ActionDispatch::Routing
   class Mapper
     
     protected
-      def devise_phone(mapping, controllers)
+      def devise_phone_verification(mapping, controllers)
         resource :phone_verification, :only => [:new, :create], :path => mapping.path_names[:phone_verification], :controller => controllers[:phone_verifications] do
-          match :consume, :path => mapping.path_names[:consume], :as => :consume
-          get :insert, :path => mapping.path_names[:insert], :as => :insert
+          post :verify_code, :path => mapping.path_names[:verify_code], :as => :verify_code
+          get :send_code, :path => mapping.path_names[:send_code], :as => :send_code
         end
       end
 

data/lib/devise_phone/version.rb

@@ -1,3 +1,3 @@
 module DevisePhone
-  VERSION = "0.0.16".freeze
+  VERSION = "0.0.17".freeze
 end

data/lib/generators/devise_phone/install_generator.rb

@@ -16,40 +16,11 @@ module DevisePhone
           if old_content.match(Regexp.new(/^\s# ==> Configuration for :phone\n/))
             false
           end
+
         end
-      end
-#           else
-#             inject_into_file(devise_initializer_path, :before => "  # ==> Configuration for :confirmable\n") do
-# <<-CONTENT
-#   # ==> Configuration for :phone
-#   # The period the generated sms token is valid, after
-#   # this period, the user won't be able to activate.
-#   # config.sms_confirm_within = 0.days
 
-#   # The keys searched for confirmation values.
-#   # config.sms_confirmation_keys = [:email]
-  
-#   # Your SmsSender class. The provided one uses 
-#   # moonshado-sms gem so install it and configure
-#   # if you want to use it.
-#   # A simple instance of the class has been copied in your lib folder
-#   # For further informations on using and configuring moonshado-sms gem check
-#   # https://github.com/moonshado/moonshado-sms
-#   # config.sms_sender = "Devise::SmsSender"
-  
-# CONTENT
-      #       end
-      #     end
-      #   end
-      # end
-      
-      # def copy_locale
-      #   copy_file "../../../config/locales/en.yml", "config/locales/devise_phone.en.yml"
-      # end
-      
-      def copy_default_smser
-        copy_file "lib/sms_sender.rb", "lib/devise_sms_sender.rb"
       end
+      
     end
   end
 end

data/lib/generators/devise_phone/views_generator.rb

@@ -3,8 +3,19 @@ require 'generators/devise/views_generator'
 module DevisePhone
   module Generators
     class ViewsGenerator < Devise::Generators::ViewsGenerator
-      source_root File.expand_path("../../../../app/views", __FILE__)
+      source_root File.expand_path("../../../../app/views/devise", __FILE__)
       desc 'Copies all DevisePhone views to your application.'
+
+      def generate_view
+      	directory 'phone', "#{target_path}/phone"
+      	# directory 'path_to_install_directory', 'path_to_source_directory'
+      end
+
+      def target_path
+        @target_path ||= "app/views/#{scope || :devise}"
+      end
+
+
     end
   end
 end

data/lib/models/phone.rb

@@ -2,214 +2,113 @@ require "devise_phone/hooks"
 
 module Devise
   module Models
-    # SmsActivable is responsible to verify if an account is already confirmed to
-    # sign in, and to send sms with confirmation instructions.
-    # Confirmation instructions are sent to the user phone after creating a
-    # record and when manually requested by a new confirmation instruction request.
-    #
-    # == Options
-    #
-    # Confirmable adds the following options to devise_for:
-    #
-    #   * +sms_confirm_within+: the time you want to allow the user to access his account
-    #     before confirming it. After this period, the user access is denied. You can
-    #     use this to let your user access some features of your application without
-    #     confirming the account, but blocking it after a certain period (ie 7 days).
-    #     By default confirm_within is 0 days, so the user must confirm before entering.
-    #     If you want to allow user to use parts of the site and block others override 
-    #     sms_confirmation_required? and check manually on selected pages using the
-    #     require_sms_activated! helper or sms_confirmed? property on record
-    #
-    # == Examples
-    #
-    #   User.find(1).sms_confirm!      # returns true unless it's already confirmed
-    #   User.find(1).sms_confirmed?    # true/false
-    #   User.find(1).send_sms_token # manually send token
-    #
     module Phone
       extend ActiveSupport::Concern
 
       included do
-        before_create :set_phone_attributes, :if => :phone_verification_needed?
-        after_create  :generate_verification_code_and_send_sms, :if => :phone_verification_needed?
+        before_create :set_unverified_phone_attributes, :if => :phone_verification_needed?
+        # after_create  :private_generate_verification_code_and_send_sms, :if => :phone_verification_needed?
+        # before_save  :remember_old_phone_number
+        after_save  :private_generate_verification_code_and_send_sms, :if => :regenerate_phone_verification_needed?
       end
 
-      # # Confirm a user by setting it's sms_confirmed_at to actual time. If the user
-      # # is already confirmed, add en error to email field
-      # def confirm_sms!
-      #   unless_sms_confirmed do
-      #     self.sms_confirmation_token = nil
-      #     self.sms_confirmed_at = Time.now
-      #     save(:validate => false)
-      #   end
-      # end
-
-      # # Verifies whether a user is sms-confirmed or not
-      # def confirmed_sms?
-      #   !!sms_confirmed_at
-      # end
-
-      # Send confirmation token by sms
       def generate_verification_code_and_send_sms
-        if(self.phone_number?)
-          self.phone_verification_code = generate_phone_verification_code
-          ::Devise.sms_sender.send_sms_verification_code_to(self)
+          if(phone_verification_needed?)
+            private_generate_verification_code_and_send_sms
+          end
+          self.save!
+        end
+
+      def verify_phone_number_with_code_entered(code_entered)
+        if phone_verification_needed? && (code_entered == self.phone_verification_code)
+          mark_phone_as_verified!
+          true
         else
-          # self.errors.add(:sms_confirmation_token, :no_phone_associated)
           false
         end
       end
 
-      # # Resend sms confirmation token. This method does not need to generate a new token.
-      # def resend_sms_token
-      #   unless_sms_confirmed { send_sms_token }
-      # end
+      private
 
-      # Overwrites active? from Devise::Models::Activatable for sms confirmation
-      # by verifying whether a user is active to sign in or not. If the user
-      # is already confirmed, it should never be blocked. Otherwise we need to
-      # calculate if the confirm time has not expired for this user.
-
-      # def active?
-      #   !sms_confirmation_required? || confirmed_sms? || confirmation_sms_period_valid?
-      # end
-
-      # # The message to be shown if the account is inactive.
-      # def inactive_message
-      #   !confirmed_sms? ? I18n.t(:"devise.sms_activations.unconfirmed_sms") : super
-      # end
+        def private_generate_verification_code_and_send_sms
+            self.phone_verification_code = generate_phone_verification_code
+            set_unverified_phone_attributes
+            if phone_number.present?
+              send_sms_verification_code
+            end
+        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
-      # end
 
-      protected
+        def mark_phone_as_verified!
+          update!(phone_number_verified: true,
+                 phone_verification_code: nil,
+                 phone_verification_code_sent_at: nil,
+                 phone_verified_at: DateTime.now)
+        end
 
-        # Callback to overwrite if an sms confirmation is required or not.
+        # check if phone verification is needed and set errors here
         def phone_verification_needed?
-          phone_number.present? && !phone_number_verified
+          if phone_number.blank?
+            self.errors.add(:phone_verification_code, :empty_phone_number_field)
+            false
+          elsif phone_number_verified
+            self.errors.add(:phone_verification_code, :phone_verification_not_needed)
+            false
+          else
+            true
+          end
         end
 
-        # def sms_confirmation_required?
-        #   !confirmed_sms?
-        # end
-
-        # Checks if the confirmation for the user is within the limit time.
-        # We do this by calculating if the difference between today and the
-        # confirmation sent date does not exceed the confirm in time configured.
-        # Confirm_in is a model configuration, must always be an integer value.
-        #
-        # Example:
-        #
-        #   # sms_confirm_within = 1.day and sms_confirmation_sent_at = today
-        #   confirmation_period_valid?   # returns true
-        #
-        #   # sms_confirm_within = 5.days and sms_confirmation_sent_at = 4.days.ago
-        #   confirmation_period_valid?   # returns true
-        #
-        #   # sms_confirm_within = 5.days and sms_confirmation_sent_at = 5.days.ago
-        #   confirmation_period_valid?   # returns false
-        #
-        #   # sms_confirm_within = 0.days
-        #   confirmation_period_valid?   # will always return false
-        #
-        # def confirmation_sms_period_valid?
-        #   sms_confirmation_sent_at && sms_confirmation_sent_at.utc >= self.class.sms_confirm_within.ago
-        # end
-
-        # # Checks whether the record is confirmed or not, yielding to the block
-        # # if it's already confirmed, otherwise adds an error to email.
-        # def unless_sms_confirmed
-        #   unless confirmed_sms?
-        #     yield
-        #   else
-        #     self.errors.add(:sms_confirmation_token, :sms_already_confirmed)
-        #     false
-        #   end
-        # end
-
-        # Generates a new random token for confirmation, and stores the time
-        # this token is being generated
-        def set_phone_attributes
+        def regenerate_phone_verification_needed?
+          if phone_number.present?
+            if phone_number_changed?
+              true
+            else
+              false
+            end
+            # self.errors.add(:phone_verification_code, :empty_phone_number_field)
+            # false
+          else
+            false
+          end
+        end
 
+        # set attributes to user indicating the phone number is unverified
+        def set_unverified_phone_attributes
           self.phone_number_verified = false
           self.phone_verification_code_sent_at = DateTime.now
           self.phone_verified_at = nil
           # removes all white spaces, hyphens, and parenthesis
-          self.phone_number.gsub!(/[\s\-\(\)]+/, '')
+          if self.phone_number
+            self.phone_number.gsub!(/[\s\-\(\)]+/, '')
+          end
         end
 
+        # return 4 digits random code 0-9
         def generate_phone_verification_code
-          # begin
-          verification_code = SecureRandom.hex(3)
-          # end while self.class.exists?(phone_verification_code: verification_code)
+          verification_code = SecureRandom.random_number(10 ** 4).to_s.rjust(4,'0')
           verification_code
         end
 
-        # def generate_sms_token!
-        #   generate_sms_token && save(:validate => false)
-        # end
-
-        module ClassMethods
-          # # Attempt to find a user by it's email. If a record is found, send a new
-          # # sms token instructions to it. If not user is found, returns a new user
-          # # with an email not found error.
-          # # Options must contain the user email
-          # def send_sms_token(attributes={})
-          #   sms_confirmable = find_or_initialize_with_errors(sms_confirmation_keys, attributes, :not_found)
-          #   sms_confirmable.resend_sms_token if sms_confirmable.persisted?
-          #   sms_confirmable
-          # end
-
-          # # Find a user by it's sms confirmation token and try to confirm it.
-          # # If no user is found, returns a new user with an error.
-          # # If the user is already confirmed, create an error for the user
-          # # Options must have the sms_confirmation_token
-          # def confirm_by_sms_token(sms_confirmation_token)
-          #   sms_confirmable = find_or_initialize_with_error_by(:sms_confirmation_token, sms_confirmation_token)
-          #   sms_confirmable.confirm_sms! if sms_confirmable.persisted?
-          #   sms_confirmable
-          # end
-
-          def mark_phone_as_verified!
-            update!(phone_number_verified: true,
-                   phone_verification_code: nil,
-                   phone_verification_code_sent_at: nil,
-                   phone_verified_at: DateTime.now)
-          end 
-
-          def verify_phone_number_with_code_entered(code_entered)
-            if self.phone_verification_code == code_entered
-              mark_phone_as_verified!
-            end
-          end
-
-          def send_verification_code
-            self.set_phone_attributes
-            if self.save!
-              send_sms_for_phone_verification
-            end
-          end
-
-          # # Generates a small token that can be used conveniently on SMS's.
-          # # The token is 5 chars long and uppercased.
-
-          # def generate_small_token(column)
-          #   loop do
-          #     token = Devise.friendly_token[0,5].upcase
-          #     break token unless to_adapter.find_first({ column => token })
-          #   end
-          # end
-
-          # # Generate an sms token checking if one does not already exist in the database.
-          # def sms_confirmation_token
-          #   generate_small_token(:sms_confirmation_token)
-          # end
-
-          # Devise::Models.config(self, :sms_confirm_within, :sms_confirmation_keys)
+        # sends a message to number indicated in the secrets.yml
+        def send_sms_verification_code
+            number_to_send_to = self.phone_number
+            verification_code = self.phone_verification_code
+
+            twilio_sid = Rails.application.config.twilio[:sid]
+            twilio_token = Rails.application.config.twilio[:token]
+            twilio_phone_number = Rails.application.config.twilio[:phone_number]
+            twilio_message_body = I18n.t("devise.phone.message_body", :verification_code => verification_code)
+
+            @twilio_client = Twilio::REST::Client.new twilio_sid, twilio_token
+         
+            @twilio_client.account.messages.create(
+              :from => "+1#{twilio_phone_number}",
+              :to => number_to_send_to,
+              :body => twilio_message_body
+            )
         end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_phone
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Hubert Theodore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,8 +96,8 @@ files:
 - README.rdoc
 - Rakefile
 - app/controllers/devise/phone_verifications_controller.rb
-- app/views/devise/phone/insert.html.erb
-- app/views/devise/phone/new.html.erb
+- app/views/devise/phone/_activate_phone.html.erb
+- app/views/devise/phone/_resend_code.html.erb
 - config/locales/en.yml
 - devise_phone.gemspec
 - lib/devise_phone.rb
@@ -114,7 +114,6 @@ files:
 - lib/generators/devise_phone/install_generator.rb
 - lib/generators/devise_phone/views_generator.rb
 - lib/generators/mongoid/devise_phone_generator.rb
-- lib/generators/templates/lib/sms_sender.rb
 - lib/models/phone.rb
 - rails/init.rb
 homepage: https://github.com/tjhubert/devise_phone
@@ -137,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Send SMS to verify phone number

data/app/views/devise/phone/insert.html.erb

@@ -1,11 +0,0 @@
-<h2>Activate Phone Number</h2>
-
-<%= form_for(resource, :as => resource_name, :url => consume_phone_verification_path(resource_name), :html => { :method => :post }) do |f| %>
-  
-  <p><%=label_tag :code_entered %><br />
-  <%=text_field_tag :code_entered, "" %></p>
- 
-  <p><%= f.submit "Activate" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

data/app/views/devise/phone/new.html.erb

@@ -1,12 +0,0 @@
-<h2>Resend Phone Verification Code</h2>
-
-<%= form_for(resource, :as => resource_name, :url => phone_verification_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.submit "Resend Phone Verification Code" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

data/lib/generators/templates/lib/sms_sender.rb

@@ -1,19 +0,0 @@
-	class Devise::SmsSender
-  #Actually sends the sms token. feel free to modify and adapt to your provider and/or gem
-  def send_sms_verification_code_to(user)
-    number_to_send_to = user.phone_number
-    verification_code = user.phone_verification_code
-
-    twilio_sid = "ACd35391c08cde7926e2295d1812ada918"
-    twilio_token = "44d79a36adb3d54cc15711d94d149119"
-    twilio_phone_number = "6502810746"
-
-    @twilio_client = Twilio::REST::Client.new twilio_sid, twilio_token
- 
-    @twilio_client.account.sms.messages.create(
-      :from => "+1#{twilio_phone_number}",
-      :to => number_to_send_to,
-      :body => "Hi! This is MathCrunch. Your verification code is #{verification_code}"
-    )
-  end
-end