http_mailer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77bd037d4360e21fbdc3882b92793d876e65cb52
-  data.tar.gz: 03b48365cf131921df32b9a1a905b2f324bd711e
+  metadata.gz: cf7543d7c4535c14bf3f0a728f48d4c11daa9953
+  data.tar.gz: 809069c15685e40d2df9dab51843caa3e1ff8051
 SHA512:
-  metadata.gz: 8ad1ba8d03c9dda0b9380c146e5970591a3d45cbfc809de09825696defe757fdca6dc6983d0ec7a130e420c8bf5f616cb425403350b3cd050176b989a706f915
-  data.tar.gz: 020c32f5ed37d4c2ec53a69534d3cf6f426750522f5c2a01eb9b3b61f0e280d7f91e36a05ea7b3db818f24abd1658c24b4556b6ac440c5cc8e6dcb0d4ff13c91
+  metadata.gz: a33ab2b97224bc9d508ef4df60be77708f0c1954e76b9aec04b877792d725e76249140f4e367a021eda9d197d2d01886c6913248c7e49ae99bc9dcf118750036
+  data.tar.gz: 8331b0a4182bbfd24ba252d071088e98eb0f792eecb4d20338db32ff3a4b3cbaf5f1e16fca8653a34d07a9c161cf366b2290fe0a7ffa0ead8bf4e0e60fb30054

data/lib/http_mailer/mailgun/mailgun_service_api.rb

@@ -11,7 +11,7 @@ module HttpMailer
     end
 
     def send_messages_url
-      "#{self.protocol}://api:key-#{self.api_key}@#{self.host}/#{self.version}/#{self.subdomain}/messages"
+      "#{self.protocol}://api:#{self.api_key}@#{self.host}/#{self.version}/#{self.subdomain}/messages"
     end
   end
 end

data/lib/http_mailer/version.rb

@@ -1,3 +1,3 @@
 module HttpMailer
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/client_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe HttpMailer::Client do
 
   context "when configured" do
-    let(:settings){ {:mailgun => {:host => "api.mailgun.net", :api_key => "12345", :subdomain => "sandbox12345.mailgun.org"},
+    let(:settings){ {:mailgun => {:host => "api.mailgun.net", :api_key => "key-12345", :subdomain => "sandbox12345.mailgun.org"},
                     :sendgrid => {:host => "sendgrid.com", :api_user=> "test", :api_key => "1234"},
                     :mandrill => {:host => "mandrillapp.com", :api_key => "1234567890"}} }
 
@@ -14,7 +14,7 @@ describe HttpMailer::Client do
     end
 
     describe '#send_message' do
-      let(:settings){ {:mailgun => {:host => "api.mailgun.net", :api_key => "12345", :subdomain => "sandbox12345.mailgun.org"},
+      let(:settings){ {:mailgun => {:host => "api.mailgun.net", :api_key => "key-12345", :subdomain => "sandbox12345.mailgun.org"},
                     :sendgrid => {:host => "sendgrid.com", :api_user=> "test", :api_key => "1234"},
                     :mandrill => {:host => "mandrillapp.com", :api_key => "1234567890"}} }
       let(:mailer_client){ HttpMailer::Client.new(settings) }

data/spec/mailgun/mailgun_service_api_spec.rb

@@ -4,7 +4,7 @@ describe HttpMailer::MailgunServiceApi do
   
   describe "#send_messages_url" do
     let(:host){ "api.mailgun.net" }
-    let(:api_key){ "1234567890" }
+    let(:api_key){ "key-1234567890" }
     let(:subdomain){ "sandbox1234567890.mailgun.org" }
     let(:protocol){ "https" }
     let(:version){ "v2" }

data/spec/mailgun/mailgun_service_handler_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe HttpMailer::MailgunServiceHandler do
   
   describe "#send_message" do
-    let(:settings){ {:host => "api.mailgun.net", :api_key => "12345", :subdomain => "sandbox12345.mailgun.org"} }
+    let(:settings){ {:host => "api.mailgun.net", :api_key => "key-12345", :subdomain => "sandbox12345.mailgun.org"} }
     let(:mailer){ HttpMailer::MailgunServiceHandler.new(settings) }
     let(:sender){ "Mailgun Sandbox <postmaster@sandbox12345.mailgun.org>"}
     let(:reciever){ "Test <test@gmail.com>" }
@@ -18,7 +18,7 @@ describe HttpMailer::MailgunServiceHandler do
 
   describe "#configured?" do
     context "fully configured" do
-      let(:settings){ {:host => "api.mailgun.net", :api_key => "12345", :subdomain => "sandbox12345.mailgun.org"} }
+      let(:settings){ {:host => "api.mailgun.net", :api_key => "key-12345", :subdomain => "sandbox12345.mailgun.org"} }
       let(:mailer){ HttpMailer::MailgunServiceHandler.new(settings) }
 
       it 'returns true' do
@@ -30,13 +30,13 @@ describe HttpMailer::MailgunServiceHandler do
       let(:no_settings){ {} }
       let(:mailer_with_no_settings){ HttpMailer::MailgunServiceHandler.new(no_settings) }
 
-      let(:settings_missing_host){ {:api_key => "12345", :subdomain => "sandbox12345.mailgun.org"} }
+      let(:settings_missing_host){ {:api_key => "key-12345", :subdomain => "sandbox12345.mailgun.org"} }
       let(:mailer_missing_host){ HttpMailer::MailgunServiceHandler.new(settings_missing_host) }
 
       let(:settings_missing_api_key){ {:host => "api.mailgun.net", :subdomain => "sandbox12345.mailgun.org"} }
       let(:mailer_missing_api_key){ HttpMailer::MailgunServiceHandler.new(settings_missing_api_key) }
 
-      let(:settings_missing_subdomain){ {:host => "api.mailgun.net", :api_key => "12345"} }
+      let(:settings_missing_subdomain){ {:host => "api.mailgun.net", :api_key => "key-12345"} }
       let(:mailer_missing_subdomain){ HttpMailer::MailgunServiceHandler.new(settings_missing_subdomain) }
 
       it 'returns false' do

data/spec/spec_helper.rb

@@ -12,17 +12,17 @@ RSpec.configure do |config|
           :headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'224', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
       to_return(:status => 200, :body => "", :headers => {})
 
-    stub_request(:post, "https://api:key-12345@api.mailgun.net/v2/sandbox12345.mailgun.org/messages").
-         with(:body => {"from"=>"sender@test.com", "subject"=>"Hello", "text"=>"Congratulations, you just sent an email with HttpMailer!  You are truly awesome!", "to"=>"reciever@test.com>"},
-              :headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'174', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
-         to_return(:status => 200, :body => "", :headers => {})
-
     # Stub SendGrid HTTP requests
     stub_request(:post, "https://sendgrid.com/api/mail.send.json").
       with(:body => {"api_key"=>/.*/, "api_user"=>/.*/, "from"=>/.*/, "fromname"=>/.*/, "subject"=>/.*/, "text"=>/.*/, "to"=>/.*/, "toname"=>/.*/},
           :headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'208', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
       to_return(:status => 200, :body => "", :headers => {})
 
+    stub_request(:post, "https://sendgrid.com/api/mail.send.json").
+         with(:body => {"api_key"=>"1234", "api_user"=>"test", "from"=>"sender@test.com", "fromname"=>"", "subject"=>"Hello", "text"=>"Congratulations, you just sent an email with HttpMailer!  You are truly awesome!", "to"=>"reciever@test.com>", "toname"=>""},
+              :headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'219', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=>'Ruby'}).
+         to_return(:status => 200, :body => "", :headers => {})
+
     # Stub Mandrill HTTP requests
     stub_request(:post, "https://mandrillapp.com/api/1.0/messages/send.json").
        with(:body => "{\"key\":\"1234567890\",\"message\":{\"html\":null,\"text\":\"Congratulations, you just sent an email with Mandrill!  You are truly awesome!\",\"subject\":\"Hello\",\"from_email\":\"papa@prose.com\",\"from_name\":\"Ernest Hemingway\",\"to\":[{\"email\":\"jd@catcher.com\",\"name\":\"JD Salinger\"}],\"headers\":{},\"important\":null,\"track_opens\":null,\"track_clicks\":null,\"auto_text\":null,\"auto_html\":null,\"inline_css\":null,\"url_strip_qs\":null,\"preserve_recipients\":null,\"view_content_link\":null,\"bcc_address\":null,\"tracking_domain\":null,\"signing_domain\":null,\"return_path_domain\":null,\"merge\":null,\"merge_language\":null,\"global_merge_vars\":[],\"merge_vars\":[],\"tags\":[],\"subaccount\":null,\"google_analytics_domains\":[],\"google_analytics_campaign\":null,\"metadata\":[],\"recipient_metadata\":[],\"attachments\":[],\"images\":[]}}",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dru Ibarra