twilio_contactable 0.8.5 → 0.8.7

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.7

data/lib/contactable.rb

@@ -89,14 +89,7 @@ module TwilioContactable
       return false if _TC_phone_number.blank?
 
       format_phone_number
-      confirmation_code =
-        if sms_confirmation_attempted &&
-           sms_confirmation_code &&
-           sms_confirmation_attempted > Time.now.utc - 60*5
-          sms_confirmation_code
-        else
-          TwilioContactable.generate_confirmation_code
-        end
+      confirmation_code = TwilioContactable.confirmation_code(self, :sms)
 
       # Use this class' confirmation_message method if it
       # exists, otherwise use the generic message
@@ -112,9 +105,9 @@ module TwilioContactable
 
       if response.success?
         update_twilio_contactable_sms_confirmation confirmation_code
-      else
-        false
       end
+
+      response
     end
 
     # Begins a phone call to the user where they'll need to type
@@ -125,22 +118,15 @@ module TwilioContactable
       return false if _TC_phone_number.blank?
 
       format_phone_number
-      confirmation_code =
-        if voice_confirmation_attempted &&
-           voice_confirmation_code &&
-           voice_confirmation_attempted > Time.now.utc - 60*5
-          voice_confirmation_code
-        else
-          TwilioContactable.generate_confirmation_code
-        end
+      confirmation_code = TwilioContactable.confirmation_code(self, :voice)
 
       response = TwilioContactable::Gateway.initiate_voice_call(self, _TC_formatted_phone_number)
 
       if response.success?
         update_twilio_contactable_voice_confirmation confirmation_code
-      else
-        false
       end
+
+      response
     end
 
     # Compares user-provided code with the stored confirmation

data/lib/gateway.rb

@@ -17,16 +17,20 @@ module TwilioContactable
       end
     end
     class Response
-      def initialize(*args)
-        @options = args.last
+      def initialize(response = nil)
+        @response = response
       end
-
+    end
+    class Success < Response
+      def success?
+        true
+      end
+    end
+    class Error < Response
       def success?
-        :success == @options[:status]
+        false
       end
     end
-    Success = Response.new(:status => :success)
-    Error   = Response.new(:status => :error)
 
     API_VERSION   = '2010-04-01'
 
@@ -88,8 +92,8 @@ module TwilioContactable
           response = post service, data
  
           Net::HTTPCreated == response.code_type ?
-                                TwilioContactable::Gateway::Success :
-                                TwilioContactable::Gateway::Error
+                                TwilioContactable::Gateway::Success.new(response) :
+                                TwilioContactable::Gateway::Error.new(response)
         end
 
         def post(service, data = {})

data/lib/twilio_contactable.rb

@@ -1,4 +1,5 @@
 module TwilioContactable
+  CONFIRMATION_CODE_LENGTH = 4
   class << self
     def numerize(numberish)
       numberish.to_s.scan(/\d+/).join
@@ -20,9 +21,21 @@ module TwilioContactable
       "Code: #{confirmation_code} Enter code on web to verify phone. Msg&data rates may apply. Freq set by u. T&C & support on web site. Txt HELP for help"
     end
 
+    def confirmation_code(record, type)
+      attempted = record.send("_TC_#{type}_confirmation_attempted")
+      current_code = record.send("_TC_#{type}_confirmation_code")
+      if !attempted.blank? &&
+         attempted > Time.now.utc - 60*5 &&
+         current_code.to_s.size == CONFIRMATION_CODE_LENGTH
+        current_code
+      else
+        generate_confirmation_code
+      end
+    end
+
     def generate_confirmation_code
       nums = (0..9).to_a
-      (0...4).collect { nums[Kernel.rand(nums.length)] }.join
+      (0...CONFIRMATION_CODE_LENGTH).collect { nums[Kernel.rand(nums.length)] }.join
     end
   end
 end

data/test/twilio_contactable_contactable_test.rb

@@ -2,8 +2,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'test_helper'))
 
 class TwilioContactableContactableTest < ActiveSupport::TestCase
 
-  Success = TwilioContactable::Gateway::Response.new(:status => :success)
-  Error   = TwilioContactable::Gateway::Response.new(:status => :error)
+  Success = TwilioContactable::Gateway::Success.new
+  Error   = TwilioContactable::Gateway::Error.new
 
   context "configuration" do
     TwilioContactable::Contactable::Attributes.each do |attr|
@@ -98,7 +98,8 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
           }
           should "work" do assert @worked end
           should "save confirmation number in proper attribute" do
-            assert @user._TC_sms_confirmation_code
+            assert @user._TC_sms_confirmation_code.length ==
+                    TwilioContactable::CONFIRMATION_CODE_LENGTH
           end
           should "set confirmation attempted time" do
             assert @user._TC_sms_confirmation_attempted > 3.minutes.ago
@@ -151,7 +152,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             end
           end
         end
-        context "confirming phone number with a custom short code" do
+        context "with a custom short code" do
           context "with expectations" do
             setup {
               message = "long message blah blah MYCODE blah"
@@ -171,12 +172,14 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             end
           end
         end
-        context "confirming phone number when the confirmation fails for some reason" do
+        context "when the confirmation fails for some reason" do
           setup {
             TwilioContactable::Gateway.stubs(:deliver).returns(Error)
-            @worked = @user.send_sms_confirmation!
+            @response = @user.send_sms_confirmation!
           }
-          should "not work" do assert !@worked end
+          should "not work" do
+            assert !@response.success?
+          end
           should "not save confirmation number" do
             assert @user._TC_sms_confirmation_code.blank?
           end
@@ -192,11 +195,12 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             class TestController < ActionController::Base
               include TwilioContactable::Controller
               twilio_contactable User
-              self
             end
-            @worked = @user.send_voice_confirmation!
+            @response = @user.send_voice_confirmation!
           }
-          should "work" do assert @worked end
+          should "work" do
+            assert @response.success?
+          end
           should "save confirmation number in proper attribute" do
             assert @user._TC_voice_confirmation_code
           end
@@ -210,7 +214,9 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             assert !@user.voice_confirmed?
           end
           context "calling voice_confirm_with(right_code)" do
-            setup { @user.voice_confirm_with(@user._TC_voice_confirmation_code) }
+            setup {
+              @worked = @user.voice_confirm_with(@user._TC_voice_confirmation_code)
+            }
             should "work" do
               assert @worked
             end

data/twilio_contactable.gemspec

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio_contactable
 version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 7
+  version: 0.8.7
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 2
         - 0
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -53,6 +56,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -98,6 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -106,6 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"