mailgun-ruby 1.3.1 → 1.3.3

data/spec/integration/email_validation_spec.rb

@@ -16,6 +16,7 @@ describe 'For the email validation endpoint', order: :defined, vcr: vcr_opts do
   end
 
   it 'returns parsed and unparsable lists' do
+    skip 'is parse method removed?'
     res = @mg_obj.parse(@all_addrs)
 
     expect(res["parsed"]).to eq(@valid)
@@ -58,7 +59,7 @@ describe 'For the email validation endpoint', order: :defined, vcr: vcr_opts do
         "is_role_address" => false,
         "is_valid" => false,
         "mailbox_verification" => "unknown",
-        "reason" => "Validation failed for 'example.org', reason: 'malformed address; missing @ sign'",
+        #"reason" => "Validation failed for 'example.org', reason: 'malformed address; missing @ sign'",
         "parts" => {
             "display_name" => nil,
             "domain" => nil,

data/spec/integration/list_spec.rb

@@ -6,7 +6,7 @@ vcr_opts = { :cassette_name => "mailing_list" }
 describe 'For the Mailing Lists endpoint', vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
+    @domain = TESTDOMAIN || 'DOMAIN.TEST'
     @ml_address = "integration_test_list@#{@domain}"
   end
 

data/spec/integration/mailer_spec.rb

@@ -9,7 +9,7 @@ ActionMailer::Base.raise_delivery_errors = true
 Rails.logger = Logger.new('/dev/null')
 Rails.logger.level = Logger::DEBUG
 
-class UnitTestMailer < ActionMailer::Base
+class IntegrationUnitTestMailer < ActionMailer::Base
   default from: 'unittest@example.org'
 
   def plain_message(address, from, subject, headers)
@@ -24,14 +24,14 @@ end
 vcr_opts = { :cassette_name => 'message_deliver' }
 
 describe 'Message deliver', vcr: vcr_opts do
-  let(:domain) { TESTDOMAIN }
+  let(:domain) { TESTDOMAIN || 'DOMAIN.TEST' }
   let(:config) do
     {
       api_key: APIKEY,
       domain: domain
     }
   end
-  let(:mail) { UnitTestMailer.plain_message("bob@#{domain}", "bob@#{domain}", 'subject', {}) }
+  let!(:mail) { IntegrationUnitTestMailer.plain_message("bob@#{domain}", "bob@#{domain}", 'subject', {}) }
 
   it 'successfully delivers message' do
     result = Railgun::Mailer.new(config).deliver!(mail)
@@ -53,9 +53,9 @@ describe 'Invalid domain', vcr: vcr_opts do
       domain: domain
     }
   end
-  let(:mail) { UnitTestMailer.plain_message('sally@not-our-doma.in', "bob@#{domain}", 'subject', {}) }
+  let(:mail) { IntegrationUnitTestMailer.plain_message('sally@not-our-doma.in', "bob@#{domain}", 'subject', {}) }
 
   it 'raises expected error' do
-    expect { Railgun::Mailer.new(config).deliver!(mail) }.to raise_error Mailgun::CommunicationError, /Forbidden/
+    expect { Railgun::Mailer.new(config).deliver!(mail) }.to raise_error Mailgun::Unauthorized, /Invalid Domain or API key/
   end
 end

data/spec/integration/mailgun_spec.rb

@@ -15,7 +15,7 @@ vcr_opts = { :cassette_name => "exceptions" }
 describe 'Client exceptions', vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
+    @domain = TESTDOMAIN || 'DOMAIN.TEST'
   end
 
   it 'display useful error information' do
@@ -27,7 +27,7 @@ describe 'Client exceptions', vcr: vcr_opts do
           :text => 'INTEGRATION TESTING'
       })
     rescue Mailgun::CommunicationError => err
-      expect(err.message).to eq('404 Not Found: Domain not found: not-our-doma.in')
+      expect(err.message).to eq('the server responded with status 404')
     else
       fail
     end
@@ -39,7 +39,7 @@ vcr_opts = { :cassette_name => "exceptions-invalid-api-key" }
 describe 'Client exceptions', vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
+    @domain = TESTDOMAIN || 'DOMAIN.TEST'
   end
 
   it 'displays error information that API key is invalid' do
@@ -63,7 +63,7 @@ vcr_opts = { :cassette_name => "exceptions-invalid-data" }
 describe 'Client exceptions', vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
+    @domain = TESTDOMAIN || 'DOMAIN.TEST'
   end
 
   it 'display useful error information' do
@@ -87,7 +87,7 @@ vcr_opts = { :cassette_name => "exceptions-not-allowed" }
 describe 'Client exceptions', vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
+    @domain = TESTDOMAIN || 'DOMAIN.TEST'
   end
 
   it 'display useful error information' do
@@ -111,10 +111,11 @@ vcr_opts = { :cassette_name => "send_message" }
 describe 'The method send_message()', vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
+    @domain = TESTDOMAIN || 'DOMAIN.TEST'
   end
 
   it 'sends a standard message in test mode.' do
+    @mg_obj.enable_test_mode!
     result = @mg_obj.send_message(@domain, {:from => "bob@#{@domain}",
                                     :to => "sally@#{@domain}",
                                     :subject => 'Hash Integration Test',
@@ -183,7 +184,8 @@ Sender: me@samples.mailgun.org
 
 Testing some Mailgun awesomness!'
 
-    message_params = {:to => "sally@#{@domain}",
+    message_params = {:from => "bobby@#{@domain}",
+                      :to => "sally@#{@domain}",
                       :message => mime_string}
 
     result = @mg_obj.send_message(@domain, message_params)

data/spec/integration/routes_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'mailgun'
 
-vcr_opts = { :cassette_name => "routes" }
+vcr_opts = { :cassette_name => "routes", :match_requests_on => [:uri, :method, :body] }
 
 describe 'For the Routes endpoint', order: :defined, vcr: vcr_opts do
   before(:all) do
@@ -25,6 +25,22 @@ describe 'For the Routes endpoint', order: :defined, vcr: vcr_opts do
     expect(result.body["route"]["priority"]).to eq(10)
   end
 
+  it 'creates a route with multiple actions' do
+    result = @mg_obj.post("routes",  { priority: 10,
+                                       description: 'Integration Test Route',
+                                       expression: "match_recipient(\"#{@forward_to}\")",
+                                       action: ["forward(\"#{@recipient}\")", "stop()"] })
+
+    result.to_h!
+    expect(result.body["message"]).to eq("Route has been created")
+    expect(result.body["route"]["description"]).to eq("Integration Test Route")
+    expect(result.body["route"]["actions"].count).to eq 2
+    expect(result.body["route"]["actions"][0]).to include("forward(\"#{@recipient}\")")
+    expect(result.body["route"]["actions"][1]).to include("stop()")
+    expect(result.body["route"]["expression"]).to include("match_recipient(\"#{@forward_to}\")")
+    expect(result.body["route"]["priority"]).to eq(10)
+  end
+
   it 'gets a list of all routes.' do
     result = @mg_obj.get("routes", {:limit => 50})
 

data/spec/integration/stats_spec.rb

@@ -6,7 +6,7 @@ vcr_opts = { :cassette_name => "stats" }
 describe 'For the Stats endpoint', vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
+    @domain = TESTDOMAIN || 'DOMAIN.TEST'
   end
 
   it 'get some stats.' do

data/spec/integration/unsubscribes_spec.rb

@@ -6,8 +6,8 @@ vcr_opts = { :cassette_name => "unsubscribes" }
 describe 'For the Unsubscribes endpoint', order: :defined, vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
-    @email = "integration-test-email@#{TESTDOMAIN}"
+    @domain = TESTDOMAIN || 'DOMAIN.TEST'
+    @email = "integration-test-email@#{@domain}"
   end
 
   it 'adds an unsubscriber' do

data/spec/integration/webhook_spec.rb

@@ -6,7 +6,7 @@ vcr_opts = { :cassette_name => "webhooks" }
 describe 'For the webhooks endpoint', order: :defined, vcr: vcr_opts do
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY, APIHOST, APIVERSION, SSL)
-    @domain = TESTDOMAIN
+    @domain = 'DOMAIN.TEST'
     @testhook = 'accepted'
     @testhookup = 'accepted'
   end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'mailgun'
 
 require 'vcr'
 require 'webmock/rspec'
+require 'rspec/its'
 
 #WebMock.disable_net_connect!(allow_localhost: true)
 require_relative 'unit/connection/test_client'

data/spec/unit/events/events_spec.rb

@@ -20,7 +20,7 @@ describe 'Pagination' do
     json = JSON.parse(result.body)
     expect(json).to include("paging")
     expect(json["paging"]).to include("next")
-    expect(json["paging"]).to include{"previous"}
+    expect(json["paging"]).to include("previous")
   end
 
   it 'should calculate proper next-page url' do

data/spec/unit/messages/message_builder_spec.rb

@@ -265,7 +265,7 @@ describe 'The method add_attachment' do
     @mb_obj.add_attachment io, 'mailgun_icon.png'
 
     expect(@mb_obj.message[:attachment].length).to eq(1)
-    expect(@mb_obj.message[:attachment].first.original_filename).to eq 'mailgun_icon.png'
+    expect(@mb_obj.message[:attachment].first.io.original_filename).to eq 'mailgun_icon.png'
   end
 
   context 'when attachment has unknown type' do

data/vcr_cassettes/bounces.yml

@@ -2,185 +2,13 @@
 http_interactions:
 - request:
     method: post
-    uri: https://api:<APIKEY>@api.mailgun.net/v3/DOMAIN.TEST/bounces
-    body:
-      encoding: US-ASCII
-      string: address=integration-test%2Bemail%40DOMAIN.TEST&code=550&error=Integration%20Test
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      Content-Length:
-      - '113'
-      Content-Type:
-      - application/x-www-form-urlencoded
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx
-      Date:
-      - Fri, 08 Jan 2016 20:33:28 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Content-Length:
-      - '139'
-      Connection:
-      - keep-alive
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Max-Age:
-      - '600'
-      Access-Control-Allow-Methods:
-      - GET, POST, PUT, DELETE, OPTIONS
-      Access-Control-Allow-Headers:
-      - Content-Type, x-requested-with
+    uri: https://api.mailgun.net/bounces
     body:
       encoding: UTF-8
-      string: '{"address":"integration-test+email@DOMAIN.TEST","message":"Address
-        has been added to the bounces table"}'
-    http_version:
-  recorded_at: Fri, 08 Jan 2016 20:33:29 GMT
-- request:
-    method: get
-    uri: https://api:<APIKEY>@api.mailgun.net/v3/DOMAIN.TEST/bounces/integration-test+email@DOMAIN.TEST
-    body:
-      encoding: US-ASCII
-      string: ''
+      string: address=integration-test%2Bemail%40&code=550&error=Integration+Test
     headers:
-      Accept:
-      - "*/*"
-      Accept-Encoding:
-      - gzip, deflate
       User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx
-      Date:
-      - Fri, 08 Jan 2016 20:33:28 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Content-Length:
-      - '168'
-      Connection:
-      - keep-alive
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Max-Age:
-      - '600'
-      Access-Control-Allow-Methods:
-      - GET, POST, PUT, DELETE, OPTIONS
-      Access-Control-Allow-Headers:
-      - Content-Type, x-requested-with
-    body:
-      encoding: UTF-8
-      string: '{"address":"integration-test+email@DOMAIN.TEST","code":"550","error":"Integration
-        Test","created_at":"Fri, 08 Jan 2016 20:33:28 UTC"}'
-    http_version:
-  recorded_at: Fri, 08 Jan 2016 20:33:29 GMT
-- request:
-    method: get
-    uri: https://api:<APIKEY>@api.mailgun.net/v3/DOMAIN.TEST/bounces
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx
-      Date:
-      - Fri, 08 Jan 2016 20:33:29 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Content-Length:
-      - '819'
-      Connection:
-      - keep-alive
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Max-Age:
-      - '600'
-      Access-Control-Allow-Methods:
-      - GET, POST, PUT, DELETE, OPTIONS
-      Access-Control-Allow-Headers:
-      - Content-Type, x-requested-with
-    body:
-      encoding: UTF-8
-      string: '{"items":[{"address":"integration-test+email@DOMAIN.TEST","code":"550","error":"Integration
-        Test","created_at":"Fri, 08 Jan 2016 20:33:28 UTC"}],"paging":{"first":"https://api.mailgun.net/v3/DOMAIN.TEST/bounces?limit=100","last":"https://api.mailgun.net/v3/DOMAIN.TEST/bounces?page=last\u0026limit=100","next":"https://api.mailgun.net/v3/DOMAIN.TEST/bounces?page=next\u0026address=integration-test%2Bemaill%40DOMAIN.TEST\u0026limit=100","previous":"https://api.mailgun.net/v3/DOMAIN.TEST/bounces?page=previous\u0026address=integration-test%2Bemail%40DOMAIN.TEST\u0026limit=100"}}'
-    http_version:
-  recorded_at: Fri, 08 Jan 2016 20:33:29 GMT
-- request:
-    method: delete
-    uri: https://api:<APIKEY>@api.mailgun.net/v3/DOMAIN.TEST/bounces/integration-test+email@DOMAIN.TEST
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - "*/*; q=0.5, application/xml"
-      Accept-Encoding:
-      - gzip, deflate
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - nginx
-      Date:
-      - Fri, 08 Jan 2016 20:33:29 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Content-Length:
-      - '128'
-      Connection:
-      - keep-alive
-      Access-Control-Allow-Origin:
-      - "*"
-      Access-Control-Max-Age:
-      - '600'
-      Access-Control-Allow-Methods:
-      - GET, POST, PUT, DELETE, OPTIONS
-      Access-Control-Allow-Headers:
-      - Content-Type, x-requested-with
-    body:
-      encoding: UTF-8
-      string: '{"address":"integration-test+email@DOMAIN.TEST","message":"Bounced
-        address has been removed"}'
-    http_version:
-  recorded_at: Fri, 08 Jan 2016 20:33:30 GMT
-- request:
-    method: post
-    uri: https://api.mailgun.net/v3/DOMAIN.TEST/bounces
-    body:
-      encoding: UTF-8
-      string: address=integration-test%2Bemail%40DOMAIN.TEST&code=550&error=Integration+Test
-    headers:
-      User-Agent:
-      - mailgun-sdk-ruby/1.3.0
+      - mailgun-sdk-ruby/1.3.2
       Accept:
       - "*/*"
       Authorization:
@@ -194,46 +22,26 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Access-Control-Allow-Credentials:
-      - 'true'
-      Access-Control-Allow-Origin:
-      - "*"
-      Cache-Control:
-      - no-store
-      Content-Length:
-      - '145'
-      Content-Type:
-      - application/json; charset=utf-8
       Date:
-      - Sun, 26 Jan 2025 07:29:04 GMT
-      Strict-Transport-Security:
-      - max-age=63072000; includeSubDomains
-      X-Mailgun-Key-Id:
-      - 90b59dea-f2d12a53
-      X-Request-Limit:
-      - '2500'
-      X-Request-Remaining:
-      - '2499'
-      X-Request-Reset:
-      - '1737876559178'
-      X-Xss-Protection:
-      - 1; mode=block
+      - Mon, 24 Feb 2025 23:15:10 GMT
+      Content-Length:
+      - '0'
     body:
       encoding: UTF-8
-      string: '{"message":"Address has been added to the bounces table","address":"integration-test+email@DOMAIN.TEST"}
+      string: '{"message":"Address has been added to the bounces table","address":"integration-test+email@"}
 
         '
     http_version:
-  recorded_at: Sun, 26 Jan 2025 07:29:04 GMT
+  recorded_at: Mon, 24 Feb 2025 23:15:10 GMT
 - request:
     method: get
-    uri: https://api.mailgun.net/v3/DOMAIN.TEST/bounces/integration-test+email@DOMAIN.TEST
+    uri: https://api.mailgun.net/bounces/integration-test+email@
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - mailgun-sdk-ruby/1.3.0
+      - mailgun-sdk-ruby/1.3.2
       Accept:
       - "*/*"
       Authorization:
@@ -245,47 +53,27 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Access-Control-Allow-Credentials:
-      - 'true'
-      Access-Control-Allow-Origin:
-      - "*"
-      Cache-Control:
-      - no-store
-      Content-Length:
-      - '174'
-      Content-Type:
-      - application/json; charset=utf-8
       Date:
-      - Sun, 26 Jan 2025 07:29:04 GMT
-      Strict-Transport-Security:
-      - max-age=63072000; includeSubDomains
-      X-Mailgun-Key-Id:
-      - 90b59dea-f2d12a53
-      X-Request-Limit:
-      - '2500'
-      X-Request-Remaining:
-      - '2498'
-      X-Request-Reset:
-      - '1737876559178'
-      X-Xss-Protection:
-      - 1; mode=block
+      - Mon, 24 Feb 2025 23:15:11 GMT
+      Content-Length:
+      - '0'
     body:
       encoding: UTF-8
-      string: '{"address":"integration-test+email@DOMAIN.TEST","code":"550","error":"Integration
+      string: '{"address":"integration-test+email@","code":"550","error":"Integration
         Test","created_at":"Sun, 26 Jan 2025 07:29:04 UTC"}
 
         '
     http_version:
-  recorded_at: Sun, 26 Jan 2025 07:29:04 GMT
+  recorded_at: Mon, 24 Feb 2025 23:15:11 GMT
 - request:
     method: get
-    uri: https://api.mailgun.net/v3/DOMAIN.TEST/bounces
+    uri: https://api.mailgun.net/bounces
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - mailgun-sdk-ruby/1.3.0
+      - mailgun-sdk-ruby/1.3.2
       Accept:
       - "*/*"
       Authorization:
@@ -297,30 +85,10 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Access-Control-Allow-Credentials:
-      - 'true'
-      Access-Control-Allow-Origin:
-      - "*"
-      Cache-Control:
-      - no-store
-      Content-Length:
-      - '858'
-      Content-Type:
-      - application/json; charset=utf-8
       Date:
-      - Sun, 26 Jan 2025 07:29:05 GMT
-      Strict-Transport-Security:
-      - max-age=63072000; includeSubDomains
-      X-Mailgun-Key-Id:
-      - 90b59dea-f2d12a53
-      X-Request-Limit:
-      - '2500'
-      X-Request-Remaining:
-      - '2497'
-      X-Request-Reset:
-      - '1737876559178'
-      X-Xss-Protection:
-      - 1; mode=block
+      - Mon, 24 Feb 2025 23:15:11 GMT
+      Content-Length:
+      - '0'
     body:
       encoding: UTF-8
       string: '{"items":[{"address":"integration-test+email@DOMAIN.TEST","code":"550","error":"Integration
@@ -328,16 +96,16 @@ http_interactions:
 
         '
     http_version:
-  recorded_at: Sun, 26 Jan 2025 07:29:05 GMT
+  recorded_at: Mon, 24 Feb 2025 23:15:11 GMT
 - request:
     method: delete
-    uri: https://api.mailgun.net/v3/DOMAIN.TEST/bounces/integration-test+email@DOMAIN.TEST
+    uri: https://api.mailgun.net/bounces/integration-test+email@
     body:
       encoding: US-ASCII
       string: ''
     headers:
       User-Agent:
-      - mailgun-sdk-ruby/1.3.0
+      - mailgun-sdk-ruby/1.3.2
       Accept:
       - "*/*"
       Authorization:
@@ -349,30 +117,14 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Access-Control-Allow-Credentials:
-      - 'true'
-      Access-Control-Allow-Origin:
-      - "*"
-      Cache-Control:
-      - no-store
-      Content-Length:
-      - '134'
       Content-Type:
-      - application/json; charset=utf-8
+      - text/plain; charset=utf-8
+      X-Content-Type-Options:
+      - nosniff
       Date:
-      - Sun, 26 Jan 2025 07:29:06 GMT
-      Strict-Transport-Security:
-      - max-age=63072000; includeSubDomains
-      X-Mailgun-Key-Id:
-      - 90b59dea-f2d12a53
-      X-Request-Limit:
-      - '2500'
-      X-Request-Remaining:
-      - '2496'
-      X-Request-Reset:
-      - '1737876559178'
-      X-Xss-Protection:
-      - 1; mode=block
+      - Mon, 24 Feb 2025 23:15:12 GMT
+      Content-Length:
+      - '19'
     body:
       encoding: UTF-8
       string: '{"address":"integration-test+email@DOMAIN.TEST","message":"Bounced