mailosaur 1.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bc63d96b4be5d0d2237c75e37d178c3b751ff97
-  data.tar.gz: 693a017692b35b80e1247b2efd09ca7594b7fc1b
+  metadata.gz: 8b1f5cd8eee1338957480eefdd2a8ce560388ac0
+  data.tar.gz: 2903aed8d22f6555607826ef7231e0e0950fa9bf
 SHA512:
-  metadata.gz: 44f8d684eb2171409644a2c50a5168b3923b77f78b8be71cd0996c59878866702a852e745efe265f256b6501ee47d312c4bf70b0580f717689c43d740630d62d
-  data.tar.gz: 0e51f9927c4bc92cd56c20aa3e3eea4cdfa480595ee7aa90a86605a285973e69121769a8961e926c17e21801b0e28050aa6d6609dd9df95ec9312fb2a14de5ba
+  metadata.gz: 3e2e95a516ead64c04f7797f29082af5db8c7bc64e95b9b7e6f8016204aea922e5e7ed3bf9c8cdb6d44c17135ae5b64e7e210f94e151a2d429d128a3c1ee5869
+  data.tar.gz: ff9b637d8ea7bb90ebc331e8ef899af901b12037cb9438a6a94bca736567663237b7de799f5d144b26917636ecc894fa6083e5d7effdb14645e0e1348e794ae8

data/lib/mailosaur.rb

@@ -1,12 +1,14 @@
 require_relative 'helper.rb'
 
+
 class Mailosaur
   attr_reader :message
 
-  def initialize(mailbox = nil, apiKey = nil)
+  def initialize(mailbox = nil, apiKey = nil, base_url = nil, smtp_host = nil)
     @mailbox  = ENV['MAILOSAUR_MAILBOX'] || mailbox
     @api_key  = ENV['MAILOSAUR_APIKEY']  || apiKey
-    @base_uri = 'https://mailosaur.com/v2'
+    @base_url = base_url || ENV['MAILOSAUR_BASE_URL'] || 'https://mailosaur.com/api'
+    @smtp_host =  smtp_host || ENV['MAILOSAUR_SMTP_HOST'] || 'mailosaur.in'
     @message  = MessageGenerator.new
   end
 
@@ -16,7 +18,6 @@ class Mailosaur
       search_criteria = {'search' => search_criteria}
     end
     search_criteria['key']     = @api_key
-    search_criteria['mailbox'] = @mailbox
     response = send_get_emails_request(search_criteria)
     if !response.nil? && response.length > 2
       data   = JSON.parse(response.body)
@@ -35,39 +36,39 @@ class Mailosaur
   # Retrieves the email with the given id.
   def get_email(email_id)
     params   = {'key' => @api_key}
-    response = RestClient.get("#{@base_uri}/email/#{email_id}", {:params => params})
+    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, '@mailbox' => @mailbox }
-    RestClient.post("#{@base_uri}/emails/deleteall", nil, {:params => query_params})
+    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_uri}/email/#{email_id}/delete/", nil, {:params => params})
+    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_uri}/attachment/#{attachment_id}", {:params => params}).body
+    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_uri}/raw/#{raw_id}", {:params => params}).body
+    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@mailosaur.in" % [uuid, @mailbox]
+    "%s.%s@%s" % [uuid, @mailbox, @smtp_host]
   end
 
   # old methods
@@ -107,6 +108,6 @@ class Mailosaur
   private
 
   def send_get_emails_request(search_criteria)
-    RestClient.get("#{@base_uri}/emails", {:params => search_criteria})
+    RestClient.get("#{@base_url}/mailboxes/#{@mailbox}/emails", {:params => search_criteria})
   end
 end

data/lib/mailosaur/email.rb

@@ -3,16 +3,16 @@ 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
+  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']
+    @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']
+    @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']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailosaur
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Clickity Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -80,7 +80,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 10.3.2
-description: Gem containing ruby bindings for the mailosaur.com mail testing api.
+description: Gem containing ruby client library for Mailosaur.
 email: support@mailosaur.com
 executables: []
 extensions: []
@@ -97,7 +97,7 @@ files:
 - lib/mailosaur/image.rb
 - lib/mailosaur/link.rb
 - lib/mailosaur/message_generator.rb
-homepage: http://mailosaur.com
+homepage: https://mailosaur.com
 licenses:
 - MIT
 metadata: {}
@@ -117,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Bindings for mailosaur.com
+summary: Client library for Mailosaur
 test_files: []