nexmo-voice 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae184c99ebe299cbd4292676ecf3cbd3abd3d26b
-  data.tar.gz: 21b45d35a87c5398f69bb85eef539bb2dd44079f
+  metadata.gz: 9d24b6a0dde0960412e1f82131ad423e88edd752
+  data.tar.gz: c8ec3595c30af2b7976be722b502283798d5a72b
 SHA512:
-  metadata.gz: 78ced49e4f68710e11f573f5e904d6c797acfe8c2d55a1c69286b73c9dedd36fad67176ae9cea0ab149198e3e0c87aeb37ffe4b1fe5e28ec66d97cc34fa388ec
-  data.tar.gz: 2487753de41f53f8813518e1a81b10af0da1324d6ab6ab4813ef623e004d0f3eb9a12d7271f3c86f4b2673ceacbaa137b6ba94d38a7ecedec8b097c29d652a2a
+  metadata.gz: c801a7f43351e700d7ca6369867b8f4fbfb052200ebc9e6a7c882b40e185a9482f073d09623f59a976cc1229c1a823eb27f3c3e60f6a3fa2fd1184dc1ae7dccf
+  data.tar.gz: 97f077752c30d2643287fa4df9f792e531d9f0ccd3b0d6a720eb3d0a7085bcaa2666bd9025a49ed390b26182a61966dcdddf2ce2a7c1f1db92340004b21c5921

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
-## 0.1.0
+## 0.1.2
+
+* Support read_timeout and open_timeout
+  `Nexmo::Voice::Client.new 'your_key', 'your_secret', read_timeout: 2, open_timeout: 2`
+
+## 0.1.1
 
 * Support timeout `Nexmo::Voice::Client.new 'your_key', 'your_secret', timeout: 2`

data/lib/nexmo/voice.rb

@@ -6,18 +6,21 @@ require 'nexmo/voice/ttses'
 
 module Nexmo
   module Voice
-    BASE_URL = 'https://api.nexmo.com'
+    BASE_URL = 'https://api.nexmo.com'.freeze
 
     class Client
       DEFAULT_TIMEOUT = 10
 
       attr_accessor :nexmo_adaptor, :api_config,
-        :calls, :ttses
+                    :calls, :ttses
 
       def initialize(api_key, api_secret, options = {})
-        @nexmo_adaptor = RestClient::Resource.new(BASE_URL,
-                                                  timeout: options.fetch(:timeout) { DEFAULT_TIMEOUT },
-                                                  open_timeout: options.fetch(:open_timeout) { DEFAULT_TIMEOUT })
+        @nexmo_adaptor =
+          RestClient::Resource.new(
+            BASE_URL,
+            read_timeout: options.fetch(:read_timeout) { DEFAULT_TIMEOUT },
+            open_timeout: options.fetch(:open_timeout) { DEFAULT_TIMEOUT }
+          )
 
         @api_config = {
           api_key: api_key,
@@ -29,9 +32,9 @@ module Nexmo
       end
 
       def get(resource, entity = {})
-        @nexmo_adaptor[resource.class::RELATIVE_URL].get(params: entity.merge(@api_config))
+        @nexmo_adaptor[resource.class::RELATIVE_URL]
+          .get(params: entity.merge(@api_config))
       end
     end
-
   end
 end

data/lib/nexmo/voice/calls.rb

@@ -1,6 +1,6 @@
 module Nexmo::Voice
   class Calls
-    RELATIVE_URL = '/call/json'
+    RELATIVE_URL = '/call/json'.freeze
 
     attr_accessor :client
 
@@ -12,6 +12,5 @@ module Nexmo::Voice
     def create(entity = {})
       @client.get(self, entity)
     end
-
   end
 end

data/lib/nexmo/voice/ttses.rb

@@ -1,6 +1,6 @@
 module Nexmo::Voice
   class Ttses
-    RELATIVE_URL = '/tts/json'
+    RELATIVE_URL = '/tts/json'.freeze
 
     attr_accessor :client
 
@@ -12,7 +12,5 @@ module Nexmo::Voice
     def create(entity = {})
       @client.get(self, entity)
     end
-
   end
 end
-

data/lib/nexmo/voice/version.rb

@@ -1,5 +1,5 @@
 module Nexmo
   module Voice
-    VERSION = "0.1.1"
+    VERSION = '0.1.2'.freeze
   end
 end

data/nexmo-voice.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rest-client', '~> 1.7.2'
+  spec.add_dependency 'rest-client', '~> 2.0', '>= 2.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/spec/nexmo/voice/calls_spec.rb

@@ -13,7 +13,8 @@ describe Nexmo::Voice::Calls do
   }
 
   it 'not raises errors' do
-    stub_request(:get, %r(https://api.nexmo.com/call/json.*)).to_return(body: response_json)
+    stub_request(:get, %r{https://api.nexmo.com/call/json.*})
+      .to_return(body: response_json.to_json)
 
     expect {
       client.calls.create(entity)
@@ -21,10 +22,11 @@ describe Nexmo::Voice::Calls do
   end
 
   it 'timeouts' do
-    stub_request(:get, %r(https://api.nexmo.com/call/json.*)).to_timeout
+    stub_request(:get, %r{https://api.nexmo.com/call/json.*})
+      .to_timeout
 
     expect {
       client.calls.create(entity)
-    }.to raise_error
+    }.to raise_error(RestClient::Exceptions::ReadTimeout)
   end
 end

data/spec/nexmo/voice/ttses_spec.rb

@@ -13,7 +13,8 @@ describe Nexmo::Voice::Ttses do
   }
 
   it 'not raises errors' do
-    stub_request(:get, %r(https://api.nexmo.com/tts/json.*)).to_return(body: response_json)
+    stub_request(:get, %r{https://api.nexmo.com/tts/json.*})
+      .to_return(body: response_json.to_json)
 
     expect {
       client.ttses.create(entity)
@@ -21,11 +22,11 @@ describe Nexmo::Voice::Ttses do
   end
 
   it 'timeouts' do
-    stub_request(:get, %r(https://api.nexmo.com/tts/json.*)).to_timeout
+    stub_request(:get, %r{https://api.nexmo.com/tts/json.*})
+      .to_timeout
 
     expect {
-      client.calls.create(entity)
-    }.to raise_error
+      client.ttses.create(entity)
+    }.to raise_error(RestClient::Exceptions::ReadTimeout)
   end
 end
-

data/spec/nexmo/voice_spec.rb

@@ -16,13 +16,13 @@ RSpec.describe Nexmo::Voice::Client do
   end
 
   it 'sets the default timeout' do
-    expect(client.nexmo_adaptor.timeout).to eq 10
-    expect(client.nexmo_adaptor.open_timeout).to eq 10
+    expect(client.nexmo_adaptor.options[:read_timeout]).to eq 10
+    expect(client.nexmo_adaptor.options[:open_timeout]).to eq 10
   end
 
   it 'sets the timeout' do
-    another_client = Nexmo::Voice::Client.new api_key, api_secret, timeout: 2, open_timeout: 1
-    expect(another_client.nexmo_adaptor.timeout).to eq 2
-    expect(another_client.nexmo_adaptor.open_timeout).to eq 1
+    another_client = Nexmo::Voice::Client.new api_key, api_secret, read_timeout: 2, open_timeout: 1
+    expect(another_client.nexmo_adaptor.options[:read_timeout]).to eq 2
+    expect(another_client.nexmo_adaptor.options[:open_timeout]).to eq 1
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,2 @@
 require 'nexmo/voice'
 require 'webmock/rspec'
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexmo-voice
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - fahchen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.2
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the Nexmo Voice API.