twilio-ruby 4.9.1 → 4.10.0.edge

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad8c952ac5958e476622d7c2dc41af0b66c85cf
-  data.tar.gz: 2058f8524b23c47d60956ed53c15531a7a483f15
+  metadata.gz: bb00225c470d6aa3ea0ba2a72c34f2078c3965a2
+  data.tar.gz: 32c48483bdd58ffa6e99fb842ad6fe82264300e2
 SHA512:
-  metadata.gz: c5acd95e6d7843836eeeb0fb123857074b098818385a4c443bc4ce7ecce14bb56ad96c5c265ed326468eb8ba59407acc9313c44c0d6946cd05f7017eb9b02638
-  data.tar.gz: 5b529ff5f673b78dc31cc6edc2f728646e35a70b3d31ca77931d1a1aadd9e84e9a22c7aebc7a32a0b0b401d5a91271ed9162f406d61b71bb39dc81e25515d1f3
+  metadata.gz: cc126639b3455f0be6c0d3f69d82e02d91e6dbcc5e3e958dcf4a42993dfacf3ee06cd9b94f74fb79dfd442138acc6d027f4ef8f403eacd198314ebf15c62d5ed
+  data.tar.gz: 00ca225a65c495655c163dc85df394272f4c993077701b74c590d897b81669a42aa89103debc669776bbea882ea0018e7c5869a46fa9b47b635ae22e3d26ce37

data/CHANGES.md

@@ -1,10 +1,18 @@
 twilio-ruby changelog
 =====================
 
+Version 4.10.0-edge
+-------------
+
+Released January 28, 2016:
+
+- Add support for filter_friendly_name in WorkflowConfig
+- Load reservations by default in TaskRouter
+
 Version 4.9.1
 -------------
 
-Release January 28, 2015
+Release January 28, 2016
 
 - Fix ip messaging first person grant
 

data/lib/twilio-ruby.rb

@@ -36,6 +36,10 @@ require 'twilio-ruby/rest/pricing/phone_numbers'
 require 'twilio-ruby/rest/pricing/voice/numbers'
 require 'twilio-ruby/rest/pricing/voice'
 require 'twilio-ruby/rest/pricing/messaging'
+require 'twilio-ruby/rest/conversations/in_progress'
+require 'twilio-ruby/rest/conversations/completed'
+require 'twilio-ruby/rest/conversations/conversations'
+require 'twilio-ruby/rest/conversations/participants'
 require 'twilio-ruby/rest/ip-messaging/services'
 require 'twilio-ruby/rest/ip-messaging/channels'
 require 'twilio-ruby/rest/ip-messaging/members'
@@ -104,6 +108,7 @@ require 'twilio-ruby/rest/notifications'
 require 'twilio-ruby/rest/addresses'
 require 'twilio-ruby/rest/addresses/dependent_phone_numbers'
 require 'twilio-ruby/rest/client'
+require 'twilio-ruby/rest/conversations_client'
 require 'twilio-ruby/rest/task_router_client'
 require 'twilio-ruby/rest/trunking_client'
 require 'twilio-ruby/rest/lookups_client'

data/lib/twilio-ruby/rest/conversations/completed.rb

@@ -0,0 +1,13 @@
+module Twilio
+  module REST
+    module Conversations
+      class Completed < NextGenListResource
+        def initialize(path, client)
+          @path, @client = path, client
+          @instance_class = Twilio::REST::Conversations::Conversation
+          @instance_id_key = 'sid'
+        end
+      end
+    end
+  end
+end

data/lib/twilio-ruby/rest/conversations/conversations.rb

@@ -0,0 +1,23 @@
+module Twilio
+  module REST
+    module Conversations
+      class Conversations < NextGenListResource
+        def initialize(path, client)
+          @path, @client = path, client
+          @submodule = :Conversations
+          freeze_path
+          resource :in_progress,
+                   :completed
+        end
+      end
+
+      class Conversation < InstanceResource
+        def initialize(path, client, params={})
+          super
+          @submodule = :Conversations
+          resource :participants
+        end
+      end
+    end
+  end
+end

data/lib/twilio-ruby/rest/conversations/in_progress.rb

@@ -0,0 +1,13 @@
+module Twilio
+  module REST
+    module Conversations
+      class InProgress < NextGenListResource
+        def initialize(path, client)
+          @path, @client = path, client
+          @instance_class = Twilio::REST::Conversations::Conversation
+          @instance_id_key = 'sid'
+        end
+      end
+    end
+  end
+end

data/lib/twilio-ruby/rest/conversations/participants.rb

@@ -0,0 +1,8 @@
+module Twilio
+  module REST
+    module Conversations
+      class Participants < NextGenListResource; end
+      class Participant < InstanceResource; end
+    end
+  end
+end

data/lib/twilio-ruby/rest/conversations_client.rb

@@ -0,0 +1,99 @@
+require 'twilio-ruby/rest/base_client'
+module Twilio
+  module REST
+    class ConversationsClient < BaseClient
+      API_VERSION = 'v1'
+
+      attr_reader :conversations
+
+      host 'conversations.twilio.com'
+
+      ##
+      # Instantiate a new HTTP Conversations client to talk to Twilio. The parameters
+      # +account_sid+, +auth_token+ are required, unless you have configured
+      # them already using the block configure syntax, and used to generate the
+      # HTTP basic auth header in each request. The +options+ parameter is a
+      # hash of connection configuration options. the following keys are
+      # supported:
+      #
+      # === <tt>host: 'conversations.twilio.com'</tt>
+      #
+      # The domain to which you'd like the client to make HTTP requests. Useful
+      # for testing. Defaults to 'conversations.twilio.com'.
+      #
+      # === <tt>port: 443</tt>
+      #
+      # The port on which to connect to the above domain. Defaults to 443 and
+      # should be left that way except in testing environments.
+      #
+      # === <tt>use_ssl: true</tt>
+      #
+      # Declare whether ssl should be used for connections to the above domain.
+      # Defaults to true and should be left alone except when testing.
+      #
+      # === <tt>ssl_verify_peer: true</tt>
+      #
+      # Declare whether to verify the host's ssl cert when setting up the
+      # connection to the above domain. Defaults to true, but can be turned off
+      # to avoid ssl certificate verification failures in environments without
+      # the necessary ca certificates.
+      #
+      # === <tt>ssl_ca_file: '/path/to/ca/file'</tt>
+      #
+      # Specify the path to the certificate authority bundle you'd like to use
+      # to verify Twilio's SSL certificate on each request. If not specified, a
+      # certificate bundle extraced from Firefox is packaged with the gem and
+      # used by default.
+      #
+      # === <tt>timeout: 30</tt>
+      #
+      # Set the time in seconds to wait before timing out the HTTP request.
+      # Defaults to 30 seconds. If you aren't fetching giant pages of call or
+      # SMS logs you can safely decrease this to something like 3 seconds or
+      # lower. In paricular if you are sending SMS you can set this to 1 second
+      # or less and swallow the exception if you don't care about the response.
+      #
+      # === <tt>proxy_addr: 'proxy.host.domain'</tt>
+      #
+      # The domain of a proxy through which you'd like the client to make HTTP
+      # requests. Defaults to nil.
+      #
+      # === <tt>proxy_port: 3128</tt>
+      #
+      # The port on which to connect to the above proxy. Defaults to nil.
+      #
+      # === <tt>proxy_user: 'username'</tt>
+      #
+      # The user name to use for authentication with the proxy. Defaults to nil.
+      #
+      # === <tt>proxy_pass: 'password'</tt>
+      #
+      # The password to use for authentication with the proxy. Defaults to nil.
+      #
+      # === <tt>retry_limit: 1</tt>
+      #
+      # The number of times to retry a request that has failed before throwing
+      # an exception. Defaults to one.
+      def inspect # :nodoc:
+        "<Twilio::REST::ConversationsClient @account_sid=#{@account_sid}>"
+      end
+
+      protected
+
+      ##
+      # Create subresource properties
+      def set_up_subresources # :doc:
+        @conversations = Twilio::REST::Conversations::Conversations.new "/#{API_VERSION}/Conversations", self
+      end
+
+      ##
+      # Builds up full request path
+      def build_full_path(path, params, method)
+        path = path.dup
+        path << "?#{url_encode(params)}" if method == :get && !params.empty?
+        path
+      end
+
+    end
+  end
+end

data/lib/twilio-ruby/rest/list_resource.rb

@@ -10,7 +10,7 @@ module Twilio
           'Countries' => 'Country',
           'Feedback' => 'FeedbackInstance',
           'IpAddresses' => 'IpAddress',
-          'Media' => 'MediaInstance',
+          'Media' => 'MediaInstance'
         }
         @path, @client = path, client
         resource_name = self.class.name.split('::')[-1]
@@ -46,7 +46,8 @@ module Twilio
         raise "Can't get a resource list without a REST Client" unless @client
         response = @client.get @path, params, full_path
         resources = response[@list_key]
-        path = full_path ? @path.split('.')[0] : @path
+        path = @frozen_path ? @frozen_path : @path
+        path = full_path ? path.split('.')[0] : path
         resource_list = resources.map do |resource|
           @instance_class.new "#{path}/#{resource[@instance_id_key]}", @client,
             resource
@@ -80,7 +81,7 @@ module Twilio
       # attribute of the returned instance resource object, such as
       # its #date_created or #voice_url attributes.
       def get(sid)
-        @instance_class.new "#{@path}/#{sid}", @client
+        @instance_class.new "#{@frozen_path || @path}/#{sid}", @client
       end
       alias :find :get # for the ActiveRecord lovers
 

data/lib/twilio-ruby/rest/next_gen_list_resource.rb

@@ -4,11 +4,12 @@ module Twilio
       def list(params={}, full_path=false)
         raise "Can't get a resource list without a REST Client" unless @client
         response = @client.get @path, params, full_path
-        list_key = response['meta']['key']
+        list_key = response['meta']['key'] if response['meta']
         raise "Couldn't find a list key in response meta" unless list_key
         resources = response[list_key]
+        path = @frozen_path ? @frozen_path : @path
         resource_list = resources.map do |resource|
-          @instance_class.new "#{@path}/#{resource[@instance_id_key]}", @client,
+          @instance_class.new "#{path}/#{resource[@instance_id_key]}", @client,
                               resource
         end
         client, list_class = @client, self.class

data/lib/twilio-ruby/rest/utils.rb

@@ -19,6 +19,13 @@ module Twilio
 
       protected
 
+      # Freeze the base list path.
+      # Used on list resources so filters (such as /Local) do not affect the
+      # instance resource path.
+      def freeze_path
+        @frozen_path = @path
+      end
+
       def resource(*resources)
         custom_resource_names = { sms: 'SMS', sip: 'SIP' }
         resources.each do |r|
@@ -31,7 +38,11 @@ module Twilio
             Twilio::REST.const_get(@submodule)
           end
           resource_class = enclosing_module.const_get resource
-          instance_variable_set("@#{r}", resource_class.new(path, @client))
+          resource_object = resource_class.new(path, @client)
+          instance_variable_set("@#{r}", resource_object)
+          if @frozen_path
+            resource_object.instance_variable_set(:@frozen_path, @frozen_path)
+          end
         end
         self.class.instance_eval { attr_reader *resources }
       end

data/lib/twilio-ruby/task_router/capability.rb

@@ -136,8 +136,11 @@ module Twilio
           @activityUrl = @baseUrl + "/Activities"
           allow(@activityUrl, "GET")
 
-          @reservationsUrl = @baseUrl + "/Tasks/**"
-          allow(@reservationsUrl, "GET")
+          @tasksUrl = @baseUrl + "/Tasks/**"
+          allow(@tasksUrl, "GET")
+
+          @workerReservationsUrl = @resourceUrl + "/Reservations/**"
+          allow(@workerReservationsUrl, "GET")
 
         elsif(@channel_id[0..1] == 'WQ')
           @resourceUrl = @baseUrl + "/TaskQueues/" + @channel_id
@@ -171,11 +174,13 @@ module Twilio
 
       def initialize(account_sid, auth_token, workspace_sid, worker_sid)
         super(account_sid, auth_token, workspace_sid, worker_sid)
-        @reservationsUrl = @baseUrl + "/Tasks/**"
+        @tasksUrl = @baseUrl + "/Tasks/**"
         @activityUrl = @baseUrl + "/Activities"
+        @workerReservationsUrl = @resourceUrl + "/Reservations/**"
 
         allow(@activityUrl, "GET")
-        allow(@reservationsUrl, "GET")
+        allow(@tasksUrl, "GET")
+        allow(@workerReservationsUrl, "GET")
       end
 
       def allow_activity_updates
@@ -183,7 +188,8 @@ module Twilio
       end
 
       def allow_reservation_updates
-        allow(@reservationsUrl, "POST", nil, nil)
+        allow(@tasksUrl, "POST", nil, nil)
+        allow(@workerReservationsUrl, "POST", nil, nil)
       end
 
       protected

data/lib/twilio-ruby/task_router/workflow_builder.rb

@@ -79,7 +79,13 @@ module Twilio
         rule['targets'].each do |target|
           targets.push(Twilio::TaskRouter::WorkflowRuleTarget.parse_json(target))
         end
-        Twilio::TaskRouter::WorkflowRule.new rule['expression'], targets, rule['friendly_name']
+        unless rule['filter_friendly_name'].nil?
+          friendly_name = rule['filter_friendly_name']
+        end
+        unless rule['friendly_name'].nil?
+          friendly_name = rule['friendly_name']
+        end
+        Twilio::TaskRouter::WorkflowRule.new rule['expression'], targets, friendly_name
       end
     end
     class WorkflowRuleTarget

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '4.9.1'
+  VERSION = '4.10.0.edge'
 end

data/spec/conversations/conversations_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Twilio::REST::Conversations::Conversations do
+
+  it 'creates an in_progress property' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
+    expect(conversations).to respond_to(:in_progress)
+  end
+
+  it 'creates a completed property' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
+    expect(conversations).to respond_to(:completed)
+  end
+
+end
+
+describe Twilio::REST::Conversations::InProgress do
+  it 'gets constructed by conversations' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
+    expect(conversations.in_progress.instance_variable_get('@path')).to eq('/v1/Conversations/InProgress')
+  end
+  it 'uses Conversation as its instance class' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
+    expect(conversations.in_progress.instance_variable_get('@instance_class')).to eq(Twilio::REST::Conversations::Conversation)
+  end
+end
+
+describe Twilio::REST::Conversations::Completed do
+  it 'gets constructed by conversations' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
+    expect(conversations.completed.instance_variable_get('@path')).to eq('/v1/Conversations/Completed')
+  end
+  it 'uses Conversation as its instance class' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversations = Twilio::REST::Conversations::Conversations.new '/v1/Conversations', client
+    expect(conversations.completed.instance_variable_get('@instance_class')).to eq(Twilio::REST::Conversations::Conversation)
+  end
+end
+
+describe Twilio::REST::Conversations::Conversation do
+  it 'has correct path when fetched from /InProgress' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversation = client.conversations.in_progress.get('CA123')
+    expect(conversation.instance_variable_get('@path')).to eq('/v1/Conversations/CA123')
+  end
+  it 'has correct path when fetched from /Completed' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversation = client.conversations.completed.get('CA123')
+    expect(conversation.instance_variable_get('@path')).to eq('/v1/Conversations/CA123')
+  end
+  it 'sets up participants subresource' do
+    client = Twilio::REST::ConversationsClient.new 'otherSid', 'otherToken'
+    conversation = Twilio::REST::Conversations::Conversation.new '/v1/Conversations/CA123', client
+    expect(conversation).to respond_to(:participants)
+  end
+end

data/spec/rest/conversations_client_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Twilio::REST::ConversationsClient do
+  before do
+    @client = Twilio::REST::ConversationsClient.new('AC123', 'foobar')
+  end
+
+  it 'should set up an conversations resources object' do
+    expect(@client).to respond_to(:conversations)
+    expect(@client.conversations.instance_variable_get('@path')).to eq('/v1/Conversations')
+  end
+
+end

data/spec/task_router/workflow_builder_spec.rb

@@ -0,0 +1,501 @@
+require 'spec_helper'
+
+describe Twilio::TaskRouter::WorkflowConfiguration do
+  describe 'with a workflow builder' do
+
+    it 'should construct a default rule target' do
+      everyoneQueue = 'WQf6724bd5005b30eeb6ea990c3e59e536'
+      defaultTarget = Twilio::TaskRouter::WorkflowRuleTarget.new everyoneQueue
+      expect(defaultTarget.queue).to eq(everyoneQueue)
+      expect(defaultTarget.priority).to be_nil
+      expect(defaultTarget.timeout).to be_nil
+      expect(defaultTarget.expression).to be_nil
+    end
+
+    it 'should construct a simple rule target' do
+      everyoneQueue = 'WQf6724bd5005b30eeb6ea990c3e59e536'
+      priority = 10
+      timeout = 60
+      defaultTarget = Twilio::TaskRouter::WorkflowRuleTarget.new everyoneQueue, priority, timeout
+      expect(defaultTarget.queue).to eq(everyoneQueue)
+      expect(defaultTarget.priority).to eq(priority)
+      expect(defaultTarget.timeout).to eq(timeout)
+      expect(defaultTarget.expression).to be_nil
+    end
+
+    it 'should construct a worker filter rule target' do
+      everyoneQueue = 'WQf6724bd5005b30eeb6ea990c3e59e536'
+      priority = 10
+      timeout = 60
+      filterWorkerExpression = "task.language IN worker.languages";
+      defaultTarget = Twilio::TaskRouter::WorkflowRuleTarget.new everyoneQueue, priority, timeout, filterWorkerExpression
+      expect(defaultTarget.queue).to eq(everyoneQueue)
+      expect(defaultTarget.priority).to eq(priority)
+      expect(defaultTarget.timeout).to eq(timeout)
+      expect(defaultTarget.expression).to eq(filterWorkerExpression)
+    end
+
+    it 'should construct simple rule' do
+      salesQueue = "WQf6724bd5005b30eeb6ea990c3e59e536"
+      salesTarget = Twilio::TaskRouter::WorkflowRuleTarget.new salesQueue
+      expression = "type=='sales'"
+      friendlyName = "Sales"
+      salesTargets = [salesTarget]
+      salesRule = Twilio::TaskRouter::WorkflowRule.new expression, salesTargets, friendlyName
+      expect(salesRule.expression).to eq(expression)
+      expect(salesRule.friendly_name).to eq(friendlyName)
+      expect(salesRule.targets[0]).to eq(salesTarget)
+    end
+
+    it 'should construct a full workflow' do
+      salesQueue = "WQf6724bd5005b30eeb6ea990c3e59e536"
+      marketingQueue = "WQ8c62f84b61ccfa6a333757cd508f0aae"
+      supportQueue = "WQ5940dc0da87eaf6e3321d62041d4403b"
+      everyoneQueue = "WQ6d29383312b24bd898a8df32779fc043"
+
+      defaultTarget = Twilio::TaskRouter::WorkflowRuleTarget.new everyoneQueue
+
+      salesTarget = Twilio::TaskRouter::WorkflowRuleTarget.new salesQueue
+      salesRule = Twilio::TaskRouter::WorkflowRule.new "type=='sales'", [salesTarget], 'Sales'
+
+      marketingTarget = Twilio::TaskRouter::WorkflowRuleTarget.new marketingQueue
+      marketingRule = Twilio::TaskRouter::WorkflowRule.new "type=='marketing'", [marketingTarget], 'Marketing'
+
+      supportTarget = Twilio::TaskRouter::WorkflowRuleTarget.new supportQueue
+      supportRule = Twilio::TaskRouter::WorkflowRule.new "type=='support'", [supportTarget], 'Support'
+
+      rules = [salesRule, marketingRule, supportRule]
+
+      config = Twilio::TaskRouter::WorkflowConfiguration.new rules, defaultTarget
+      json = config.to_json
+
+      expected = "{
+        \"task_routing\":{
+          \"filters\":[
+           {
+            \"expression\":\"type=='sales'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\"
+               }
+            ],
+            \"friendly_name\":\"Sales\"
+           },
+           {
+            \"expression\":\"type=='marketing'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\"
+               }
+            ],
+            \"friendly_name\":\"Marketing\"
+           },
+           {
+            \"expression\":\"type=='support'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\"
+               }
+            ],
+            \"friendly_name\":\"Support\"
+           }
+          ],
+          \"default_filter\":{
+           \"queue\":\"WQ6d29383312b24bd898a8df32779fc043\"
+          }
+        }
+      }"
+
+      expected = JSON.parse(expected).to_json
+
+      expect(expected).to eq(json)
+    end
+
+    it 'should construct a full workflow with timeouts' do
+      salesQueue = "WQf6724bd5005b30eeb6ea990c3e59e536"
+      marketingQueue = "WQ8c62f84b61ccfa6a333757cd508f0aae"
+      supportQueue = "WQ5940dc0da87eaf6e3321d62041d4403b"
+      everyoneQueue = "WQ6d29383312b24bd898a8df32779fc043"
+
+      defaultTarget = Twilio::TaskRouter::WorkflowRuleTarget.new everyoneQueue
+
+      salesTarget1 = Twilio::TaskRouter::WorkflowRuleTarget.new salesQueue, 5, 30
+      salesTarget2 = Twilio::TaskRouter::WorkflowRuleTarget.new salesQueue, 10
+      salesRule = Twilio::TaskRouter::WorkflowRule.new "type=='sales'", [salesTarget1, salesTarget2], 'Sales'
+
+      marketingTarget1 = Twilio::TaskRouter::WorkflowRuleTarget.new marketingQueue, 1, 120
+      marketingTarget2 = Twilio::TaskRouter::WorkflowRuleTarget.new marketingQueue, 3
+      marketingRule = Twilio::TaskRouter::WorkflowRule.new "type=='marketing'", [marketingTarget1, marketingTarget2], 'Marketing'
+
+      supportTarget1 = Twilio::TaskRouter::WorkflowRuleTarget.new supportQueue, 10, 30
+      supportTarget2 = Twilio::TaskRouter::WorkflowRuleTarget.new supportQueue, 15
+      supportRule = Twilio::TaskRouter::WorkflowRule.new "type=='support'", [supportTarget1, supportTarget2], 'Support'
+
+      rules = [salesRule, marketingRule, supportRule]
+
+      config = Twilio::TaskRouter::WorkflowConfiguration.new rules, defaultTarget
+      json = config.to_json
+
+      expected = "{
+        \"task_routing\":{
+          \"filters\":[
+           {
+            \"expression\":\"type=='sales'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 5,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 10
+               }
+            ],
+            \"friendly_name\":\"Sales\"
+           },
+           {
+            \"expression\":\"type=='marketing'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 1,
+                \"timeout\": 120
+               },
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 3
+               }
+            ],
+            \"friendly_name\":\"Marketing\"
+           },
+           {
+            \"expression\":\"type=='support'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 10,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 15
+               }
+            ],
+            \"friendly_name\":\"Support\"
+           }
+          ],
+          \"default_filter\":{
+           \"queue\":\"WQ6d29383312b24bd898a8df32779fc043\"
+          }
+        }
+      }";
+
+      expected = JSON.parse(expected).to_json
+
+      expect(expected).to eq(json)
+    end
+
+    it 'should be able to parse the workflow' do
+      json = "{
+        \"task_routing\":{
+          \"filters\":[
+           {
+            \"expression\":\"type=='sales'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 5,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 10
+               }
+            ],
+            \"friendly_name\":\"Sales\"
+           },
+           {
+            \"expression\":\"type=='marketing'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 1,
+                \"timeout\": 120
+               },
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 3
+               }
+            ],
+            \"friendly_name\":\"Marketing\"
+           },
+           {
+            \"expression\":\"type=='support'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 10,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 15
+               }
+            ],
+            \"friendly_name\":\"Support\"
+           }
+          ],
+          \"default_filter\":{
+           \"queue\":\"WQ6d29383312b24bd898a8df32779fc043\"
+          }
+        }
+      }"
+
+      config = Twilio::TaskRouter::WorkflowConfiguration.parse_json(json)
+
+      expect(config.rules.length).to eq(3)
+      expect(config.default_target).to_not be_nil
+      # sales assertions
+      expect(config.rules[0].expression).to eq("type=='sales'")
+      expect(config.rules[0].friendly_name).to eq("Sales")
+      expect(config.rules[0].targets.length).to eq(2)
+      expect(config.rules[0].targets[0].queue).to eq("WQf6724bd5005b30eeb6ea990c3e59e536")
+      expect(config.rules[0].targets[0].priority).to eq(5)
+      expect(config.rules[0].targets[0].timeout).to eq(30)
+      expect(config.rules[0].targets[1].queue).to eq("WQf6724bd5005b30eeb6ea990c3e59e536")
+      expect(config.rules[0].targets[1].priority).to eq(10)
+      # marketing assertions
+      expect(config.rules[1].expression).to eq("type=='marketing'")
+      expect(config.rules[1].friendly_name).to eq("Marketing")
+      expect(config.rules[1].targets.length).to eq(2)
+      expect(config.rules[1].targets[0].queue).to eq("WQ8c62f84b61ccfa6a333757cd508f0aae")
+      expect(config.rules[1].targets[0].priority).to eq(1)
+      expect(config.rules[1].targets[0].timeout).to eq(120)
+      expect(config.rules[1].targets[1].queue).to eq("WQ8c62f84b61ccfa6a333757cd508f0aae")
+      expect(config.rules[1].targets[1].priority).to eq(3)
+      # support assertions
+      expect(config.rules[2].expression).to eq("type=='support'")
+      expect(config.rules[2].friendly_name).to eq("Support")
+      expect(config.rules[2].targets.length).to eq(2)
+      expect(config.rules[2].targets[0].queue).to eq("WQ5940dc0da87eaf6e3321d62041d4403b")
+      expect(config.rules[2].targets[0].priority).to eq(10)
+      expect(config.rules[2].targets[0].timeout).to eq(30)
+      expect(config.rules[2].targets[1].queue).to eq("WQ5940dc0da87eaf6e3321d62041d4403b")
+      expect(config.rules[2].targets[1].priority).to eq(15)
+      # default filter
+      expect(config.default_target.queue).to eq("WQ6d29383312b24bd898a8df32779fc043")
+    end
+
+    it 'should be able to parse the workflow with filter friendly name' do
+      json = "{
+        \"task_routing\":{
+          \"filters\":[
+           {
+            \"expression\":\"type=='sales'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 5,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 10
+               }
+            ],
+            \"filter_friendly_name\":\"Sales\"
+           },
+           {
+            \"expression\":\"type=='marketing'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 1,
+                \"timeout\": 120
+               },
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 3
+               }
+            ],
+            \"filter_friendly_name\":\"Marketing\"
+           },
+           {
+            \"expression\":\"type=='support'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 10,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 15
+               }
+            ],
+            \"filter_friendly_name\":\"Support\"
+           }
+          ],
+          \"default_filter\":{
+           \"queue\":\"WQ6d29383312b24bd898a8df32779fc043\"
+          }
+        }
+      }"
+
+      config = Twilio::TaskRouter::WorkflowConfiguration.parse_json(json)
+
+      expect(config.rules.length).to eq(3)
+      expect(config.default_target).to_not be_nil
+      # sales assertions
+      expect(config.rules[0].expression).to eq("type=='sales'")
+      expect(config.rules[0].friendly_name).to eq("Sales")
+      expect(config.rules[0].targets.length).to eq(2)
+      expect(config.rules[0].targets[0].queue).to eq("WQf6724bd5005b30eeb6ea990c3e59e536")
+      expect(config.rules[0].targets[0].priority).to eq(5)
+      expect(config.rules[0].targets[0].timeout).to eq(30)
+      expect(config.rules[0].targets[1].queue).to eq("WQf6724bd5005b30eeb6ea990c3e59e536")
+      expect(config.rules[0].targets[1].priority).to eq(10)
+      # marketing assertions
+      expect(config.rules[1].expression).to eq("type=='marketing'")
+      expect(config.rules[1].friendly_name).to eq("Marketing")
+      expect(config.rules[1].targets.length).to eq(2)
+      expect(config.rules[1].targets[0].queue).to eq("WQ8c62f84b61ccfa6a333757cd508f0aae")
+      expect(config.rules[1].targets[0].priority).to eq(1)
+      expect(config.rules[1].targets[0].timeout).to eq(120)
+      expect(config.rules[1].targets[1].queue).to eq("WQ8c62f84b61ccfa6a333757cd508f0aae")
+      expect(config.rules[1].targets[1].priority).to eq(3)
+      # support assertions
+      expect(config.rules[2].expression).to eq("type=='support'")
+      expect(config.rules[2].friendly_name).to eq("Support")
+      expect(config.rules[2].targets.length).to eq(2)
+      expect(config.rules[2].targets[0].queue).to eq("WQ5940dc0da87eaf6e3321d62041d4403b")
+      expect(config.rules[2].targets[0].priority).to eq(10)
+      expect(config.rules[2].targets[0].timeout).to eq(30)
+      expect(config.rules[2].targets[1].queue).to eq("WQ5940dc0da87eaf6e3321d62041d4403b")
+      expect(config.rules[2].targets[1].priority).to eq(15)
+      # default filter
+      expect(config.default_target.queue).to eq("WQ6d29383312b24bd898a8df32779fc043")
+    end
+
+    it 'should be able to parse the workflow with filter friendly name and marshall as friendly name' do
+      json = "{
+        \"task_routing\":{
+          \"filters\":[
+           {
+            \"expression\":\"type=='sales'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 5,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 10
+               }
+            ],
+            \"filter_friendly_name\":\"Sales\"
+           },
+           {
+            \"expression\":\"type=='marketing'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 1,
+                \"timeout\": 120
+               },
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 3
+               }
+            ],
+            \"filter_friendly_name\":\"Marketing\"
+           },
+           {
+            \"expression\":\"type=='support'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 10,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 15
+               }
+            ],
+            \"filter_friendly_name\":\"Support\"
+           }
+          ],
+          \"default_filter\":{
+           \"queue\":\"WQ6d29383312b24bd898a8df32779fc043\"
+          }
+        }
+      }"
+
+      config = Twilio::TaskRouter::WorkflowConfiguration.parse_json(json)
+
+      newJSON = config.to_json
+
+      expected = "{
+        \"task_routing\":{
+          \"filters\":[
+           {
+            \"expression\":\"type=='sales'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 5,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQf6724bd5005b30eeb6ea990c3e59e536\",
+                \"priority\": 10
+               }
+            ],
+            \"friendly_name\":\"Sales\"
+           },
+           {
+            \"expression\":\"type=='marketing'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 1,
+                \"timeout\": 120
+               },
+               {
+                \"queue\":\"WQ8c62f84b61ccfa6a333757cd508f0aae\",
+                \"priority\": 3
+               }
+            ],
+            \"friendly_name\":\"Marketing\"
+           },
+           {
+            \"expression\":\"type=='support'\",
+            \"targets\":[
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 10,
+                \"timeout\": 30
+               },
+               {
+                \"queue\":\"WQ5940dc0da87eaf6e3321d62041d4403b\",
+                \"priority\": 15
+               }
+            ],
+            \"friendly_name\":\"Support\"
+           }
+          ],
+          \"default_filter\":{
+           \"queue\":\"WQ6d29383312b24bd898a8df32779fc043\"
+          }
+        }
+      }"
+
+      expected = JSON.parse(expected).to_json
+
+      expect(expected).to eq(newJSON)
+    end
+  end
+end

data/spec/task_router_deprecated_spec.rb

@@ -42,7 +42,7 @@ describe Twilio::TaskRouter::Capability do
     it 'should allow websocket operations and fetching the workspace by default' do
       token = @capability.generate_token
       decoded, header = JWT.decode token, 'foobar'
-      expect(decoded['policies'].size).to eq(5)
+      expect(decoded['policies'].size).to eq(6)
 
       activites_fetch_policy = {
           'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities',
@@ -53,14 +53,23 @@ describe Twilio::TaskRouter::Capability do
       }
       expect(decoded['policies'][0]).to eq(activites_fetch_policy)
 
-      reservation_fetch_policy = {
+      task_fetch_policy = {
           'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**',
           'method' => 'GET',
           'query_filter' => {},
           'post_filter' => {},
           'allow' => true
       }
-      expect(decoded['policies'][1]).to eq(reservation_fetch_policy)
+      expect(decoded['policies'][1]).to eq(task_fetch_policy)
+
+      worker_reservation_fetch_policy = {
+          'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789/Reservations/**',
+          'method' => 'GET',
+          'query_filter' => {},
+          'post_filter' => {},
+          'allow' => true
+      }
+      expect(decoded['policies'][2]).to eq(worker_reservation_fetch_policy)
 
       get_policy = {
         "url" => 'https://event-bridge.twilio.com/v1/wschannels/AC123/WK789',
@@ -69,7 +78,7 @@ describe Twilio::TaskRouter::Capability do
         "post_filter" => {},
         "allow" => true
       }
-      expect(decoded['policies'][2]).to eq(get_policy)
+      expect(decoded['policies'][3]).to eq(get_policy)
       post_policy = {
         "url" => 'https://event-bridge.twilio.com/v1/wschannels/AC123/WK789',
         "method" => 'POST',
@@ -77,7 +86,7 @@ describe Twilio::TaskRouter::Capability do
         "post_filter" => {},
         "allow" => true
       }
-      expect(decoded['policies'][3]).to eq(post_policy)
+      expect(decoded['policies'][4]).to eq(post_policy)
 
       worker_fetch_policy = {
           'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789',
@@ -86,7 +95,7 @@ describe Twilio::TaskRouter::Capability do
           'post_filter' => {},
           'allow' => true
       }
-      expect(decoded['policies'][4]).to eq(worker_fetch_policy)
+      expect(decoded['policies'][5]).to eq(worker_fetch_policy)
     end
 
     it 'should add a policy when #allow_worker_activity_updates is called' do

data/spec/task_router_worker_spec.rb

@@ -42,7 +42,7 @@ describe Twilio::TaskRouter::WorkerCapability do
     it 'should allow websocket operations and activity list fetches by default' do
       token = @capability.generate_token
       decoded, header = JWT.decode token, 'foobar'
-      expect(decoded['policies'].size).to eq(5)
+      expect(decoded['policies'].size).to eq(6)
       get_policy = {
         "url" => 'https://event-bridge.twilio.com/v1/wschannels/AC123/WK789',
         "method" => 'GET',
@@ -78,14 +78,23 @@ describe Twilio::TaskRouter::WorkerCapability do
       }
       expect(decoded['policies'][3]).to eq(activities_policy)
 
-      reservations_policy = {
+      tasks_policy = {
           'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**',
           'method' => 'GET',
           'query_filter' => {},
           'post_filter' => {},
           'allow' => true
       }
-      expect(decoded['policies'][4]).to eq(reservations_policy)
+      expect(decoded['policies'][4]).to eq(tasks_policy)
+
+      worker_reservations_policy = {
+          'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789/Reservations/**',
+          'method' => 'GET',
+          'query_filter' => {},
+          'post_filter' => {},
+          'allow' => true
+      }
+      expect(decoded['policies'][5]).to eq(worker_reservations_policy)
     end
 
     it 'should add a policy when #allow_activity_updates is called' do
@@ -107,7 +116,7 @@ describe Twilio::TaskRouter::WorkerCapability do
       expect(decoded['policies'].size).to eq(policies_size+1)
     end
 
-    it 'should add a policy when #allow_reservation_updates is called' do
+    it 'should add two policies when #allow_reservation_updates is called' do
       token = @capability.generate_token
       decoded, header = JWT.decode token, 'foobar'
       policies_size = decoded['policies'].size
@@ -115,15 +124,23 @@ describe Twilio::TaskRouter::WorkerCapability do
       @capability.allow_reservation_updates
       token = @capability.generate_token
       decoded, header = JWT.decode token, 'foobar'
-      reservation_policy = {
+      tasks_policy = {
         'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**',
         'method' => 'POST',
         'query_filter' => {},
         'post_filter' => {},
         'allow' => true
       }
-      expect(decoded['policies'][-1]).to eq(reservation_policy)
-      expect(decoded['policies'].size).to eq(policies_size+1)
+      expect(decoded['policies'][-2]).to eq(tasks_policy)
+      worker_reservations_policy = {
+          'url' => 'https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789/Reservations/**',
+          'method' => 'POST',
+          'query_filter' => {},
+          'post_filter' => {},
+          'allow' => true
+      }
+      expect(decoded['policies'][-1]).to eq(worker_reservations_policy)
+      expect(decoded['policies'].size).to eq(policies_size+2)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 4.9.1
+  version: 4.10.0.edge
 platform: ruby
 authors:
 - Andrew Benton
@@ -150,6 +150,11 @@ files:
 - lib/twilio-ruby/rest/conferences.rb
 - lib/twilio-ruby/rest/conferences/participants.rb
 - lib/twilio-ruby/rest/connect_apps.rb
+- lib/twilio-ruby/rest/conversations/completed.rb
+- lib/twilio-ruby/rest/conversations/conversations.rb
+- lib/twilio-ruby/rest/conversations/in_progress.rb
+- lib/twilio-ruby/rest/conversations/participants.rb
+- lib/twilio-ruby/rest/conversations_client.rb
 - lib/twilio-ruby/rest/errors.rb
 - lib/twilio-ruby/rest/incoming_phone_numbers.rb
 - lib/twilio-ruby/rest/incoming_phone_numbers/local.rb
@@ -235,6 +240,7 @@ files:
 - lib/twilio-ruby/util/configuration.rb
 - lib/twilio-ruby/util/request_validator.rb
 - lib/twilio-ruby/version.rb
+- spec/conversations/conversations_spec.rb
 - spec/rack/twilio_webhook_authentication_spec.rb
 - spec/rest/account_spec.rb
 - spec/rest/address_spec.rb
@@ -243,6 +249,7 @@ files:
 - spec/rest/call_spec.rb
 - spec/rest/client_spec.rb
 - spec/rest/conference_spec.rb
+- spec/rest/conversations_client_spec.rb
 - spec/rest/instance_resource_spec.rb
 - spec/rest/ip-messaging/channel_spec.rb
 - spec/rest/ip-messaging/service_spec.rb
@@ -265,6 +272,7 @@ files:
 - spec/rest/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb.rb
+- spec/task_router/workflow_builder_spec.rb
 - spec/task_router_deprecated_spec.rb
 - spec/task_router_spec.rb
 - spec/task_router_taskqueue_spec.rb
@@ -299,9 +307,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -310,6 +318,7 @@ specification_version: 4
 summary: A simple library for communicating with the Twilio REST API, building TwiML,
   and generating Twilio Client Capability Tokens
 test_files:
+- spec/conversations/conversations_spec.rb
 - spec/rack/twilio_webhook_authentication_spec.rb
 - spec/rest/account_spec.rb
 - spec/rest/address_spec.rb
@@ -318,6 +327,7 @@ test_files:
 - spec/rest/call_spec.rb
 - spec/rest/client_spec.rb
 - spec/rest/conference_spec.rb
+- spec/rest/conversations_client_spec.rb
 - spec/rest/instance_resource_spec.rb
 - spec/rest/ip-messaging/channel_spec.rb
 - spec/rest/ip-messaging/service_spec.rb
@@ -340,6 +350,7 @@ test_files:
 - spec/rest/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/fakeweb.rb
+- spec/task_router/workflow_builder_spec.rb
 - spec/task_router_deprecated_spec.rb
 - spec/task_router_spec.rb
 - spec/task_router_taskqueue_spec.rb