twilio_contactable 0.8.3 → 0.8.4

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/lib/controller.rb

@@ -42,29 +42,46 @@ module TwilioContactable
 
     def start_voice_confirmation
       render :xml => (Twilio::Response.new.tap do |response|
-        response.addGather(
-              :action => url_for(
-                :action => 'receive_voice_confirmation',
-                :contactable_type => params[:contactable_type],
-                :contactable_id   => params[:contactable_id]
-              )
-            ).tap do |gather|
-          gather.addSay "Please type the numbers that appear on your screen, followed by the pound sign"
-        end
+        gather(response)
       end.respond)
     end
 
     def receive_voice_confirmation
       @contactable = params[:contactable_type].constantize.find(params[:contactable_id])
-      @contactable.voice_confirm_with(params['Digits'])
-      render :xml => (Twilio::Response.new.tap do |response|
-        response.addSay "Thank you, please return to the website and continue"
-        response.addHangup
-      end.respond)
+      if @contactable.voice_confirm_with(params['Digits'])
+        render :xml => (Twilio::Response.new.tap do |response|
+          response.addSay "Thank you, please return to the website and continue"
+          response.addHangup
+        end.respond)
+      else
+        render :xml => (Twilio::Response.new.tap do |response|
+          response.addSay "Sorry, those aren't the correct numbers."
+          gather(response)
+        end.respond)
+      end
     end
 
     protected
 
+      def gather(response)
+        tries = (params[:tries] ||= '0').succ!
+        if tries.to_i > 4
+          response.addSay "We're sorry, this doesn't seem to be working. Please contact technical support."
+          response.addHangup
+        else
+          response.addGather(
+                :action => url_for(
+                  :action => 'receive_voice_confirmation',
+                  :contactable_type => params[:contactable_type],
+                  :contactable_id   => params[:contactable_id],
+                  :tries            => tries
+                )
+              ).tap do |gather|
+            gather.addSay "Please type the numbers that appear on your screen, followed by the pound sign"
+          end
+        end
+      end
+
       def find_contactable_by_phone_number(number)
         [number, number.sub(/^\+/,''), number.sub(/^\+1/,'')].uniq.compact.each do |possible_phone_number|
           @@contactable_classes.each do |klass|

data/lib/twilio_contactable.rb

@@ -23,8 +23,8 @@ module TwilioContactable
     end
 
     def generate_confirmation_code
-      chars = (0..9).to_a + ('A'..'Z').to_a
-      (0...6).collect { chars[Kernel.rand(chars.length)] }.join
+      nums = (0..9).to_a
+      (0...4).collect { nums[Kernel.rand(nums.length)] }.join
     end
   end
 end

data/test/twilio_contactable_contactable_test.rb

@@ -103,23 +103,6 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
               end
             end
           end
-          context "calling sms_confirm_with(right code, wrong case)" do
-            setup {
-              @downcased_code = @user._TC_sms_confirmation_code.downcase
-              @worked = @user.sms_confirm_with(@downcased_code)
-            }
-            should "have good test data" do
-              assert_not_equal @downcased_code,
-                               @user._TC_sms_confirmation_code
-            end
-            should "work" do
-              assert @worked
-            end
-            should "save the phone number into the confirmed attribute" do
-              assert_equal @user._TC_sms_confirmed_phone_number,
-                           @user._TC_formatted_phone_number
-            end
-          end
           context "calling sms_confirm_with(wrong_code)" do
             setup { @worked = @user.sms_confirm_with('wrong_code') }
             should "not work" do
@@ -220,23 +203,6 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
               end
             end
           end
-          context "calling voice_confirm_with(right code, wrong case)" do
-            setup {
-              @downcased_code = @user._TC_voice_confirmation_code.downcase
-              @worked = @user.voice_confirm_with(@downcased_code)
-            }
-            should "have good test data" do
-              assert_not_equal @downcased_code,
-                               @user._TC_voice_confirmation_code
-            end
-            should "work" do
-              assert @worked
-            end
-            should "save the phone number into the confirmed attribute" do
-              assert_equal @user._TC_voice_confirmed_phone_number,
-                           @user._TC_formatted_phone_number
-            end
-          end
           context "calling voice_confirm_with(wrong_code)" do
             setup { @worked = @user.voice_confirm_with('wrong_code') }
             should "not work" do

data/test/twilio_contactable_controller_test.rb

@@ -83,7 +83,7 @@ class TwilioContactableControllerTest < ActionController::TestCase
         assert_dom_equal %q{
           <response>
             <gather
-              action="http://test.host/twilio_contactable/receive_voice_confirmation?contactable_id=1&amp;contactable_type=User"
+              action="http://test.host/twilio_contactable/receive_voice_confirmation?contactable_id=1&amp;contactable_type=User&amp;tries=1"
               >
               <say>
                 Please type the numbers that appear on your screen, followed by the pound sign

data/test/twilio_module_test.rb

@@ -39,8 +39,8 @@ class TwilioContactableModuleTest < ActiveSupport::TestCase
 
   context "generating codes" do
     setup { @code = TwilioContactable.generate_confirmation_code }
-    should "be 6 digits" do
-      assert_equal 6, @code.length
+    should "be 4 digits" do
+      assert_equal 4, @code.length
     end
   end
 

data/twilio_contactable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twilio_contactable}
-  s.version = "0.8.3"
+  s.version = "0.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio_contactable
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Jack Danger Canty