mailosaur 5.0.2 → 5.0.20

data/lib/Mailosaur/version.rb

@@ -1,8 +1,3 @@
-# encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
-
 module Mailosaur
-    VERSION = '5.0.2'
+    VERSION = '5.0.20'
 end

data/lib/mailosaur.rb

@@ -4,11 +4,7 @@ require 'base64'
 require 'erb'
 require 'securerandom'
 require 'time'
-require 'timeliness'
 require 'faraday'
-require 'faraday-cookie_jar'
-require 'concurrent'
-require 'ms_rest'
 require 'Mailosaur/module_definition'
 
 module Mailosaur
@@ -16,7 +12,6 @@ module Mailosaur
   autoload :Files,                                              'Mailosaur/files.rb'
   autoload :Messages,                                           'Mailosaur/messages.rb'
   autoload :Servers,                                            'Mailosaur/servers.rb'
-  autoload :MailosaurBaseClient,                                'Mailosaur/mailosaur_base_client.rb'
   autoload :MailosaurError,                                     'Mailosaur/mailosaur_error.rb'
 
   module Models
@@ -38,20 +33,41 @@ module Mailosaur
     autoload :ServerListResult,                                   'Mailosaur/models/server_list_result.rb'
     autoload :SpamFilterResults,                                  'Mailosaur/models/spam_filter_results.rb'
     autoload :ServerCreateOptions,                                'Mailosaur/models/server_create_options.rb'
+autoload :BaseModel,                                              'Mailosaur/models/base_model.rb'
   end
 
-  class MailosaurClient < MailosaurBaseClient
-    def initialize(api_key, base_url = 'https://mailosaur.com/')
-      credentials = MsRest::BasicAuthenticationCredentials.new(api_key, '')
-      super(credentials, base_url, nil)
-    end
-  end
+  class MailosaurClient
+    # @return [Analysis] analysis
+    attr_reader :analysis
+
+    # @return [Files] files
+    attr_reader :files
+
+    # @return [Messages] messages
+    attr_reader :messages
+
+    # @return [Servers] servers
+    attr_reader :servers
+
+    #
+    # Creates initializes a new instance of the MailosaurClient class.
+    # @param api_key [String] your Mailosaur API key.
+    # @param base_url [String] the base URI of the service.
+    #
+    def initialize(api_key, base_url)
+      conn = Faraday.new(base_url || 'https://mailosaur.com/', {
+        :headers => {
+          :content_type => 'application/json; charset=utf-8',
+          :user_agent => 'mailosaur-ruby/5.0.20'
+        }
+      })
+
+      conn.basic_auth(api_key, '')
 
-  # Monkey patch generate_email_address method
-  class Servers
-    def generate_email_address(server)
-      host = ENV['MAILOSAUR_SMTP_HOST'] || 'mailosaur.io'
-      '%s.%s@%s' % [SecureRandom.hex(3), server, host]
+      @analysis = Analysis.new(conn)
+      @files = Files.new(conn)
+      @messages = Messages.new(conn)
+      @servers = Servers.new(conn)
     end
   end
 end

metadata

@@ -1,71 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: mailosaur
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.20
 platform: ruby
 authors:
 - Mailosaur Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: ms_rest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+        version: 1.7.5
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
-- !ruby/object:Gem::Dependency
-  name: faraday-cookie_jar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 0.9.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +57,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,11 +67,17 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.1
   type: :development
@@ -92,6 +85,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.1
 - !ruby/object:Gem::Dependency
@@ -99,6 +95,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :development
@@ -106,6 +105,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
@@ -113,6 +115,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.7
   type: :development
@@ -120,10 +125,13 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.7
-description: Gem containing ruby client library for Mailosaur.
-email: support@mailosaur.com
+description: Ruby client library for Mailosaur.
+email: code@mailosaur.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -132,10 +140,10 @@ files:
 - README.md
 - lib/Mailosaur/analysis.rb
 - lib/Mailosaur/files.rb
-- lib/Mailosaur/mailosaur_base_client.rb
 - lib/Mailosaur/mailosaur_error.rb
 - lib/Mailosaur/messages.rb
 - lib/Mailosaur/models/attachment.rb
+- lib/Mailosaur/models/base_model.rb
 - lib/Mailosaur/models/forwarding_rule.rb
 - lib/Mailosaur/models/image.rb
 - lib/Mailosaur/models/link.rb
@@ -176,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Client library for Mailosaur
+summary: Ruby client library for Mailosaur
 test_files: []

data/lib/Mailosaur/mailosaur_base_client.rb

@@ -1,120 +0,0 @@
-# encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is
-# regenerated.
-
-module Mailosaur
-  #
-  # A service client - single point of access to the REST API.
-  #
-  class MailosaurBaseClient < MsRest::ServiceClient
-    include MsRest::Serialization
-
-    # @return [String] the base URI of the service.
-    attr_accessor :base_url
-
-    # @return Subscription credentials which uniquely identify client
-    # subscription.
-    attr_accessor :credentials
-
-    # @return [Analysis] analysis
-    attr_reader :analysis
-
-    # @return [Files] files
-    attr_reader :files
-
-    # @return [Messages] messages
-    attr_reader :messages
-
-    # @return [Servers] servers
-    attr_reader :servers
-
-    #
-    # Creates initializes a new instance of the MailosaurBaseClient class.
-    # @param credentials [MsRest::ServiceClientCredentials] credentials to authorize HTTP requests made by the service client.
-    # @param base_url [String] the base URI of the service.
-    # @param options [Array] filters to be applied to the HTTP requests.
-    #
-    def initialize(credentials = nil, base_url = nil, options = nil)
-      super(credentials, options)
-      @base_url = base_url || 'https://mailosaur.com/'
-
-      fail ArgumentError, 'invalid type of credentials input parameter' unless credentials.is_a?(MsRest::ServiceClientCredentials) unless credentials.nil?
-      @credentials = credentials
-
-      @analysis = Analysis.new(self)
-      @files = Files.new(self)
-      @messages = Messages.new(self)
-      @servers = Servers.new(self)
-      add_telemetry
-    end
-
-    #
-    # Makes a request and returns the body of the response.
-    # @param method [Symbol] with any of the following values :get, :put, :post, :patch, :delete.
-    # @param path [String] the path, relative to {base_url}.
-    # @param options [Hash{String=>String}] specifying any request options like :body.
-    # @return [Hash{String=>String}] containing the body of the response.
-    # Example:
-    #
-    #  request_content = "{'location':'westus','tags':{'tag1':'val1','tag2':'val2'}}"
-    #  path = "/path"
-    #  options = {
-    #    body: request_content,
-    #    query_params: {'api-version' => '2016-02-01'}
-    #  }
-    #  result = @client.make_request(:put, path, options)
-    #
-    def make_request(method, path, options = {})
-      result = make_request_with_http_info(method, path, options)
-      result.body unless result.nil?
-    end
-
-    #
-    # Makes a request and returns the operation response.
-    # @param method [Symbol] with any of the following values :get, :put, :post, :patch, :delete.
-    # @param path [String] the path, relative to {base_url}.
-    # @param options [Hash{String=>String}] specifying any request options like :body.
-    # @return [MsRest::HttpOperationResponse] Operation response containing the request, response and status.
-    #
-    def make_request_with_http_info(method, path, options = {})
-      result = make_request_async(method, path, options).value!
-      result.body = result.response.body.to_s.empty? ? nil : JSON.load(result.response.body)
-      result
-    end
-
-    #
-    # Makes a request asynchronously.
-    # @param method [Symbol] with any of the following values :get, :put, :post, :patch, :delete.
-    # @param path [String] the path, relative to {base_url}.
-    # @param options [Hash{String=>String}] specifying any request options like :body.
-    # @return [Concurrent::Promise] Promise object which holds the HTTP response.
-    #
-    def make_request_async(method, path, options = {})
-      fail ArgumentError, 'method is nil' if method.nil?
-      fail ArgumentError, 'path is nil' if path.nil?
-
-      request_url = options[:base_url] || @base_url
-      if(!options[:headers].nil? && !options[:headers]['Content-Type'].nil?)
-        @request_headers['Content-Type'] = options[:headers]['Content-Type']
-      end
-
-      request_headers = @request_headers
-      options.merge!({headers: request_headers.merge(options[:headers] || {})})
-      options.merge!({credentials: @credentials}) unless @credentials.nil?
-
-      super(request_url, method, path, options)
-    end
-
-
-    private
-    #
-    # Adds telemetry information.
-    #
-    def add_telemetry
-        sdk_information = 'Mailosaur'
-        sdk_information = "#{sdk_information}/5.0.2"
-        add_user_agent_information(sdk_information)
-    end
-  end
-end