twilio_contactable 0.7.4 → 0.7.5

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/lib/contactable.rb

@@ -127,6 +127,7 @@ module TwilioContactable
     # code. If they match then the current phone number is set
     # as confirmed by the user.
     def sms_confirm_with(code)
+      check_for_twilio_contactable_columns(:sms)
       if _TC_sms_confirmation_code.to_s.downcase == code.downcase
         # save the phone number into the 'confirmed phone number' attribute
         self._TC_sms_confirmed_phone_number = _TC_formatted_phone_number
@@ -139,6 +140,7 @@ module TwilioContactable
     # Returns true if the current phone number has been confirmed by
     # the user for recieving TXT messages.
     def sms_confirmed?
+      check_for_twilio_contactable_columns(:sms)
       return false if _TC_sms_confirmed_phone_number.blank?
       self._TC_sms_confirmed_phone_number == _TC_formatted_phone_number
     end
@@ -147,6 +149,7 @@ module TwilioContactable
     # code. If they match then the current phone number is set
     # as confirmed by the user.
     def voice_confirm_with(code)
+      check_for_twilio_contactable_columns(:voice)
       if _TC_voice_confirmation_code.to_s.downcase == code.downcase
         # save the phone number into the 'confirmed phone number' attribute
         self._TC_voice_confirmed_phone_number = _TC_formatted_phone_number
@@ -159,6 +162,7 @@ module TwilioContactable
     # Returns true if the current phone number has been confirmed by
     # the user by receiving a phone call
     def voice_confirmed?
+      check_for_twilio_contactable_columns(:voice)
       return false if _TC_voice_confirmed_phone_number.blank?
       self._TC_voice_confirmed_phone_number == _TC_formatted_phone_number
     end
@@ -187,6 +191,16 @@ module TwilioContactable
 
     protected
 
+      def check_for_twilio_contactable_columns(type)
+        columns_to_check_for = ["#{type}_confirmed_phone_number",
+                                "#{type}_confirmation_attempted",
+                                "#{type}_confirmation_code"]
+        return if self.class.columns.select do |column|
+          columns_to_check_for.include? column.name.to_s
+        end.size == columns_to_check_for.size
+        warn "TwilioContactable #{type.to_s.inspect} confirmation columns have not been added to #{self.class.name.inspect}"
+      end
+
       def update_twilio_contactable_sms_confirmation(new_code)
         self._TC_sms_confirmation_code = new_code
         self._TC_sms_confirmation_attempted = Time.now.utc

data/lib/controller.rb

@@ -50,15 +50,16 @@ module TwilioContactable
             ).tap do |gather|
           gather.addSay "Please type the numbers that appear on your screen, followed by the pound sign"
         end
-        response.addSay "Thank you, please return to the website and continue"
-        response.addPause
       end.respond)
     end
 
     def receive_voice_confirmation
       @contactable = params[:contactable_type].constantize.find(params[:contactable_id])
       @contactable.voice_confirm_with(params['Digits'])
-      render :xml => ''
+      render :xml => (Twilio::Response.new.tap do |response|
+        response.addSay "Thank you, please return to the website and continue"
+        response.addHangup
+      end.respond)
     end
 
     protected

data/test/twilio_contactable_controller_test.rb

@@ -81,20 +81,16 @@ class TwilioContactableControllerTest < ActionController::TestCase
       should_respond_with_content_type :xml
       should "render Gather TwiML node with a Say inside" do
         assert_dom_equal %q{
-        <response>
-          <gather
-            action="http://test.host/twilio_contactable/receive_voice_confirmation?contactable_id=1&amp;contactable_type=User"
-            >
-            <say>
-              Please type the numbers that appear on your screen, followed by the pound sign
-            </say>
-          </gather>
-          <say>
-            Thank you, please return to the website and continue
-          </say>
-          <pause></pause>
-        </response>
-      }, @response.body
+          <response>
+            <gather
+              action="http://test.host/twilio_contactable/receive_voice_confirmation?contactable_id=1&amp;contactable_type=User"
+              >
+              <say>
+                Please type the numbers that appear on your screen, followed by the pound sign
+              </say>
+            </gather>
+          </response>},
+        @response.body
       end
     end
     context "receiving digits from Twilio" do
@@ -113,6 +109,16 @@ class TwilioContactableControllerTest < ActionController::TestCase
       should "not change the user's sms confirmation setting" do
         assert !@user.sms_confirmed?
       end
+      should "render message in TwiML and hang up" do
+        assert_dom_equal %q{
+          <response>
+            <say>
+              Thank you, please return to the website and continue
+            </say>
+            <hangup></hangup>
+          </response>},
+          @response.body
+      end
     end
   end
 end

data/twilio_contactable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twilio_contactable}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Danger Canty"]
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/JackDanger/twilio_contactable}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Help authorize the users of your Rails apps to confirm and use their phone numbers}
   s.test_files = [
     "test/test_helper.rb",
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<twiliolib>, [">= 2.0.5"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio_contactable
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -21,9 +22,11 @@ dependencies:
   name: twiliolib
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 2
         - 0
@@ -35,9 +38,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +52,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -91,23 +98,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Help authorize the users of your Rails apps to confirm and use their phone numbers