mailgun 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0473a66b46e7ce54574d5f4f4c89867a563f2982
-  data.tar.gz: 9ad4fff672c513bc611fd99f724570177fa19582
+  metadata.gz: f299f5774c3b4633c5585f6fd12c81c47c06de1c
+  data.tar.gz: fefddce633b68496cd6248cd93e70e1e6684ce38
 SHA512:
-  metadata.gz: 1cddcab564ee3f9a8e1759a1ec253fef84ccb88a65debd3ab7c1e139a39c4d2c577dd90937e600cfbb90ffe8bd78cfea0378d472999749f0ecdeefab23a9ee36
-  data.tar.gz: e768a1407bdf85514d1ba2940b2fdb3d34f35de5d76159ad0274437441897d0e2c0e92df4f24d255948a2b4bf4718603cf6b9f15ae3ebc006b2c3fe64c79279e
+  metadata.gz: 6171bc203666c967ab67d3f9bed2ff5c2177810bf13895e2c67d5ef8158c09dd1ede7cd396f22c62a86a05f14efda28180af0600dd344aec366555da9a9fb5c5
+  data.tar.gz: 6b5c901517191cdf63704b22859b0c4bb03d516cc48efbe8eefe2a085278b84d8dec4eee9a9bfc98514911daece3d2e8127ae4be0777a3136d484f2583211918

data/README.md

@@ -15,6 +15,7 @@ Mailgun exposes the following resources:
   * Bounces
   * Unsubscribes
   * Complaints
+  * Domain management
 
 Patches are welcome (and easy!). 
 
@@ -150,6 +151,21 @@ Supported route filters are: `:match_header`, `:match_recipient`, and `:catch_al
 Supported route actions are: `:forward`, and `:stop`
 
 
+#### Domains
+```ruby
+# Add a domain
+@mailgun.domains.create "example.com"
+
+# List all domains that belong to the account
+@mailgun.domains.list
+
+# Get info for a domain
+@mailgun.domains.find "example.com"
+
+# Remove a domain
+@mailbox.domains.delete "example.com"
+```
+
 ## Making Your Changes
 
   * Fork the project (Github has really good step-by-step directions)
@@ -186,6 +202,8 @@ Supported route actions are: `:forward`, and `:stop`
 * Yomi Colledge ([@baphled](http://github.com/baphled))
 * Scott Carleton ([@scotterc](http://github.com/scotterc)) - new functionality and improvements
 * Alan deLevie ([@adelevie](http://github.com/adelevie)) - Sending email
+* kdayton (<http://github.com/kdayton->) - Support for domains API
+* gabriel (<http://github.com/gabriel>) - Fix to accept domain in options
 
 ## License
 

data/lib/mailgun.rb

@@ -4,6 +4,7 @@ require "multimap"
 
 require "mailgun/mailgun_error"
 require "mailgun/base"
+require "mailgun/domain"
 require "mailgun/route"
 require "mailgun/mailbox"
 require "mailgun/bounce"

data/lib/mailgun/base.rb

@@ -6,12 +6,14 @@ module Mailgun
     # * Procotol - http or https [default to https]
     # * API key and version
     # * Test mode - if enabled, doesn't actually send emails (see http://documentation.mailgun.net/user_manual.html#sending-in-test-mode)
+    # * Domain - domain to use
     def initialize(options)
       Mailgun.mailgun_host    = options.fetch(:mailgun_host)    {"api.mailgun.net"}
       Mailgun.protocol        = options.fetch(:protocol)        { "https"  }
       Mailgun.api_version     = options.fetch(:api_version)     { "v2"  }
       Mailgun.test_mode       = options.fetch(:test_mode)       { false }
       Mailgun.api_key         = options.fetch(:api_key)         { raise ArgumentError.new(":api_key is a required argument to initialize Mailgun") if Mailgun.api_key.nil?}
+      Mailgun.domain          = options.fetch(:domain)
     end
 
     # Returns the base url used in all Mailgun API calls
@@ -36,6 +38,10 @@ module Mailgun
       Mailgun::Bounce.new(self, domain)
     end
     
+    def domains
+      Mailgun::Domain.new(self)
+    end
+
     def unsubscribes(domain = Mailgun.domain)
       Mailgun::Unsubscribe.new(self, domain)
     end

data/lib/mailgun/domain.rb

@@ -0,0 +1,40 @@
+module Mailgun
+
+  # Interface to manage domains
+  class Domain
+
+    # Used internally, called from Mailgun::Base
+    def initialize(mailgun)
+      @mailgun = mailgun
+    end
+    
+    # List all domains on the account
+    def list(options={})
+      Mailgun.submit(:get, domain_url, options)["items"] || []
+    end
+
+    # Find domain by name
+    def find(domain)
+      Mailgun.submit :get, domain_url(domain)
+    end
+
+    # Add domain to account
+    def create(domain, opts = {})
+      opts = {name: domain}.merge(opts)
+      Mailgun.submit :post, domain_url, opts
+    end
+
+    # Remves a domain from account
+    def delete(domain)
+      Mailgun.submit :delete, domain_url(domain)
+    end
+
+    private
+
+    # Helper method to generate the proper url for Mailgun domain API calls
+    def domain_url(domain = nil)
+      "#{@mailgun.base_url}/domains#{'/' + domain if domain}"
+    end
+    
+  end
+end

data/mailgun.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "mailgun"
   gem.require_paths = ["lib"]
-  gem.version       = "0.6"
+  gem.version       = "0.7"
   
   gem.add_dependency(%q<rest-client>, [">= 0"])
   gem.add_dependency(%q<multimap>, [">= 0"])

data/spec/domain_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Mailgun::Domain do
+
+  before :each do
+    @mailgun = Mailgun({:api_key => "api-key"})   # used to get the default values
+
+    @sample = {
+      :email  => "test@sample.mailgun.org",
+      :name   => "test",
+      :domain => "sample.mailgun.org"
+    }
+  end
+
+  describe "list domains" do
+    it "should make a GET request with the right params" do
+
+      sample_response = "{\"total_count\": 1, \"items\": [{\"created_at\": \"Tue, 12 Feb 2013 20:13:49 GMT\", \"smtp_login\": \"postmaster@sample.mailgun.org\", \"name\": \"sample.mailgun.org\", \"smtp_password\": \"67bw67bz7w\" }]}"
+      domains_url = @mailgun.domains.send(:domain_url)
+
+      Mailgun.should_receive(:submit).
+        with(:get, domains_url, {}).
+        and_return(sample_response)
+    
+      @mailgun.domains.list
+    end
+  end
+
+  describe "find domains" do
+    it "should make a GET request with correct params to find given domain" do
+      sample_response = "{\"domain\": {\"created_at\": \"Tue, 12 Feb 2013 20:13:49 GMT\", \"smtp_login\": \"postmaster@bample.mailgun.org\", \"name\": \"sample.mailgun.org\", \"smtp_password\": \"67bw67bz7w\" }, \"receiving_dns_records\": [], \"sending_dns_records\": []}"
+      domains_url = @mailgun.domains.send(:domain_url, @sample[:domain])
+
+      Mailgun.should_receive(:submit).
+        with(:get, domains_url).
+        and_return(sample_response)
+
+      @mailgun.domains.find(@sample[:domain])
+    end
+  end
+
+  describe "add domains" do
+    it "should make a POST request with correct params to add a domain" do
+      sample_response = "{\"domain\": {\"created_at\": \"Tue, 12 Feb 2013 20:13:49 GMT\", \"smtp_login\": \"postmaster@sample.mailgun.org\",\"name\": \"sample.mailgun.org\",\"smtp_password\": \"67bw67bz7w\"}, \"message\": \"Domain has been created\"}"
+      domains_url = @mailgun.domains.send(:domain_url)
+
+      Mailgun.should_receive(:submit).
+        with(:post, domains_url, {:name => @sample[:domain]} ).
+        and_return(sample_response)
+
+      @mailgun.domains.create(@sample[:domain])
+    end
+  end
+
+  describe "delete domain" do
+    it "should make a DELETE request with correct params" do
+      sample_response = "{\"message\": \"Domain has been deleted\"}"
+      domains_url = @mailgun.domains.send(:domain_url, @sample[:domain])
+
+      Mailgun.should_receive(:submit).
+        with(:delete, domains_url).
+        and_return(sample_response)
+
+      @mailgun.domains.delete(@sample[:domain])
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailgun
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Akash Manohar J
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -83,6 +83,7 @@ files:
 - lib/mailgun/base.rb
 - lib/mailgun/bounce.rb
 - lib/mailgun/complaint.rb
+- lib/mailgun/domain.rb
 - lib/mailgun/list.rb
 - lib/mailgun/list/member.rb
 - lib/mailgun/log.rb
@@ -95,6 +96,7 @@ files:
 - spec/base_spec.rb
 - spec/bounce_spec.rb
 - spec/complaint_spec.rb
+- spec/domain_spec.rb
 - spec/list/member_spec.rb
 - spec/list/message_spec.rb
 - spec/list_spec.rb
@@ -130,6 +132,7 @@ test_files:
 - spec/base_spec.rb
 - spec/bounce_spec.rb
 - spec/complaint_spec.rb
+- spec/domain_spec.rb
 - spec/list/member_spec.rb
 - spec/list/message_spec.rb
 - spec/list_spec.rb