http_mailer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b12f95a1a164c385317f44782c9bddd404f68c3c
-  data.tar.gz: a876c7adab1bc789cafb57bd70b79f065bbed8eb
+  metadata.gz: bb960b319971c84288901f6242b8b7e9ede0caf3
+  data.tar.gz: 42033f95265ad6afb618e5152b03d0ca09a5b689
 SHA512:
-  metadata.gz: 91ea1abd78d90b3e2321cb233e94e459e289ba838302511d3be4f5ffd5d747ad2edfa725fc25da9766f80ebefb6ed1c688346ab863d9a6840a310baa24a64376
-  data.tar.gz: c9ea884fba506e34c1e5c3346fe7cc6a7e33b9b40d82cae241e4de6dd1e23f77f3f0e20fc901217eca2889b0d8f7e1fe21ef8a514ddb342b2b126e2ca08c2142
+  metadata.gz: 0553e51355e8f429873706facbd84ff5edfa5c3038981ebe9b614893b39b93339b0dc78dab7b5ef394e1d6547c3e014cb6b0ce9c64b1340975fc3f5305ddfdc3
+  data.tar.gz: 1ea8d630febe20b7f11afcc0b08fc1671e7fc928c66e3d5ad11f054a2e426288a1aed9e75858e7e8895a8ed8955a1a45bfa83f58e7bf9a96a90d9a765a3df443

data/lib/http_mailer.rb

@@ -1,5 +1,6 @@
 require 'rest_client'
 require "http_mailer/version"
+require "http_mailer/client"
 require "http_mailer/service_handler"
 require "http_mailer/service_configuration"
 require "http_mailer/mailgun/mailgun_service_api"
@@ -13,16 +14,9 @@ require "http_mailer/sendgrid/sendgrid_service_handler"
 module HttpMailer
   
   class << self
-    def mailgun(settings)
-      MailgunServiceHandler.new(settings)
-    end
-
-    def sendgrid(settings)
-      SendGridServiceHandler.new(settings)
-    end
-
-    def mandrill(settings)
-      MandrillServiceHandler.new(settings)
+    def client(settings)
+      HttpMailer::Client.new(settings)
     end
   end
+
 end

data/lib/http_mailer/client.rb

@@ -0,0 +1,29 @@
+module HttpMailer
+  class Client
+    attr_reader :configuration, :mailgun, :sendgrid, :mandrill
+
+    def initialize(settings)
+      configure(settings)
+    end
+
+    def configure(settings)
+      @mailgun = MailgunServiceHandler.new(settings[:mailgun])
+      @sendgrid = SendGridServiceHandler.new(settings[:sendgrid])
+      @mandrill = MandrillServiceHandler.new(settings[:mandrill])
+    end
+
+    def send_message(from, to, subject, body, from_name='', to_name='')
+      response = nil
+
+      [mailgun, sendgrid, mandrill].each do |service|
+        if service.configured?
+          response = service.send_message(from, to, subject, body, to_name, from_name)
+          break if response.code == 200
+        end
+      end
+
+      return response
+    end
+
+  end
+end

data/lib/http_mailer/mailgun/mailgun_service_handler.rb

@@ -10,7 +10,11 @@ module HttpMailer
       )
     end
 
-    def send_message(from, to, subject, text)
+    def configured?
+      super && !self.service_configuration.settings.subdomain.nil?
+    end
+
+    def send_message(from, to, subject, text, from_name='', to_name='')
       ::RestClient.post self.service_api.send_messages_url,
         :from => from,
         :to => to,

data/lib/http_mailer/mandrill/mandrill_message.rb

@@ -3,7 +3,7 @@ module HttpMailer
     attr_accessor :to, :to_name, :from, :from_name, :subject, :text, :html
     attr_reader :structure
 
-    def initialize(to, from, subject, text=nil, html=nil, to_name=nil, from_name=nil)
+    def initialize(from, to, subject, text=nil, html=nil, from_name=nil, to_name=nil)
       @to = to
       @from = from
       @subject = subject

data/lib/http_mailer/mandrill/mandrill_service_handler.rb

@@ -7,8 +7,8 @@ module HttpMailer
       @service_api = ::HttpMailer::MandrillServiceApi.new(self.service_configuration.settings.host)
     end
 
-    def send_message(from, to, subject, text, to_name='', from_name='')
-      message = MandrillMessage.new(from, to, subject, text, nil, to_name, from_name)
+    def send_message(from, to, subject, text, from_name='', to_name='')
+      message = MandrillMessage.new(from, to, subject, text, nil, from_name, to_name)
       payload = {
         :key => self.service_configuration.settings.api_key,
         :message => message.to_h

data/lib/http_mailer/sendgrid/sendgrid_service_handler.rb

@@ -7,7 +7,7 @@ module HttpMailer
       @service_api = ::HttpMailer::SendGridServiceApi.new(self.service_configuration.settings.host)
     end
 
-    def send_message(from, to, subject, text, to_name='', from_name='')
+    def send_message(from, to, subject, text, from_name='', to_name='')
       ::RestClient.post self.service_api.send_messages_url,
         :api_user => self.service_configuration.settings.api_user,
         :api_key => self.service_configuration.settings.api_key,

data/lib/http_mailer/service_handler.rb

@@ -6,5 +6,10 @@ module HttpMailer
       @service_configuration = ServiceConfiguration.new(settings)
     end
 
+    def configured?
+      !self.service_configuration.settings.host.nil? &&
+      !self.service_configuration.settings.api_key.nil?
+    end
+
   end
 end

data/lib/http_mailer/version.rb

@@ -1,3 +1,3 @@
 module HttpMailer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/client_spec.rb

@@ -0,0 +1,34 @@
+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"},
+                    :sendgrid => {:host => "sendgrid.com", :api_user=> "test", :api_key => "1234"},
+                    :mandrill => {:host => "mandrillapp.com", :api_key => "1234567890"}} }
+
+    describe "#initialize" do
+      it "creates a client instance" do
+        expect(HttpMailer::Client.new(settings)).to be_a HttpMailer::Client
+      end
+    end
+
+    describe '#send_message' do
+      let(:settings){ {:mailgun => {:host => "api.mailgun.net", :api_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) }
+
+      let(:sender){ "sender@test.com"}
+      let(:reciever){ "reciever@test.com>" }
+      let(:subject){ "Hello" }
+      let(:email_body){ "Congratulations, you just sent an email with HttpMailer!  You are truly awesome!" }
+
+      it 'sends an email' do
+        response = mailer_client.send_message(sender, reciever, subject, email_body)
+        expect(response.code).to eq(200)
+      end
+    end
+  end
+
+end

data/spec/http_mailer_spec.rb

@@ -2,33 +2,14 @@ require 'spec_helper'
 
 describe HttpMailer do
 
-  context "when configured for Mailgun" do
-    let(:settings){ {:host => "api.mailgun.net", :api_key => "12345", :subdomain => "sandbox12345.mailgun.org"} }
-
-    describe ".mailgun" do
-      it "creates a service handler for Mailgun" do
-        expect(HttpMailer.mailgun(settings)).to be_a HttpMailer::MailgunServiceHandler
-      end
-    end
-  end
-
-  context "when configured for SendGrid" do
-    let(:settings){ {:host => "sendgrid.com", :api_user=> "test", :api_key => "1234"} }
-
-    describe ".sendgrid" do
-      it "creates a service handler for SendGrid" do
-        expect(HttpMailer.sendgrid(settings)).to be_a HttpMailer::SendGridServiceHandler
-      end
-    end
-
-  end
-
-  context "when configured for Mandrill" do
-    let(:settings){ {:host => "mandrillapp.com", :api_key => "1234567890"} }
-
-    describe ".mandrill" do
-      it "creates a service handler for Mandrill" do
-        expect(HttpMailer.mandrill(settings)).to be_a HttpMailer::MandrillServiceHandler
+  context "when configured" do
+    let(:settings){ {:mailgun => {:host => "api.mailgun.net", :api_key => "12345", :subdomain => "sandbox12345.mailgun.org"},
+                    :sendgrid => {:host => "sendgrid.com", :api_user=> "test", :api_key => "1234"},
+                    :mandrill => {:host => "mandrillapp.com", :api_key => "1234567890"}} }
+
+    describe ".client" do
+      it "creates a client instance" do
+        expect(HttpMailer.client(settings)).to be_a HttpMailer::Client
       end
     end
   end

data/spec/mailgun/mailgun_service_handler_spec.rb

@@ -15,4 +15,36 @@ describe HttpMailer::MailgunServiceHandler do
       expect(response.code).to eq(200)
     end
   end
+
+  describe "#configured?" do
+    context "fully configured" do
+      let(:settings){ {:host => "api.mailgun.net", :api_key => "12345", :subdomain => "sandbox12345.mailgun.org"} }
+      let(:mailer){ HttpMailer::MailgunServiceHandler.new(settings) }
+
+      it 'returns true' do
+        expect(mailer.configured?).to be true
+      end
+    end
+
+    context "not fully configured" 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(: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(:mailer_missing_subdomain){ HttpMailer::MailgunServiceHandler.new(settings_missing_subdomain) }
+
+      it 'returns false' do
+        expect(mailer_with_no_settings.configured?).to be false
+        expect(mailer_missing_host.configured?).to be false
+        expect(mailer_missing_api_key.configured?).to be false
+        expect(mailer_missing_subdomain.configured?).to be false
+      end
+    end
+  end
 end

data/spec/mandrill/mandrill_message_spec.rb

@@ -10,7 +10,7 @@ describe HttpMailer::MandrillMessage do
     let(:subject){ "Hello" }
     let(:text_body){ "Congratulations, you just sent an email with Mandrill!  You are truly awesome!" }
     let(:html_body){ "<h1>Congratulations, you just sent an email with Mandrill!  You are truly awesome!</h1>"}
-    let(:message){ HttpMailer::MandrillMessage.new(to, from, subject, text_body, html_body, to_name, from_name) }
+    let(:message){ HttpMailer::MandrillMessage.new(from, to, subject, text_body, html_body, from_name, to_name) }
 
     it 'builds a propery formated Mandrill message' do
       expect(message.to_h[:to]).to eq [{:email => to, :name => to_name}]

data/spec/mandrill/mandrill_service_handler_spec.rb

@@ -13,8 +13,9 @@ describe HttpMailer::MandrillServiceHandler do
     let(:email_body){ "Congratulations, you just sent an email with Mandrill!  You are truly awesome!" }
 
     it 'sends an email message' do
-      response = mailer.send_message(to, from, subject, email_body, to_name, from_name)
+      response = mailer.send_message(from, to, subject, email_body, from_name, to_name)
       expect(response.code).to eq(200)
     end
   end
+
 end

data/spec/sendgrid/sendgrid_service_handler_spec.rb

@@ -15,4 +15,5 @@ describe HttpMailer::SendGridServiceHandler do
       expect(response.code).to eq(200)
     end
   end
+  
 end

data/spec/service_handler_spec.rb

@@ -12,4 +12,32 @@ describe HttpMailer::ServiceHandler do
     end
   end
 
+  describe "#configured?" do
+    context "fully configured" do
+      let(:settings){ {:host => "mandrillapp.com", :api_key => "1234567890"} }
+      let(:mailer){ HttpMailer::ServiceHandler.new(settings) }
+
+      it 'returns true' do
+        expect(mailer.configured?).to be true
+      end
+    end
+
+    context "not fully configured" do
+      let(:no_settings){ {} }
+      let(:mailer_with_no_settings){ HttpMailer::ServiceHandler.new(no_settings) }
+
+      let(:settings_missing_host){ {:api_key => "1234567890"} }
+      let(:mailer_missing_host){ HttpMailer::ServiceHandler.new(settings_missing_host) }
+
+      let(:settings_missing_api_key){ {:host => "mandrillapp.com"} }
+      let(:mailer_missing_api_key){ HttpMailer::ServiceHandler.new(settings_missing_api_key) }
+
+      it 'returns false' do
+        expect(mailer_with_no_settings.configured?).to be false
+        expect(mailer_missing_host.configured?).to be false
+        expect(mailer_missing_api_key.configured?).to be false
+      end
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -12,6 +12,11 @@ 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"=>/.*/},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dru Ibarra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,7 @@ files:
 - Rakefile
 - http_mailer.gemspec
 - lib/http_mailer.rb
+- lib/http_mailer/client.rb
 - lib/http_mailer/mailgun/mailgun_service_api.rb
 - lib/http_mailer/mailgun/mailgun_service_handler.rb
 - lib/http_mailer/mandrill/mandrill_message.rb
@@ -104,6 +105,7 @@ files:
 - lib/http_mailer/service_configuration.rb
 - lib/http_mailer/service_handler.rb
 - lib/http_mailer/version.rb
+- spec/client_spec.rb
 - spec/http_mailer_spec.rb
 - spec/mailgun/mailgun_service_api_spec.rb
 - spec/mailgun/mailgun_service_handler_spec.rb
@@ -140,6 +142,7 @@ signing_key:
 specification_version: 4
 summary: Sends email via HTTP APIs
 test_files:
+- spec/client_spec.rb
 - spec/http_mailer_spec.rb
 - spec/mailgun/mailgun_service_api_spec.rb
 - spec/mailgun/mailgun_service_handler_spec.rb