mailosaur 7.5.0 → 7.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba11091df0403a909d8a57e7700554de73b60d7210c5ded9464bfb11275b9b21
-  data.tar.gz: 62145309ef9d9e55381e05ef7e26f0d8c5eee04120a798e46a505c9f8eb4a22f
+  metadata.gz: eeaf9bb2c4d001d8f0ec173e4fb0fcbe02515cbb2ac1eae04c2f9961811dad2c
+  data.tar.gz: cdcf3c7bdd32cde468875fac15003169d65a4283b38de7c8970c1f3870a08d8f
 SHA512:
-  metadata.gz: c6a98ecd886efcd9b6b682a01ab84fd4d9f85fdbcacdbd7f6ca80997a354e294418bda65ad4c20e0fb116c9bc77ae2c05a75ab5d56a82ec5f3b526caaf2c2ab8
-  data.tar.gz: 19438600dabe29a2e5557636068f83d688950e3e5e52ecef0aeeb9400e522f28b61f1bb5367951fe88e375192944be754362cf05b23e702938f8fd9132261b99
+  metadata.gz: 534cdf190200dcf2b24ef400f598dec13de6466fa347d46c90a967e3c7c45c9ba1ed024da2fd67a9ce0afa3c41e886b6cffe2e3af8c711cb2fe8f2185805efab
+  data.tar.gz: 16ab4b387df53be279ad409e9d04d479c17db62f43db17b5ed60df256ee28c617b2fa6ed4d22e9df64b8a7b3f26e05e5b8ea02a7f1c97927d745932522296684

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/message_summary.rb

@@ -4,8 +4,6 @@ module Mailosaur
       def initialize(data = {})
         @id = data['id']
         @server = data['server']
-        @rcpt = []
-        (data['rcpt'] || []).each do |i| @rcpt << Mailosaur::Models::MessageAddress.new(i) end
         @from = []
         (data['from'] || []).each do |i| @from << Mailosaur::Models::MessageAddress.new(i) end
         @to = []
@@ -26,9 +24,6 @@ module Mailosaur
       # @return [String]
       attr_accessor :server
 
-      # @return [Array<MessageAddress>]
-      attr_accessor :rcpt
-
       # @return [Array<MessageAddress>]
       attr_accessor :from
 

data/lib/Mailosaur/models/metadata.rb

@@ -4,10 +4,33 @@ module Mailosaur
       def initialize(data = {})
         @headers = []
         (data['headers'] || []).each do |i| @headers << Mailosaur::Models::MessageHeader.new(i) end
+
+        @ehlo = data['ehlo']
+
+        @mail_from = data['mailFrom']
+
+        @rcpt_to = []
+        (data['rcptTo'] || []).each do |i| @rcpt_to << Mailosaur::Models::MessageAddress.new(i) end
       end
 
       # @return [Array<MessageHeader>] Email headers.
       attr_accessor :headers
+
+      # @return [String] The fully-qualified domain name or IP address that was provided with the
+      # Extended HELLO (EHLO) or HELLO (HELO) command. This value is generally
+      # used to identify the SMTP client.
+      # https://datatracker.ietf.org/doc/html/rfc5321#section-4.1.1.1
+      attr_accessor :ehlo
+
+      # @return [String] The source mailbox/email address, referred to as the 'reverse-path',
+      # provided via the MAIL command during the SMTP transaction.
+      # https://datatracker.ietf.org/doc/html/rfc5321#section-4.1.1.2
+      attr_accessor :mail_from
+
+      # @return [Array<MessageAddress>] The recipient email addresses, each referred to as a 'forward-path',
+      # provided via the RCPT command during the SMTP transaction.
+      # https://datatracker.ietf.org/doc/html/rfc5321#section-4.1.1.3
+      attr_accessor :rcpt_to
     end
   end
 end

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.5.0'.freeze
+    VERSION = '7.8.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailosaur
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.8.0
 platform: ruby
 authors:
 - Mailosaur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -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.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: The Mailosaur Ruby library