refactor the way objects are built from json to make it more easily o…

…verrideable

lib/twilio-ruby/rest/available_phone_numbers.rb

@@ -2,9 +2,9 @@ module Twilio
   module REST
     class AvailablePhoneNumbers < ListResource
       def initialize(uri, client)
-        @resource_name = 'countries'
-        @instance_class = Twilio::REST.const_get 'Country'
         @uri, @client = uri, client
+        @instance_class = Twilio::REST::Country
+        @list_key, @instance_id_key = 'countries', 'country_code'
       end
     end
 

lib/twilio-ruby/rest/available_phone_numbers/local.rb

@@ -2,9 +2,9 @@ module Twilio
   module REST
     class Local < ListResource
       def initialize(uri, client)
-        @resource_name = 'available_phone_numbers'
-        @instance_class = Twilio::REST::AvailablePhoneNumber
         @uri, @client = uri, client
+        @instance_class = Twilio::REST::AvailablePhoneNumber
+        @list_key, @instance_id_key = 'available_phone_numbers', 'sid'
       end
     end
   end

lib/twilio-ruby/rest/available_phone_numbers/toll_free.rb

@@ -2,9 +2,9 @@ module Twilio
   module REST
     class TollFree < ListResource
       def initialize(uri, client)
-        @resource_name = 'available_phone_numbers'
-        @instance_class = Twilio::REST::AvailablePhoneNumber
         @uri, @client = uri, client
+        @instance_class = Twilio::REST::AvailablePhoneNumber
+        @list_key, @instance_id_key = 'available_phone_numbers', 'sid'
       end
     end
   end

lib/twilio-ruby/rest/conferences/participants.rb

@@ -1,9 +1,10 @@
 module Twilio
   module REST
     class Participants < ListResource
-      private
-      def instance_sid_key
-        'call_sid'
+      def initialize(uri, client)
+        super
+        # hard-code the json key since participants don't have sids
+        @instance_id_key = 'call_sid'
       end
     end
 

lib/twilio-ruby/rest/list_resource.rb

@@ -4,9 +4,10 @@ class ListResource
       include Utils
 
       def initialize(uri, client)
-        @resource_name = self.class.name.split('::')[-1]
-        @instance_class = Twilio::REST.const_get @resource_name.chop
         @uri, @client = uri, client
+        resource_name = self.class.name.split('::')[-1]
+        @instance_class = Twilio::REST.const_get resource_name.chop
+        @list_key, @instance_id_key = detwilify(resource_name), 'sid'
       end
 
       def inspect # :nodoc:
@@ -26,9 +27,9 @@ def inspect # :nodoc:
       def list(params = {})
         raise "Can't get a resource list without a REST Client" unless @client
         response = @client.get @uri, params
-        resources = response[detwilify(@resource_name)]
+        resources = response[@list_key]
         resource_list = resources.map do |resource|
-          @instance_class.new "#{@uri}/#{resource[instance_sid_key]}", @client,
+          @instance_class.new "#{@uri}/#{resource[@instance_id_key]}", @client,
             resource
         end
         # set the +total+ property on the array
@@ -71,18 +72,9 @@ def get(sid)
       def create(params={})
         raise "Can't create a resource without a REST Client" unless @client
         response = @client.post @uri, params
-        @instance_class.new "#{@uri}/#{response[instance_sid_key]}", @client,
+        @instance_class.new "#{@uri}/#{response[@instance_id_key]}", @client,
           response
       end
-
-      private
-
-      ##
-      # Return the JSON key containing the sid of each instance. This method is
-      # overridden for conference participants and perhaps other resources.
-      def instance_sid_key
-        'sid'
-      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ class Messages < ListResource
       def initialize(uri, client)
         super
         # hard-code the json key since 'messages' doesn't exist in the response
-        @resource_name = 'sms_messages'
+        @list_key = 'sms_messages'
       end
     end