twilio_contactable 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/contactable.rb

@@ -114,7 +114,7 @@ module TwilioContactable
 
       confirmation_code = TwilioContactable.generate_confirmation_code
 
-      response = TwilioContactable::Gateway.initiate_voice_call(self, _TC_phone_number)
+      response = TwilioContactable::Gateway.initiate_voice_call(self, _TC_formatted_phone_number)
 
       if response.success?
         update_twilio_contactable_voice_confirmation confirmation_code
@@ -129,7 +129,7 @@ module TwilioContactable
     def sms_confirm_with(code)
       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_phone_number
+        self._TC_sms_confirmed_phone_number = _TC_formatted_phone_number
         save
       else
         false
@@ -140,7 +140,7 @@ module TwilioContactable
     # the user for recieving TXT messages.
     def sms_confirmed?
       return false if _TC_sms_confirmed_phone_number.blank?
-      self._TC_sms_confirmed_phone_number == _TC_phone_number
+      self._TC_sms_confirmed_phone_number == _TC_formatted_phone_number
     end
 
     # Compares user-provided code with the stored confirmation
@@ -149,7 +149,7 @@ module TwilioContactable
     def voice_confirm_with(code)
       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_phone_number
+        self._TC_voice_confirmed_phone_number = _TC_formatted_phone_number
         save
       else
         false
@@ -160,7 +160,7 @@ module TwilioContactable
     # the user by receiving a phone call
     def voice_confirmed?
       return false if _TC_voice_confirmed_phone_number.blank?
-      self._TC_voice_confirmed_phone_number == _TC_phone_number
+      self._TC_voice_confirmed_phone_number == _TC_formatted_phone_number
     end
 
     # Sends one or more TXT messages to the contactable record's
@@ -177,7 +177,7 @@ module TwilioContactable
 
       # split into pieces that fit as individual messages.
       msg.to_s.scan(/.{1,160}/m).map do |text|
-        if TwilioContactable::Gateway.deliver_sms(text, _TC_phone_number).success?
+        if TwilioContactable::Gateway.deliver_sms(text, _TC_formatted_phone_number).success?
           text.size
         else
           false

data/test/twilio_contactable_contactable_test.rb

@@ -77,7 +77,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
               assert @worked
             end
             should "save the phone number into the confirmed attribute" do
-              assert_equal @user._TC_phone_number,
+              assert_equal @user._TC_formatted_phone_number,
                            @user._TC_sms_confirmed_phone_number,
                            @user.reload.inspect
             end
@@ -87,6 +87,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             context "and then attempting to confirm another number" do
               setup {
                 @user._TC_phone_number = "206-555-8990"
+                @user.save
                 TwilioContactable::Gateway.stubs(:deliver).returns(Success).once
                 @user.send_sms_confirmation!
               }
@@ -112,7 +113,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             end
             should "save the phone number into the confirmed attribute" do
               assert_equal @user._TC_sms_confirmed_phone_number,
-                           @user._TC_phone_number
+                           @user._TC_formatted_phone_number
             end
           end
           context "calling sms_confirm_with(wrong_code)" do
@@ -122,7 +123,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             end
             should "not save the phone number into the confirmed attribute" do
               assert_not_equal @user._TC_sms_confirmed_phone_number,
-                               @user._TC_phone_number
+                               @user._TC_formatted_phone_number
             end
             should_not_change "confirmed phone number attribute" do
               @user.reload._TC_sms_confirmed_phone_number
@@ -135,7 +136,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
               message = "long message blah blah MYCODE blah"
               TwilioContactable.expects(:generate_confirmation_code).returns('MYCODE').once
               TwilioContactable.expects(:confirmation_message).returns(message).once
-              TwilioContactable::Gateway.expects(:deliver).with(message, @user._TC_phone_number).once
+              TwilioContactable::Gateway.expects(:deliver).with(message, @user._TC_formatted_phone_number).once
               @user.send_sms_confirmation!
             }
           end
@@ -193,7 +194,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
               assert @worked
             end
             should "save the phone number into the confirmed attribute" do
-              assert_equal @user._TC_phone_number,
+              assert_equal @user._TC_formatted_phone_number,
                            @user._TC_voice_confirmed_phone_number,
                            @user.reload.inspect
             end
@@ -203,6 +204,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             context "and then attempting to confirm another number" do
               setup {
                 @user._TC_phone_number = "206-555-8990"
+                @user.save
                 TwilioContactable::Gateway.stubs(:deliver).returns(Success).once
                 @user.send_voice_confirmation!
               }
@@ -228,7 +230,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             end
             should "save the phone number into the confirmed attribute" do
               assert_equal @user._TC_voice_confirmed_phone_number,
-                           @user._TC_phone_number
+                           @user._TC_formatted_phone_number
             end
           end
           context "calling voice_confirm_with(wrong_code)" do
@@ -238,7 +240,7 @@ class TwilioContactableContactableTest < ActiveSupport::TestCase
             end
             should "not save the phone number into the confirmed attribute" do
               assert_not_equal @user._TC_voice_confirmed_phone_number,
-                               @user._TC_phone_number
+                               @user._TC_formatted_phone_number
             end
             should_not_change "confirmed phone number attribute" do
               @user.reload._TC_voice_confirmed_phone_number

data/twilio_contactable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{twilio_contactable}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -21,6 +21,7 @@ dependencies:
   name: twiliolib
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -47,6 +49,7 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -91,6 +94,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -98,6 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -107,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 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