mailgun 0.5 → 0.6

data/spec/list/member_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Mailgun::List::Member do
+describe Mailgun::MailingList::Member do
 
   before :each do
     @mailgun = Mailgun({:api_key => "api-key"})		# used to get the default values
 
-    @list_member_options = {
+    @sample = {
       :email      => "test@sample.mailgun.org",
       :list_email => "test_list@sample.mailgun.org",
       :name       => "test",
@@ -16,55 +16,66 @@ describe Mailgun::List::Member do
   describe "list members" do
     it "should make a GET request with the right params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:get).with("#{@mailgun.list_members.send(:list_member_url, @list_member_options[:list_email])}", {}).and_return(sample_response)
+      mailing_list_members_url = @mailgun.list_members(@sample[:list_email]).send(:list_member_url)
+
+      Mailgun.should_receive(:submit).
+        with(:get, mailing_list_members_url, {}).
+        and_return(sample_response)
     
-      @mailgun.list_members.list @list_member_options[:list_email]
+      @mailgun.list_members(@sample[:list_email]).list
     end
   end
 
   describe "find member in list" do
     it "should make a GET request with correct params to find given email address" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:get)
-      .with("#{@mailgun.list_members.send(:list_member_url, @list_member_options[:list_email], @list_member_options[:email])}", {})
-      .and_return(sample_response)
+      mailing_list_members_url = @mailgun.list_members(@sample[:list_email]).send(:list_member_url, @sample[:email])
+      
+      Mailgun.should_receive(:submit).
+        with(:get, mailing_list_members_url).
+        and_return(sample_response)
 
-      @mailgun.list_members.find(@list_member_options[:list_email], @list_member_options[:email])
+      @mailgun.list_members(@sample[:list_email]).find(@sample[:email])
     end
   end
 
   describe "add member to list" do
     it "should make a POST request with correct params to add a given email address" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:post)
-      .with("#{@mailgun.list_members.send(:list_member_url, @list_member_options[:list_email])}", {
-        :address => @list_member_options[:email], :subscribed => 'yes', :upsert => 'no'
-      }).and_return(sample_response)
+      mailing_list_members_url = @mailgun.list_members(@sample[:list_email]).send(:list_member_url)
+
+      Mailgun.should_receive(:submit).
+        with(:post, mailing_list_members_url, {
+          :address => @sample[:email]
+        }).
+        and_return(sample_response)
 
-      @mailgun.list_members.add(@list_member_options[:list_email], @list_member_options[:email])
+      @mailgun.list_members(@sample[:list_email]).add(@sample[:email])
     end
   end
 
   describe "update member in list" do
     it "should make a PUT request with correct params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:put)
-      .with("#{@mailgun.list_members.send(:list_member_url, @list_member_options[:list_email], @list_member_options[:email])}", {
-        :address => @list_member_options[:email], :subscribed => 'yes'
-      }).and_return(sample_response)
+      Mailgun.should_receive(:submit).
+        with(:put, "#{@mailgun.list_members(@sample[:list_email]).send(:list_member_url, @sample[:email])}", {
+          :address => @sample[:email]
+        }).
+        and_return(sample_response)
 
-      @mailgun.list_members.update(@list_member_options[:list_email], @list_member_options[:email])
+      @mailgun.list_members(@sample[:list_email]).update(@sample[:email])
     end
   end
 
   describe "delete member from list" do
     it "should make a DELETE request with correct params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:delete)
-      .with("#{@mailgun.list_members.send(:list_member_url, @list_member_options[:list_email], @list_member_options[:email])}", {})
-      .and_return(sample_response)
+      mailing_list_members_url = @mailgun.list_members(@sample[:list_email]).send(:list_member_url, @sample[:email])
+      Mailgun.should_receive(:submit).
+        with(:delete, mailing_list_members_url).
+        and_return(sample_response)
 
-      @mailgun.list_members.remove(@list_member_options[:list_email], @list_member_options[:email])
+      @mailgun.list_members(@sample[:list_email]).remove(@sample[:email])
     end
   end
 

data/spec/list/message_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Mailgun::Log 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 "send email" do
+    it "should make a POST request to send an email" do
+
+      sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
+      Mailgun.should_receive(:submit)
+      .with(:get, "#{@mailgun.lists.send(:list_url, @sample[:list_email])}")
+      .and_return(sample_response)
+
+      @mailgun.lists.find(@sample[:list_email])
+
+      sample_response = "{\"message\": \"Queued. Thank you.\",\"id\": \"<20111114174239.25659.5817@samples.mailgun.org>\"}"
+      parameters = {
+        :to => "cooldev@your.mailgun.domain",
+        :subject => "missing tps reports",
+        :text => "yeah, we're gonna need you to come in on friday...yeah.",
+        :from => "lumberg.bill@initech.mailgun.domain"
+      }
+      Mailgun.should_receive(:submit)                            \
+        .with(:post, @mailgun.messages.messages_url, parameters) \
+        .and_return(sample_response)
+
+      @mailgun.messages.send_email(parameters)
+    end
+  end
+
+end

data/spec/list_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Mailgun::List do
+describe Mailgun::MailingList do
 
   before :each do
     @mailgun = Mailgun({:api_key => "api-key"})		# used to get the default values
 
-    @list_options = {
+    @sample = {
       :email      => "test@sample.mailgun.org",
       :list_email => "dev@samples.mailgun.org",
       :name       => "test",
@@ -13,57 +13,57 @@ describe Mailgun::List do
     }
   end
 
-  describe "all list" do
+  describe "list mailing lists" do
     it "should make a GET request with the right params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:get)
-      .with("#{@mailgun.lists.send(:list_url)}", {}).and_return(sample_response)
+      Mailgun.should_receive(:submit)
+      .with(:get, "#{@mailgun.lists.send(:list_url)}", {}).and_return(sample_response)
     
-      @mailgun.lists.all
+      @mailgun.lists.list
     end
   end
 
   describe "find list adress" do
     it "should make a GET request with correct params to find given email address" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:get)
-      .with("#{@mailgun.lists.send(:list_url, @list_options[:list_email])}", {})
+      Mailgun.should_receive(:submit)
+      .with(:get, "#{@mailgun.lists.send(:list_url, @sample[:list_email])}")
       .and_return(sample_response)
 
-      @mailgun.lists.find(@list_options[:list_email])
+      @mailgun.lists.find(@sample[:list_email])
     end
   end
 
   describe "create list" do
     it "should make a POST request with correct params to add a given email address" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:post)
-      .with("#{@mailgun.lists.send(:list_url)}", {:address => @list_options[:list_email]})
+      Mailgun.should_receive(:submit)
+      .with(:post, "#{@mailgun.lists.send(:list_url)}", {:address => @sample[:list_email]})
       .and_return(sample_response)
 
-      @mailgun.lists.create(@list_options[:list_email])
+      @mailgun.lists.create(@sample[:list_email])
     end
   end
 
   describe "update list" do
     it "should make a PUT request with correct params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:put)
-      .with("#{@mailgun.lists.send(:list_url, @list_options[:list_email])}", {:address => @list_options[:email]})
+      Mailgun.should_receive(:submit)
+      .with(:put, "#{@mailgun.lists.send(:list_url, @sample[:list_email])}", {:address => @sample[:email]})
       .and_return(sample_response)
 
-      @mailgun.lists.update(@list_options[:list_email], @list_options[:email])
+      @mailgun.lists.update(@sample[:list_email], @sample[:email])
     end
   end
 
   describe "delete list" do
     it "should make a DELETE request with correct params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:delete)
-      .with("#{@mailgun.lists.send(:list_url, @list_options[:list_email])}", {})
+      Mailgun.should_receive(:submit)
+      .with(:delete, "#{@mailgun.lists.send(:list_url, @sample[:list_email])}")
       .and_return(sample_response)
 
-      @mailgun.lists.delete(@list_options[:list_email])
+      @mailgun.lists.delete(@sample[:list_email])
     end
   end
 

data/spec/log_spec.rb

@@ -5,7 +5,7 @@ describe Mailgun::Log do
   before :each do
     @mailgun = Mailgun({:api_key => "api-key"})		# used to get the default values
 
-    @log_options = {
+    @sample = {
       :email  => "test@sample.mailgun.org",
       :name   => "test",
       :domain => "sample.mailgun.org"
@@ -15,9 +15,12 @@ describe Mailgun::Log do
   describe "list log" do
     it "should make a GET request with the right params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:get).with("#{@mailgun.log.send(:log_url, @log_options[:domain])}", {:limit => 100, :skip => 0}).and_return(sample_response)
+      log_url = @mailgun.log(@sample[:domain]).send(:log_url)
+      Mailgun.should_receive(:submit).
+        with(:get, log_url, {}).
+        and_return(sample_response)
 
-      @mailgun.log.list @log_options[:domain]
+      @mailgun.log(@sample[:domain]).list
     end
   end
 

data/spec/mailbox_spec.rb

@@ -5,9 +5,9 @@ describe Mailgun::Mailbox do
   before :each do
     @mailgun = Mailgun({:api_key => "api-key"})		# used to get the default values
 
-    @mailbox_options = {
+    @sample = {
       :email  => "test@sample.mailgun.org",
-      :name   => "test",
+      :mailbox_name => "test",
       :domain => "sample.mailgun.org"
     }
   end
@@ -15,43 +15,49 @@ describe Mailgun::Mailbox do
   describe "list mailboxes" do
     it "should make a GET request with the right params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:get).with("#{@mailgun.mailboxes.send(:mailbox_url, @mailbox_options[:domain])}", {}).and_return(sample_response)
+      mailboxes_url = @mailgun.mailboxes(@sample[:domain]).send(:mailbox_url)
 
-      @mailgun.mailboxes.list @mailbox_options[:domain]
+      Mailgun.should_receive(:submit).
+        with(:get,mailboxes_url, {}).
+        and_return(sample_response)
+
+      @mailgun.mailboxes(@sample[:domain]).list
     end
   end
 
   describe "create mailbox" do
     it "should make a POST request with the right params"	do
-      RestClient.should_receive(:post)
-        .with("#{@mailgun.mailboxes.send(:mailbox_url, @mailbox_options[:domain])}",
-        :mailbox  => @mailbox_options[:email],
-        :password => @mailbox_options[:password])
+      mailboxes_url = @mailgun.mailboxes(@sample[:domain]).send(:mailbox_url)
+      Mailgun.should_receive(:submit)
+        .with(:post, mailboxes_url,
+          :mailbox  => @sample[:email],
+          :password => @sample[:password])
         .and_return({})
 
-      @mailgun.mailboxes.create(@mailbox_options[:email], @mailbox_options[:password])
+      @mailgun.mailboxes(@sample[:domain]).create(@sample[:mailbox_name], @sample[:password])
     end
   end
 
   describe "update mailbox" do
     it "should make a PUT request with the right params" do
-      RestClient.should_receive(:put)
-        .with("#{@mailgun.mailboxes.send(:mailbox_url, @mailbox_options[:domain], @mailbox_options[:name])}",
-        :password => @mailbox_options[:password])
+      mailboxes_url = @mailgun.mailboxes(@sample[:domain]).send(:mailbox_url, @sample[:mailbox_name])
+      Mailgun.should_receive(:submit)
+        .with(:put, mailboxes_url, :password => @sample[:password])
         .and_return({})
 
-      @mailgun.mailboxes.update_password @mailbox_options[:email],
-      @mailbox_options[:password]
+      @mailgun.mailboxes(@sample[:domain]).
+        update_password(@sample[:mailbox_name], @sample[:password])
     end
   end
 
   describe "destroy mailbox" do
     it "should make a DELETE request with the right params" do
-      RestClient.should_receive(:delete)
-        .with("#{@mailgun.mailboxes.send(:mailbox_url, @mailbox_options[:domain], @mailbox_options[:name])}", {})
+      mailboxes_url = @mailgun.mailboxes(@sample[:domain]).send(:mailbox_url, @sample[:name])
+      Mailgun.should_receive(:submit)
+        .with(:delete, mailboxes_url)
         .and_return({})
 
-      @mailgun.mailboxes.destroy @mailbox_options[:email]
+      @mailgun.mailboxes(@sample[:domain]).destroy(@sample[:name])
     end
   end
 end

data/spec/route_spec.rb

@@ -9,12 +9,18 @@ describe Mailgun::Route do
 
   describe "list routes" do
     before :each do
-      sample_response = "{\"items\": []}"
-      RestClient.should_receive(:get)
-        .with("#{@mailgun.routes.send(:route_url)}",:limit=>100, :skip=>0)
-        .and_return(sample_response)
+      sample_response = <<EOF
+{
+  "total_count": 0,
+  "items": []
+}
+EOF.to_json
+
+      Mailgun.should_receive(:submit).
+        with(:get, "#{@mailgun.routes.send(:route_url)}", {}).
+        and_return(sample_response)
     end
-      
+
     it "should make a GET request with the right params" do
       @mailgun.routes.list
     end
@@ -26,9 +32,26 @@ describe Mailgun::Route do
 
   describe "get route" do
     it "should make a GET request with the right params" do
-      RestClient.should_receive(:get)
-        .with("#{@mailgun.routes.send(:route_url, @sample_route_id)}", {})
-        .and_return("{\"route\": {\"id\": \"#{@sample_route_id}\" }}")
+      sample_response = <<EOF
+{
+  "route": {
+      "description": "Sample route",
+      "created_at": "Wed, 15 Feb 2012 13:03:31 GMT",
+      "actions": [
+          "forward(\"http://myhost.com/messages/\")",
+          "stop()"
+      ],
+      "priority": 1,
+      "expression": "match_recipient(\".*@samples.mailgun.org\")",
+      "id": "4f3bad2335335426750048c6"
+  }
+}
+EOF
+
+      Mailgun.should_receive(:submit).
+        with(:get, "#{@mailgun.routes.send(:route_url, @sample_route_id)}").
+        and_return(sample_response)
+
       @mailgun.routes.find @sample_route_id
     end
   end
@@ -42,8 +65,8 @@ describe Mailgun::Route do
       options[:expression]  = [:match_recipient, "sample.mailgun.org"]
       options[:action]      = [[:forward, "http://test-site.com"], [:stop]]
 
-      RestClient.should_receive(:post)
-        .with(@mailgun.routes.send(:route_url), instance_of(Multimap))
+      Mailgun.should_receive(:submit)
+        .with(:post, @mailgun.routes.send(:route_url), instance_of(Multimap))
         .and_return("{\"route\": {\"id\": \"@sample_route_id\"}}")
       
       @mailgun.routes.create(
@@ -59,9 +82,9 @@ describe Mailgun::Route do
     it "should make a PUT request with the right params" do
       options = {}
       options[:description] = "test_route"
-      
-      RestClient.should_receive(:put)
-        .with("#{@mailgun.routes.send(:route_url, @sample_route_id)}", instance_of(Multimap))
+
+      Mailgun.should_receive(:submit)
+        .with(:put, "#{@mailgun.routes.send(:route_url, @sample_route_id)}", instance_of(Multimap))
         .and_return("{\"id\": \"#{@sample_route_id}\"}")
       @mailgun.routes.update @sample_route_id, options
     end
@@ -69,9 +92,9 @@ describe Mailgun::Route do
 
   describe "delete route" do
     it "should make a DELETE request with the right params" do
-      RestClient.should_receive(:delete)
-        .with("#{@mailgun.routes.send(:route_url, @sample_route_id)}", {})
-        .and_return("{\"id\": \"#{@sample_route_id}\"}")
+      Mailgun.should_receive(:submit).
+        with(:delete, "#{@mailgun.routes.send(:route_url, @sample_route_id)}").
+        and_return("{\"id\": \"#{@sample_route_id}\"}")
       @mailgun.routes.destroy @sample_route_id
     end
   end

data/spec/unsubscribe_spec.rb

@@ -5,7 +5,7 @@ describe Mailgun::Unsubscribe do
   before :each do
     @mailgun = Mailgun({:api_key => "api-key"})		# used to get the default values
 
-    @unsubscribe_options = {
+    @sample = {
       :email  => "test@sample.mailgun.org",
       :name   => "test",
       :domain => "sample.mailgun.org",
@@ -16,55 +16,65 @@ describe Mailgun::Unsubscribe do
   describe "list unsubscribes" do
     it "should make a GET request with the right params" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:get).with("#{@mailgun.unsubscribes.send(:unsubscribe_url, @unsubscribe_options[:domain])}", {}).and_return(sample_response)
+      unsubscribes_url = @mailgun.unsubscribes(@sample[:domain]).send(:unsubscribe_url)
+      Mailgun.should_receive(:submit).
+        with(:get, unsubscribes_url, {}).
+        and_return(sample_response)
 
-      @mailgun.unsubscribes.list @unsubscribe_options[:domain]
+      @mailgun.unsubscribes(@sample[:domain]).list
     end
   end
 
   describe "find unsubscribe" do
     it "should make a GET request with the right params to find given email address" do
       sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-      RestClient.should_receive(:get)
-      .with("#{@mailgun.unsubscribes.send(:unsubscribe_url, @unsubscribe_options[:domain], @unsubscribe_options[:email])}", {})
-      .and_return(sample_response)
+      unsubscribes_url = @mailgun.unsubscribes(@sample[:domain]).send(:unsubscribe_url, @sample[:email])
 
-      @mailgun.unsubscribes.find(@unsubscribe_options[:domain], @unsubscribe_options[:email])
+      Mailgun.should_receive(:submit)
+        .with(:get, unsubscribes_url)
+        .and_return(sample_response)
+
+      @mailgun.unsubscribes(@sample[:domain]).find(@sample[:email])
     end
   end
 
   describe "delete unsubscribe" do
     it "should make a DELETE request with correct params to remove a given email address" do
-      response_message = "{\"message\"=>\"Unsubscribe event has been removed\", \"address\"=>\"#{@unsubscribe_options[:email]}\"}"
+      response_message = "{\"message\"=>\"Unsubscribe event has been removed\", \"address\"=>\"#{@sample[:email]}\"}"
+      unsubscribes_url = @mailgun.unsubscribes(@sample[:domain]).send(:unsubscribe_url, @sample[:email])
+
       Mailgun.should_receive(:submit)
-      .with(:delete, "#{@mailgun.unsubscribes.send(:unsubscribe_url, @unsubscribe_options[:domain], @unsubscribe_options[:email])}")
-      .and_return(response_message)
+        .with(:delete, unsubscribes_url)
+        .and_return(response_message)
 
-      @mailgun.unsubscribes.remove(@unsubscribe_options[:domain], @unsubscribe_options[:email])
+      @mailgun.unsubscribes(@sample[:domain]).remove(@sample[:email])
     end
   end
 
   describe "add unsubscribe" do
     context "to tag" do
       it "should make a POST request with correct params to add a given email address to unsubscribe from a tag" do
-        response_message = "{\"message\"=>\"Address has been added to the unsubscribes table\", \"address\"=>\"#{@unsubscribe_options[:email]}\"}"
+        response_message = "{\"message\"=>\"Address has been added to the unsubscribes table\", \"address\"=>\"#{@sample[:email]}\"}"
         Mailgun.should_receive(:submit)
-        .with(:post, "#{@mailgun.unsubscribes.send(:unsubscribe_url, @unsubscribe_options[:domain])}",{:address=>@unsubscribe_options[:email], :tag=>@unsubscribe_options[:tag]})
-        .and_return(response_message)
-        @mailgun.unsubscribes.add(@unsubscribe_options[:email], @unsubscribe_options[:domain],  @unsubscribe_options[:tag])
+          .with(:post, "#{@mailgun.unsubscribes(@sample[:domain]).send(:unsubscribe_url)}",{:address=>@sample[:email], :tag=>@sample[:tag]})
+          .and_return(response_message)
+
+        @mailgun.unsubscribes(@sample[:domain]).add(@sample[:email], @sample[:tag])
       end
     end
 
     context "on all" do
       it "should make a POST request with correct params to add a given email address to unsubscribe from all tags" do
         sample_response = "{\"items\": [{\"size_bytes\": 0,  \"mailbox\": \"postmaster@bsample.mailgun.org\" }  ]}"
-        RestClient.should_receive(:post)
-        .with("#{@mailgun.unsubscribes.send(:unsubscribe_url, @unsubscribe_options[:domain])}", {
-          :address => @unsubscribe_options[:email], :tag => '*'
-        })
-        .and_return(sample_response)
+        unsubscribes_url = @mailgun.unsubscribes(@sample[:domain]).send(:unsubscribe_url)
+
+        Mailgun.should_receive(:submit)
+          .with(:post, unsubscribes_url, {
+            :address => @sample[:email], :tag => '*'
+          })
+          .and_return(sample_response)
 
-        @mailgun.unsubscribes.add(@unsubscribe_options[:email], @unsubscribe_options[:domain])
+        @mailgun.unsubscribes(@sample[:domain]).add(@sample[:email])
       end
     end
   end