twilio-ruby 3.14.3 → 3.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77bf7b770b0f8deeac38b2ed13ddade0f5c19c38
-  data.tar.gz: 84e2b0002a9c511296e1b57aab3a1d9ee4f857a3
+  metadata.gz: e8bf4ccb567cfcec52fe35a2dcbdc00d5162f3a6
+  data.tar.gz: e3a045befa32f513203f22a0ceee78084b7303ab
 SHA512:
-  metadata.gz: 5ad94bb471b8adde9de5470dfd712e3c47f70c6b100db9ebe9d40000b8a58ccf23e2bc01f1b72f2e062ed3163a5297f15bec9ab26e7410976e7983f556c8913c
-  data.tar.gz: e96311fd80abb64ee1372fe08c912e42954f57f9d473ca351d6704268301f6610487e793ffce4a58619f8dbfe4e38335babda8097b873f5f13fbd2143b8e0463
+  metadata.gz: e32b334d54614e3d89c2a7403f2c661b04eff50240d2fc6bda13dcab3c85a9a978a6c6f96ac74a6f734859201f8ed6ba6deb86369870379d63f14719d8a1827f
+  data.tar.gz: eb0b6cea76078763094d33ec83c089d0fe252eeb984444d0d6b57277171267ea70200858e2b8ac9fd9a810d5e915743f071a7347bbc6cfbb7a8d1a640184f86f

data/CHANGES.md

@@ -1,6 +1,15 @@
 twilio-ruby changelog
 =====================
 
+Version 3.14.4
+--------------
+
+Released January 8, 2015
+
+- Feature: dynamically choose the auth token to validate requests with when using the TwilioWebhookAuthentication middleware.
+- Deprecation: The Twilio::REST::SMS::Message resource is deprecated.
+- More fixing of docs
+
 Version 3.14.3
 --------------
 

data/docs/usage/token-generation.rst

@@ -14,7 +14,7 @@ Twilio Client.
 Capability tokens are used by `Twilio Client
 <http://www.twilio.com/api/client>`_ to provide connection
 security and authorization. The `Capability Token documentation
-<http://www.twilio.com/docs/tokens>`_ explains in depth the purpose and
+<https://www.twilio.com/docs/client/capability-tokens>`_ explains in depth the purpose and
 features of these tokens.
 
 :class:`Twilio::Util::Capability` is responsible for the creation of these

data/docs/usage/validation.rst

@@ -95,3 +95,13 @@ a Sinatra application:
 Now, any POST request to /messages in your application that doesn't validate as
 a Twilio request, will automatically respond with a 403 status code and your
 action will not be hit.
+
+If you use subaccounts and need to validate with different auth tokens, you can pass a block to the middleware instead of an auth token. The block will be passed the Account Sid making the call.
+
+.. code-block:: ruby
+
+    use Rack::TwilioWebhookAuthentication, nil, /\/messages/ do |account_sid|
+      # lookup auth_token from account_sid
+    end
+
+Ensure you pass `nil` for the auth_token when passing a block, otherwise the block will not be called.

data/lib/rack/twilio_webhook_authentication.rb

@@ -17,18 +17,20 @@ module Rack
   # doesn't validate then the middleware responds immediately with a 403 status.
 
   class TwilioWebhookAuthentication
-    def initialize(app, auth_token, *paths)
+    def initialize(app, auth_token, *paths, &auth_token_lookup)
       @app = app
       @auth_token = auth_token
+      define_singleton_method(:get_auth_token, auth_token_lookup) if block_given?
       @path_regex = Regexp.union(paths)
     end
 
     def call(env)
       return @app.call(env) unless env["PATH_INFO"].match(@path_regex)
-      validator = Twilio::Util::RequestValidator.new(@auth_token)
       request = Rack::Request.new(env)
       original_url = request.url
       params = request.post? ? request.POST : {}
+      auth_token = @auth_token || get_auth_token(params['AccountSid'])
+      validator = Twilio::Util::RequestValidator.new(auth_token)
       signature = env['HTTP_X_TWILIO_SIGNATURE'] || ""
       if validator.validate(original_url, params, signature)
         @app.call(env)
@@ -41,4 +43,5 @@ module Rack
       end
     end
   end
+
 end

data/lib/twilio-ruby/rest/sms/messages.rb

@@ -1,7 +1,26 @@
 module Twilio
   module REST
     module SMS
+      
+      module Deprecation
+        def deprecate(method_name)
+          old_method = "_deprecated_#{method_name}"
+          alias_method old_method, method_name
+          define_method method_name do |*args, &block|
+            warn "[DEPRECATED] SMS Resource is deprecated. Please use Messages (https://www.twilio.com/docs/api/rest/message)"
+            send old_method, *args, &block
+          end
+        end
+      end
+
       class Messages < ListResource
+        extend Deprecation
+         
+        deprecate :list
+        deprecate :total
+        deprecate :get
+        deprecate :create
+
         def initialize(path, client)
           super
           @list_key = 'sms_messages'
@@ -9,6 +28,11 @@ module Twilio
       end
 
       class Message < InstanceResource
+        extend Deprecation
+
+        deprecate :update
+        deprecate :refresh
+        deprecate :delete
       end
     end
   end

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '3.14.3'
+  VERSION = '3.14.4'
 end

data/spec/rack/twilio_webhook_authentication_spec.rb

@@ -18,6 +18,28 @@ describe Rack::TwilioWebhookAuthentication do
         Rack::TwilioWebhookAuthentication.new(@app, 'ABC', /\/voice/, /\/sms/)
       }.not_to raise_error
     end
+
+    it 'should initialize with an app, dynamic token and paths' do
+      expect {
+        Rack::TwilioWebhookAuthentication.new(@app, nil, /\/voice/, /\/sms/)
+      }.not_to raise_error
+    end
+  end
+
+  describe 'calling against one path with dynamic auth token' do
+    it 'should allow a request through if it validates' do
+      auth_token = 'qwerty'
+      account_sid = 12345
+      expect_any_instance_of(Rack::Request).to receive(:post?).and_return(true)
+      expect_any_instance_of(Rack::Request).to receive(:POST).and_return({'AccountSid' => account_sid})
+      @middleware = Rack::TwilioWebhookAuthentication.new(@app, nil, /\/voice/) { |asid| auth_token}
+      request_validator = double('RequestValidator')
+      expect(Twilio::Util::RequestValidator).to receive(:new).with(auth_token).and_return(request_validator)
+      expect(request_validator).to receive(:validate).and_return(true)
+      request = Rack::MockRequest.env_for('/voice')
+      status, headers, body = @middleware.call(request)
+      expect(status).to be(200)
+    end
   end
 
   describe 'calling against one path' do

data/spec/rest/sms/message_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe Twilio::REST::SMS::Message do
+
+  before do
+    client = double("Client")
+    allow(client).to receive(:post) do 
+      {'sid' => 'qwerty' } 
+    end
+
+    allow(client).to receive(:get) do 
+      {'sid' => 'qwerty', 'sms_message' => [] } 
+    end
+    
+    allow(client).to receive(:delete) do 
+      {'sid' => 'qwerty' } 
+    end
+
+    @message = Twilio::REST::SMS::Message.new('someUri',client)
+  end
+ 
+  it 'should warn of deprecation of SMS Message Update' do
+    expect(@message).to receive(:warn)
+    @message.update
+  end
+
+  it 'should warn of deprecation of SMS Message Refresh' do
+    expect(@message).to receive(:warn)
+    @message.refresh
+  end
+
+  it 'should warn of deprecation of SMS Message Delete' do
+    expect(@message).to receive(:warn)
+    @message.delete
+  end
+
+end

data/spec/rest/sms/messages_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Twilio::REST::SMS::Messages do
+
+  before do
+    client = double("Client")
+    allow(client).to receive(:post) do 
+      {'sid' => 'qwerty' } 
+    end
+
+    allow(client).to receive(:get) do 
+      {'sid' => 'qwerty', 'sms_messages' => [] } 
+    end
+    @messages = Twilio::REST::SMS::Messages.new('someUri',client)
+  end
+
+  it 'should warn of deprecation of SMS Messages Create' do
+    expect(@messages).to receive(:warn)
+    @messages.create to: "+1", from: "+2", body: "But Jenny!"
+  end  
+
+  it 'should warn of deprecation of SMS Messages List' do
+    expect(@messages).to receive(:warn)
+    @messages.list to: "+1"
+  end  
+  
+  it 'should warn of deprecation of SMS Messages Get' do
+    expect(@messages).to receive(:warn)
+    @messages.get sid: "qwerty"
+  end  
+
+  it 'should warn of deprecation of SMS Messages total' do
+    expect(@messages).to receive(:warn)
+    @messages.total
+  end  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 3.14.3
+  version: 3.14.4
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -195,6 +195,8 @@ files:
 - spec/rest/numbers_spec.rb
 - spec/rest/queue_spec.rb
 - spec/rest/recording_spec.rb
+- spec/rest/sms/message_spec.rb
+- spec/rest/sms/messages_spec.rb
 - spec/rest/token_spec.rb
 - spec/rest/utils_spec.rb
 - spec/spec_helper.rb
@@ -250,6 +252,8 @@ test_files:
 - spec/rest/numbers_spec.rb
 - spec/rest/queue_spec.rb
 - spec/rest/recording_spec.rb
+- spec/rest/sms/message_spec.rb
+- spec/rest/sms/messages_spec.rb
 - spec/rest/token_spec.rb
 - spec/rest/utils_spec.rb
 - spec/spec_helper.rb