devise_phone 0.0.164 → 0.0.165

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2908cbcc2f76d5f90a6a319864e65b980a0b3754
-  data.tar.gz: e1e4247c124c076258e20ceef4c9b3741e1b4aff
+  metadata.gz: 70a83b26e9d151e9b9a8b6fc131fc0f0191a58dd
+  data.tar.gz: 009202764b0c4c904cc1f71484486bf3a3a9a73a
 SHA512:
-  metadata.gz: 06164a61896a8d952d9b12cac52f5536a5716f7c08621782ab32091b08256ed81228c963f01e8c921dd41a6d676cfa239f0921a4ea22a221353e056cc413fb9a
-  data.tar.gz: 0e0ecf25d74cf692afb78dcc813bc410e282a0b2870578a62509e3aa47236cc11bb548a2f7f2c93e36a583b1aaa0946d62aa968bf7b6b73b9669780126731ce6
+  metadata.gz: f819275b7113340d0f043da247f723132d2ef5a94d4578b57d0630c013fa703603ba2f66d36885c05ac75d422e417305d16fe2f6118bb042d2271c520ce3f2d8
+  data.tar.gz: 74bc57e15053599775a315c518edba3ee87bd9bcdc7371752e6a5f7612b79107835da62524597adce019c5b93763b7546dc0d9e924f9d1f84bf6b41b545e12c0

data/app/controllers/devise/phone_verifications_controller.rb

@@ -9,7 +9,7 @@ class Devise::PhoneVerificationsController < DeviseController
   # POST /resource/phone_verification
   def create
 
-    self.send_verification_code
+    # self.set_default_phone_attributes_and_send_verification_code
 
     # self.resource = resource_class.send_verification_code
     
@@ -23,13 +23,26 @@ class Devise::PhoneVerificationsController < DeviseController
   
   # GET /resource/phone_verification/insert
   def insert
-    build_resource({})
+    # puts "current_user"
+    # puts current_user
+    # puts "current_user methods"
+    # puts current_user.methods
+    # puts "User.all.first"
+    # puts User.all.first
+    # puts "the same?"
+    # puts User.all.first == current_user
+
+    # User.all.first.generate_verification_code_and_send_sms
+    # puts current_user.methods
+    current_user.generate_verification_code_and_send_sms
+    # build_resource({})
   end
   
   # GET or POST /resource/phone_verification/consume?sms_token=abcdef
   def consume
     
-    self.verify_phone_number_with_code_entered(params[:code_entered])
+    # puts current_user.phone_number
+    current_user.verify_phone_number_with_code_entered(params[:code_entered])
 
     # self.resource = resource_class.verify_phone_number_with_code_entered(params[:code_entered])
 

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

@@ -0,0 +1,9 @@
+<h2>Activate Phone Number</h2>
+
+<%= form_for(resource, :as => resource_name, :url => consume_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 => insert_user_phone_verification_path(resource_name), :html => { :method => :get }, remote: true) do |f| %>
+  <%= devise_error_messages! %>
+
+  <%= f.submit "Resend Phone Verification Code" %>
+  
+<% end %>

data/lib/devise_phone.rb

@@ -10,22 +10,54 @@ require 'devise_phone/controllers/helpers'
 require 'devise_phone/rails'
 
 module Devise
+
+  # Get the phone class from the phone reference object.
+  def self.phone
+    @@phone_ref.get
+  end
+
+  # Set the phone reference object to access the phone.
+  def self.phone=(class_name)
+    @@phone_ref = ref(class_name)
+  end
+  self.phone = "Devise::Phone"
   # 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
+  # def self.setup
+  #   yield self
+  # 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
+  # class Getter
+  #   def initialize name
+  #     @name = name
+  #   end
+
+  #   def get
+  #     ActiveSupport::Dependencies.constantize(@name)
+  #   end
+  # end
+
+  # def self.ref(arg)
+  #   if defined?(ActiveSupport::Dependencies::ClassCache)
+  #     ActiveSupport::Dependencies::reference(arg)
+  #     Getter.new(arg)
+  #   else
+  #     ActiveSupport::Dependencies.ref(arg)
+  #   end
+  # end
+  # # Get the sms sender class from the phone 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)
+  #   @@phone_ref = ref(class_name)
+  # end
   
-  self.sms_sender = "Devise::SmsSender"
+  # @@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/version.rb

@@ -1,3 +1,3 @@
 module DevisePhone
-  VERSION = "0.0.164".freeze
+  VERSION = "0.0.165".freeze
 end

data/lib/generators/devise_phone/install_generator.rb

@@ -47,9 +47,9 @@ module DevisePhone
       #   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
+      # 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

@@ -2,7 +2,7 @@ require 'generators/devise/views_generator'
 
 module DevisePhone
   module Generators
-    class ViewsGenerator < Devise::Generators::ViewsGenerator
+    class ViewsGenerator
       source_root File.expand_path("../../../../app/views/devise", __FILE__)
       desc 'Copies all DevisePhone views to your application.'
 

data/lib/models/phone.rb

@@ -30,10 +30,12 @@ module Devise
       extend ActiveSupport::Concern
 
       included do
-        before_create :set_phone_attributes, :if => :phone_verification_needed?
+        before_create :set_unverified_phone_attributes, :if => :phone_verification_needed?
         after_create  :generate_verification_code_and_send_sms, :if => :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!
@@ -51,15 +53,28 @@ module Devise
 
       # Send confirmation token by sms
       def generate_verification_code_and_send_sms
+        puts "in the public method"
         if(self.phone_number?)
-          self.phone_verification_code = generate_phone_verification_code
-          ::Devise.sms_sender.send_sms_verification_code_to(self)
+          puts "generating code"
+          update!(phone_verification_code: generate_phone_verification_code)
+          send_sms_verification_code
+        else
+          self.errors.add(:phone_verification_code, :no_phone_associated)
+          false
+        end
+      end
+
+      def verify_phone_number_with_code_entered(code_entered)
+        if (code_entered == self.phone_verification_code)
+          mark_phone_as_verified!
+          true
         else
-          # self.errors.add(:sms_confirmation_token, :no_phone_associated)
+          self.errors.add(:phone_verification_code, :wrong_code_entered)
           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 }
@@ -85,54 +100,23 @@ module Devise
       #   self.sms_confirmed_at = Time.now
       # end
 
-      protected
+      private
+
+        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.
         def phone_verification_needed?
           phone_number.present? && !phone_number_verified
         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 set_unverified_phone_attributes
 
           self.phone_number_verified = false
           self.phone_verification_code_sent_at = DateTime.now
@@ -142,74 +126,78 @@ module Devise
         end
 
         def generate_phone_verification_code
-          # begin
           verification_code = SecureRandom.hex(3)
-          # end while self.class.exists?(phone_verification_code: verification_code)
           verification_code
         end
 
-        # def generate_sms_token!
-        #   generate_sms_token && save(:validate => false)
-        # end
+        def send_sms_verification_code
+            puts "in the private method"
+
+            number_to_send_to = self.phone_number
+            verification_code = self.phone_verification_code
 
-        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
+            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
+
+      module ClassMethods
+
+        def generate_verification_code_and_send_sms
+          puts "in the public method"
+          if(self.phone_number?)
+            puts "generating code"
+            update!(phone_verification_code: generate_phone_verification_code)
+            send_sms_verification_code
+          else
+            self.errors.add(:phone_verification_code, :no_phone_associated)
+            false
           end
+        end
 
-          def send_verification_code
-            self.set_phone_attributes
-            if self.save!
-              send_sms_for_phone_verification
-            end
+        def verify_phone_number_with_code_entered(code_entered)
+          if (code_entered == self.phone_verification_code)
+            mark_phone_as_verified!
+            true
+          else
+            self.errors.add(:phone_verification_code, :wrong_code_entered)
+            false
           end
+        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
+        #   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 
 
-          # # 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
+        #   def verify_phone_number_with_code_entered(code_entered)
+        #     if self.phone_verification_code == code_entered
+        #       mark_phone_as_verified!
+        #     end
+        #   end
 
-          # Devise::Models.config(self, :sms_confirm_within, :sms_confirmation_keys)
-        end
+        #   def set_unverified_phone_attributes_and_send_verification_code
+        #     self.set_verified_phone_attributes
+        #     if self.save!
+        #       send_sms_for_verification_code
+        #     end
+        #   end
+
+        # end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_phone
 version: !ruby/object:Gem::Version
-  version: 0.0.164
+  version: 0.0.165
 platform: ruby
 authors:
 - Hubert Theodore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-19 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

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