mailgun-ruby 1.4.0 → 1.4.2

data/spec/integration/routes_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'mailgun'
 
-vcr_opts = { :cassette_name => "routes", :match_requests_on => [:uri, :method, :body] }
+vcr_opts = { cassette_name: 'routes', match_requests_on: %i[uri method body] }
 
 describe 'For the Routes endpoint', order: :defined, vcr: vcr_opts do
   before(:all) do
@@ -12,79 +14,78 @@ describe 'For the Routes endpoint', order: :defined, vcr: vcr_opts do
   end
 
   it 'creates a route' do
-    result = @mg_obj.post("routes",  { priority: 10,
-                                       description: 'Integration Test Route',
-                                       expression: "match_recipient(\"#{@forward_to}\")",
-                                       action: "forward(\"#{@recipient}\")" })
+    result = @mg_obj.post('routes', { priority: 10,
+                                      description: 'Integration Test Route',
+                                      expression: "match_recipient(\"#{@forward_to}\")",
+                                      action: "forward(\"#{@recipient}\")" })
 
     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"]).to include("forward(\"#{@recipient}\")")
-    expect(result.body["route"]["expression"]).to include("match_recipient(\"#{@forward_to}\")")
-    expect(result.body["route"]["priority"]).to eq(10)
+    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']).to include("forward(\"#{@recipient}\")")
+    expect(result.body['route']['expression']).to include("match_recipient(\"#{@forward_to}\")")
+    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 = @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)
+    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})
+    result = @mg_obj.get('routes', { limit: 50 })
 
     result.to_h!
-    expect(result.body["total_count"]).to be > 0
+    expect(result.body['total_count']).to be > 0
   end
 
   it 'gets the route.' do
-    result = @mg_obj.get("routes", {:limit => 1})
+    result = @mg_obj.get('routes', { limit: 1 })
     route_id = result.to_h['items'].first['id']
 
     result = @mg_obj.get("routes/#{route_id}")
 
     result.to_h!
-    expect(result.body["route"]["description"]).to eq("Integration Test Route")
-    expect(result.body["route"]["actions"]).to include("forward(\"#{@recipient}\")")
-    expect(result.body["route"]["expression"]).to include("match_recipient(\"#{@forward_to}\")")
-    expect(result.body["route"]["priority"]).to eq(10)
+    expect(result.body['route']['description']).to eq('Integration Test Route')
+    expect(result.body['route']['actions']).to include("forward(\"#{@recipient}\")")
+    expect(result.body['route']['expression']).to include("match_recipient(\"#{@forward_to}\")")
+    expect(result.body['route']['priority']).to eq(10)
   end
 
   it 'updates the route.' do
-    result = @mg_obj.get("routes", {:limit => 1})
+    result = @mg_obj.get('routes', { limit: 1 })
     route_id = result.to_h['items'].first['id']
 
-    result = @mg_obj.put("routes/#{route_id}",  {:priority => 10,
-                                                  :description => 'Integration Test Route Update',
-                                                  :expression => "match_recipient(\"#{@forward_to}\")",
-                                                  :action => "forward(\"#{@recipient}\")"})
+    result = @mg_obj.put("routes/#{route_id}", { priority: 10,
+                                                 description: 'Integration Test Route Update',
+                                                 expression: "match_recipient(\"#{@forward_to}\")",
+                                                 action: "forward(\"#{@recipient}\")" })
 
     result.to_h!
-    expect(result.body["message"]).to eq("Route has been updated")
-    expect(result.body["description"]).to eq("Integration Test Route Update")
-    expect(result.body["actions"]).to include("forward(\"#{@recipient}\")")
-    expect(result.body["expression"]).to include("match_recipient(\"#{@forward_to}\")")
-    expect(result.body["priority"]).to eq(10)
+    expect(result.body['message']).to eq('Route has been updated')
+    expect(result.body['description']).to eq('Integration Test Route Update')
+    expect(result.body['actions']).to include("forward(\"#{@recipient}\")")
+    expect(result.body['expression']).to include("match_recipient(\"#{@forward_to}\")")
+    expect(result.body['priority']).to eq(10)
   end
 
   it 'removes a route' do
-    result = @mg_obj.get("routes", {:limit => 1})
+    result = @mg_obj.get('routes', { limit: 1 })
     route_id = result.to_h['items'].first['id']
 
     @mg_obj.delete("routes/#{route_id}")
 
     result.to_h!
   end
-
 end

data/spec/integration/stats_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'mailgun'
 
-vcr_opts = { :cassette_name => "stats" }
+vcr_opts = { cassette_name: 'stats' }
 
 describe 'For the Stats endpoint', vcr: vcr_opts do
   before(:all) do
@@ -10,6 +12,6 @@ describe 'For the Stats endpoint', vcr: vcr_opts do
   end
 
   it 'get some stats.' do
-    @mg_obj.get("#{@domain}/stats", {:limit => 50, :skip => 10, :event => 'sent'})
+    @mg_obj.get("#{@domain}/stats", { limit: 50, skip: 10, event: 'sent' })
   end
 end

data/spec/integration/subaccounts_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'mailgun'
 
-vcr_opts = { :cassette_name => "subaccounts" }
+vcr_opts = { cassette_name: 'subaccounts' }
 
 describe 'For the subaccounts endpoints', vcr: vcr_opts do
   let(:name) { 'test.subaccount' }
@@ -16,7 +18,8 @@ describe 'For the subaccounts endpoints', vcr: vcr_opts do
     it 'returns a list of templates' do
       result = @mg_obj.list
 
-      expect(result).to eq({"subaccounts"=>[{"id"=>"xxx", "name"=>"test-ruby-lib", "status"=>"open"}], "total"=>1})
+      expect(result).to eq({ 'subaccounts' => [{ 'id' => 'xxx', 'name' => 'test-ruby-lib', 'status' => 'open' }],
+                             'total' => 1 })
     end
   end
 
@@ -24,26 +27,23 @@ describe 'For the subaccounts endpoints', vcr: vcr_opts do
     it 'creates the subaccount' do
       result = @mg_obj.create(name)
 
-      expect(result).to eq({"subaccount"=>{"id"=>"xxx", "name"=>"test.subaccount", "status"=>"open"}})
+      expect(result).to eq({ 'subaccount' => { 'id' => 'xxx', 'name' => 'test.subaccount', 'status' => 'open' } })
     end
   end
 
-
   describe '#info' do
     it 'gets the templates info' do
       result = @mg_obj.info(subaccount_id)
 
-      expect(result).to eq({"subaccount"=>{"id"=>"xxx", "name"=>"test-ruby-lib", "status"=>"open"}})
+      expect(result).to eq({ 'subaccount' => { 'id' => 'xxx', 'name' => 'test-ruby-lib', 'status' => 'open' } })
     end
   end
 
-
-
   describe '#enable' do
     it 'enables the subaccount' do
       result = @mg_obj.enable(subaccount_id)
 
-      expect(result).to eq({"subaccount"=>{"id"=>"xxx", "name"=>"test-ruby-lib", "status"=>"open"}})
+      expect(result).to eq({ 'subaccount' => { 'id' => 'xxx', 'name' => 'test-ruby-lib', 'status' => 'open' } })
     end
   end
 
@@ -51,8 +51,7 @@ describe 'For the subaccounts endpoints', vcr: vcr_opts do
     it 'disables the subaccount' do
       result = @mg_obj.disable(subaccount_id)
 
-      expect(result).to eq({"subaccount"=>{"id"=>"xxx", "name"=>"test-ruby-lib", "status"=>"disabled"}})
+      expect(result).to eq({ 'subaccount' => { 'id' => 'xxx', 'name' => 'test-ruby-lib', 'status' => 'disabled' } })
     end
   end
-
 end

data/spec/integration/suppressions_spec.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'mailgun'
 require 'mailgun/suppressions'
 
-vcr_opts = { :cassette_name => 'suppressions' }
+vcr_opts = { cassette_name: 'suppressions' }
 
 describe 'For the suppressions handling class', order: :defined, vcr: vcr_opts do
-
   before(:all) do
     @mg_obj = Mailgun::Client.new(APIKEY)
     @suppress = Mailgun::Suppressions.new(@mg_obj, TESTDOMAIN)
@@ -18,10 +19,10 @@ describe 'For the suppressions handling class', order: :defined, vcr: vcr_opts d
     bounces = []
     @addresses.each do |addr|
       bounces.push({
-        :address => addr,
-        :code => 500,
-        :error => 'integration testing',
-      })
+                     address: addr,
+                     code: 500,
+                     error: 'integration testing'
+                   })
     end
 
     response, nested = @suppress.create_bounces bounces
@@ -35,9 +36,9 @@ describe 'For the suppressions handling class', order: :defined, vcr: vcr_opts d
   it 'raises ParameterError if no bounce[:address] is present' do
     bounces = []
     bounces.push({
-      :code => 500,
-      :error => 'integration testing',
-    })
+                   code: 500,
+                   error: 'integration testing'
+                 })
 
     expect { @suppress.create_bounces bounces }.to raise_error(Mailgun::ParameterError)
   end
@@ -56,9 +57,9 @@ describe 'For the suppressions handling class', order: :defined, vcr: vcr_opts d
     unsubscribes = []
     @addresses.each do |addr|
       unsubscribes.push({
-        :address => addr,
-        :tag => 'integration',
-      })
+                          address: addr,
+                          tag: 'integration'
+                        })
     end
 
     response, nested = @suppress.create_unsubscribes unsubscribes
@@ -73,9 +74,9 @@ describe 'For the suppressions handling class', order: :defined, vcr: vcr_opts d
     unsubscribes = []
     @addresses.each do |addr|
       unsubscribes.push({
-        :address => addr,
-        :tags => ['integration'],
-      })
+                          address: addr,
+                          tags: ['integration']
+                        })
     end
 
     response, nested = @suppress.create_unsubscribes unsubscribes
@@ -89,8 +90,8 @@ describe 'For the suppressions handling class', order: :defined, vcr: vcr_opts d
   it 'raises ParameterError if no unsubscribe[:address] is present' do
     unsubscribes = []
     unsubscribes.push({
-      :tag => 'integration',
-    })
+                        tag: 'integration'
+                      })
 
     expect { @suppress.create_unsubscribes unsubscribes }.to raise_error(Mailgun::ParameterError)
   end
@@ -108,7 +109,7 @@ describe 'For the suppressions handling class', order: :defined, vcr: vcr_opts d
   it 'can batch-add complaints' do
     complaints = []
     @addresses.each do |addr|
-      complaints.push :address => addr
+      complaints.push address: addr
     end
 
     response, nested = @suppress.create_complaints complaints
@@ -122,8 +123,8 @@ describe 'For the suppressions handling class', order: :defined, vcr: vcr_opts d
   it 'raises ParameterError if no complaint[:address] is present' do
     complaints = []
     complaints.push({
-      :tag => 'integration',
-    })
+                      tag: 'integration'
+                    })
 
     expect { @suppress.create_complaints complaints }.to raise_error(Mailgun::ParameterError)
   end

data/spec/integration/templates_spec.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'mailgun'
 
-vcr_opts = { :cassette_name => "templates" }
+vcr_opts = { cassette_name: 'templates' }
 
 describe 'For the templates endpoints', vcr: vcr_opts do
   let(:template_name) { 'test.template' }
-  let(:domain) { "integration-test.domain.invalid" }
+  let(:domain) { 'integration-test.domain.invalid' }
   let(:tag) { 'v2' }
 
   before(:all) do
@@ -21,14 +23,14 @@ describe 'For the templates endpoints', vcr: vcr_opts do
           name: template_name,
           description: 'Test',
           template: '{{fname}} {{lname}}',
-            comment: 'test comment',
-            headers: '{"Subject": "{{subject}}"}',
-            tag: 'V1'
+          comment: 'test comment',
+          headers: '{"Subject": "{{subject}}"}',
+          tag: 'V1'
         }
       )
 
-      expect(result['template']["name"]).to eq('test.template')
-      expect(result['template']["description"]).to eq("Test")
+      expect(result['template']['name']).to eq('test.template')
+      expect(result['template']['description']).to eq('Test')
     end
   end
 
@@ -36,8 +38,8 @@ describe 'For the templates endpoints', vcr: vcr_opts do
     it 'gets the templates info' do
       result = @mg_obj.info(domain, 'test.template')
 
-      expect(result).to include("template")
-      expect(result["template"]["name"]).to eq(template_name)
+      expect(result).to include('template')
+      expect(result['template']['name']).to eq(template_name)
     end
   end
 
@@ -88,7 +90,7 @@ describe 'For the templates endpoints', vcr: vcr_opts do
         }
       )
 
-      expect(result['template']["version"]['tag']).to eq(tag)
+      expect(result['template']['version']['tag']).to eq(tag)
     end
   end
 
@@ -96,7 +98,7 @@ describe 'For the templates endpoints', vcr: vcr_opts do
     it "gets the template's version info" do
       result = @mg_obj.info_version(domain, template_name, tag)
 
-      expect(result["template"]["version"]['tag']).to eq(tag)
+      expect(result['template']['version']['tag']).to eq(tag)
     end
   end
 
@@ -121,7 +123,7 @@ describe 'For the templates endpoints', vcr: vcr_opts do
     it "returns template's versions" do
       result = @mg_obj.template_versions_list(domain, template_name)
 
-      expect(result["template"]["versions"].first).to include('tag')
+      expect(result['template']['versions'].first).to include('tag')
     end
   end
 

data/spec/integration/unsubscribes_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'mailgun'
 
-vcr_opts = { :cassette_name => "unsubscribes" }
+vcr_opts = { cassette_name: 'unsubscribes' }
 
 describe 'For the Unsubscribes endpoint', order: :defined, vcr: vcr_opts do
   before(:all) do
@@ -14,22 +16,22 @@ describe 'For the Unsubscribes endpoint', order: :defined, vcr: vcr_opts do
     result = @mg_obj.post "#{@domain}/unsubscribes", address: @email, tag: '*'
 
     result.to_h!
-    expect(result.body["message"]).to eq("Address has been added to the unsubscribes table")
-    expect(result.body["address"]).to eq(@email)
+    expect(result.body['message']).to eq('Address has been added to the unsubscribes table')
+    expect(result.body['address']).to eq(@email)
   end
 
   it 'get an unsubscribee.' do
     result = @mg_obj.get "#{@domain}/unsubscribes/#{@email}"
 
     result.to_h!
-    expect(result.body["address"]).to eq(@email)
+    expect(result.body['address']).to eq(@email)
   end
 
   it 'gets a list of unsubscribes.' do
     result = @mg_obj.get "#{@domain}/unsubscribes"
 
     result.to_h!
-    expect(result.body["items"].length).to be > 0
+    expect(result.body['items'].length).to be > 0
   end
 
   it 'removes an unsubscribee' do
@@ -37,6 +39,6 @@ describe 'For the Unsubscribes endpoint', order: :defined, vcr: vcr_opts do
 
     result.to_h!
     expect(result.body['address']).to eq(@email)
-    expect(result.body["message"]).to eq("Unsubscribe event has been removed")
+    expect(result.body['message']).to eq('Unsubscribe event has been removed')
   end
 end

data/spec/integration/webhook_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'mailgun'
 
-vcr_opts = { :cassette_name => "webhooks" }
+vcr_opts = { cassette_name: 'webhooks' }
 
 describe 'For the webhooks endpoint', order: :defined, vcr: vcr_opts do
   before(:all) do
@@ -13,42 +15,41 @@ describe 'For the webhooks endpoint', order: :defined, vcr: vcr_opts do
 
   it 'creates a webhook' do
     result = @mg_obj.post("domains/#{@domain}/webhooks", { id: @testhook,
-                                                           url: "http://example.com/mailgun/events/#{@testhook}" } )
+                                                           url: "http://example.com/mailgun/events/#{@testhook}" })
 
     result.to_h!
-    expect(result.body["message"]).to eq("Webhook has been created")
-    expect(result.body["webhook"]["urls"]).to include("http://example.com/mailgun/events/#{@testhook}")
+    expect(result.body['message']).to eq('Webhook has been created')
+    expect(result.body['webhook']['urls']).to include("http://example.com/mailgun/events/#{@testhook}")
   end
 
   it 'gets a webhook.' do
     result = @mg_obj.get("domains/#{@domain}/webhooks/#{@testhook}")
 
     result.to_h!
-    expect(result.body["webhook"]["urls"]).to include("http://example.com/mailgun/events/#{@testhook}")
+    expect(result.body['webhook']['urls']).to include("http://example.com/mailgun/events/#{@testhook}")
   end
 
   it 'gets a list of all webhooks.' do
     result = @mg_obj.get("domains/#{@domain}/webhooks")
 
     result.to_h!
-    expect(result.body["webhooks"]["accepted"]["urls"]).to include("http://example.com/mailgun/events/#{@testhook}")
+    expect(result.body['webhooks']['accepted']['urls']).to include("http://example.com/mailgun/events/#{@testhook}")
   end
 
   it 'updates a webhook.' do
-    result = @mg_obj.put("domains/#{@domain}/webhooks/#{@testhook}", {:id => @testhook,
-                                                                :url => "http://example.com/mailgun/events/#{@testhookup}"})
+    result = @mg_obj.put("domains/#{@domain}/webhooks/#{@testhook}", { id: @testhook,
+                                                                       url: "http://example.com/mailgun/events/#{@testhookup}" })
 
     result.to_h!
-    expect(result.body["message"]).to eq("Webhook has been updated")
-    expect(result.body["webhook"]["urls"]).to include("http://example.com/mailgun/events/#{@testhookup}")
+    expect(result.body['message']).to eq('Webhook has been updated')
+    expect(result.body['webhook']['urls']).to include("http://example.com/mailgun/events/#{@testhookup}")
   end
 
   it 'removes a webhook' do
     result = @mg_obj.delete("domains/#{@domain}/webhooks/#{@testhook}")
 
     result.to_h!
-    expect(result.body['message']).to eq("Webhook has been deleted")
+    expect(result.body['message']).to eq('Webhook has been deleted')
     expect(result.body['webhook']['urls']).to include("http://example.com/mailgun/events/#{@testhookup}")
   end
-
 end

data/spec/spec_helper.rb

@@ -1,11 +1,9 @@
-require 'rubygems'
-require 'bundler'
-require 'bundler/setup'
-Bundler.setup(:development)
+# frozen_string_literal: true
 
 require 'simplecov'
+
 SimpleCov.start do
-  add_filter "/spec/"
+  add_filter '/spec/'
 end
 
 require 'mailgun'
@@ -14,22 +12,20 @@ require 'vcr'
 require 'webmock/rspec'
 require 'rspec/its'
 
-#WebMock.disable_net_connect!(allow_localhost: true)
+# WebMock.disable_net_connect!(allow_localhost: true)
 require_relative 'unit/connection/test_client'
 
-RSpec.configure do |c|
-  c.raise_errors_for_deprecations!
-end
+RSpec.configure(&:raise_errors_for_deprecations!)
 
-APIHOST = "api.mailgun.net"
-APIVERSION = "v3"
+APIHOST = 'api.mailgun.net'
+APIVERSION = 'v3'
 SSL = true
 
 # For integration tests modify .ruby-env.yml
 # use .ruby-env.yml.example for an example
 # alternatively
 # set environment variables as named in .ruby-env.yml.example
-envfile = File.join(File.dirname(__FILE__), '..','.ruby-env.yml')
+envfile = File.join(File.dirname(__FILE__), '..', '.ruby-env.yml')
 envs = File.exist?(envfile) ? YAML.load_file(envfile) : ENV
 APIKEY = envs['MAILGUN_APIKEY']
 PUB_APIKEY = envs['MAILGUN_PUB_APIKEY']