eco-helpers 3.0.37 → 3.1.2

data/lib/eco/api/common/session/mailer/provider_base.rb

@@ -1,63 +1,58 @@
 # rubocop:disable Naming/MethodParameterName
-module Eco
-  module API
-    module Common
-      module Session
-        class Mailer
-          class ProviderBase
-            class << self
-              def to_desc(to: nil, cc: nil, bcc: nil)
-                cc_to  = [cc].flatten.compact.uniq
-                bcc_to = [bcc].flatten.compact.uniq
-
-                { to_addresses: [to].flatten.compact.uniq }.tap do |dest|
-                  dest.merge!(cc_addresses: cc_to)   unless cc_to.empty?
-                  dest.merge!(bcc_addresses: bcc_to) unless bcc_to.empty?
-                end
-              end
-            end
+class Eco::API::Common::Session::Mailer
+  class ProviderBase
+    class << self
+      def to_desc(to: nil, cc: nil, bcc: nil)
+        cc_to  = [cc].flatten.compact.uniq
+        bcc_to = [bcc].flatten.compact.uniq
+
+        { to_addresses: [to].flatten.compact.uniq }.tap do |dest|
+          dest.merge!(cc_addresses: cc_to)   unless cc_to.empty?
+          dest.merge!(bcc_addresses: bcc_to) unless bcc_to.empty?
+        end
+      end
+    end
 
-            include Eco::Language::AuxiliarLogger
+    include Eco::Language::AuxiliarLogger
 
-            attr_reader :config
+    attr_reader :config
 
-            def initialize(config, logger:)
-              @config = config
-              @logger = logger
-            end
+    def initialize(config, logger:)
+      @config = config
+      @logger = logger
+    end
 
-            def send_mail(subject:, body:, to: nil, cc: nil, bcc: nil) # rubocop:disable Lint/UnusedMethodArgument
-              raise 'You must implement this method'
-            end
+    def send_mail(subject:, body:, to: nil, cc: nil, bcc: nil) # rubocop:disable Lint/UnusedMethodArgument
+      raise 'You must implement this method'
+    end
 
-            def fetch_to(value = nil)
-              value || config.mailer.to
-            end
+    def fetch_to(value = nil)
+      value || config.mailer.to || env_credential(:to)
+    end
 
-            private
+    private
 
-            def credentials
-              raise 'You must implement this method'
-            end
+    def credentials
+      {
+        to:   'MAILER_TO',
+        from: 'MAILER_FROM'
+      }
+    end
 
-            def fetch_from(value = nil)
-              value || config.mailer.from
-            end
+    def fetch_from(value = nil)
+      value || config.mailer.from || env_credential(:from)
+    end
 
-            def fetch_access_key_id
-              env_mail(:id) || config.mailer.access_key_id
-            end
+    def fetch_access_key_id
+      env_credential(:id) || config.mailer.access_key_id
+    end
 
-            def fetch_secret_access_key
-              env_mail(:key) || config.mailer.secret_access_key
-            end
+    def fetch_secret_access_key
+      env_credential(:key) || config.mailer.secret_access_key
+    end
 
-            def env_mail(prop)
-              ENV[credentials[prop]]
-            end
-          end
-        end
-      end
+    def env_credential(prop)
+      ENV[credentials[prop]]
     end
   end
 end

data/lib/eco/api/common/session/mailer/sendgrid_provider.rb

@@ -1,116 +1,108 @@
 # rubocop:disable Naming/MethodParameterName
-module Eco
-  module API
-    module Common
-      module Session
-        class Mailer
-          class SendgridProvider < ProviderBase
-            def send_mail(subject:, body:, to: nil, cc: nil, bcc: nil)
-              return false unless sendgrid
-
-              data = to_data(
-                subject: subject,
-                body:    body,
-                to:      to,
-                cc:      cc,
-                bcc:     bcc
-              )
-
-              mailer._('send').post(request_body: data)
-            end
-
-            def fetch_to(value = nil)
-              emails = [super].flatten.compact
-              to_email_model(emails)
-            end
-
-            # @return [Boolean] whether or not the mailer is configured for usage.
-            def configured?
-              fetch_secret_access_key
-            end
-
-            private
-
-            def credentials
-              @credentials ||= {
-                id:  'SENDGRID_ACCESS_ID',
-                key: 'SENDGRID_ACCESS_KEY'
-              }
-            end
-
-            def to_data(subject:, body:, to: nil, cc: nil, bcc: nil)
-              {
-                'personalizations' => [
-                  {
-                    'to'      => fetch_to(to).flatten,
-                    'subject' => subject
-                  }.tap do |pers|
-                    merge_if('cc', cc, target: pers)
-                    merge_if('bcc', bcc, target: pers)
-                  end
-                ],
-                'from'             => fetch_from,
-                'content'          => [
-                  {
-                    'type'  => 'text/plain',
-                    'value' => body
-                  }
-                ]
-              }
-            end
-
-            def mailer
-              @mailer ||= sendgrid&.client&.mail
-            end
-
-            def sendgrid
-              require 'sendgrid-ruby'
-              extend(::SendGrid) unless is_a?(SendGrid)
-
-              @sendgrid ||= SendGrid::API.new(
-                api_key: fetch_secret_access_key
-              )
-            rescue StandardError => err
-              log(:error) {
-                "Trying to send an email with wrong email configuration: #{err}"
-              }
-              nil
-            end
-
-            def to_email_model(value)
-              case value
-              when Array
-                value.map do |val|
-                  to_email_model(val)
-                end.compact
-              else
-                return if value.to_s.strip.empty?
-
-                {
-                  'email' => value
-                }
-              end
-            end
-
-            def merge_if(key, data, target: {})
-              return if data.to_s.strip.empty?
-
-              key_data = to_email_model(data)
-
-              return if key_data.nil?
-              return if key_data.empty?
-
-              target.merge!({key.to_s => key_data})
-            end
-
-            def fetch_from(value = nil)
-              email = [super].flatten.compact.first
-              to_email_model(email)
-            end
+class Eco::API::Common::Session::Mailer
+  class SendgridProvider < ProviderBase
+    def send_mail(subject:, body:, to: nil, cc: nil, bcc: nil)
+      return false unless sendgrid
+
+      data = to_data(
+        subject: subject,
+        body:    body,
+        to:      to,
+        cc:      cc,
+        bcc:     bcc
+      )
+
+      mailer._('send').post(request_body: data)
+    end
+
+    def fetch_to(value = nil)
+      emails = [super].flatten.compact
+      to_email_model(emails)
+    end
+
+    # @return [Boolean] whether or not the mailer is configured for usage.
+    def configured?
+      fetch_secret_access_key
+    end
+
+    private
+
+    def credentials
+      @credentials ||= super.merge({
+        id:  'SENDGRID_ACCESS_ID',
+        key: 'SENDGRID_ACCESS_KEY'
+      })
+    end
+
+    def to_data(subject:, body:, to: nil, cc: nil, bcc: nil)
+      {
+        'personalizations' => [
+          {
+            'to'      => fetch_to(to).flatten,
+            'subject' => subject
+          }.tap do |pers|
+            merge_if('cc', cc, target: pers)
+            merge_if('bcc', bcc, target: pers)
           end
-        end
+        ],
+        'from'             => fetch_from,
+        'content'          => [
+          {
+            'type'  => 'text/plain',
+            'value' => body
+          }
+        ]
+      }
+    end
+
+    def mailer
+      @mailer ||= sendgrid&.client&.mail
+    end
+
+    def sendgrid
+      require 'sendgrid-ruby'
+      extend(::SendGrid) unless is_a?(SendGrid)
+
+      @sendgrid ||= SendGrid::API.new(
+        api_key: fetch_secret_access_key
+      )
+    rescue StandardError => err
+      log(:error) {
+        "Trying to send an email with wrong email configuration: #{err}"
+      }
+      nil
+    end
+
+    def to_email_model(value)
+      case value
+      when Array
+        value.map do |val|
+          to_email_model(val)
+        end.compact
+      else
+        return if value.to_s.strip.empty?
+
+        {
+          'email' => value
+        }
       end
     end
+
+    def merge_if(key, data, target: {})
+      return if data.to_s.strip.empty?
+
+      key_data = to_email_model(data)
+
+      return if key_data.nil?
+      return if key_data.empty?
+
+      target.merge!({key.to_s => key_data})
+    end
+
+    def fetch_from(value = nil)
+      email = [super].flatten.compact.first
+      to_email_model(email)
+    end
   end
 end
 

data/lib/eco/api/common/session/mailer.rb

@@ -1,91 +1,86 @@
 # rubocop:disable Naming/MethodParameterName
 
-require_relative 'mailer/provider_base'
-require_relative 'mailer/aws_provider'
-require_relative 'mailer/sendgrid_provider'
-module Eco
-  module API
-    module Common
-      module Session
-        class Mailer
-          include Eco::Language::AuxiliarLogger
-
-          DEFAULT_PROVIDER = :sendgrid
-
-          attr_reader :provider
-
-          # @param enviro [Eco::API::Common::Session::Environment]
-          def initialize(enviro:, provider: DEFAULT_PROVIDER)
-            msg = "Required Environment object (enviro:). Given: #{enviro.class}"
-            raise msg if enviro && !enviro.is_a?(Eco::API::Common::Session::Environment)
-
-            @enviro   = enviro
-            @provider = provider || DEFAULT_PROVIDER
-          end
-
-          # Sends an email
-          # @param to [String] destination email address
-          # @param subject [String] subject of the email
-          # @param body [String] `html` or plain text message
-          def mail(subject:, body:, to: nil, cc: nil, bcc: nil)
-            return false unless (serv = service)
-
-            unless serv.configured?
-              msg  = 'Mailer: You are missing configuration parameters '
-              msg << "for '#{provider}'. Review your .env file"
-              log(:error) { msg }
-              return false
-            end
-
-            serv.send_mail(
-              subject: subject,
-              body:    body,
-              to:      to,
-              cc:      cc,
-              bcc:     bcc
-            ).tap do |response|
-              next unless response
-
-              to_addr = serv.fetch_to(to)
-              msg     = "Sent email #{ProviderBase.to_desc(
-                to:  to_addr,
-                cc:  cc,
-                bcc: bcc
-              )}"
-
-              puts msg
-              log(:debug) { msg }
-            end
-          end
-
-          private
-
-          def service
-            case provider
-            when :aws
-              AwsProvider.new(config, logger: logger)
-            when :sendgrid
-              SendgridProvider.new(config, logger: logger)
-            else
-              msg = "Unknown mail provider '#{provider}'"
-              puts msg
-              log(:debug) { msg }
-
-              nil
-            end
-          end
-
-          def logger
-            @enviro&.logger || super
-          end
-
-          def config
-            @enviro.config || {}
-          end
-        end
+module Eco::API::Common::Session
+  class Mailer
+    include Eco::Language::AuxiliarLogger
+
+    DEFAULT_PROVIDER = :sendgrid
+
+    attr_reader :provider
+
+    # @param enviro [Eco::API::Common::Session::Environment]
+    def initialize(enviro:, provider: DEFAULT_PROVIDER)
+      msg = "Required Environment object (enviro:). Given: #{enviro.class}"
+      raise msg if enviro && !enviro.is_a?(Eco::API::Common::Session::Environment)
+
+      @enviro   = enviro
+      @provider = provider || DEFAULT_PROVIDER
+    end
+
+    # Sends an email
+    # @param to [String] destination email address
+    # @param subject [String] subject of the email
+    # @param body [String] `html` or plain text message
+    def mail(subject:, body:, to: nil, cc: nil, bcc: nil)
+      return false unless (serv = service)
+
+      unless serv.configured?
+        msg  = 'Mailer: You are missing configuration parameters '
+        msg << "for '#{provider}'. Review your .env file"
+        log(:error) { msg }
+        return false
+      end
+
+      serv.send_mail(
+        subject: subject,
+        body:    body,
+        to:      to,
+        cc:      cc,
+        bcc:     bcc
+      ).tap do |response|
+        next unless response
+
+        to_addr = serv.fetch_to(to)
+        msg     = "Sent email #{ProviderBase.to_desc(
+          to:  to_addr,
+          cc:  cc,
+          bcc: bcc
+        )}"
+
+        puts msg
+        log(:debug) { msg }
+      end
+    end
+
+    private
+
+    def service
+      case provider
+      when :aws
+        AwsProvider.new(config, logger: logger)
+      when :sendgrid
+        SendgridProvider.new(config, logger: logger)
+      else
+        msg = "Unknown mail provider '#{provider}'"
+        puts msg
+        log(:debug) { msg }
+
+        nil
       end
     end
+
+    def logger
+      @enviro&.logger || super
+    end
+
+    def config
+      @enviro.config || {}
+    end
   end
 end
 
+require_relative 'mailer/provider_base'
+require_relative 'mailer/aws_provider'
+require_relative 'mailer/sendgrid_provider'
+
 # rubocop:enable Naming/MethodParameterName