Merge pull request #17 from twilio/include-utils-in-taskrouter-client

Includes Utils and REST::Utils in BaseClient.
twilio · Feb 18, 2015 · 73ddee8 · 73ddee8
2 parents 0857a99 + 3512fd9
commit 73ddee8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/twilio-ruby/rest/client.rb b/lib/twilio-ruby/rest/client.rb
@@ -1,6 +1,8 @@
 module Twilio
   module REST
     class BaseClient
+      include Twilio::Util
+      include Twilio::REST::Utils
 
       HTTP_HEADERS = {
           'Accept' => 'application/json',
@@ -157,9 +159,6 @@ def connect_and_send(request) # :doc:
     # accounts and ListResource#create to create a new account. Use
     # ListResource#get to grab a particular account once you know its sid.
     class Client < BaseClient
-      include Twilio::Util
-      include Twilio::REST::Utils
-
       API_VERSION = '2010-04-01'
 
       attr_reader :account, :accounts

diff --git a/lib/twilio-ruby/rest/next_gen_list_resource.rb b/lib/twilio-ruby/rest/next_gen_list_resource.rb
@@ -3,7 +3,7 @@ module REST
     class NextGenListResource < Twilio::REST::ListResource
       def list(params={}, full_path=false)
         raise "Can't get a resource list without a REST Client" unless @client
-        response = @client.get @path, params, true
+        response = @client.get @path, params, full_path
         list_key = response['meta']['key']
         raise "Couldn't find a list key in response meta" unless list_key
         resources = response[list_key]