nexmo 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8c6620dc24f8cb8e4260f28df8d33775a796624
-  data.tar.gz: f19674fb59e52953d0c690edba86fccc2e29a793
+  metadata.gz: fc7d3219d5a4d8671e83fa33eb807e317778b479
+  data.tar.gz: 51cec360405377fca50f586cc5fc5fb375a23409
 SHA512:
-  metadata.gz: 441b7447fbe1e1a0452ed3f82cb531376b09e97e1c6241bfb5db59f2374f755db299ee56b41f475fa0d1f6ce13469c52a50c891a59e558d4818d4632764ec8f2
-  data.tar.gz: c085d5cae72f90a22c6d8e7912d52e2e43a910b658282c770d9cb44e15e2586bc9fab6258ede4f2daa943458e2efa88aa1961bcc50c64bc34226fa9c09dc238c
+  metadata.gz: 781a072b8c216d96d000aec974974f648ca5375899380279d4ac8ddb55ca5824df744b4bdf1e959d19919bfb00125159f69d0e558706c7d187badbce70df1bc1
+  data.tar.gz: e540e6124bb1d17c166ca0ddf2ab166083869f5330f1285fa42f21f85ad3df1a09ae3c0f146cb3b64ba8982d58f6e6dd208e6bff2ad5cb595d87815588f54d25

data/lib/nexmo/client.rb

@@ -6,9 +6,9 @@ module Nexmo
     attr_accessor :key, :secret, :auth_token
 
     def initialize(options = {})
-      @key = options.fetch(:key) { ENV.fetch('NEXMO_API_KEY') }
+      @key = options.fetch(:key) { ENV['NEXMO_API_KEY'] }
 
-      @secret = options.fetch(:secret) { ENV.fetch('NEXMO_API_SECRET') }
+      @secret = options.fetch(:secret) { ENV['NEXMO_API_SECRET'] }
 
       @signature_secret = options.fetch(:signature_secret) { ENV['NEXMO_SIGNATURE_SECRET'] }
 
@@ -20,8 +20,6 @@ module Nexmo
 
       @api_host = options.fetch(:api_host) { 'api.nexmo.com' }
 
-      @sns_host = options.fetch(:sns_host) { 'sns.nexmo.com' }
-
       @user_agent = "nexmo-ruby/#{VERSION} ruby/#{RUBY_VERSION}"
 
       if options.key?(:app_name) && options.key?(:app_version)
@@ -101,14 +99,6 @@ module Nexmo
       get(@host, '/search/messages', Hash === params ? params : {ids: Array(params)})
     end
 
-    def send_ussd_push_message(params)
-      post(@host, '/ussd/json', params)
-    end
-
-    def send_ussd_prompt_message(params)
-      post(@host, '/ussd-prompt/json', params)
-    end
-
     def send_2fa_message(params)
       post(@host, '/sc/us/2fa/json', params)
     end
@@ -129,14 +119,6 @@ module Nexmo
       post(@host, '/sc/us/alert/opt-in/manage/json', params)
     end
 
-    def sns_publish(message, params)
-      post(@sns_host, '/sns/json', {cmd: 'publish', message: message}.merge(params))
-    end
-
-    def sns_subscribe(recipient, params)
-      post(@sns_host, '/sns/json', {cmd: 'subscribe', to: recipient}.merge(params))
-    end
-
     def initiate_call(params)
       Kernel.warn "#{self.class}##{__method__} is deprecated (use the Voice API instead)."
 
@@ -280,7 +262,7 @@ module Nexmo
 
     def get(host, request_uri, params = {})
       uri = URI('https://' + host + request_uri)
-      uri.query = Params.encode(params.merge(api_key: @key, api_secret: @secret))
+      uri.query = Params.encode(params.merge(api_key_and_secret))
 
       message = Net::HTTP::Get.new(uri.request_uri)
 
@@ -291,7 +273,7 @@ module Nexmo
       uri = URI('https://' + host + request_uri)
 
       message = Net::HTTP::Post.new(uri.request_uri)
-      message.form_data = params.merge(api_key: @key, api_secret: @secret)
+      message.form_data = params.merge(api_key_and_secret)
 
       request(uri, message)
     end
@@ -301,14 +283,14 @@ module Nexmo
 
       message = Net::HTTP::Put.new(uri.request_uri)
       message['Content-Type'] = 'application/json'
-      message.body = JSON.generate(params.merge(api_key: @key, api_secret: @secret))
+      message.body = JSON.generate(params.merge(api_key_and_secret))
 
       request(uri, message)
     end
 
     def delete(host, request_uri)
       uri = URI('https://' + host + request_uri)
-      uri.query = Params.encode({api_key: @key, api_secret: @secret})
+      uri.query = Params.encode(api_key_and_secret)
 
       message = Net::HTTP::Delete.new(uri.request_uri)
 
@@ -366,6 +348,22 @@ module Nexmo
       end
     end
 
+    def api_key_and_secret
+      unless @key
+        raise AuthenticationError.new('No API key provided. ' \
+          'See https://developer.nexmo.com/concepts/guides/authentication for details, ' \
+          'or email support@nexmo.com if you have any questions.')
+      end
+
+      unless @secret
+        raise AuthenticationError.new('No API secret provided. ' \
+          'See https://developer.nexmo.com/concepts/guides/authentication for details, ' \
+          'or email support@nexmo.com if you have any questions.')
+      end
+
+      {api_key: @key, api_secret: @secret}
+    end
+
     def generate_auth_token
       unless @application_id
         raise AuthenticationError.new('No application_id provided. ' \

data/lib/nexmo/signature.rb

@@ -8,11 +8,21 @@ module Nexmo
 
       signature = params.delete('sig')
 
-      ::JWT.secure_compare(signature, digest(params, secret))
+      secure_compare(signature, digest(params, secret))
     end
 
     private
 
+    if defined?(::JWT::SecurityUtils) # ruby-jwt v2
+      def self.secure_compare(left, right)
+        ::JWT::SecurityUtils.secure_compare(left, right)
+      end
+    else
+      def self.secure_compare(left, right)
+        ::JWT.secure_compare(left, right)
+      end
+    end
+
     def self.digest(params, secret)
       md5 = Digest::MD5.new
 

data/lib/nexmo/version.rb

@@ -1,3 +1,3 @@
 module Nexmo
-  VERSION = '4.7.0'
+  VERSION = '4.8.0'
 end

data/nexmo.gemspec

@@ -12,14 +12,15 @@ Gem::Specification.new do |s|
   s.summary = 'This is the Ruby client library for Nexmo\'s API. To use it you\'ll need a Nexmo account. Sign up for free at https://www.nexmo.com'
   s.files = Dir.glob('{lib,spec}/**/*') + %w(LICENSE.txt README.md nexmo.gemspec)
   s.required_ruby_version = '>= 1.9.3'
-  s.add_dependency('jwt')
   s.add_development_dependency('rake')
   s.add_development_dependency('minitest', '~> 5.0')
 
   if RUBY_VERSION == '1.9.3'
+    s.add_dependency('jwt', '< 2.0.0')
     s.add_development_dependency('addressable', '< 2.5.0')
     s.add_development_dependency('webmock', '~> 1.0')
   else
+    s.add_dependency('jwt')
     s.add_development_dependency('webmock', '~> 2.0')
   end
 

data/spec/nexmo/client_spec.rb

@@ -16,8 +16,6 @@ describe 'Nexmo::Client' do
 
     @api_base_url = 'https://api.nexmo.com'
 
-    @sns_base_url = 'https://sns.nexmo.com'
-
     @response_body = {body: '{"key":"value"}', headers: {'Content-Type' => 'application/json;charset=utf-8'}}
 
     @response_object = {'key' => 'value'}
@@ -187,22 +185,6 @@ describe 'Nexmo::Client' do
     end
   end
 
-  describe 'send_ussd_push_message method' do
-    it 'posts to the ussd resource and returns the response object' do
-      expect_post "#@base_url/ussd/json", "api_key=#@api_key&api_secret=#@api_secret&from=MyCompany20&to=447525856424&text=Hello"
-
-      @client.send_ussd_push_message(from: 'MyCompany20', to: '447525856424', text: 'Hello').must_equal(@response_object)
-    end
-  end
-
-  describe 'send_ussd_prompt_message method' do
-    it 'posts to the ussd prompt resource and returns the response object' do
-      expect_post "#@base_url/ussd-prompt/json", "api_key=#@api_key&api_secret=#@api_secret&from=virtual-number&to=447525856424&text=Hello"
-
-      @client.send_ussd_prompt_message(from: 'virtual-number', to: '447525856424', text: 'Hello').must_equal(@response_object)
-    end
-  end
-
   describe 'send_2fa_message method' do
     it 'posts to the short code two factor authentication resource and returns the response object' do
       expect_post "#@base_url/sc/us/2fa/json", "api_key=#@api_key&api_secret=#@api_secret&to=16365553226&pin=1234"
@@ -243,22 +225,6 @@ describe 'Nexmo::Client' do
     end
   end
 
-  describe 'sns_publish method' do
-    it 'posts to the sns resource and returns the response object' do
-      expect_post "#@sns_base_url/sns/json", "api_key=#@api_key&api_secret=#@api_secret&cmd=publish&message=Hello&topic=arn&from=MyCompany20"
-
-      @client.sns_publish('Hello', topic: 'arn', from: 'MyCompany20').must_equal(@response_object)
-    end
-  end
-
-  describe 'sns_subscribe method' do
-    it 'posts to the sns resource and returns the response object' do
-      expect_post "#@sns_base_url/sns/json", "api_key=#@api_key&api_secret=#@api_secret&cmd=subscribe&to=447525856424&topic=arn"
-
-      @client.sns_subscribe('447525856424', topic: 'arn').must_equal(@response_object)
-    end
-  end
-
   describe 'initiate_call method' do
     it 'posts to the call resource and returns the response object' do
       expect_post "#@base_url/call/json", "api_key=#@api_key&api_secret=#@api_secret&to=16365553226&answer_url=http://example.com/answer"
@@ -533,24 +499,40 @@ describe 'Nexmo::Client' do
     it 'raises an authentication error exception if the signature secret was not provided' do
       client = Nexmo::Client.new(key: @api_key, secret: @api_secret)
 
-      exception = proc { @client.check_signature({}) }.must_raise(Nexmo::AuthenticationError)
+      exception = proc { client.check_signature({}) }.must_raise(Nexmo::AuthenticationError)
 
       exception.message.must_include('No signature_secret provided.')
     end
   end
 
+  it 'raises an authentication error exception if the api key was not provided' do
+    client = Nexmo::Client.new(secret: @api_secret)
+
+    exception = proc { client.get_balance }.must_raise(Nexmo::AuthenticationError)
+
+    exception.message.must_include('No API key provided.')
+  end
+
+  it 'raises an authentication error exception if the api secret was not provided' do
+    client = Nexmo::Client.new(key: @api_key)
+
+    exception = proc { client.get_balance }.must_raise(Nexmo::AuthenticationError)
+
+    exception.message.must_include('No API secret provided.')
+  end
+
   it 'raises an authentication error exception if the application id was not provided' do
-    @client = Nexmo::Client.new(key: @api_key, secret: @api_secret, private_key: @private_key)
+    client = Nexmo::Client.new(private_key: @private_key)
 
-    exception = proc { @client.get_calls }.must_raise(Nexmo::AuthenticationError)
+    exception = proc { client.get_calls }.must_raise(Nexmo::AuthenticationError)
 
     exception.message.must_include('No application_id provided.')
   end
 
   it 'raises an authentication error exception if the private key was not provided' do
-    @client = Nexmo::Client.new(key: @api_key, secret: @api_secret, application_id: @application_id)
+    client = Nexmo::Client.new(application_id: @application_id)
 
-    exception = proc { @client.get_calls }.must_raise(Nexmo::AuthenticationError)
+    exception = proc { client.get_calls }.must_raise(Nexmo::AuthenticationError)
 
     exception.message.must_include('No private_key provided.')
   end

data/spec/nexmo/jwt_spec.rb

@@ -40,7 +40,7 @@ describe 'Nexmo::JWT' do
   private
 
   def decode(encoded_token)
-    JWT.decode(encoded_token, private_key, 'RS256').first
+    JWT.decode(encoded_token, private_key, verify=true, {algorithm: 'RS256'}).first
   end
 
   def application_id

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: nexmo
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: This is the Ruby client library for Nexmo's API. To use it you'll need a