nexmo 7.1.2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964a347a61a516b4161b0110412b262ff82614b5c48cddb0d85ee6b9878854ee
-  data.tar.gz: 50edc921ee4c8a8e4f7172d5c1d8ec3efa195d04d9923efcd98c2f4f6623d145
+  metadata.gz: ad124eb0e0e93884dc48ed8257b977c2cc365b19668326751d0fa9c0dd843696
+  data.tar.gz: a7e1dae46b7e4c9d86b49fa51f6e74679ec1df56d55961e81e1a8d12b1831f29
 SHA512:
-  metadata.gz: 0b35dad79758fb59d4ef8662b6684afd655965ca402832c19b652c7985a4234ad3d815dbbbe190ccfda001901067918e3518fce6d3aa31c9f3ed88e09e8bfacb
-  data.tar.gz: 91b1f197f77d8cfd7fcabc3d35d69e6b9adbad8d1dd30c0f0e7f8d376bc7dc521dd519ab0184c79ec1d02fb879afaaf0c8c606fc6a13692c03ba8804e31d0f92
+  metadata.gz: 4de53e3319290efe704e16603a09aa79af15cc47aaf75f539e1e442b040d6e86f7427e6a412702c0557cd1d43c1ee8b31b38e71646ac615766277ed63caa590c
+  data.tar.gz: 57c846af9f53f5537a6aeda3d588e36c6ef41c273f18640fe2214e37428ecd8d5ba7cfe91b619fc5035c43b0847a9507d97b9b036aa3fc1d6bb6b67bf975601f

data/README.md

@@ -1,6 +1,6 @@
 # Nexmo Client Library for Ruby
 
-[![Gem Version](https://badge.fury.io/rb/nexmo.svg)](https://badge.fury.io/rb/nexmo) [![Build Status](https://api.travis-ci.org/Nexmo/nexmo-ruby.svg?branch=master)](https://travis-ci.org/Nexmo/nexmo-ruby) [![Coverage Status](https://coveralls.io/repos/github/Nexmo/nexmo-ruby/badge.svg?branch=coveralls)](https://coveralls.io/github/Nexmo/nexmo-ruby?branch=master)
+[![Gem Version](https://badge.fury.io/rb/nexmo.svg)](https://badge.fury.io/rb/nexmo) [![Coverage Status](https://github.com/nexmo/nexmo-ruby/workflows/CI/badge.svg) [![Coverage Status](https://coveralls.io/repos/github/Nexmo/nexmo-ruby/badge.svg?branch=coveralls)](https://coveralls.io/github/Nexmo/nexmo-ruby?branch=master)
 
 <img src="https://developer.nexmo.com/assets/images/Vonage_Nexmo.svg" height="48px" alt="Nexmo is now known as Vonage" />
 
@@ -112,18 +112,19 @@ the token option. For example:
 ```ruby
 claims = {
   application_id: application_id,
+  private_key: 'path/to/private.key',
   nbf: 1483315200,
-  exp: 1514764800,
-  iat: 1483228800
+  ttl: 800
 }
 
-private_key = File.read('path/to/private.key')
-
-token = Nexmo::JWT.generate(claims, private_key)
+token = Nexmo::JWT.generate(claims)
 
 client = Nexmo::Client.new(token: token)
 ````
 
+Documentation for the Nexmo Ruby JWT generator gem can be found at
+[https://www.rubydoc.info/github/nexmo/nexmo-jwt-ruby](https://www.rubydoc.info/github/nexmo/nexmo-jwt-ruby).
+The documentation outlines all the possible parameters you can use to customize and build a token with.
 
 ## Webhook signatures
 

data/lib/nexmo/jwt.rb

@@ -1,13 +1,11 @@
-# typed: strict
+# typed: false
 # frozen_string_literal: true
 require 'securerandom'
 require 'openssl'
-require 'jwt'
+require 'nexmo-jwt'
 
 module Nexmo
-  module JWT
-    extend T::Sig
-
+  class JWT
     # Generate an encoded JSON Web Token.
     #
     # By default the Nexmo Ruby SDK generates a short lived JWT per request.
@@ -16,12 +14,14 @@ module Nexmo
     # directly call {Nexmo::JWT.generate} to generate a token, and set the token
     # attribute on the client object.
     #
+    # Documentation for the Nexmo Ruby JWT generator gem can be found at
+    # https://www.rubydoc.info/github/nexmo/nexmo-jwt-ruby
+    #
     # @example
     #   claims = {
     #     application_id: application_id,
-    #     nbf: 1483315200,
-    #     exp: 1514764800,
-    #     iat: 1483228800
+    #     ttl: 800,
+    #     subject: 'My_Subject'
     #   }
     #
     #   private_key = File.read('path/to/private.key')
@@ -33,15 +33,11 @@ module Nexmo
     #
     # @return [String]
     #
-    sig { params(payload: T::Hash[T.any(Symbol, String), T.any(String, Integer)], private_key: T.any(OpenSSL::PKey::RSA, String)).returns(String) }
-    def self.generate(payload, private_key)
-      payload[:iat] = iat = Time.now.to_i unless payload.key?(:iat) || payload.key?('iat')
-      payload[:exp] = T.must(iat) + 60 unless payload.key?(:exp) || payload.key?('exp')
-      payload[:jti] = SecureRandom.uuid unless payload.key?(:jti) || payload.key?('jti')
-
-      private_key = OpenSSL::PKey::RSA.new(private_key) unless private_key.respond_to?(:sign)
+    def self.generate(payload, private_key = nil)
+      raise "Expecting 'private_key' in either the payload or as a separate parameter" if !payload[:private_key] && !private_key
 
-      ::JWT.encode(payload, private_key, 'RS256')
+      payload[:private_key] = private_key if private_key && !payload[:private_key]
+      @token = Nexmo::JWTBuilder.new(payload).jwt.generate
     end
   end
 end

data/lib/nexmo/keys.rb

@@ -10,9 +10,25 @@ module Nexmo
       hash.transform_keys { |k| k.to_s.tr('_', '-') }
     end
 
-    sig { params(hash: T::Hash[T.untyped, T.untyped]).returns(T::Hash[String, T.untyped]) }
+    sig { params(hash: T::Hash[T.untyped, T.untyped]).returns(T::Hash[T.untyped, T.untyped]) }
     def camelcase(hash)
-      hash.transform_keys { |k| k.to_s.gsub(/_(\w)/) { $1.upcase } }
+      exceptions = [
+        'dr_call_back_url',
+        'mo_http_url',
+        'mo_smpp_sys_type',
+        'mo_call_back_url',
+        'voice_callback_type',
+        'voice_callback_value',
+        'voice_status_callback',
+        'messages_callback_value',
+        'messages_callback_type'
+      ]
+      hash.transform_keys do |k|
+        if exceptions.include?(k.to_s)
+          next k.to_s.gsub(/_(\w)/) { $1.upcase.to_s }
+        end
+          k
+      end
     end
 
     ATTRIBUTE_KEYS = T.let(Hash.new { |h, k| h[k] = k.split(PATTERN).join('_').downcase.to_sym }, T::Hash[T.untyped, T.untyped])

data/lib/nexmo/redact.rb

@@ -1,8 +1,10 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module Nexmo
   class Redact < Namespace
+    extend T::Sig
+
     self.authentication = Basic
 
     self.request_body = JSON
@@ -27,6 +29,7 @@ module Nexmo
     #
     # @see https://developer.nexmo.com/api/redact#redact-message
     #
+    sig { params(params: T::Hash[Symbol, T.untyped]).returns(Nexmo::Response) }
     def transaction(params)
       request('/v1/redact/transaction', params: params, type: Post)
     end

data/lib/nexmo/version.rb

@@ -1,5 +1,5 @@
 # typed: strong
 
 module Nexmo
-  VERSION = '7.1.2'
+  VERSION = '7.2.0'
 end

data/nexmo.gemspec

@@ -12,9 +12,10 @@ 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/**/*.rb') + %w(LICENSE.txt README.md nexmo.gemspec)
   s.required_ruby_version = '>= 2.5.0'
-  s.add_dependency('jwt', '~> 2')
+  s.add_dependency('nexmo-jwt', '~> 0.1.1')
   s.add_dependency('zeitwerk', '~> 2', '>= 2.2')
   s.add_dependency('sorbet-runtime', '~> 0.5')
+  s.add_development_dependency('timecop', '~> 0.9')
   s.require_path = 'lib'
   s.metadata = {
     'homepage' => 'https://github.com/Nexmo/nexmo-ruby',

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nexmo
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.2.0
 platform: ruby
 authors:
 - Nexmo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: nexmo-jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: Nexmo Client Library for Ruby
 email:
 - devrel@nexmo.com