mailosaur 7.4.0 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0629407acde130c71828a35283ecc427f73881193164f236a970d6226fe4ed7d'
-  data.tar.gz: 66d6af0d7d7bd39d52f61c87c80acbf4524e2324c5ffe0c264397d8c99e4cdd0
+  metadata.gz: f91c18a443ec50a2034fab26e92fef85673a3aa5c4afde59f95763ca6c84b26f
+  data.tar.gz: 8a0ecf04c844630ac316548778135e6f0ba36ae0302b05bfd7c1b81c16bc05cf
 SHA512:
-  metadata.gz: 1754ac94d3a1566bf813e9adc6012ca42fa7be204dab7d733a2ae8bcc8d14b44a947f18a2795212ad49fd09406ebc3ba93c4cbc77b0ef57ecbf8c4f303cf4ea1
-  data.tar.gz: 511648f014115e7ab22f8cf2893ff87264a7355b8dddf193655c992b742ff48a30cc69d57f8ca44589e45e246fb6566cb17a503714fc9c30c013e712127a0817
+  metadata.gz: 5bfab6fd07260d62159be23a80d8196fe73c2f7fba2b756ccf1e7d9b9b26ec7d50dfd7fd01b065830e3fc4c0e62ef656343b6478dcc419dbcea1c03c769d8cde
+  data.tar.gz: 837c2559149390868a1928ec653df6083b86b8830b8280687ad5dd8e2661e275943ed6bf0a7b8aaeccfa6665817b945e0767124236f94611980fdf2ea8281c9e

data/lib/Mailosaur/analysis.rb

@@ -22,7 +22,7 @@ module Mailosaur
     # @return [SpamAnalysisResult] operation results.
     #
     def spam(email)
-      response = conn.get 'api/analysis/spam/' + email
+      response = conn.get "api/analysis/spam/#{email}"
       @handle_http_error.call(response) unless response.status == 200
       model = JSON.load(response.body)
       Mailosaur::Models::SpamAnalysisResult.new(model)

data/lib/Mailosaur/files.rb

@@ -23,7 +23,7 @@ module Mailosaur
     # @return [NOT_IMPLEMENTED] operation results.
     #
     def get_attachment(id)
-      response = conn.get 'api/files/attachments/' + id
+      response = conn.get "api/files/attachments/#{id}"
       @handle_http_error.call(response) unless response.status == 200
       response.body
     end
@@ -39,7 +39,7 @@ module Mailosaur
     # @return [NOT_IMPLEMENTED] operation results.
     #
     def get_email(id)
-      response = conn.get 'api/files/email/' + id
+      response = conn.get "api/files/email/#{id}"
       @handle_http_error.call(response) unless response.status == 200
       response.body
     end

data/lib/Mailosaur/mailosaur_error.rb

@@ -1,8 +1,6 @@
 module Mailosaur
   class MailosaurError < StandardError
-    attr_reader :error_type
-    attr_reader :http_status_code
-    attr_reader :http_response_body
+    attr_reader :error_type, :http_status_code, :http_response_body
 
     def initialize(message = '', error_type = '', http_status_code = nil, http_response_body = nil)
       super(message)

data/lib/Mailosaur/messages.rb

@@ -49,7 +49,7 @@ module Mailosaur
     # @return [Message] operation results.
     #
     def get_by_id(id)
-      response = conn.get 'api/messages/' + id
+      response = conn.get "api/messages/#{id}"
       @handle_http_error.call(response) unless response.status == 200
       model = JSON.load(response.body)
       Mailosaur::Models::Message.new(model)
@@ -64,7 +64,7 @@ module Mailosaur
     # @param id The identifier of the message to be deleted.
     #
     def delete(id)
-      response = conn.delete 'api/messages/' + id
+      response = conn.delete "api/messages/#{id}"
       @handle_http_error.call(response) unless response.status == 204
       nil
     end
@@ -87,10 +87,10 @@ module Mailosaur
     # @return [MessageListResult] operation results.
     #
     def list(server, page: nil, items_per_page: nil, received_after: nil)
-      url = 'api/messages?server=' + server
-      url += page ? '&page=' + page.to_s : ''
-      url += items_per_page ? '&itemsPerPage=' + items_per_page.to_s : ''
-      url += received_after ? '&receivedAfter=' + CGI.escape(received_after.iso8601) : ''
+      url = "api/messages?server=#{server}"
+      url += page ? "&page=#{page}" : ''
+      url += items_per_page ? "&itemsPerPage=#{items_per_page}" : ''
+      url += received_after ? "&receivedAfter=#{CGI.escape(received_after.iso8601)}" : ''
 
       response = conn.get url
 
@@ -109,7 +109,7 @@ module Mailosaur
     # @param server [String] The identifier of the server to be emptied.
     #
     def delete_all(server)
-      response = conn.delete 'api/messages?server=' + server
+      response = conn.delete "api/messages?server=#{server}"
       @handle_http_error.call(response) unless response.status == 204
       nil
     end
@@ -138,10 +138,10 @@ module Mailosaur
     # @return [MessageListResult] operation results.
     #
     def search(server, criteria, page: nil, items_per_page: nil, timeout: nil, received_after: nil, error_on_timeout: true) # rubocop:disable all
-      url = 'api/messages/search?server=' + server
-      url += page ? '&page=' + page.to_s : ''
-      url += items_per_page ? '&itemsPerPage=' + items_per_page.to_s : ''
-      url += received_after ? '&receivedAfter=' + CGI.escape(received_after.iso8601) : ''
+      url = "api/messages/search?server=#{server}"
+      url += page ? "&page=#{page}" : ''
+      url += items_per_page ? "&itemsPerPage=#{items_per_page}" : ''
+      url += received_after ? "&receivedAfter=#{CGI.escape(received_after.iso8601)}" : ''
 
       poll_count = 0
       start_time = Time.now.to_f
@@ -184,7 +184,7 @@ module Mailosaur
     # @return [Message] operation result.
     #
     def create(server, message_create_options)
-      response = conn.post 'api/messages?server=' + server, message_create_options.to_json
+      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)
       Mailosaur::Models::Message.new(model)
@@ -202,7 +202,7 @@ module Mailosaur
     # @return [Message] operation result.
     #
     def forward(id, message_forward_options)
-      response = conn.post 'api/messages/' + id + '/forward', message_forward_options.to_json
+      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)
       Mailosaur::Models::Message.new(model)
@@ -221,7 +221,7 @@ module Mailosaur
     # @return [Message] operation result.
     #
     def reply(id, message_reply_options)
-      response = conn.post 'api/messages/' + id + '/reply', message_reply_options.to_json
+      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)
       Mailosaur::Models::Message.new(model)

data/lib/Mailosaur/models/attachment.rb

@@ -5,6 +5,7 @@ module Mailosaur
         @id = data['id']
         @content_type = data['contentType']
         @file_name = data['fileName']
+        @content = data['content']
         @content_id = data['contentId']
         @length = data['length']
         @url = data['url']
@@ -19,6 +20,9 @@ module Mailosaur
       # @return [String]
       attr_accessor :file_name
 
+      # @return [String]
+      attr_accessor :content
+
       # @return [String]
       attr_accessor :content_id
 

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

@@ -7,6 +7,7 @@ module Mailosaur
         @subject = data['subject']
         @text = data['text']
         @html = data['html']
+        @attachments = data['attachments']
       end
 
       # @return [String] The email address to which the email will be sent.
@@ -26,6 +27,9 @@ module Mailosaur
       # @return [String] The HTML body of the email. Note that only text
       # or html can be supplied, not both.
       attr_accessor :html
+
+      # @return [Array<Attachment>] Any message attachments.
+      attr_accessor :attachments
     end
   end
 end

data/lib/Mailosaur/models/message_reply_options.rb

@@ -4,6 +4,7 @@ module Mailosaur
       def initialize(data = {})
         @text = data['text']
         @html = data['html']
+        @attachments = data['attachments']
       end
 
       # @return [String] Any additional plain text content to include in
@@ -13,6 +14,9 @@ module Mailosaur
       # @return [String] Any additional HTML content to include in the
       # reply. Note that only html or text can be supplied, not both.
       attr_accessor :html
+
+      # @return [Array<Attachment>] Any message attachments.
+      attr_accessor :attachments
     end
   end
 end

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

@@ -54,7 +54,7 @@ module Mailosaur
     # @return [Server] operation results.
     #
     def get(id)
-      response = conn.get 'api/servers/' + id
+      response = conn.get "api/servers/#{id}"
       @handle_http_error.call(response) unless response.status == 200
       model = JSON.load(response.body)
       Mailosaur::Models::Server.new(model)
@@ -71,7 +71,7 @@ module Mailosaur
     # @return [String] Server password.
     #
     def get_password(id)
-      response = conn.get 'api/servers/' + id + '/password'
+      response = conn.get "api/servers/#{id}/password"
       @handle_http_error.call(response) unless response.status == 200
       model = JSON.load(response.body)
       model['value']
@@ -88,7 +88,7 @@ module Mailosaur
     # @return [Server] operation results.
     #
     def update(id, server)
-      response = conn.put 'api/servers/' + id, server.to_json
+      response = conn.put "api/servers/#{id}", server.to_json
       @handle_http_error.call(response) unless response.status == 200
       model = JSON.load(response.body)
       Mailosaur::Models::Server.new(model)
@@ -103,7 +103,7 @@ module Mailosaur
     # @param id [String] The identifier of the server to be deleted.
     #
     def delete(id)
-      response = conn.delete 'api/servers/' + id
+      response = conn.delete "api/servers/#{id}"
       @handle_http_error.call(response) unless response.status == 204
       nil
     end

data/lib/Mailosaur/version.rb

@@ -1,3 +1,3 @@
 module Mailosaur
-    VERSION = '7.4.0'.freeze
+    VERSION = '7.7.0'.freeze
 end

data/lib/mailosaur.rb

@@ -34,6 +34,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'
@@ -86,9 +87,9 @@ module Mailosaur
       Faraday.new(@base_url, {
         headers: {
           content_type: 'application/json; charset=utf-8',
-          user_agent: 'mailosaur-ruby/' + Mailosaur::VERSION
+          user_agent: "mailosaur-ruby/#{Mailosaur::VERSION}"
         }
-      }).tap { |conn| conn.basic_auth(@api_key, '') }
+      }).tap { |conn| conn.request(:basic_auth, @api_key, '') }
     end
 
     def handle_http_error(response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailosaur
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.7.0
 platform: ruby
 authors:
 - Mailosaur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -76,34 +76,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: 1.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.68.0
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +153,7 @@ files:
 - lib/Mailosaur/messages.rb
 - lib/Mailosaur/models/attachment.rb
 - lib/Mailosaur/models/base_model.rb
+- lib/Mailosaur/models/code.rb
 - lib/Mailosaur/models/image.rb
 - lib/Mailosaur/models/link.rb
 - lib/Mailosaur/models/message.rb
@@ -204,14 +199,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: The Mailosaur Ruby library