vf-email-handler 0.2.3 → 0.3.0p

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f88f2f3e91ad0c00491afd069ac02471b6535658
-  data.tar.gz: a01816abb062d652c9c00297d89b82642fa0e096
+  metadata.gz: def62a53dcd807d0bd59ebfc38445bebb3310f36
+  data.tar.gz: da00d80b997982af38bd62d96e8f90725e439112
 SHA512:
-  metadata.gz: ca128f9cc7f8245a7a5134be1d5be33eb5271c8a72edcfdb3b6b074a4c10bb1225e71a4054d856ee9d19b84f207db64388aaf0dd8819efc444a74f62cdccfbe2
-  data.tar.gz: e7d0292a96f259399f91bcdc349e47a05a5dbce74823cddc2eaa30b9204c2eeea6888615e95db2013ab78b05736ddbb67c2be900ae99f6ba4168cb70816d0e37
+  metadata.gz: fa7633b478c69869cb9bc15d99c4b2570ae2b45111224020eebf23ef6e7fc8d967df22e6fa12940b2552d3bb7a50b041089105cf77b29c3b98de3a66c115e9a7
+  data.tar.gz: fc4d59c63367f4c89801369dbd3682643c9e56634bf840a2200f50497e55fa852ea80d9a7465adf37e13154bf4e6b10243231ac0a075e759006dec854eaf51ab

data/bin/vf-email-handler

@@ -4,6 +4,7 @@ require 'meta/console_strings'
 require 'meta/version'
 require 'initializers/aws'
 require 'initializers/logger'
+require 'initializers/postmark'
 require 'aws/ses'
 require 'aws/sqs'
 
@@ -15,6 +16,7 @@ end
 
 def start(settings)
   MailHandler::AWS.setup settings
+  MailHandler::Postmark.setup settings
   MailHandler::Logger.setup settings
   MailHandler::Handler.begin_work_loop
 end

data/lib/initializers/postmark.rb

@@ -0,0 +1,12 @@
+module MailHandler
+  # Initializes SES and SQS interfaces
+  module AWS
+    class << self
+      def setup(config)
+        require 'interfaces/postmark'
+
+        Postmark.setup config[:postmark][:token]
+      end
+    end
+  end
+end

data/lib/interfaces/postmark.rb

@@ -0,0 +1,67 @@
+require 'postmark'
+
+module MailHandler
+  # Containing everything related to SES comunication
+  module Postmark
+    # Setup and cofig the SES
+    class << self
+      attr_reader :mailer
+
+      def setup(config)
+        @mailer = Mailer.new config
+      end
+    end
+
+    # Yields an interface to Postmark
+    class Mailer
+      def initialize(token)
+        @client = Postmark::ApiClient.new(token)
+        check_connection
+      end
+
+      def send_mail(email)
+        response = @client.deliver(
+          from: email.from,
+          to: email.to,
+          subject: email.subject,
+          html_body: email.html,
+          track_opens: true
+        )
+        log email, response
+        response
+      rescue StandardError => e
+        puts e.to_s
+      end
+
+      private
+
+      def log(email, response)
+        return unless response
+        if response[:error_code] != 0
+          log_failure email, response
+        else
+          log_success email
+        end
+      end
+
+      def log_failure(email, response)
+        Logger.error(
+          subject:    email,
+          error_code: response[:error_code],
+          error_type: 'POSTMARK ERROR',
+        )
+      end
+
+      def log_success(email)
+        Logger.success(
+          subject: email,
+          message: 'successfully sent'
+        )
+      end
+
+      def check_connection
+        @client.server_info
+      end
+    end
+  end
+end

data/lib/mailhandler.rb

@@ -5,6 +5,7 @@ module MailHandler
   # Base handler that does it all
   class Handler
     def self.begin_work_loop
+      force_gc
       loop do
         begin
           new.do_work
@@ -14,7 +15,6 @@ module MailHandler
             error_type: e.class.to_s,
             trace: e.to_s
           )
-          raise e
         end
       end
     end
@@ -22,9 +22,9 @@ module MailHandler
     def do_work
       if messages.any?
         messages.each do |message|
-          if response = send(email_from(message))
-            message.delete unless response.error?
-          end
+          response = send(email_from(message))
+          next unless response
+          message.delete unless response[:error_code] != 0
         end
       else
         sleep 1
@@ -44,11 +44,18 @@ module MailHandler
     end
 
     def send(email)
-      SES.mailer.send_mail email
+      Postmark.mailer.send_mail email
     end
 
     def wait_for(worker)
       sleep(0.01) until worker.done?
     end
+
+    def force_gc
+      Thread.new do
+        sleep 60
+        GC.start
+      end
+    end
   end
 end

data/lib/meta/version.rb

@@ -1,4 +1,4 @@
 # Current version of the handler
 module MailHandler
-  VERSION = '0.2.3'
+  VERSION = '0.3.0p'
 end

data/vf-email-handler.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email                 = 'karl.litterfeldt@videofy.me'
   s.license               = 'MIT-LICENSE'
 
-  s.required_ruby_version = '>=2.1.2'
+  s.required_ruby_version = '>=2.2.0'
 
   s.homepage              = 'http://www.videofy.me'
 
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.executables           = %w(vf-email-handler)
   s.require_paths         = ['lib']
 
-  s.add_dependency 'aws-ses', '~> 0.5'
+  s.add_dependency 'postmark'
   s.add_dependency 'aws-sdk', '~> 1.52.0'
 
   s.add_development_dependency 'rspec', '~> 3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vf-email-handler
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0p
 platform: ruby
 authors:
 - Videofy
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-ses
+  name: postmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,8 @@ files:
 - bin/vf-email-handler
 - lib/initializers/aws.rb
 - lib/initializers/logger.rb
+- lib/initializers/postmark.rb
+- lib/interfaces/postmark.rb
 - lib/interfaces/ses.rb
 - lib/interfaces/sqs.rb
 - lib/logger/logger.rb
@@ -122,15 +124,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Integrates AWS SQS with SES letting youseemlessly queue emails for sending