mailosaur 7.6.0 → 7.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7fada04554f5062be36d26e90696358362e477f02a4342e3e41c4296a37cd05
-  data.tar.gz: b9d768ae07fd46bc9e0456b88963c473434f92772d3aed6d4d805f01d1b956fe
+  metadata.gz: d313fcdf753165dd1bf655f1a90b8767dc899892ae992d1f84637b939ff6076d
+  data.tar.gz: c1ebb1785652c11e8e84cdc79f56e6ac6befd345a43442eead11b314d24711a5
 SHA512:
-  metadata.gz: f9e635870cc5e3102dcdeb1e247841ea2341cd8593cfe1f3fa0f084741dd73599c7c856f2f8756601389c83ba53eadbfe0efee60c43c90ae60fe6be97c521631
-  data.tar.gz: d71f6b94a70a7532e4727a6047a2d8f93b630b637d73f0a47664b3544edbbb9f736e9b37d8122ae41c156e510b87099c4da61cca3e8e9eb55e849a124a94bfb2
+  metadata.gz: af4ee7f7be13b22196d1159a3cc515559a94eac799a660fe84c78f7662072f5f152bd71e958102136314d5851e55e2338a78cde74a7ba9e745ceb174091afa2a
+  data.tar.gz: f9ba56ceede596803d663c6372304eb92ad840d492c56dd8a737834ca45ac3b4cd153eaff448e95006de3f49aa3497002c6c17c2fca8c0243ec5ec2562630e4b

data/lib/Mailosaur/analysis.rb

@@ -24,7 +24,7 @@ module Mailosaur
     def spam(email)
       response = conn.get "api/analysis/spam/#{email}"
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::SpamAnalysisResult.new(model)
     end
   end

data/lib/Mailosaur/devices.rb

@@ -0,0 +1,83 @@
+module Mailosaur
+  class Devices
+    #
+    # Creates and initializes a new instance of the Devices class.
+    # @param client connection.
+    #
+    def initialize(conn, handle_http_error)
+      @conn = conn
+      @handle_http_error = handle_http_error
+    end
+
+    # @return [Connection] the client connection.
+    attr_reader :conn
+
+    #
+    # List all devices
+    #
+    # Returns a list of your virtual security devices.
+    #
+    # @return [DeviceListResult] operation results.
+    #
+    def list
+      response = conn.get 'api/devices'
+      @handle_http_error.call(response) unless response.status == 200
+      model = JSON.parse(response.body)
+      Mailosaur::Models::DeviceListResult.new(model)
+    end
+
+    #
+    # Create a device
+    #
+    # Creates a new virtual security device and returns it.
+    #
+    # @param device_create_options [DeviceCreateOptions]
+    #
+    # @return [Device] operation results.
+    #
+    def create(device_create_options)
+      response = conn.post 'api/devices', device_create_options.to_json
+      @handle_http_error.call(response) unless response.status == 200
+      model = JSON.parse(response.body)
+      Mailosaur::Models::Device.new(model)
+    end
+
+    #
+    # Retrieve OTP
+    #
+    # Retrieves the current one-time password for a saved device, or given base32-encoded shared secret.
+    #
+    # @param query [String] Either the unique identifier of the device, or a base32-encoded shared secret.
+    #
+    # @return [OtpResult] operation results.
+    #
+    def otp(query)
+      if query.include? '-'
+        response = conn.get "api/devices/#{query}/otp"
+        @handle_http_error.call(response) unless response.status == 200
+        model = JSON.parse(response.body)
+        return Mailosaur::Models::OtpResult.new(model)
+      end
+
+      options = Mailosaur::Models::DeviceCreateOptions.new
+      options.shared_secret = query
+      response = conn.post 'api/devices/otp', options.to_json
+      @handle_http_error.call(response) unless response.status == 200
+      model = JSON.parse(response.body)
+      Mailosaur::Models::OtpResult.new(model)
+    end
+
+    #
+    # Delete a device
+    #
+    # Permanently deletes a device. This operation cannot be undone.
+    #
+    # @param id [String] The identifier of the device to be deleted.
+    #
+    def delete(id)
+      response = conn.delete "api/devices/#{id}"
+      @handle_http_error.call(response) unless response.status == 204
+      nil
+    end
+  end
+end

data/lib/Mailosaur/messages.rb

@@ -51,7 +51,7 @@ module Mailosaur
     def get_by_id(id)
       response = conn.get "api/messages/#{id}"
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::Message.new(model)
     end
 
@@ -96,7 +96,7 @@ module Mailosaur
 
       @handle_http_error.call(response) unless response.status == 200
 
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::MessageListResult.new(model)
     end
 
@@ -151,7 +151,7 @@ module Mailosaur
 
         @handle_http_error.call(response) unless response.status == 200
 
-        model = JSON.load(response.body)
+        model = JSON.parse(response.body)
         return Mailosaur::Models::MessageListResult.new(model) if timeout.to_i.zero? || !model['items'].empty?
 
         delay_pattern = (response.headers['x-ms-delay'] || '1000').split(',').map(&:to_i)
@@ -186,7 +186,7 @@ module Mailosaur
     def create(server, message_create_options)
       response = conn.post "api/messages?server=#{server}", message_create_options.to_json
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::Message.new(model)
     end
 
@@ -204,7 +204,7 @@ module Mailosaur
     def forward(id, message_forward_options)
       response = conn.post "api/messages/#{id}/forward", message_forward_options.to_json
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::Message.new(model)
     end
 
@@ -223,7 +223,7 @@ module Mailosaur
     def reply(id, message_reply_options)
       response = conn.post "api/messages/#{id}/reply", message_reply_options.to_json
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::Message.new(model)
     end
   end

data/lib/Mailosaur/models/code.rb

@@ -0,0 +1,12 @@
+module Mailosaur
+  module Models
+    class Code < BaseModel
+      def initialize(data = {})
+        @value = data['value']
+      end
+
+      # @return [String]
+      attr_accessor :value
+    end
+  end
+end

data/lib/Mailosaur/models/device.rb

@@ -0,0 +1,16 @@
+module Mailosaur
+  module Models
+    class Device < BaseModel
+      def initialize(data = {})
+        @id = data['id']
+        @name = data['name']
+      end
+
+      # @return [String] Unique identifier for the device.
+      attr_accessor :id
+
+      # @return [String] The name of the device.
+      attr_accessor :name
+    end
+  end
+end

data/lib/Mailosaur/models/device_create_options.rb

@@ -0,0 +1,16 @@
+module Mailosaur
+  module Models
+    class DeviceCreateOptions < BaseModel
+      def initialize(data = {})
+        @name = data['name']
+        @shared_secret = data['shared_secret']
+      end
+
+      # @return [String] A name used to identify the device.
+      attr_accessor :name
+
+      # @return [String] The base32-encoded shared secret for this device.
+      attr_accessor :shared_secret
+    end
+  end
+end

data/lib/Mailosaur/models/device_list_result.rb

@@ -0,0 +1,13 @@
+module Mailosaur
+  module Models
+    class DeviceListResult < BaseModel
+      def initialize(data = {})
+        @items = []
+        (data['items'] || []).each { |i| @items << Mailosaur::Models::Device.new(i) }
+      end
+
+      # @return [Array<Device>] The individual devices forming the result.
+      attr_accessor :items
+    end
+  end
+end

data/lib/Mailosaur/models/message_content.rb

@@ -4,6 +4,8 @@ module Mailosaur
       def initialize(data = {})
         @links = []
         (data['links'] || []).each do |i| @links << Mailosaur::Models::Link.new(i) end
+        @codes = []
+        (data['codes'] || []).each do |i| @codes << Mailosaur::Models::Code.new(i) end
         @images = []
         (data['images'] || []).each do |i| @images << Mailosaur::Models::Image.new(i) end
         @body = data['body']
@@ -12,6 +14,9 @@ module Mailosaur
       # @return [Array<Link>]
       attr_accessor :links
 
+      # @return [Array<Code>]
+      attr_accessor :codes
+
       # @return [Array<Image>]
       attr_accessor :images
 

data/lib/Mailosaur/models/otp_result.rb

@@ -0,0 +1,16 @@
+module Mailosaur
+  module Models
+    class OtpResult < BaseModel
+      def initialize(data = {})
+        @code = data['code']
+        @expires = data['expires']
+      end
+
+      # @return [String] The current one-time password.
+      attr_accessor :code
+
+      # @return [String] The expiry date/time of the current one-time password.
+      attr_accessor :expires
+    end
+  end
+end

data/lib/Mailosaur/servers.rb

@@ -23,7 +23,7 @@ module Mailosaur
     def list
       response = conn.get 'api/servers'
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::ServerListResult.new(model)
     end
 
@@ -39,7 +39,7 @@ module Mailosaur
     def create(server_create_options)
       response = conn.post 'api/servers', server_create_options.to_json
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::Server.new(model)
     end
 
@@ -56,7 +56,7 @@ module Mailosaur
     def get(id)
       response = conn.get "api/servers/#{id}"
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::Server.new(model)
     end
 
@@ -73,7 +73,7 @@ module Mailosaur
     def get_password(id)
       response = conn.get "api/servers/#{id}/password"
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       model['value']
     end
 
@@ -90,7 +90,7 @@ module Mailosaur
     def update(id, server)
       response = conn.put "api/servers/#{id}", server.to_json
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::Server.new(model)
     end
 
@@ -110,7 +110,7 @@ module Mailosaur
 
     def generate_email_address(server)
       host = ENV['MAILOSAUR_SMTP_HOST'] || 'mailosaur.net'
-      '%s@%s.%s' % [SecureRandom.hex(3), server, host]
+      format('%s@%s.%s', SecureRandom.hex(3), server, host)
     end
   end
 end

data/lib/Mailosaur/usage.rb

@@ -22,7 +22,7 @@ module Mailosaur
     def limits
       response = conn.get 'api/usage/limits'
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::UsageAccountLimits.new(model)
     end
 
@@ -34,7 +34,7 @@ module Mailosaur
     def transactions
       response = conn.get 'api/usage/transactions'
       @handle_http_error.call(response) unless response.status == 200
-      model = JSON.load(response.body)
+      model = JSON.parse(response.body)
       Mailosaur::Models::UsageTransactionListResult.new(model)
     end
   end

data/lib/Mailosaur/version.rb

@@ -1,3 +1,3 @@
 module Mailosaur
-    VERSION = '7.6.0'.freeze
+    VERSION = '7.9.0'.freeze
 end

data/lib/mailosaur.rb

@@ -14,6 +14,7 @@ module Mailosaur
   autoload :Messages,                                           'Mailosaur/messages.rb'
   autoload :Servers,                                            'Mailosaur/servers.rb'
   autoload :Usage,                                              'Mailosaur/usage.rb'
+  autoload :Devices,                                            'Mailosaur/devices.rb'
   autoload :MailosaurError,                                     'Mailosaur/mailosaur_error.rb'
 
   module Models
@@ -34,6 +35,7 @@ module Mailosaur
     autoload :MessageContent,                                     'Mailosaur/models/message_content.rb'
     autoload :Server,                                             'Mailosaur/models/server.rb'
     autoload :Link,                                               'Mailosaur/models/link.rb'
+    autoload :Code,                                               'Mailosaur/models/code.rb'
     autoload :ServerListResult,                                   'Mailosaur/models/server_list_result.rb'
     autoload :SpamFilterResults,                                  'Mailosaur/models/spam_filter_results.rb'
     autoload :ServerCreateOptions,                                'Mailosaur/models/server_create_options.rb'
@@ -41,6 +43,10 @@ module Mailosaur
     autoload :UsageAccountLimit,                                  'Mailosaur/models/usage_account_limit.rb'
     autoload :UsageTransactionListResult,                         'Mailosaur/models/usage_transaction_list_result.rb'
     autoload :UsageTransaction,                                   'Mailosaur/models/usage_transaction.rb'
+    autoload :Device,                                             'Mailosaur/models/device.rb'
+    autoload :DeviceListResult,                                   'Mailosaur/models/device_list_result.rb'
+    autoload :DeviceCreateOptions,                                'Mailosaur/models/device_create_options.rb'
+    autoload :OtpResult,                                          'Mailosaur/models/otp_result.rb'
     autoload :BaseModel,                                          'Mailosaur/models/base_model.rb'
   end
 
@@ -80,6 +86,11 @@ module Mailosaur
       @usage ||= Usage.new(connection, method(:handle_http_error))
     end
 
+    # @return [Devices] usage
+    def devices
+      @devices ||= Devices.new(connection, method(:handle_http_error))
+    end
+
     private
 
     def connection
@@ -88,7 +99,16 @@ module Mailosaur
           content_type: 'application/json; charset=utf-8',
           user_agent: "mailosaur-ruby/#{Mailosaur::VERSION}"
         }
-      }).tap { |conn| conn.request(:basic_auth, @api_key, '') }
+      }).tap do |conn|
+        case Faraday::VERSION
+        when /^0/
+          conn.basic_auth @api_key, ''
+        when /^1/
+          conn.request(:basic_auth, @api_key, '')
+        else
+          conn.request(:authorization, :basic, @api_key, '')
+        end
+      end
     end
 
     def handle_http_error(response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailosaur
 version: !ruby/object:Gem::Version
-  version: 7.6.0
+  version: 7.9.0
 platform: ruby
 authors:
 - Mailosaur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,54 +90,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.30.0
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.5.3
 description: The Mailosaur Ruby library lets you integrate email and SMS testing into
   your continuous integration process.
 email: code@mailosaur.com
@@ -148,11 +148,16 @@ files:
 - LICENSE
 - README.md
 - lib/Mailosaur/analysis.rb
+- lib/Mailosaur/devices.rb
 - lib/Mailosaur/files.rb
 - lib/Mailosaur/mailosaur_error.rb
 - lib/Mailosaur/messages.rb
 - lib/Mailosaur/models/attachment.rb
 - lib/Mailosaur/models/base_model.rb
+- lib/Mailosaur/models/code.rb
+- lib/Mailosaur/models/device.rb
+- lib/Mailosaur/models/device_create_options.rb
+- lib/Mailosaur/models/device_list_result.rb
 - lib/Mailosaur/models/image.rb
 - lib/Mailosaur/models/link.rb
 - lib/Mailosaur/models/message.rb
@@ -165,6 +170,7 @@ files:
 - lib/Mailosaur/models/message_reply_options.rb
 - lib/Mailosaur/models/message_summary.rb
 - lib/Mailosaur/models/metadata.rb
+- lib/Mailosaur/models/otp_result.rb
 - lib/Mailosaur/models/search_criteria.rb
 - lib/Mailosaur/models/server.rb
 - lib/Mailosaur/models/server_create_options.rb
@@ -205,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: The Mailosaur Ruby library