mailosaur 7.8.0 → 7.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeaf9bb2c4d001d8f0ec173e4fb0fcbe02515cbb2ac1eae04c2f9961811dad2c
-  data.tar.gz: cdcf3c7bdd32cde468875fac15003169d65a4283b38de7c8970c1f3870a08d8f
+  metadata.gz: 6102a62b1dead548c4a915faaa7e5d11fefc16c10850ccee5482c9974ab656df
+  data.tar.gz: 9005be36f38c933f9ada0df3312fc23dcffd74c6611d93ef300277ab9c78a0bb
 SHA512:
-  metadata.gz: 534cdf190200dcf2b24ef400f598dec13de6466fa347d46c90a967e3c7c45c9ba1ed024da2fd67a9ce0afa3c41e886b6cffe2e3af8c711cb2fe8f2185805efab
-  data.tar.gz: 16ab4b387df53be279ad409e9d04d479c17db62f43db17b5ed60df256ee28c617b2fa6ed4d22e9df64b8a7b3f26e05e5b8ea02a7f1c97927d745932522296684
+  metadata.gz: 43b69b34cae04d096a6c2a7d16275d83b98cd3b9d9a876e6512b4c99ad85eb59c5c4830ca3c3b983e0988037c522e847c7297125175eb5e5240a1aabba857403
+  data.tar.gz: f1cf79f34626e7645ac92a8eef78c9b7d535c5c765170318b03cde0e4385a3a5df82a00b71e3019cb2517b4021c0d5fde7ed7dfeaddeb7b289eff491eea2c029

data/lib/Mailosaur/messages.rb

@@ -137,7 +137,7 @@ 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
+    def search(server, criteria, page: nil, items_per_page: nil, timeout: nil, received_after: nil, error_on_timeout: true)
       url = "api/messages/search?server=#{server}"
       url += page ? "&page=#{page}" : ''
       url += items_per_page ? "&itemsPerPage=#{items_per_page}" : ''

data/lib/Mailosaur/models/message_create_options.rb

@@ -3,6 +3,7 @@ module Mailosaur
     class MessageCreateOptions < BaseModel
       def initialize(data = {})
         @to = data['to']
+        @from = data['from']
         @send = data['send']
         @subject = data['subject']
         @text = data['text']
@@ -14,6 +15,11 @@ module Mailosaur
       # Must be a verified email address.
       attr_accessor :to
 
+      # @return [String] Allows for the partial override of the message's
+      # 'from' address. This **must** be an address ending with
+      # `YOUR_SERVER.mailosaur.net`, such as `my-emails@a1bcdef2.mailosaur.net`.
+      attr_accessor :from
+
       # @return [Boolean] If true, email will be sent upon creation.
       attr_accessor :send
 

data/lib/Mailosaur/version.rb

@@ -1,3 +1,3 @@
 module Mailosaur
-    VERSION = '7.8.0'.freeze
+    VERSION = '7.11.0'.freeze
 end

data/lib/mailosaur.rb

@@ -99,19 +99,37 @@ 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)
+      message = ''
       case response.status
       when 400
-        raise Mailosaur::MailosaurError.new('Request had one or more invalid parameters.', 'invalid_request', response.status, response.body)
+        begin
+          json = JSON.parse(response.body)
+          json['errors'].each do |err|
+            message += format('(%s) %s\r\n', err['field'], err['detail'][0]['description'])
+          end
+        rescue StandardError
+          message = 'Request had one or more invalid parameters.'
+        end
+        raise Mailosaur::MailosaurError.new(message, 'invalid_request', response.status, response.body)
       when 401
         raise Mailosaur::MailosaurError.new('Authentication failed, check your API key.', 'authentication_error', response.status, response.body)
       when 403
         raise Mailosaur::MailosaurError.new('Insufficient permission to perform that task.', 'permission_error', response.status, response.body)
       when 404
-        raise Mailosaur::MailosaurError.new('Request did not find any matching resources.', 'invalid_request', response.status, response.body)
+        raise Mailosaur::MailosaurError.new('Not found, check input parameters.', 'invalid_request', response.status, response.body)
       else
         raise Mailosaur::MailosaurError.new('An API error occurred, see httpResponse for further information.', 'api_error', response.status, response.body)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailosaur
 version: !ruby/object:Gem::Version
-  version: 7.8.0
+  version: 7.11.0
 platform: ruby
 authors:
 - Mailosaur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-09-06 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