ringcentral_sdk 0.5.2 → 1.0.0

data/lib/ringcentral_sdk/{subscription.rb → rest/subscription.rb}

@@ -6,7 +6,7 @@ require 'openssl'
 require 'pubnub'
 require 'timers'
 
-module RingCentralSdk
+module RingCentralSdk::REST
   class Subscription
     include Observable
 
@@ -14,8 +14,8 @@ module RingCentralSdk
 
     attr_reader :event_filters
 
-    def initialize(platform)
-      @_platform = platform
+    def initialize(client)
+      @_client = client
       @event_filters = []
       @_timeout = nil
       @_subscription = nil_subscription()
@@ -72,10 +72,10 @@ module RingCentralSdk
       end
 
       begin
-        response = @_platform.client.post do |req|
+        response = @_client.http.post do |req|
           req.url 'subscription'
           req.body = {
-            :eventFilters    => @_platform.create_urls(@event_filters),
+            :eventFilters    => @_client.create_urls(@event_filters),
             :deliveryMode    => {
               :transportType => 'PubNub'
             }
@@ -109,10 +109,10 @@ module RingCentralSdk
       _clear_timeout()
 
       begin
-        response = @_platform.client.put do |req|
+        response = @_client.http.put do |req|
           req.url 'subscription/' + @_subscription['id'].to_s
           req.body = {
-            :eventFilters => @_platform.create_urls(@event_filters),
+            :eventFilters => @_client.create_urls(@event_filters),
           }
         end
 
@@ -135,7 +135,7 @@ module RingCentralSdk
 
       begin
         url = 'subscription/' + @_subscription['id'].to_s
-        response = @_platform.client.delete do |req|
+        response = @_client.http.delete do |req|
           req.url = 'subscription' + @_subscription['id']
         end
         reset()

data/lib/ringcentral_sdk/rest.rb

@@ -0,0 +1,15 @@
+module RingCentralSdk::REST
+  autoload :Cache, 'ringcentral_sdk/rest/cache'
+  autoload :Client, 'ringcentral_sdk/rest/client'
+  autoload :Config, 'ringcentral_sdk/rest/config'
+  autoload :ConfigApp, 'ringcentral_sdk/rest/config'
+  autoload :ConfigUser, 'ringcentral_sdk/rest/config'
+  autoload :ConfigEnvRc, 'ringcentral_sdk/rest/config'
+  autoload :Extension, 'ringcentral_sdk/rest/extension'
+  autoload :ExtensionPresence, 'ringcentral_sdk/rest/extension_presence'
+  autoload :Messages, 'ringcentral_sdk/rest/messages'
+  autoload :MessagesFax, 'ringcentral_sdk/rest/messages'
+  autoload :MessagesSMS, 'ringcentral_sdk/rest/messages'
+  autoload :Request, 'ringcentral_sdk/rest/request'
+  autoload :Subscription, 'ringcentral_sdk/rest/subscription'
+end

data/lib/ringcentral_sdk.rb

@@ -1,19 +1,15 @@
 module RingCentralSdk
 
-  VERSION = '0.5.2'
+  VERSION = '1.0.0'
 
   RC_SERVER_PRODUCTION = 'https://platform.ringcentral.com'
   RC_SERVER_SANDBOX    = 'https://platform.devtest.ringcentral.com'
 
-  autoload :Cache, 'ringcentral_sdk/cache'
-  autoload :Helpers, 'ringcentral_sdk/helpers'
-  autoload :Platform, 'ringcentral_sdk/platform'
-  autoload :Simple, 'ringcentral_sdk/simple'
-  autoload :Subscription, 'ringcentral_sdk/subscription'
+  autoload :REST, 'ringcentral_sdk/rest'
 
   class << self
     def new(app_key, app_secret, server_url=RC_SERVER_SANDBOX, opts={})
-      RingCentralSdk::Platform.new(app_key, app_secret, server_url, opts)
+      RingCentralSdk::REST::Client.new(app_key, app_secret, server_url, opts)
     end
   end
 

data/mkdocs.yml

@@ -0,0 +1,30 @@
+site_name: RingCentral SDK for Ruby
+site_url: https://github.com/grokify/ringcentral-sdk-ruby
+repo_url: https://github.com/grokify/ringcentral-sdk-ruby.git
+docs_dir: docs
+theme: readthedocs
+pages:
+# Introduction:
+- ['index.md', 'About', 'RingCentral SDK']
+- ['quickstart.md', 'About', 'Quickstart']
+
+## Authorization:
+- ['usage/authorization/Authorization.md', 'Authorization', 'Authorization']
+
+## Generic HTTP
+- ['usage/http-client.md', 'Generic Requests', 'HTTP Client']
+
+## Messaging:
+- ['usage/messages/SMS-Messages.md', 'Messaging', 'SMS Messages']
+- ['usage/messages/Fax-Messages.md', 'Messaging', 'Fax Messages']
+
+## Voice:
+- ['usage/voice/Click-To-Call.md', 'Voice', 'Click-To-Call']
+- ['usage/messages/Call-Recordings.md', 'Voice', 'Call Recordings']
+
+## Call Queues:
+- ['usage/callqueues/Member-Status.md', 'Call Queues', 'Member Status']
+
+## Notifications:
+- ['usage/notifications/Subscriptions.md', 'Notifications', 'Subscriptions']
+- ['usage/notifications/Subscriptions-All-Extensions.md', 'Notifications', 'Subscribe to All Extensions']

data/ringcentral_sdk.gemspec

@@ -0,0 +1,31 @@
+lib = 'ringcentral_sdk'
+lib_file = File.expand_path("../lib/#{lib}.rb", __FILE__)
+File.read(lib_file) =~ /\bVERSION\s*=\s*["'](.+?)["']/
+version = $1
+#require File.expand_path('../lib/ringcentral_sdk/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = 'ringcentral_sdk'
+  s.version     = version
+  s.date        = '2016-01-21'
+  s.summary     = 'RingCentral SDK - Ruby SDK for the RingCentral Connect Platform API'
+  s.description = 'A Ruby SDK for the RingCentral Connect Platform API'
+  s.authors     = ['John Wang']
+  s.email       = 'johncwang@gmail.com'
+  s.homepage    = 'https://github.com/grokify/'
+  s.licenses    = ['MIT']
+  s.files       = Dir['lib/**/**/*'] # + Dir['bin/*']
+  s.files      += Dir['[A-Z]*']    + Dir['test/**/*']
+  # s.files.reject! { |fn| fn.include? "CVS" }
+  # s.required_ruby_version = '>= 1.8.7' # 1.8.7+ is tested
+  s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.0'
+  s.add_dependency 'faraday', '~> 0.9', '>= 0.9'
+  s.add_dependency 'faraday_middleware', '~> 0', '>= 0'
+  s.add_dependency 'faraday_middleware-oauth2_refresh', '~> 0'
+  s.add_dependency 'mime', '~> 0.4', '>= 0.4.3'
+  s.add_dependency 'mime-types', '~> 1.25' # >= 1.9 '~> 2.5', '>= 2.5'
+  s.add_dependency 'multi_json', '~> 1.3'
+  s.add_dependency 'oauth2', '~> 1.0', '>= 1.0.0'
+  s.add_dependency 'pubnub', '~> 3.7', '>= 3.7.3'
+  s.add_dependency 'timers', '~> 0'
+end

data/test/{test_helper.rb → test_base.rb}

@@ -2,11 +2,11 @@ require 'coveralls'
 Coveralls.wear!
 
 require 'test/unit'
-require "mocha/test_unit"
+require 'mocha/test_unit'
 require 'ringcentral_sdk'
 
-rcsdk = RingCentralSdk.new(
+client = RingCentralSdk.new(
   'my_app_key',
   'my_app_secret',
   RingCentralSdk::RC_SERVER_SANDBOX
-)
+)

data/test/{test_platform.rb → test_client.rb}

@@ -1,4 +1,4 @@
-require './test/test_helper.rb'
+require './test/test_base.rb'
 
 require 'faraday'
 require 'oauth2'
@@ -17,13 +17,13 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   def test_set_client
-    rcsdk = new_rcsdk()
+    rcsdk = new_client()
     assert_equal true, rcsdk.oauth2client.is_a?(OAuth2::Client)
 
     rcsdk.set_oauth2_client()
     assert_equal true, rcsdk.oauth2client.is_a?(OAuth2::Client)
 
-    rcsdk = new_rcsdk()
+    rcsdk = new_client()
     oauth2client = OAuth2::Client.new(
       'my_app_key',
       'my_app_secret',
@@ -43,7 +43,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     @rcsdk.set_token(token_data)
 
     assert_equal 'OAuth2::AccessToken', @rcsdk.token.class.name
-    assert_equal 'Faraday::Connection', @rcsdk.client.class.name
+    assert_equal 'Faraday::Connection', @rcsdk.http.class.name
 
     assert_raise do
       @rcsdk.set_token('test')
@@ -55,10 +55,12 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
       'my_app_key',
       'my_app_secret',
       RingCentralSdk::RC_SERVER_PRODUCTION,
-      {:redirect_uri => 'http://localhost:4567/oauth'}
+      {:redirect_url => 'http://localhost:4567/oauth'}
     )
     authorize_url = rcsdk.authorize_url()
 
+    puts authorize_url
+
     assert_equal true, authorize_url.is_a?(String)
     assert_equal 0, authorize_url.index(RingCentralSdk::RC_SERVER_PRODUCTION)
     assert_equal true, (authorize_url.index('localhost') > 0) ? true : false
@@ -89,7 +91,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   def test_authorize_code
-    rcsdk = new_rcsdk()
+    rcsdk = new_client()
     rcsdk.set_oauth2_client()
 
     stub_token_hash = data_auth_token_with_refresh
@@ -101,7 +103,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     assert_equal 'OAuth2::AccessToken', token.class.name
     assert_equal 'OAuth2::AccessToken', rcsdk.token.class.name
 
-    rcsdk = new_rcsdk({:redirect_uri => 'http://localhost:4567/oauth'})
+    rcsdk = new_client({:redirect_uri => 'http://localhost:4567/oauth'})
     rcsdk.set_oauth2_client()
 
     stub_token_hash = data_auth_token_with_refresh
@@ -113,7 +115,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     assert_equal 'OAuth2::AccessToken', token.class.name
     assert_equal 'OAuth2::AccessToken', rcsdk.token.class.name
 
-    rcsdk = new_rcsdk()
+    rcsdk = new_client()
     rcsdk.set_oauth2_client()
 
     stub_token_hash = data_auth_token
@@ -125,7 +127,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
     assert_equal 'OAuth2::AccessToken', token.class.name
     assert_equal 'OAuth2::AccessToken', rcsdk.token.class.name
 
-    rcsdk = new_rcsdk()
+    rcsdk = new_client()
     rcsdk.set_oauth2_client()
 
     stub_token_hash = data_auth_token
@@ -139,7 +141,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   def test_authorize_password_with_refresh
-    rcsdk = new_rcsdk()
+    rcsdk = new_client()
     rcsdk.set_oauth2_client()
 
     stub_token_hash = data_auth_token_with_refresh
@@ -154,7 +156,7 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   def test_authorize_password_without_refresh
-    rcsdk = new_rcsdk()
+    rcsdk = new_client()
     rcsdk.set_oauth2_client()
 
     stub_token_hash = data_auth_token_without_refresh
@@ -173,34 +175,62 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
       @rcsdk.request()
     end
 
-    rcsdk = new_rcsdk()
-    rcsdk.set_oauth2_client()
+    client = new_client()
+    client.set_oauth2_client()
 
     stub_token_hash = data_auth_token_with_refresh
-    stub_token = OAuth2::AccessToken::from_hash(rcsdk.oauth2client, stub_token_hash)
+    stub_token = OAuth2::AccessToken::from_hash(client.oauth2client, stub_token_hash)
 
-    rcsdk.oauth2client.password.stubs(:get_token).returns(stub_token)
+    client.oauth2client.password.stubs(:get_token).returns(stub_token)
 
-    token = rcsdk.authorize('my_test_username', 'my_test_extension', 'my_test_password')
+    token = client.authorize('my_test_username', 'my_test_extension', 'my_test_password')
 
     #@rcsdk.client.stubs(:post).returns(Faraday::Response.new)
     Faraday::Connection.any_instance.stubs(:post).returns(Faraday::Response.new)
 
-    fax = RingCentralSdk::Helpers::CreateFaxRequest.new(
-      nil, # Can be nil or {} for defaults '~'
-      {
-        # phone numbers are in E.164 format with or without leading '+'
-        :to            => '+16505551212',
-        :faxResolution => 'High',
-        :coverPageText => 'RingCentral fax demo using Ruby SDK!'
-      },
-      :text => 'RingCentral fax demo using Ruby SDK!'
+    fax = RingCentralSdk::REST::Request::Fax.new(
+      # phone numbers are in E.164 format with or without leading '+'
+      :to            => '+16505551212',
+      :faxResolution => 'High',
+      :coverPageText => 'RingCentral fax demo using Ruby SDK!',
+      :text          => 'RingCentral fax demo using Ruby SDK!'
+    )
+    res = client.send_request(fax)
+    assert_equal 'Faraday::Response', res.class.name
+
+    assert_raise do
+      res = client.send_request('non-fax')
+    end
+
+    res = client.messages.fax.create(
+      :to            => '+16505551212',
+      :faxResolution => 'High',
+      :coverPageText => 'RingCentral fax demo using Ruby SDK!',
+      :text          => 'RingCentral fax demo using Ruby SDK!'
+    )
+    assert_equal 'Faraday::Response', res.class.name
+  end
+
+  def test_sms
+    client = new_client()
+    client.set_oauth2_client()
+
+    stub_token_hash = data_auth_token_with_refresh
+    stub_token = OAuth2::AccessToken::from_hash(client.oauth2client, stub_token_hash)
+
+    client.oauth2client.password.stubs(:get_token).returns(stub_token)
+
+    token = client.authorize('my_test_username', 'my_test_extension', 'my_test_password')
+
+    res = client.messages.sms.create(
+      :from => '+16505551212',
+      :to => '+14155551212',
+      :text => 'test'
     )
-    res = rcsdk.request(fax)
     assert_equal 'Faraday::Response', res.class.name
   end
 
-  def new_rcsdk(opts={})
+  def new_client(opts={})
     return RingCentralSdk.new(
       'my_app_key',
       'my_app_secret',
@@ -236,4 +266,4 @@ class RingCentralSdkPlatformTest < Test::Unit::TestCase
   end
 
   alias_method :data_auth_token, :data_auth_token_with_refresh
-end
+end

data/test/test_config.rb

@@ -0,0 +1,29 @@
+require './test/test_base.rb'
+
+require 'faraday'
+require 'oauth2'
+
+class RingCentralSdkRESTConfigTest < Test::Unit::TestCase
+  def setup
+    @config = RingCentralSdk::REST::Config.new.load_dotenv
+  end
+
+  def test_main
+    @config = RingCentralSdk::REST::Config.new.load_dotenv
+    assert_equal 'myAppKey', @config.app.key
+    assert_equal 'myAppSecret', @config.app.secret
+    assert_equal 'myRcApiServerUrl', @config.app.server_url
+    assert_equal 'myRcApiRedirectUrl', @config.app.redirect_url
+
+    assert_equal 'myUsername', @config.user.username
+    assert_equal 'myExtension', @config.user.extension
+    assert_equal 'myPassword', @config.user.password
+
+    assert_equal 'demoFaxToPhoneNumber', @config.env.data['RC_DEMO_FAX_TO']
+
+    @config.user.nilify
+    assert_equal '', @config.user.username
+    assert_equal '', @config.user.extension
+    assert_equal '', @config.user.password
+  end
+end

data/test/test_extension_presence.rb

@@ -0,0 +1,154 @@
+require './test/test_base.rb'
+
+class RingCentralSdkRESTExtensionPresenceTest < Test::Unit::TestCase
+  def new_client
+    client = RingCentralSdk::REST::Client.new(
+      'my_app_key',
+      'my_app_secret',
+      RingCentralSdk::RC_SERVER_SANDBOX
+    )
+    return client
+  end
+
+  def test_department_calls_enable
+    presence = RingCentralSdk::REST::ExtensionPresence.new(111111)
+
+    new_statuses = {
+      :enable => {
+        'DoNotAcceptAnyCalls' => 'TakeDepartmentCallsOnly',
+        'DoNotAcceptDepartmentCalls' => 'TakeAllCalls'
+      },
+      :disable => {
+        'TakeAllCalls' => 'DoNotAcceptDepartmentCalls',
+        'TakeDepartmentCallsOnly' => 'DoNotAcceptAnyCalls'
+      }
+    }
+
+    cur_status = 'TakeAllCalls'
+    assert_equal 'DoNotAcceptDepartmentCalls', \
+      presence.new_status_dnd_department_calls(cur_status, false)
+    assert_equal 'TakeAllCalls', \
+      presence.new_status_dnd_department_calls(cur_status, true)
+
+    cur_status = 'TakeDepartmentCallsOnly'
+    assert_equal 'DoNotAcceptAnyCalls', \
+      presence.new_status_dnd_department_calls(cur_status, false)
+    assert_equal 'TakeDepartmentCallsOnly', \
+      presence.new_status_dnd_department_calls(cur_status, true)
+
+    cur_status = 'DoNotAcceptAnyCalls'
+    assert_equal 'DoNotAcceptAnyCalls', \
+      presence.new_status_dnd_department_calls(cur_status, false)
+    assert_equal 'TakeDepartmentCallsOnly', \
+      presence.new_status_dnd_department_calls(cur_status, true)
+
+    cur_status = 'DoNotAcceptDepartmentCalls'
+    assert_equal 'DoNotAcceptDepartmentCalls', \
+      presence.new_status_dnd_department_calls(cur_status, false)
+    assert_equal 'TakeAllCalls', \
+      presence.new_status_dnd_department_calls(cur_status, true)
+  end
+
+  def test_retrieve
+    stub_auth = RingCentralSdkTestSubAuth.new
+    client = stub_auth.new_client_with_auth
+    stub_presence = data_extension_presence
+
+    Faraday::Connection.any_instance.stubs(:get).returns(Faraday::Response.new)
+    Faraday::Connection.any_instance.stubs(:put).returns(Faraday::Response.new)
+
+    presence = RingCentralSdk::REST::ExtensionPresence.new(111111, :client => client)
+    presence.retrieve()
+    presence.presence_data = stub_presence
+
+    assert_equal 'TakeAllCalls', presence.presence_data['dndStatus']
+
+    assert_equal true, presence.department_calls_enabled?
+
+    #new_status = presence.department_calls_enable false
+    #assert_equal 'DoNotAcceptDepartmentCalls', new_status
+
+    presence.extension_id = 'abc'
+    assert_raise do
+      presence.retrieve
+    end
+
+    assert_raise do
+      presence.update nil
+    end
+
+    presence.update({:dndStatus=>'TakeAllCalls'})
+  end
+
+  def data_extension_presence
+    json = '{
+  "uri": "https://platform.devtest.ringcentral.com/restapi/v1.0/account/111111/extension/222222/presence",
+  "extension": {
+    "uri": "https://platform.devtest.ringcentral.com/restapi/v1.0/account/111111/extension/222222",
+    "id": 222222,
+    "extensionNumber": "102"
+  },
+  "presenceStatus": "Available",
+  "telephonyStatus": "NoCall",
+  "userStatus": "Available",
+  "dndStatus": "TakeAllCalls",
+  "allowSeeMyPresence": true,
+  "ringOnMonitoredCall": false,
+  "pickUpCallsOnHold": false
+}'
+    data = JSON.parse(json, :symbolize_names=>false)
+    return data
+  end
+end
+
+class RingCentralSdkTestSubAuth
+
+  def new_client
+    client = RingCentralSdk::REST::Client.new(
+      'my_app_key',
+      'my_app_secret',
+      RingCentralSdk::RC_SERVER_SANDBOX
+    )
+    return client
+  end
+
+  def new_client_with_auth()
+    client = new_client()
+    client.set_oauth2_client()
+
+    stub_token_hash = data_auth_token_with_refresh
+    stub_token = OAuth2::AccessToken::from_hash(client.oauth2client, stub_token_hash)
+
+    client.oauth2client.password.stubs(:get_token).returns(stub_token)
+
+    token = client.authorize('my_test_username', 'my_test_extension', 'my_test_password')
+    return client
+  end
+
+    def data_auth_token_with_refresh
+      json = '{
+  "access_token": "my_test_access_token_with_refresh",
+  "token_type": "bearer",
+  "expires_in": 3599,
+  "refresh_token": "my_test_refresh_token",
+  "refresh_token_expires_in": 604799,
+  "scope": "ReadCallLog DirectRingOut EditCallLog ReadAccounts Contacts EditExtensions ReadContacts SMS EditPresence RingOut EditCustomData ReadPresence EditPaymentInfo Interoperability Accounts NumberLookup InternalMessages ReadCallRecording EditAccounts Faxes EditReportingSettings ReadClientInfo EditMessages VoipCalling ReadMessages",
+  "owner_id": "1234567890"
+      }'
+      data = JSON.parse(json, :symbolize_names=>true)
+      return data
+    end
+
+    def data_auth_token_without_refresh
+      json = '{
+  "access_token": "my_test_access_token_without_refresh",
+  "token_type": "bearer",
+  "expires_in": 3599,
+  "scope": "ReadCallLog DirectRingOut EditCallLog ReadAccounts Contacts EditExtensions ReadContacts SMS EditPresence RingOut EditCustomData ReadPresence EditPaymentInfo Interoperability Accounts NumberLookup InternalMessages ReadCallRecording EditAccounts Faxes EditReportingSettings ReadClientInfo EditMessages VoipCalling ReadMessages",
+  "owner_id": "1234567890"
+      }'
+      data = JSON.parse(json, :symbolize_names=>true)
+      return data
+    end
+
+end

data/test/test_helper_fax.rb

@@ -1,33 +1,28 @@
 # encoding: utf-8
 
-require './test/test_helper.rb'
+require './test/test_base.rb'
 
 class RingCentralSdkHelperFaxTest < Test::Unit::TestCase
   def testSetup
 
-    fax = RingCentralSdk::Helpers::CreateFaxRequest.new(
-      nil, # Can be nil or {} for defaults '~'
-      {
-        # phone numbers are in E.164 format with or without leading '+'
-        :to            => '+16505551212',
-        :faxResolution => 'High',
-        :coverPageText => 'RingCentral fax demo using Ruby SDK!'
-      },
-      :text => 'RingCentral fax demo using Ruby SDK!'
+    fax = RingCentralSdk::REST::Request::Fax.new(
+      # phone numbers are in E.164 format with or without leading '+'
+      :to            => '+16505551212',
+      :faxResolution => 'High',
+      :coverPageText => 'RingCentral fax demo using Ruby SDK!',
+      :text          => 'RingCentral fax demo using Ruby SDK!'
     )
 
-    assert_equal "RingCentralSdk::Helpers::CreateFaxRequest", fax.class.name
+    assert_equal "RingCentralSdk::REST::Request::Fax", fax.class.name
     assert_equal 'account/~/extension/~/fax', fax.url()
 
-    fax2 = RingCentralSdk::Helpers::CreateFaxRequest.new(
-      { :account_id => '111111111', :extension_id => '222222222' }, # Can be nil or {} for defaults '~'
-      {
-        # phone numbers are in E.164 format with or without leading '+'
-        "to"           => { :phoneNumber => '+16505551212' },
-        :faxResolution => 'High',
-        :coverPageText => 'RingCentral fax demo using Ruby SDK Résolution!'
-      },
-      :file_name => './scripts/test_file.pdf'
+    fax2 = RingCentralSdk::REST::Request::Fax.new(
+      :accountId     => '111111111',
+      :extensionId   => '222222222',
+      :to            => { :phoneNumber => '+16505551212' },
+      :faxResolution => 'High',
+      :coverPageText => 'RingCentral fax demo using Ruby SDK Résolution!',
+      :files         => ['./scripts/test_file.pdf']
     )
 
     assert_equal 'account/111111111/extension/222222222/fax', fax2.url()
@@ -39,37 +34,38 @@ class RingCentralSdkHelperFaxTest < Test::Unit::TestCase
     # Test UTF-8 metadata and file MIME concatenation
     body = fax2.body
 
-    fax3 = RingCentralSdk::Helpers::CreateFaxRequest.new(
-      { :account_id => 111111111, :extension_id => 222222222 }, # Can be nil or {} for defaults '~'
-      {
-        # phone numbers are in E.164 format with or without leading '+'
-        :to           => [{ :phoneNumber => '+16505551212' }],
-        :faxResolution => 'High',
-        :coverPageText => 'RingCentral fax demo using Ruby SDK!'
-      },
+    fax3 = RingCentralSdk::REST::Request::Fax.new(
+      :accountId => 111111111,
+      :extensionId => 222222222,
+      # phone numbers are in E.164 format with or without leading '+'
+      :to           => [{ :phoneNumber => '+16505551212' }],
+      :faxResolution => 'High',
+      :coverPageText => 'RingCentral fax demo using Ruby SDK!',
       :text => 'RingCentral fax demo using Ruby SDK!'
     )
 
     assert_equal 'account/111111111/extension/222222222/fax', fax3.url()
 
-    fax4 = RingCentralSdk::Helpers::CreateFaxRequest.new(
-      { :account_id => 111111111, :extension_id => 222222222 }, # Can be nil or {} for defaults '~'
-      '{"to":"+16505551212","coverPageText":"RingCentral fax demo using Ruby SDK!"}',
+    fax4 = RingCentralSdk::REST::Request::Fax.new(
+      :accountId => 111111111,
+      :extensionId => 222222222, # Can be nil or {} for defaults '~'
+      :to => '+16505551212","coverPageText":"RingCentral fax demo using Ruby SDK!"}',
       :text => 'RingCentral fax demo using Ruby SDK!'
     )
     assert_equal 'account/111111111/extension/222222222/fax', fax4.url()
 
-    fax5 = RingCentralSdk::Helpers::CreateFaxRequest.new(
-      { :account_id => 111111111, :extension_id => 222222222 }, # Can be nil or {} for defaults '~'
-      '{"coverPageText":"RingCentral fax demo using Ruby SDK!"}',
+    fax5 = RingCentralSdk::REST::Request::Fax.new(
+      :accountId => 111111111,
+      :extensionId => 222222222, # Can be nil or {} for defaults '~'
+      :coverPageText => "RingCentral fax demo using Ruby SDK!",
       :text => 'RingCentral fax demo using Ruby SDK!'
     )
     assert_equal 'account/111111111/extension/222222222/fax', fax5.url()
 
-    assert_equal 'application/pdf', fax.get_file_content_type('example.pdf')
-    assert_equal 'attachment', fax.get_attachment_content_disposition()
-    assert_equal 'attachment; filename="example.pdf"', fax.get_attachment_content_disposition('example.pdf')
-    assert_equal 'attachment; filename="example.pdf"', fax.get_attachment_content_disposition('/path/to/example.pdf')
+    #assert_equal 'application/pdf', fax.get_file_content_type('example.pdf')
+    #assert_equal 'attachment', fax.get_attachment_content_disposition()
+    #assert_equal 'attachment; filename="example.pdf"', fax.get_attachment_content_disposition('example.pdf')
+    #assert_equal 'attachment; filename="example.pdf"', fax.get_attachment_content_disposition('/path/to/example.pdf')
     assert_equal 'post', fax.method()
 
     content_type = fax.content_type()
@@ -85,5 +81,12 @@ class RingCentralSdkHelperFaxTest < Test::Unit::TestCase
     assert_equal '--' + boundary, lines[0]
     assert_equal '--' + boundary + '--', lines[-1]
 
+    fax6 = RingCentralSdk::REST::Request::Fax.new(
+      :accountId => 111111111,
+      :extensionId => 222222222, # Can be nil or {} for defaults '~'
+      :coverPageText => "RingCentral fax demo using Ruby SDK!",
+      :parts => [{:text=>'RingCentral fax demo using Ruby SDK!'}]
+    )
+    assert_equal 'account/111111111/extension/222222222/fax', fax6.url()
   end
-end
+end