snails 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ee5f0ad2cdda5a366dfc31d197b29948e63b7d24be394e8a6b779ea0f11bc2
-  data.tar.gz: 6f838a808f32036b57ab67ae24e26e2cae9442af0b086aa7d524d78d94ae5df2
+  metadata.gz: 483517cd1b55bc5273ebb004bb9ef69a8cd6191de4be897c3d9f2c168ea13f4f
+  data.tar.gz: 1730ce09810faafc5802833ab4f38fb103e8dae059b9cfb51b85335893fb7f09
 SHA512:
-  metadata.gz: f4b100c320293b3f66944182bde37c32567795838358c09bad18cf94ec34ce91932d5e923245faa29ffb63350d2876b60c97c1e378aa6b75e459353f057c2f5e
-  data.tar.gz: 4a120754c9dad45639f27e1b23ed44c84054440937ac1bfaccce508263090b84feb1175388867b12ded067b4ac936615e39d3490bdc0fe69b8e9447e7f7bb737
+  metadata.gz: e104410a7d4f8eea1370a583d13e4f23cefd043bc78f12027b5fea7063a87285c2cbeb89a1ab8c9a43e7a90d582b3b397528f1c483df2db60cf7dc654f66aba7
+  data.tar.gz: dfe0ae0b0116f29c71907e35a38548d3d28af693e7dbf824b29f6e467ddab841d588c6f573b238c3e50d420bae649f81fca9efb73cb3709ac158eb121dae45e3

data/lib/snails/mailer.rb

@@ -12,32 +12,28 @@ module Snails
 
     @queue = :emails
 
-    def initialize(opts)
-      mail_config = (opts[:smtp] || opts[:mail]) or raise ":smtp options missing"
-
-      if key = mail_config.dig(:dkim, :private_key) and File.exist?(key)
-        mail_config[:dkim][:private_key] = IO.read(key)
-      elsif mail_config[:dkim]
-        puts "Private key for DKIM not found! Disabling..."
-        mail_config.delete(:dkim)
-      end
+    # class Bounce < StandardError; end
+    # class SoftBounce < Bounce; end
+    # class HardBounce < Bounce; end
 
-      Tuktuk.options = mail_config
-      @debug         = mail_config[:debug]
+    def initialize(opts)
       @from_email    = opts[:from] or raise ":from required"
       @base_subject  = opts[:base_subject] || ''
       @views         = opts[:views] || Snails.root.join('lib', 'views')
       @logfile       = opts[:logfile] # || Snails.root.join('log', 'mailer.log')
+
+      backend_name   = opts[:backend_name] || 'TestBackend'
+      @backend       = self.class.backends[backend_name].new(opts[:backend_options])
     end
 
     def email(name, &block)
       define_singleton_method(name) do |*args|
-        instance_exec(*args, &block) 
+        instance_exec(*args, &block)
       end
     end
 
     def helpers(&block)
-      instance_eval(&block) 
+      instance_eval(&block)
     end
 
     def perform(method, *args)
@@ -81,50 +77,127 @@ A <%= @exception.class %> occurred in <%= @url %>:
 
     private
 
-    def render(view)
-      template = File.read(File.join(@views, "#{view}.erb"))
+    def render(view_path, layout_lath = nil)
+      view = File.read(File.join(@views, "#{view_path}.erb"))
+      if layout_path
+        layout = File.read(File.join(@views, "#{layout_path}.erb"))
+        render_erb(layout) { render_erb(view) }
+      else
+        render_erb(view)
+      end
+    end
+
+    def render_erb(template)
       ERB.new(template).result(binding)
     end
 
     def partial(name)
       partial_name = name.to_s["/"] ? name.to_s.reverse.sub("/", "_/").reverse : "_#{name}"
-      render partial_name
+      render(partial_name)
     end
 
     def logger
       @logger ||= @logfile ? Logger.new(@logfile) : Snails.logger
     end
 
-    def send_email(from: nil, to:, subject:, body: nil, template: nil, html_body: nil, html_template: nil, message_id: nil, return_path: nil, list_unsubscribe: nil)
+    def send_email(from: @from_email, to:, subject:, body: nil, template: nil, layout: nil, html_body: nil, html_template: nil, html_layout: nil, message_id: nil, return_path: nil, list_unsubscribe: nil)
       raise "No recipient given for mail: #{subject}!" if to.blank?
 
       message = {
         to:      to,
-        from:    from || @from_email,
-        subject: @base_subject + subject 
+        from:    from,
+        subject: @base_subject + subject
       }
 
+      raise "Blank from" if message[:from].blank?
+      raise "Blank to" if message[:to].blank?
+
       if body or template
-        message[:body]  = template ? render(template) : body
+        message[:body]  = template ? render(template, layout) : body
       end
 
       if html_body or html_template
-        message[:html_body] = html_template ? render(html_template) : html_body
+        message[:html_body] = html_template ? render(html_template, html_layout) : html_body
       end
 
       message[:message_id] = message_id if message_id
       message[:return_path] = return_path if return_path
       message[:list_unsubscribe] = list_unsubscribe if list_unsubscribe
 
-      logger.info "[#{to}] Delivering: #{subject}" 
-      debug = @debug.nil? ? !Snails.env.production? : @debug # if debug isn't set, determine based on env
-      resp, email = Tuktuk.deliver(message, debug: debug)
+      logger.info "[#{to}] Delivering: #{subject}"
+      @backend.deliver(message)
+    end
+
+    alias_method :deliver, :send_email
+
+    class Backend
+      def deliver(email, options = {})
+        raise "Please redefine in subclass"
+      end
+
+      def deliver_many(emails, options = {})
+        emails.map { |e| deliver(e, options) }
+      end
+    end
+
+    class Tuktuk < Backend
+      def initialize(config = {})
+        @debug = config[:debug]
+
+        if key = config.dig(:dkim, :private_key) and File.exist?(key)
+          config[:dkim][:private_key] = IO.read(key)
+        elsif config[:dkim]
+          puts "Private key for DKIM not found! Disabling..."
+          config.delete(:dkim)
+        end
+
+        Tuktuk.options = config
+      end
+
+      def deliver(email, options = {})
+        debug = @debug.nil? ? !Snails.env.production? : @debug # if debug isn't set, determine based on env
+        resp, email = Tuktuk.deliver(email, debug: debug)
+
+        if resp.is_a?(Tuktuk::Bounce)
+          logger.info "[#{to}] Email bounced! [#{resp.code}] #{resp.message}"
+        end
+
+        return resp, email
+      end
+
+      def deliver_many(emails, options = {})
+        Tuktuk.deliver_many(emails, options)
+      end
+    end
+
+    class Mailgun < Backend
+
+      def initialize(api_key:, domain_name:)
+        @key = api_key
+        @url = "https://api.mailgun.net/v3/#{domain_name}/messages"
+      end
+
+      def deliver(email, options = {})
+        raise "No body!" if email[:body].nil?
+
+        data = {
+          from: email[:from],
+          to: email[:to],
+          subject: email[:subject],
+        }
+
+        data[:text] = email[:body] if email[:body]
+        data[:html] = email[:html_body] if email[:html_body]
+
+        if data[:text].blank? && data[:html].blank?
+          raise ArgumentError, "Either text or html required"
+        end
 
-      if resp.is_a?(Tuktuk::Bounce)
-        logger.info "[#{to}] Email bounced! [#{resp.code}] #{resp.message}"
+        opts = { username: 'api', password: @key }
+        resp = Dagger.post(@url, data, opts)
+        resp.ok? ? [resp.data, data[:to]] : nil
       end
 
-      return resp, email
     end
 
   end

data/snails.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "snails"
-  s.version     = '0.4.2'
+  s.version     = '0.4.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Tomás Pollak']
   s.email       = ['tomas@forkhq.com']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snails
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler