mailosaur 3.0.1 → 5.0.1.pre

data/lib/mailosaur.rb

@@ -1,113 +1,57 @@
-require_relative 'helper.rb'
-
-
-class Mailosaur
-  attr_reader :message
-
-  def initialize(mailbox = nil, apiKey = nil, base_url = nil, smtp_host = nil)
-    @mailbox  = ENV['MAILOSAUR_MAILBOX'] || mailbox
-    @api_key  = ENV['MAILOSAUR_APIKEY']  || apiKey
-    @base_url = base_url || ENV['MAILOSAUR_BASE_URL'] || 'https://mailosaur.com/api'
-    @smtp_host =  smtp_host || ENV['MAILOSAUR_SMTP_HOST'] || 'mailosaur.io'
-    @message  = MessageGenerator.new
-  end
-
-  # Retrieves all emails which have the searchPattern text in their body or subject.
-  def get_emails(search_criteria = {})
-    if search_criteria.is_a? String
-      search_criteria = {'search' => search_criteria}
-    end
-    search_criteria['key']     = @api_key
-    response = send_get_emails_request(search_criteria)
-    if !response.nil? && response.length > 2
-      data   = JSON.parse(response.body)
-      data.map { |em| Email.new(em) }
-    else
-      message.no_emails_found(search_criteria)
+require 'date'
+require 'json'
+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
+  autoload :Analysis,                                           'Mailosaur/analysis.rb'
+  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
+    autoload :MessageHeader,                                      'Mailosaur/models/message_header.rb'
+    autoload :SpamAssassinRule,                                   'Mailosaur/models/spam_assassin_rule.rb'
+    autoload :Metadata,                                           'Mailosaur/models/metadata.rb'
+    autoload :SpamAnalysisResult,                                 'Mailosaur/models/spam_analysis_result.rb'
+    autoload :Message,                                            'Mailosaur/models/message.rb'
+    autoload :MessageAddress,                                     'Mailosaur/models/message_address.rb'
+    autoload :MessageSummary,                                     'Mailosaur/models/message_summary.rb'
+    autoload :Image,                                              'Mailosaur/models/image.rb'
+    autoload :MessageListResult,                                  'Mailosaur/models/message_list_result.rb'
+    autoload :Attachment,                                         'Mailosaur/models/attachment.rb'
+    autoload :SearchCriteria,                                     'Mailosaur/models/search_criteria.rb'
+    autoload :ForwardingRule,                                     'Mailosaur/models/forwarding_rule.rb'
+    autoload :MessageContent,                                     'Mailosaur/models/message_content.rb'
+    autoload :Server,                                             'Mailosaur/models/server.rb'
+    autoload :Link,                                               'Mailosaur/models/link.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'
+  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
 
-  # Retrieves all emails sent to the given recipient.
-  def get_emails_by_recipient(recipient_email)
-    search_criteria = {'recipient' => recipient_email}
-    get_emails(search_criteria)
-  end
-
-  # Retrieves the email with the given id.
-  def get_email(email_id)
-    params   = {'key' => @api_key}
-    response = RestClient.get("#{@base_url}/emails/#{email_id}", {:params => params})
-    data     = JSON.parse(response.body)
-    Email.new(data)
-  end
-
-  # Deletes all emails in a @mailbox.
-  def delete_all_emails
-    query_params = {'key' => @api_key }
-    RestClient.post("#{@base_url}/mailboxes/#{@mailbox}/empty", nil, {:params => query_params})
-  end
-
-  # Deletes the email with the given id.
-  def delete_email(email_id)
-    params = {'key' => @api_key}
-    RestClient.post("#{@base_url}/emails/#{email_id}/delete", nil, {:params => params})
-  end
-
-  # Retrieves the attachment with specified id.
-  def get_attachment(attachment_id)
-    params = {'key' => @api_key}
-    RestClient.get("#{@base_url}/attachments/#{attachment_id}", {:params => params}).body
-  end
-
-  # Retrieves the complete raw EML file for the rawId given. RawId is a property on the email object.
-  def get_raw_email(raw_id)
-    params = {'key' => @api_key}
-    RestClient.get("#{@base_url}/raw/#{raw_id}", {:params => params}).body
-  end
-
-  # Generates a random email address which can be used to send emails into the @mailbox.
-  def generate_email_address
-    uuid = SecureRandom.hex(3)
-    "%s.%s@%s" % [uuid, @mailbox, @smtp_host]
-  end
-
-  # old methods
-  def getEmails(search_criteria = {})
-    message.new_syntax('getEmails')
-    get_emails(search_criteria)
-  end
-  def getEmailsByRecipient(recipient_email)
-    message.new_syntax('getEmailsByRecipient')
-    get_emails_by_recipient(recipient_email)
-  end
-  def getEmail(email_id)
-    message.new_syntax('getEmail')
-    get_email(email_id)
-  end
-  def deleteAllEmail
-    message.new_syntax('deleteAllEmail')
-    delete_all_emails
-  end
-  def deleteEmail(email_id)
-    message.new_syntax('deleteEmail')
-    delete_email(email_id)
-  end
-  def getAttachment(attachment_id)
-    message.new_syntax('getAttachment')
-    get_attachment(attachment_id)
-  end
-  def getRawEmail(raw_id)
-    message.new_syntax('getRawEmail')
-    get_raw_email(raw_id)
-  end
-  def generateEmailAddress
-    message.new_syntax('generateEmailAddress')
-    generate_email_address
-  end
-
-  private
-
-  def send_get_emails_request(search_criteria)
-    RestClient.get("#{@base_url}/mailboxes/#{@mailbox}/emails", {:params => search_criteria})
+  # 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]
+    end
   end
 end

metadata

@@ -1,130 +1,162 @@
 --- !ruby/object:Gem::Specification
 name: mailosaur
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 5.0.1.pre
 platform: ruby
 authors:
 - Mailosaur Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: ms_rest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
-  type: :development
+        version: 0.0.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 2.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: 1.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.4
+        version: 3.2.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.7
 description: Gem containing ruby client library for Mailosaur.
-email: support@mailosaur.com
+email: code@mailosaur.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/helper.rb
+- 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/forwarding_rule.rb
+- lib/Mailosaur/models/image.rb
+- lib/Mailosaur/models/link.rb
+- lib/Mailosaur/models/message.rb
+- lib/Mailosaur/models/message_address.rb
+- lib/Mailosaur/models/message_content.rb
+- lib/Mailosaur/models/message_header.rb
+- lib/Mailosaur/models/message_list_result.rb
+- lib/Mailosaur/models/message_summary.rb
+- lib/Mailosaur/models/metadata.rb
+- lib/Mailosaur/models/search_criteria.rb
+- lib/Mailosaur/models/server.rb
+- lib/Mailosaur/models/server_create_options.rb
+- lib/Mailosaur/models/server_list_result.rb
+- lib/Mailosaur/models/spam_analysis_result.rb
+- lib/Mailosaur/models/spam_assassin_rule.rb
+- lib/Mailosaur/models/spam_filter_results.rb
+- lib/Mailosaur/module_definition.rb
+- lib/Mailosaur/servers.rb
+- lib/Mailosaur/version.rb
 - lib/mailosaur.rb
-- lib/mailosaur/attachment.rb
-- lib/mailosaur/email.rb
-- lib/mailosaur/email_address.rb
-- lib/mailosaur/email_data.rb
-- lib/mailosaur/image.rb
-- lib/mailosaur/link.rb
-- lib/mailosaur/message_generator.rb
 homepage: https://mailosaur.com
 licenses:
 - MIT
@@ -140,12 +172,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Client library for Mailosaur

data/lib/helper.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-require 'rest_client'
-require 'json'
-require 'securerandom'
-require "#{File.dirname(__FILE__)}/mailosaur/email"
-require "#{File.dirname(__FILE__)}/mailosaur/message_generator"

data/lib/mailosaur/attachment.rb

@@ -1,10 +0,0 @@
-class Attachment
-  attr_accessor :contentType, :fileName, :length, :id
-
-  def initialize(hash)
-    @contentType = hash['contentType']
-    @fileName = hash['fileName']
-    @length = hash['length']
-    @id = hash['id']
-  end
-end

data/lib/mailosaur/email.rb

@@ -1,23 +0,0 @@
-require "#{File.dirname(__FILE__)}/email_address"
-require "#{File.dirname(__FILE__)}/email_data"
-require "#{File.dirname(__FILE__)}/attachment"
-
-class Email
-  attr_accessor :id, :creationdate, :senderhost, :from, :to, :mailbox, :rawid, :html, :text, :headers, :subject, :priority, :attachments
-
-  def initialize(hash)
-    @id = hash['id']
-    @creationdate = DateTime.iso8601(hash['creationdate'])
-    @senderhost = hash['senderhost'] || hash['senderHost']
-    @from= hash['from'].map { |f| EmailAddress.new(f) }
-    @to= hash['to'].map { |t| EmailAddress.new(t) }
-    @mailbox = hash['mailbox']
-    @rawid = hash['rawId'] || hash['rawid']
-    @html = hash.has_key?('html')?EmailData.new(hash['html']):nil
-    @text = hash.has_key?('text')?EmailData.new(hash['text']):nil
-    @headers = hash['headers']
-    @subject = hash['subject']
-    @priority = hash['priority']
-    @attachments = hash.has_key?('attachments')?hash['attachments'].map { |a| Attachment.new(a) } : nil
-  end
-end

data/lib/mailosaur/email_address.rb

@@ -1,9 +0,0 @@
-class EmailAddress
-  attr_accessor :address, :name
-
-  def initialize(hash)
-    @address = hash['address']
-    @name = hash['name']
-  end
-end
-

data/lib/mailosaur/email_data.rb

@@ -1,13 +0,0 @@
-require "#{File.dirname(__FILE__)}/link"
-require "#{File.dirname(__FILE__)}/image"
-
-
-class EmailData
-  attr_accessor :links, :body, :images
-
-  def initialize(hash)
-    @links =hash.has_key?('links') ? hash['links'].map { |a| Link.new(a) } : nil
-    @body = hash['body']
-    @images = hash.has_key?('images') ? hash['images'].map { |a| Image.new(a) } : nil
-  end
-end

data/lib/mailosaur/image.rb

@@ -1,8 +0,0 @@
-class Image
-  attr_accessor :src, :alt
-
-  def initialize(hash)
-    @src = hash['src']
-    @alt = hash['alt']
-  end
-end

data/lib/mailosaur/link.rb

@@ -1,8 +0,0 @@
-class Link
-  attr_accessor :href, :text
-
-  def initialize(hash)
-    @href = hash['href']
-    @text = hash['text']
-  end
-end

data/lib/mailosaur/message_generator.rb

@@ -1,31 +0,0 @@
-class MessageGenerator
-  attr_accessor :message
-
-  def no_emails_found(data)
-    "\e[36m No emails were found for #{data} \e[0m\n\e[32m Try checking the params. \e[0m"
-  end
-
-  def new_syntax(method)
-    puts ":::::: Please use new syntax for #{method} ::::::\n
-          \e[36m @mailbox.#{look_ruby(method)}(params) \e[0m"
-  end
-
-  def sleep
-    puts "\e[36m Let's give the email some time to get there... \e[0m"
-  end
-
-  private
-
-  def look_ruby(method)
-    output = String.new
-    caps   = method.scan(/[A-Z]+/).map(&:downcase!)
-    other  = method.split(/[A-Z]+/)
-    a3 = other.join('_ ')
-    a4 = a3.split(' ')
-    words = ''
-    other.count.times do |i|
-      words << "#{a4[i]}#{caps[i]}"
-    end
-    words
-  end
-end