devise_phone 0.0.1663 → 0.0.1664

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa23d1176a07078e34df9bc26d23abf25f3aadb8
-  data.tar.gz: 810341f073168f9a0eec605c52b491c33adaaa0a
+  metadata.gz: d4fe75060a2fa6b492f130e3aaf39369469cc436
+  data.tar.gz: 45ae37d053f9b0d3c99c70ba93424e3283c7a223
 SHA512:
-  metadata.gz: a0ddc5397e5d6f53c93682e028479c83001e75d626806f67a3ea943a476b4ebc67f0476b36cbf057626e4c61a97368b34c3e46184f0cd3a8fcfded3dbff14c3d
-  data.tar.gz: 43a835f4e774d7b1aba4ba499a7d7cb3117d57336e589e839f4145da3ecdb0d437a90bb6f01eaf2b142281f64af83c3ebce578c09bc1ba93e74607f55ad9a54e
+  metadata.gz: 30914f56f9c9d1d5c517984fdd8045865c1ce9240ab92c76370a0f517118fad01c95bab7f1922edfe6282a5165d00e91226dc8ea5e025674f90036818708f4a0
+  data.tar.gz: 5bd8860f3b119ebff979f70d818f75b538f892f3f1023c791481479e2b916be1453f0a611f82d3ae296fadc1306b3058e0d39c6aa18ed867849910861697adaf

data/README.rdoc

@@ -27,27 +27,14 @@ When you are done, you are ready to add DevisePhone to any of your Devise models
 
 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 secrets.yml, please specify your twilio_sid, twilio_token, and twilio_phone_number:
-
-	development:
-	  secret_key_base: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	  twilio_sid: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	  twilio_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	  twilio_phone_number: 12345678
-
-	test:
-	  secret_key_base: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	  twilio_sid: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	  twilio_token: xxxxxxxxxxxxxxxxxxxxxxxxxxxx
-	  twilio_phone_number: 12345678
-
-	# Do not keep production secrets in the repository,
-	# instead read values from the environment.
-	production:
-	  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
-	  twilio_sid: <%= ENV["TWILIO_SID"] %>
-	  twilio_token: <%= ENV["TWILIO_TOKEN"] %>
-	  twilio_phone_number: <%= ENV["TWILIO_PHONE_NUMBER"] %>
+In your config/environments, please specify your twilio_sid, twilio_token, and twilio_phone_number, and twilio_message_body (use #{verification_code} to include the phone verification code of the user) :
+
+	dconfig.twilio = {
+    sid:          'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+    token:        'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
+    phone_number: '123455678',
+    message_body: "Hi! This is from company u asked for. Your verification code is #{verification_code}"
+  }
 
 == Configuring views
 

data/lib/devise_phone/version.rb

@@ -1,3 +1,3 @@
 module DevisePhone
-  VERSION = "0.0.1663".freeze
+  VERSION = "0.0.1664".freeze
 end

data/lib/models/phone.rb

@@ -2,30 +2,6 @@ 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
 
@@ -54,34 +30,6 @@ module Devise
 
       private
 
-        # def remember_old_phone_number
-        #   puts "phone number changed?: "
-        #   puts phone_number_changed?
-        #   if phone_number.present?
-        #     puts "Old phone number before save:"
-        #     puts phone_number
-        #     @old_phone_number = phone_number
-        #   else
-        #     @old_phone_number = nil
-        #   end
-        # end
-
-        # def phone_number_changed?
-        #   puts "Old phone number after save:"
-        #   puts @old_phone_number
-        #   if @old_phone_number.present? && phone_number.present?
-        #     puts "condition 1"
-        #     @old_phone_number != phone_number
-        #   elsif @old_phone_number.blank? && phone_number.present?
-        #     puts "condition 2"
-        #     true
-        #   else
-        #     puts "condition 3"
-        #     set_unverified_phone_attributes
-        #     false
-        #   end
-        # end
-
         def private_generate_verification_code_and_send_sms
             self.phone_verification_code = generate_phone_verification_code
             set_unverified_phone_attributes
@@ -114,16 +62,13 @@ module Devise
         def regenerate_phone_verification_needed?
           if phone_number.present?
             if phone_number_changed?
-              # puts "condition 1"
               true
             else
-              # puts "condition 2"
               false
             end
             # self.errors.add(:phone_verification_code, :empty_phone_number_field)
             # false
           else
-              # puts "condition 3"
             false
           end
         end
@@ -153,33 +98,16 @@ module Devise
             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 = Rails.application.config.twilio[:message_body]
 
             @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 => "Hi! This is MathCrunch. Your verification code is #{verification_code}"
+              :body => twilio_message_body
             )
         end
-      #end of private methods
-
-      # module ClassMethods # 'public' methods for class user
-
-      #   def generate_verification_code_and_send_sms
-      #     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!
-      #     end
-      #   end
-        
-      # end #end of ClassMethods
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_phone
 version: !ruby/object:Gem::Version
-  version: 0.0.1663
+  version: 0.0.1664
 platform: ruby
 authors:
 - Hubert Theodore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,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