twilio-ruby 5.0.0.rc5 → 5.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b36c0c36564e2f8f9a28c2a0806ffb3e22ac45ce
-  data.tar.gz: 3945773e1504b060c44995ab120ee6e931ce8b34
+  metadata.gz: bbbaa3e364a1624cd589adf645929771a6f904bb
+  data.tar.gz: 22a02d6228e6248cd8b729e7217dba222e644b73
 SHA512:
-  metadata.gz: 34b7af3a9579a759eebeef7618441387c255591dccda3bdc563579d345e487ebad9a9dc1757716d1168c3c27f50c6b1e4db8e8db84b7ca89faf6ba4655e39f2e
-  data.tar.gz: e7ab48283e6cc5e1a8c9f231c267781adb3d9462ac107149dee6a20b12d1126d6d6fc67dfac5352ba75538d221f4e63682094df50be8ba370801fad72426554c
+  metadata.gz: cbd27881a6f2986afba1250a5ea958353d7a650276bbec2b3e2922d5b64d34b0d805d0b109fe067ee8d7c64b81380f0dd63f285c6135d21e4dbd210bfcaf7cb9
+  data.tar.gz: 2c5cb2d27e44730eb2bdc85262049639e5183ba0da7583384726022e7cbcc65c5c186f767de5bdc622c8bc9391a7436d2c767836ce199cb0276a0d6122224eda

data/CHANGES.md

@@ -1,6 +1,14 @@
 twilio-ruby changelog
 =====================
 
+Version 5.0.0-rc7
+-------------
+
+Release June 9, 2016
+
+- Add messaging feedback support
+
+
 Version 5.0.0-rc5
 -------------
 

data/lib/twilio-ruby/framework/serialize.rb

@@ -16,4 +16,30 @@ module Twilio
       Time.parse(date)
     end
   end
+
+  def self.flatten(map, result={}, previous=[])
+    map.each do |key, value|
+      if value.is_a? Hash
+        self.flatten(value, result, previous + [key])
+      else
+        result[(previous + [key]).join('.')] = value
+      end
+    end
+
+    result
+  end
+
+  def self.prefixed_collapsible_map(map, prefix)
+    result = {}
+    if map.is_a? Hash
+      flattened = self.flatten(map)
+      result = {}
+      flattened.each do |key, value|
+        result[prefix + '.' + key] = value
+      end
+    end
+
+    result
+  end
+
 end

data/lib/twilio-ruby/http/http_client.rb

@@ -12,6 +12,9 @@ module Twilio
         @proxy_pass = proxy_pass
         @ssl_ca_file = ssl_ca_file
         @adapter = Faraday.default_adapter
+
+        # Set default params encoder
+        Faraday::Utils.default_params_encoder = Faraday::FlatParamsEncoder
       end
 
       def request(host, port, method, url, params={}, data={}, headers={}, auth=nil, timeout=nil)

data/lib/twilio-ruby/rest/api/v2010/account/message.rb

@@ -248,6 +248,7 @@ module Twilio
               
               # Dependents
               @media = nil
+              @feedback = nil
             end
             
             ##
@@ -325,6 +326,21 @@ module Twilio
               @media
             end
             
+            ##
+            # Access the feedback
+            # @return [FeedbackList] FeedbackList
+            def feedback
+              unless @feedback
+                @feedback = FeedbackList.new(
+                    @version,
+                    account_sid: @solution[:account_sid],
+                    message_sid: @solution[:sid],
+                )
+              end
+              
+              @feedback
+            end
+            
             ##
             # Provide a user friendly representation
             def to_s
@@ -499,6 +515,13 @@ module Twilio
               @context.media
             end
             
+            ##
+            # Access the feedback
+            # @return [feedback] feedback
+            def feedback
+              @context.feedback
+            end
+            
             ##
             # Provide a user friendly representation
             def to_s

data/lib/twilio-ruby/rest/api/v2010/account/message/feedback.rb

@@ -0,0 +1,160 @@
+##
+# This code was generated by
+# \ / _    _  _|   _  _
+#  | (_)\/(_)(_|\/| |(/_  v1.0.0
+#       /       /       
+
+module Twilio
+  module REST
+    class Api < Domain
+      class V2010 < Version
+        class AccountContext < InstanceContext
+          class MessageContext < InstanceContext
+            class FeedbackList < ListResource
+              ##
+              # Initialize the FeedbackList
+              # @param [Version] version Version that contains the resource
+              # @param [String] account_sid The account_sid
+              # @param [String] message_sid The message_sid
+              
+              # @return [FeedbackList] FeedbackList
+              def initialize(version, account_sid: nil, message_sid: nil)
+                super(version)
+                
+                # Path Solution
+                @solution = {
+                    account_sid: account_sid,
+                    message_sid: message_sid
+                }
+                @uri = "/Accounts/#{@solution[:account_sid]}/Messages/#{@solution[:message_sid]}/Feedback.json"
+              end
+              
+              ##
+              # Retrieve a single page of FeedbackInstance records from the API.
+              # Request is executed immediately.
+              # @param [feedback.Outcome] outcome The outcome
+              
+              # @return [FeedbackInstance] Newly created FeedbackInstance
+              def create(outcome: nil)
+                data = {
+                    'Outcome' => outcome,
+                }
+                
+                payload = @version.create(
+                    'POST',
+                    @uri,
+                    data: data
+                )
+                
+                return FeedbackInstance.new(
+                    @version,
+                    payload,
+                    account_sid: @solution['account_sid'],
+                    message_sid: @solution['message_sid'],
+                )
+              end
+              
+              ##
+              # Provide a user friendly representation
+              def to_s
+                '#<Twilio.Api.V2010.FeedbackList>'
+              end
+            end
+          
+            class FeedbackPage < Page
+              ##
+              # Initialize the FeedbackPage
+              # @param [Version] version Version that contains the resource
+              # @param [Response] response Response from the API
+              # @param [Hash] solution Path solution for the resource
+              # @param [String] account_sid The account_sid
+              # @param [String] message_sid The message_sid
+              
+              # @return [FeedbackPage] FeedbackPage
+              def initialize(version, response, solution)
+                super(version, response)
+                
+                # Path Solution
+                @solution = solution
+              end
+              
+              ##
+              # Build an instance of FeedbackInstance
+              # @param [Hash] payload Payload response from the API
+              
+              # @return [FeedbackInstance] FeedbackInstance
+              def get_instance(payload)
+                return FeedbackInstance.new(
+                    @version,
+                    payload,
+                    account_sid: @solution['account_sid'],
+                    message_sid: @solution['message_sid'],
+                )
+              end
+              
+              ##
+              # Provide a user friendly representation
+              def to_s
+                '<Twilio.Api.V2010.FeedbackPage>'
+              end
+            end
+          
+            class FeedbackInstance < InstanceResource
+              ##
+              # Initialize the FeedbackInstance
+              # @param [Version] version Version that contains the resource
+              # @param [Hash] payload payload that contains response from Twilio
+              # @param [String] account_sid The account_sid
+              # @param [String] message_sid The message_sid
+              
+              # @return [FeedbackInstance] FeedbackInstance
+              def initialize(version, payload, account_sid: nil, message_sid: nil)
+                super(version)
+                
+                # Marshaled Properties
+                @properties = {
+                    'account_sid' => payload['account_sid'],
+                    'message_sid' => payload['message_sid'],
+                    'outcome' => payload['outcome'],
+                    'date_created' => Twilio.deserialize_rfc2822(payload['date_created']),
+                    'date_updated' => Twilio.deserialize_rfc2822(payload['date_updated']),
+                    'uri' => payload['uri'],
+                }
+              end
+              
+              def account_sid
+                @properties['account_sid']
+              end
+              
+              def message_sid
+                @properties['message_sid']
+              end
+              
+              def outcome
+                @properties['outcome']
+              end
+              
+              def date_created
+                @properties['date_created']
+              end
+              
+              def date_updated
+                @properties['date_updated']
+              end
+              
+              def uri
+                @properties['uri']
+              end
+              
+              ##
+              # Provide a user friendly representation
+              def to_s
+                "<Twilio.Api.V2010.FeedbackInstance>"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/twilio-ruby/rest/lookups/v1/phone_number.rb

@@ -83,14 +83,18 @@ module Twilio
           # Fetch a PhoneNumberInstance
           # @param [String] country_code The country_code
           # @param [String] type The type
+          # @param [String] add_ons The add_ons
+          # @param [Hash] add_ons_data The add_ons_data
           
           # @return [PhoneNumberInstance] Fetched PhoneNumberInstance
-          def fetch(country_code: nil, type: nil)
+          def fetch(country_code: nil, type: nil, add_ons: nil, add_ons_data: nil)
             params = {
                 'CountryCode' => country_code,
                 'Type' => type,
+                'AddOns' => add_ons,
             }
             
+            params.merge!(Twilio.prefixed_collapsible_map(add_ons_data, 'AddOns'))
             payload = @version.fetch(
                 'GET',
                 @uri,
@@ -129,6 +133,7 @@ module Twilio
                 'phone_number' => payload['phone_number'],
                 'national_format' => payload['national_format'],
                 'carrier' => payload['carrier'],
+                'add_ons' => payload['add_ons'],
             }
             
             # Context
@@ -170,15 +175,23 @@ module Twilio
             @properties['carrier']
           end
           
+          def add_ons
+            @properties['add_ons']
+          end
+          
           ##
           # Fetch a PhoneNumberInstance
           # @param [String] country_code The country_code
           # @param [String] type The type
+          # @param [String] add_ons The add_ons
+          # @param [Hash] add_ons_data The add_ons_data
           
           # @return [PhoneNumberInstance] Fetched PhoneNumberInstance
-          def fetch(country_code: nil, type: nil)
+          def fetch(country_code: nil, type: nil, add_ons: nil, add_ons_data: nil)
             @context.fetch(
                 type: type,
+                add_ons: add_ons,
+                add_ons_data: add_ons_data,
             )
           end
           

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

@@ -15,10 +15,11 @@ module Twilio
         @base_url = 'https://preview.twilio.com'
         @host = 'preview.twilio.com'
         @port = 443
-
+        
+        # Versions
         @wireless = nil
       end
-
+      
       ##
       # Version wireless of preview
       def wireless

data/lib/twilio-ruby/version.rb

@@ -1,3 +1,3 @@
 module Twilio
-  VERSION = '5.0.0.rc5'
+  VERSION = '5.0.0.rc7'
 end

data/spec/framework/serialize_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Twilio do
+  describe 'prefixed_collapsible_map' do
+
+    it 'should serialize nil' do
+      actual = Twilio.prefixed_collapsible_map(nil, 'Prefix')
+      expect(actual).to eq({})
+    end
+
+    it 'should serialize a single key' do
+      actual = Twilio.prefixed_collapsible_map({
+        'foo' => 'bar'
+      }, 'Prefix')
+      expect(actual).to eq({
+        'Prefix.foo' => 'bar'
+      })
+    end
+
+    it 'should serialize nested key' do
+      actual = Twilio.prefixed_collapsible_map({
+        'foo' => {
+          'bar' => 'baz'
+        }
+      }, 'Prefix')
+      expect(actual).to eq({
+        'Prefix.foo.bar' => 'baz'
+      })
+    end
+
+    it 'should serialize multiple keys' do
+      actual = Twilio.prefixed_collapsible_map({
+        'watson' => {
+          'language' => 'en',
+          'alice' => 'bob'
+        },
+          'foo' => 'bar'
+      }, 'Prefix')
+      expect(actual).to eq({
+        'Prefix.watson.language' => 'en',
+        'Prefix.watson.alice' => 'bob',
+        'Prefix.foo' => 'bar'
+      })
+    end
+
+    it 'should serialize list' do
+      actual = Twilio.prefixed_collapsible_map(['foo', 'bar'], 'Prefix')
+      expect(actual).to eq({})
+    end
+
+
+  end
+end

data/spec/integration/api/v2010/account/message/feedback_spec.rb

@@ -0,0 +1,26 @@
+##
+# This code was generated by
+# \ / _    _  _|   _  _
+#  | (_)\/(_)(_|\/| |(/_  v1.0.0
+#       /       /       
+
+require 'spec_helper.rb'
+
+describe 'Feedback' do
+  it "can create" do
+    @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
+    
+    expect {
+      @client.api.v2010.accounts("ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
+                       .messages("MMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
+                       .feedback.create()
+    }.to raise_exception(Twilio::REST::TwilioException)
+    
+    values = {}
+    expect(
+    @holodeck.has_request?(Holodeck::Request.new(
+        method: 'post',
+        url: 'https://api.twilio.com/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Messages/MMaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Feedback.json',
+    ))).to eq(true)
+  end
+end

data/spec/integration/lookups/v1/phone_number_spec.rb

@@ -37,6 +37,12 @@ describe 'PhoneNumber' do
           "country_code": "US",
           "national_format": "(510) 867-5309",
           "phone_number": "+15108675309",
+          "add_ons": {
+              "status": "successful",
+              "message": null,
+              "code": null,
+              "results": {}
+          },
           "url": "https://lookups.twilio.com/v1/PhoneNumbers/phone_number"
       }
       ]

data/spec/integration/preview/wireless/device/usage_spec.rb

@@ -11,7 +11,7 @@ describe 'Usage' do
     @holodeck.mock(Twilio::TwilioResponse.new(500, ''))
     
     expect {
-      @client.preview.wireless.devices("sid") \
+      @client.preview.wireless.devices("DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") \
                               .usage().fetch()
     }.to raise_exception(Twilio::REST::TwilioException)
     
@@ -19,7 +19,7 @@ describe 'Usage' do
     expect(
     @holodeck.has_request?(Holodeck::Request.new(
         method: 'get',
-        url: 'https://preview.twilio.com/wireless/Devices/sid/Usage',
+        url: 'https://preview.twilio.com/wireless/Devices/DEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Usage',
     ))).to eq(true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twilio-ruby
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc5
+  version: 5.0.0.rc7
 platform: ruby
 authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -139,6 +139,7 @@ files:
 - lib/twilio-ruby/rest/api/v2010/account/incoming_phone_number/mobile.rb
 - lib/twilio-ruby/rest/api/v2010/account/incoming_phone_number/toll_free.rb
 - lib/twilio-ruby/rest/api/v2010/account/message.rb
+- lib/twilio-ruby/rest/api/v2010/account/message/feedback.rb
 - lib/twilio-ruby/rest/api/v2010/account/message/media.rb
 - lib/twilio-ruby/rest/api/v2010/account/notification.rb
 - lib/twilio-ruby/rest/api/v2010/account/outgoing_caller_id.rb
@@ -243,6 +244,7 @@ files:
 - lib/twilio-ruby/util/configuration.rb
 - lib/twilio-ruby/util/request_validator.rb
 - lib/twilio-ruby/version.rb
+- spec/framework/serialize_spec.rb
 - spec/holodeck/holodeck.rb
 - spec/holodeck/hologram.rb
 - spec/integration/api/v2010/account/address/dependent_phone_number_spec.rb
@@ -265,6 +267,7 @@ files:
 - spec/integration/api/v2010/account/incoming_phone_number/mobile_spec.rb
 - spec/integration/api/v2010/account/incoming_phone_number/toll_free_spec.rb
 - spec/integration/api/v2010/account/incoming_phone_number_spec.rb
+- spec/integration/api/v2010/account/message/feedback_spec.rb
 - spec/integration/api/v2010/account/message/media_spec.rb
 - spec/integration/api/v2010/account/message_spec.rb
 - spec/integration/api/v2010/account/notification_spec.rb
@@ -388,6 +391,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/framework/serialize_spec.rb
 - spec/holodeck/holodeck.rb
 - spec/holodeck/hologram.rb
 - spec/integration/api/v2010/account/address/dependent_phone_number_spec.rb
@@ -410,6 +414,7 @@ test_files:
 - spec/integration/api/v2010/account/incoming_phone_number/mobile_spec.rb
 - spec/integration/api/v2010/account/incoming_phone_number/toll_free_spec.rb
 - spec/integration/api/v2010/account/incoming_phone_number_spec.rb
+- spec/integration/api/v2010/account/message/feedback_spec.rb
 - spec/integration/api/v2010/account/message/media_spec.rb
 - spec/integration/api/v2010/account/message_spec.rb
 - spec/integration/api/v2010/account/notification_spec.rb