mailgunner 2.1.0 → 2.2.0

data/LICENSE.txt

@@ -0,0 +1,9 @@
+Copyright (c) TIMCRAFT <http://timcraft.com>
+
+This is an Open Source project licensed under the terms of the LGPLv3 license.
+Please see <http://www.gnu.org/licenses/lgpl-3.0.html> for license text.
+
+This code is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.

data/lib/mailgunner.rb

@@ -32,15 +32,23 @@ module Mailgunner
     end
 
     def validate_address(value)
-      get('/v2/address/validate', address: value)
+      get('/v3/address/validate', address: value)
     end
 
     def parse_addresses(values)
-      get('/v2/address/parse', addresses: Array(values).join(','))
+      get('/v3/address/parse', addresses: Array(values).join(','))
+    end
+
+    def get_message(key)
+      get("/v3/domains/#{escape @domain}/messages/#{escape key}")
+    end
+
+    def get_mime_message(key)
+      get("/v3/domains/#{escape @domain}/messages/#{escape key}", {}, {'Accept' => 'message/rfc2822'})
     end
 
     def send_message(attributes = {})
-      post("/v2/#{escape @domain}/messages", attributes)
+      post("/v3/#{escape @domain}/messages", attributes)
     end
 
     def send_mime(mail)
@@ -48,209 +56,217 @@ module Mailgunner
 
       message = ['message', mail.encoded, {filename: 'message.mime'}]
 
-      multipart_post("/v2/#{escape @domain}/messages.mime", [to, message])
+      multipart_post("/v3/#{escape @domain}/messages.mime", [to, message])
+    end
+
+    def delete_message(key)
+      delete("/v3/domains/#{escape @domain}/messages/#{escape key}")
     end
 
     def get_domains(params = {})
-      get('/v2/domains', params)
+      get('/v3/domains', params)
     end
 
     def get_domain(name)
-      get("/v2/domains/#{escape name}")
+      get("/v3/domains/#{escape name}")
     end
 
     def add_domain(attributes = {})
-      post('/v2/domains', attributes)
+      post('/v3/domains', attributes)
     end
 
     def delete_domain(name)
-      delete("/v2/domains/#{escape name}")
+      delete("/v3/domains/#{escape name}")
     end
 
     def get_credentials
-      get("/v2/domains/#{escape @domain}/credentials")
+      get("/v3/domains/#{escape @domain}/credentials")
     end
 
     def add_credentials(attributes)
-      post("/v2/domains/#{escape @domain}/credentials", attributes)
+      post("/v3/domains/#{escape @domain}/credentials", attributes)
     end
 
     def update_credentials(login, attributes)
-      put("/v2/domains/#{escape @domain}/credentials/#{escape login}", attributes)
+      put("/v3/domains/#{escape @domain}/credentials/#{escape login}", attributes)
     end
 
     def delete_credentials(login)
-      delete("/v2/domains/#{escape @domain}/credentials/#{escape login}")
+      delete("/v3/domains/#{escape @domain}/credentials/#{escape login}")
     end
 
     def get_unsubscribes(params = {})
-      get("/v2/#{escape @domain}/unsubscribes", params)
+      get("/v3/#{escape @domain}/unsubscribes", params)
     end
 
     def get_unsubscribe(address)
-      get("/v2/#{escape @domain}/unsubscribes/#{escape address}")
+      get("/v3/#{escape @domain}/unsubscribes/#{escape address}")
     end
 
     def delete_unsubscribe(address_or_id)
-      delete("/v2/#{escape @domain}/unsubscribes/#{escape address_or_id}")
+      delete("/v3/#{escape @domain}/unsubscribes/#{escape address_or_id}")
     end
 
     def add_unsubscribe(attributes = {})
-      post("/v2/#{escape @domain}/unsubscribes", attributes)
+      post("/v3/#{escape @domain}/unsubscribes", attributes)
     end
 
     def get_complaints(params = {})
-      get("/v2/#{escape @domain}/complaints", params)
+      get("/v3/#{escape @domain}/complaints", params)
     end
 
     def get_complaint(address)
-      get("/v2/#{escape @domain}/complaints/#{escape address}")
+      get("/v3/#{escape @domain}/complaints/#{escape address}")
     end
 
     def add_complaint(attributes = {})
-      post("/v2/#{escape @domain}/complaints", attributes)
+      post("/v3/#{escape @domain}/complaints", attributes)
     end
 
     def delete_complaint(address)
-      delete("/v2/#{escape @domain}/complaints/#{escape address}")
+      delete("/v3/#{escape @domain}/complaints/#{escape address}")
     end
 
     def get_bounces(params = {})
-      get("/v2/#{escape @domain}/bounces", params)
+      get("/v3/#{escape @domain}/bounces", params)
     end
 
     def get_bounce(address)
-      get("/v2/#{escape @domain}/bounces/#{escape address}")
+      get("/v3/#{escape @domain}/bounces/#{escape address}")
     end
 
     def add_bounce(attributes = {})
-      post("/v2/#{escape @domain}/bounces", attributes)
+      post("/v3/#{escape @domain}/bounces", attributes)
     end
 
     def delete_bounce(address)
-      delete("/v2/#{escape @domain}/bounces/#{escape address}")
+      delete("/v3/#{escape @domain}/bounces/#{escape address}")
     end
 
     def get_stats(params = {})
-      get("/v2/#{escape @domain}/stats", params)
+      get("/v3/#{escape @domain}/stats", params)
     end
 
     def get_events(params = {})
-      get("/v2/#{escape @domain}/events", params)
+      get("/v3/#{escape @domain}/events", params)
     end
 
     def get_routes(params = {})
-      get('/v2/routes', params)
+      get('/v3/routes', params)
     end
 
     def get_route(id)
-      get("/v2/routes/#{escape id}")
+      get("/v3/routes/#{escape id}")
     end
 
     def add_route(attributes = {})
-      post('/v2/routes', attributes)
+      post('/v3/routes', attributes)
     end
 
     def update_route(id, attributes = {})
-      put("/v2/routes/#{escape id}", attributes)
+      put("/v3/routes/#{escape id}", attributes)
     end
 
     def delete_route(id)
-      delete("/v2/routes/#{escape id}")
+      delete("/v3/routes/#{escape id}")
     end
 
     def get_campaigns(params = {})
-      get("/v2/#{escape @domain}/campaigns", params)
+      get("/v3/#{escape @domain}/campaigns", params)
     end
 
     def get_campaign(id)
-      get("/v2/#{escape @domain}/campaigns/#{escape id}")
+      get("/v3/#{escape @domain}/campaigns/#{escape id}")
     end
 
     def add_campaign(attributes = {})
-      post("/v2/#{escape @domain}/campaigns", attributes)
+      post("/v3/#{escape @domain}/campaigns", attributes)
     end
 
     def update_campaign(id, attributes = {})
-      put("/v2/#{escape @domain}/campaigns/#{escape id}", attributes)
+      put("/v3/#{escape @domain}/campaigns/#{escape id}", attributes)
     end
 
     def delete_campaign(id)
-      delete("/v2/#{escape @domain}/campaigns/#{escape id}")
+      delete("/v3/#{escape @domain}/campaigns/#{escape id}")
     end
 
     def get_campaign_events(campaign_id, params = {})
-      get("/v2/#{escape @domain}/campaigns/#{escape campaign_id}/events", params)
+      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/events", params)
     end
 
     def get_campaign_stats(campaign_id, params = {})
-      get("/v2/#{escape @domain}/campaigns/#{escape campaign_id}/stats", params)
+      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/stats", params)
     end
 
     def get_campaign_clicks(campaign_id, params = {})
-      get("/v2/#{escape @domain}/campaigns/#{escape campaign_id}/clicks", params)
+      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/clicks", params)
     end
 
     def get_campaign_opens(campaign_id, params = {})
-      get("/v2/#{escape @domain}/campaigns/#{escape campaign_id}/opens", params)
+      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/opens", params)
     end
 
     def get_campaign_unsubscribes(campaign_id, params = {})
-      get("/v2/#{escape @domain}/campaigns/#{escape campaign_id}/unsubscribes", params)
+      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/unsubscribes", params)
     end
 
     def get_campaign_complaints(campaign_id, params = {})
-      get("/v2/#{escape @domain}/campaigns/#{escape campaign_id}/complaints", params)
+      get("/v3/#{escape @domain}/campaigns/#{escape campaign_id}/complaints", params)
     end
 
     def get_lists(params = {})
-      get('/v2/lists', params)
+      get('/v3/lists', params)
     end
 
     def get_list(address)
-      get("/v2/lists/#{escape address}")
+      get("/v3/lists/#{escape address}")
     end
 
     def add_list(attributes = {})
-      post('/v2/lists', attributes)
+      post('/v3/lists', attributes)
     end
 
     def update_list(address, attributes = {})
-      put("/v2/lists/#{escape address}", attributes)
+      put("/v3/lists/#{escape address}", attributes)
     end
 
     def delete_list(address)
-      delete("/v2/lists/#{escape address}")
+      delete("/v3/lists/#{escape address}")
     end
 
     def get_list_members(list_address, params = {})
-      get("/v2/lists/#{escape list_address}/members", params)
+      get("/v3/lists/#{escape list_address}/members", params)
     end
 
     def get_list_member(list_address, member_address)
-      get("/v2/lists/#{escape list_address}/members/#{escape member_address}")
+      get("/v3/lists/#{escape list_address}/members/#{escape member_address}")
     end
 
     def add_list_member(list_address, member_attributes)
-      post("/v2/lists/#{escape list_address}/members", member_attributes)
+      post("/v3/lists/#{escape list_address}/members", member_attributes)
     end
 
     def update_list_member(list_address, member_address, member_attributes)
-      put("/v2/lists/#{escape list_address}/members/#{escape member_address}", member_attributes)
+      put("/v3/lists/#{escape list_address}/members/#{escape member_address}", member_attributes)
     end
 
     def delete_list_member(list_address, member_address)
-      delete("/v2/lists/#{escape list_address}/members/#{escape member_address}")
+      delete("/v3/lists/#{escape list_address}/members/#{escape member_address}")
     end
 
     def get_list_stats(list_address)
-      get("/v2/lists/#{escape list_address}/stats")
+      get("/v3/lists/#{escape list_address}/stats")
     end
 
     private
 
-    def get(path, params = {})
-      transmit(Net::HTTP::Get.new(request_uri(path, params)))
+    def get(path, params = {}, headers = {})
+      request = Net::HTTP::Get.new(request_uri(path, params))
+
+      headers.each { |k, v| request[k] = v }
+
+      transmit(request)
     end
 
     def post(path, attributes = {})

data/mailgunner.gemspec

@@ -1,13 +1,14 @@
 Gem::Specification.new do |s|
   s.name = 'mailgunner'
-  s.version = '2.1.0'
+  s.version = '2.2.0'
+  s.license = 'LGPL-3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']
   s.homepage = 'http://github.com/timcraft/mailgunner'
   s.description = 'A Ruby wrapper for the Mailgun API'
   s.summary = 'See description'
-  s.files = Dir.glob('{lib,spec}/**/*') + %w(README.md mailgunner.gemspec)
+  s.files = Dir.glob('{lib,spec}/**/*') + %w(LICENSE.txt README.md mailgunner.gemspec)
   s.required_ruby_version = '>= 1.9.3'
   s.add_development_dependency('rake', '~> 10.1')
   s.add_development_dependency('webmock', '~> 1.18')

data/spec/mailgunner_delivery_method_spec.rb

@@ -18,7 +18,7 @@ describe 'Mailgunner::DeliveryMethod' do
 
     @domain = 'samples.mailgun.org'
 
-    @base_url = "https://api:#@api_key@api.mailgun.net/v2"
+    @base_url = "https://api:#@api_key@api.mailgun.net/v3"
 
     @address = 'user@example.com'
 
@@ -30,7 +30,7 @@ describe 'Mailgunner::DeliveryMethod' do
   it 'delivers the mail to mailgun in mime format' do
     stub_request(:post, "#@base_url/#@domain/messages.mime")
 
-    ExampleMailer.registration_confirmation(email: @address).deliver
+    ExampleMailer.registration_confirmation(email: @address).deliver_now
   end
 
   it 'raises an exception if the api returns an error' do
@@ -40,7 +40,7 @@ describe 'Mailgunner::DeliveryMethod' do
       body: '{"message": "Invalid API key"}'
     })
 
-    exception = proc { ExampleMailer.registration_confirmation(email: @address).deliver }.must_raise(Mailgunner::Error)
+    exception = proc { ExampleMailer.registration_confirmation(email: @address).deliver_now }.must_raise(Mailgunner::Error)
 
     exception.message.must_include('Invalid API key')
   end

data/spec/mailgunner_spec.rb

@@ -10,7 +10,7 @@ describe 'Mailgunner::Client' do
 
     @api_key = 'xxx'
 
-    @base_url = "https://api:#{@api_key}@api.mailgun.net/v2"
+    @base_url = "https://api:#{@api_key}@api.mailgun.net/v3"
 
     @json_response = {headers: {'Content-Type' => 'application/json;charset=utf-8'}, body: '{"key":"value"}'}
 
@@ -77,6 +77,27 @@ describe 'Mailgunner::Client' do
     end
   end
 
+  describe 'get_message method' do
+    it 'fetches the domain message resource with the given key and returns the response object' do
+      key = 'WyIzMmkey'
+
+      stub_request(:get, "#@base_url/domains/#@domain/messages/#{key}").to_return(@json_response)
+
+      @client.get_message(key).must_equal(@json_response_object)
+    end
+  end
+
+  describe 'get_mime_message method' do
+    it 'fetches the domain message resource with the given key and returns the response object' do
+      key = 'WyIzMmkey'
+
+      stub_request(:get, "#@base_url/domains/#@domain/messages/#{key}").
+        with(headers: {'Accept' => 'message/rfc2822'}).to_return(@json_response)
+
+      @client.get_mime_message(key).must_equal(@json_response_object)
+    end
+  end
+
   describe 'send_message method' do
     it 'posts to the domain messages resource and returns the response object' do
       stub_request(:post, "#@base_url/#@domain/messages").to_return(@json_response)
@@ -119,6 +140,16 @@ describe 'Mailgunner::Client' do
     end
   end
 
+  describe 'delete_message method' do
+    it 'deletes the domain message resource with the given key and returns the response object' do
+      key = 'WyIzMmkey'
+
+      stub_request(:delete, "#@base_url/domains/#@domain/messages/#{key}").to_return(@json_response)
+
+      @client.delete_message(key)
+    end
+  end
+
   describe 'get_domains method' do
     it 'fetches the domains resource and returns the response object' do
       stub_request(:get, "#@base_url/domains").to_return(@json_response)

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: mailgunner
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Tim Craft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 description: A Ruby wrapper for the Mailgun API
@@ -73,33 +82,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
-- lib/mailgunner.rb
 - lib/mailgunner/delivery_method.rb
-- mailgunner.gemspec
+- lib/mailgunner.rb
 - spec/mailgunner_delivery_method_spec.rb
 - spec/mailgunner_spec.rb
+- LICENSE.txt
+- README.md
+- mailgunner.gemspec
 homepage: http://github.com/timcraft/mailgunner
-licenses: []
-metadata: {}
+licenses:
+- LGPL-3.0
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: See description
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c1e24be43e9330f9378bbd977baabea868042090
-  data.tar.gz: 812d150cb717e63be9e99b66c2c695981d711a7f
-SHA512:
-  metadata.gz: 00d1306a5501800bfdc87ec29c9244dd232cd126c87ce7c35a5773100336be0afc4d3cf2c166bfc2b31189e59c71d280328be005b24c83ebda8c2163db2d4ee0
-  data.tar.gz: 06664445a8ece38b1dee4bc92850867ac1a098f2aa212ce6be0341ba962dec6838e9d04783157325f7a7838d04cefbe02a7d31def684c3da6a2e52e69c43630a