twilio_contactable 0.7.2 → 0.7.3

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/controller.rb

@@ -4,7 +4,8 @@ module TwilioContactable
     def self.included(controller)
       controller.instance_eval do
         # the developer should specify which model(s) will be sought
-        # when the app receives incoming requests
+        # when the app receives incoming requests.
+        # See the 'Controller' part of the README for details
         protected
         def twilio_contactable(*klasses)
           @@contactable_classes = klasses
@@ -55,6 +56,7 @@ module TwilioContactable
     def receive_voice_confirmation
       @contactable = params[:contactable_type].constantize.find(params[:contactable_id])
       @contactable.voice_confirm_with(params['Digits'])
+      render :xml => ''
     end
 
     protected

data/lib/gateway.rb

@@ -53,7 +53,7 @@ module TwilioContactable
 
       def deliver_sms(message, to, from = nil)
         deliver :sms,
-                'Message' => message,
+                'Body' => message,
                 'To' => to,
                 'From' => from
       end
@@ -85,17 +85,11 @@ module TwilioContactable
             'Calls'
           end
 
-          response = post service, data
- 
-          Net::HTTPCreated == response.code_type ?
-                                TwilioContactable::Gateway::Success :
-                                TwilioContactable::Gateway::Error
+          post service, data
         end
 
         def post(service, data = {})
           url = "/#{API_VERSION}/Accounts/#{TwilioContactable.configuration.client_id}/#{service}"
-          puts "putting data: #{data.inspect}"
-          puts "to url: #{url}"
           account.request url,
                           "POST",
                           data

data/test/twilio_contactable_controller_test.rb

@@ -93,5 +93,22 @@ class TwilioContactableControllerTest < ActionController::TestCase
       }, @response.body
       end
     end
+    context "receiving digits from Twilio" do
+      setup {
+        @digits = '12345'
+        @user = User.create! :phone_number => '206 555 6666',
+                             :voice_confirmation_code => @digits
+        @receive_params = {"contactable_type"=>"User", "contactable_id"=>@user.id, "Digits"=>@digits, "FromState"=>"WA", "Direction"=>"outbound-api", "CalledState"=>"WA", "ToState"=>"WA", "AccountSid"=>"ABCDEFG", "CallerCountry"=>"US", "CallerZip"=>"98077", "Caller"=>"{number}", "FromCity"=>"WOODINVILLE", "From"=>"{number}", "action"=>"receive_voice_confirmation", "CallerCity"=>"WOODINVILLE", "FromCountry"=>"US", "FromZip"=>"98077", "To"=>"+12069305710", "ToCity"=>"SEATTLE", "CallStatus"=>"in-progress", "controller"=>"twilio_contactable", "ToZip"=>"98188", "CalledZip"=>"98188", "CallerState"=>"WA", "CalledCity"=>"SEATTLE", "Called"=>"+12069305710", "CalledCountry"=>"US", "CallSid"=>"ABCD", "ToCountry"=>"US", "ApiVersion"=>"2010-04-01"}
+        get :receive_voice_confirmation, @receive_params
+      }
+      should_respond_with :success
+      should_respond_with_content_type :xml
+      should "set the user to confirmed via voice" do
+        assert @user.reload.voice_confirmed?
+      end
+      should "not change the user's sms confirmation setting" do
+        assert !@user.sms_confirmed?
+      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.2"
+  s.version = "0.7.3"
 
   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.7}
+  s.rubygems_version = %q{1.3.6}
   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::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= 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
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Jack Danger Canty
@@ -21,7 +21,6 @@ dependencies:
   name: twiliolib
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,7 +35,6 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -49,7 +47,6 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -94,7 +91,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -102,7 +98,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -112,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Help authorize the users of your Rails apps to confirm and use their phone numbers