bima-shark-sdk 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a940bf61424a49baa7f04791ca42ba61bb145a97
-  data.tar.gz: 734da4e58e55397a983e31ac9e53aa372e664a7b
+  metadata.gz: 36a6d2d392e0c48fdde77f944eb0e758439fd5e4
+  data.tar.gz: bc0e578ff45dbf92cf2ec2f4594d2957129c3b4e
 SHA512:
-  metadata.gz: 7c1ade4eaefb81ae08c8e799d29bd6caf4b4ff1f355df7f4382c9bd0cddb3dcc0b3b0022fb4c68ffeb6d3278a95cca50a04b3076002ff1d1e5a5e9688881b36a
-  data.tar.gz: 12186155c320e2254eed1d4e4dcfe47ac31b2f540e5d5470d15472c3b333d9915fc75347795762be86438c7d556e004d85d2f02235bd89d5913e32f62709d763
+  metadata.gz: 41efb8f03436ad58fe4cec3d189440748260f2dfb1354ef1a4510f520a9573c302450297da88d7f8861b5221e0891726415c83b8892b18094e72007323c328fc
+  data.tar.gz: fbe011415cd0ae7f7511bf4a2e46ab8e9787ef68b4f224a90c40af4fe0d8503fe6eace1e8d0c68497df1ce12b3865dfd2727e8687804474a33753432f047920e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+#### 2.4.3
+- allow `Shark::MailingService::Mailer#mail` to use separate layouts
+- rename `Shark::MailingService::Mailers::BaseMailer` to `Shark::MailingService::Mailer`
+
 #### 2.4.2
 - [fix] don't swallow connection errors
 

data/bima-shark-sdk.gemspec

@@ -7,8 +7,8 @@ require 'shark/version'
 Gem::Specification.new do |spec|
   spec.name          = 'bima-shark-sdk'
   spec.version       = Shark::VERSION
-  spec.authors       = ['Huy Dinh', 'Johannes Schmeißer', 'Joergen Dahlke']
-  spec.email         = ['bima-team@infopark.de']
+  spec.authors       = ['bima-team@justrelate.com']
+  spec.email         = ['bima-team@justrelate.com']
 
   spec.summary       = ''
   spec.description   = ''

data/lib/shark/mailing_service/mailer.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+module Shark
+  module MailingService
+    class Mailer
+      class << self
+        attr_writer :layout, :template_root
+
+        def layout
+          @layout || MailingService.config.default_layout
+        end
+
+        def method_missing(method, *args, &block)
+          return super unless respond_to?(method)
+
+          instance = new(
+            layout: layout,
+            template_name: method.to_s,
+            template_path: File.join(template_root.to_s, name.underscore)
+          )
+          instance.send(method, *args)
+          instance
+        end
+
+        def template_root
+          @template_root || MailingService.config.default_template_root
+        end
+
+        protected
+
+        def respond_to_missing?(method, include_private = false)
+          known_methods = if include_private
+                            instance_methods(false)
+                          else
+                            public_instance_methods(false)
+                          end
+          known_methods.include?(method)
+        end
+      end
+
+      attr_reader :layout, :template_name, :template_path
+
+      def initialize(layout:, template_path:, template_name:)
+        @layout = layout
+        @template_name = template_name
+        @template_path = template_path
+      end
+
+      def deliver
+        @mail.save
+      end
+      alias deliver_now deliver
+
+      protected
+
+      def body(format, locals = {})
+        renderer.render(template_name, format, locals)
+      end
+
+      def attribute_with_default(attributes, attribute)
+        return attributes[attribute] if attributes.key?(attribute)
+
+        I18n.t!("#{self.class.name.underscore}.#{template_name}.#{attribute}")
+      rescue StandardError
+        nil
+      end
+
+      def mail(attributes)
+        locals = attributes[:locals] || {}
+        mail_attributes = {
+          layout: attributes[:layout] || layout,
+          reply_to: attributes[:reply_to],
+          recipient: attributes[:to],
+          subject: attribute_with_default(attributes, :subject),
+          header: attribute_with_default(attributes, :header),
+          sub_header: attribute_with_default(attributes, :sub_header),
+          html_body: body(:html, locals),
+          text_body: body(:text, locals),
+          attachments: attributes[:attachments] || {}
+        }
+        %i[from header_image reply_to unsubscribe_url].each do |key|
+          value = attributes[key]
+          mail_attributes[key] = value if value.present?
+        end
+
+        @mail = Shark::MailingService::Mail.new(mail_attributes)
+      end
+
+      def renderer
+        @renderer ||= Renderers::ErbRenderer.new(template_path)
+      end
+    end
+
+    module Mailers
+      BaseMailer = MailingService::Mailer
+    end
+  end
+end
+
+

data/lib/shark/mailing_service.rb

@@ -10,7 +10,7 @@ module Shark
         require 'shark/mailing_service/configuration'
         require 'shark/mailing_service/renderers/context'
         require 'shark/mailing_service/renderers/erb_renderer'
-        require 'shark/mailing_service/mailers/base_mailer'
+        require 'shark/mailing_service/mailer'
 
         yield(config)
       end

data/lib/shark/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shark
-  VERSION = '2.4.2'
+  VERSION = '2.4.3'
 end

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bima-shark-sdk
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
-- Huy Dinh
-- Johannes Schmeißer
-- Joergen Dahlke
+- bima-team@justrelate.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -168,7 +166,7 @@ dependencies:
         version: '2.3'
 description: ''
 email:
-- bima-team@infopark.de
+- bima-team@justrelate.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -222,7 +220,7 @@ files:
 - lib/shark/mailing_service/base.rb
 - lib/shark/mailing_service/configuration.rb
 - lib/shark/mailing_service/mail.rb
-- lib/shark/mailing_service/mailers/base_mailer.rb
+- lib/shark/mailing_service/mailer.rb
 - lib/shark/mailing_service/renderers/context.rb
 - lib/shark/mailing_service/renderers/erb_renderer.rb
 - lib/shark/membership.rb

data/lib/shark/mailing_service/mailers/base_mailer.rb

@@ -1,96 +0,0 @@
-# frozen_string_literal: true
-
-module Shark
-  module MailingService
-    module Mailers
-      class BaseMailer
-        class << self
-          attr_writer :layout, :template_root
-
-          def layout
-            @layout || MailingService.config.default_layout
-          end
-
-          def method_missing(method, *args, &block)
-            return super unless respond_to?(method)
-
-            instance = new(
-              layout: layout,
-              template_name: method.to_s,
-              template_path: File.join(template_root.to_s, name.underscore)
-            )
-            instance.send(method, *args)
-            instance
-          end
-
-          def template_root
-            @template_root || MailingService.config.default_template_root
-          end
-
-          protected
-
-          def respond_to_missing?(method, include_private = false)
-            known_methods = if include_private
-                              instance_methods(false)
-                            else
-                              public_instance_methods(false)
-                            end
-            known_methods.include?(method)
-          end
-        end
-
-        attr_reader :layout, :template_name, :template_path
-
-        def initialize(layout:, template_path:, template_name:)
-          @layout = layout
-          @template_name = template_name
-          @template_path = template_path
-        end
-
-        def deliver
-          @mail.save
-        end
-        alias deliver_now deliver
-
-        protected
-
-        def body(format, locals = {})
-          renderer.render(template_name, format, locals)
-        end
-
-        def attribute_with_default(attributes, attribute)
-          return attributes[attribute] if attributes.key?(attribute)
-
-          I18n.t!("#{self.class.name.underscore}.#{template_name}.#{attribute}")
-        rescue StandardError
-          nil
-        end
-
-        def mail(attributes)
-          locals = attributes[:locals] || {}
-          mail_attributes = {
-            layout: layout,
-            reply_to: attributes[:reply_to],
-            recipient: attributes[:to],
-            subject: attribute_with_default(attributes, :subject),
-            header: attribute_with_default(attributes, :header),
-            sub_header: attribute_with_default(attributes, :sub_header),
-            html_body: body(:html, locals),
-            text_body: body(:text, locals),
-            attachments: attributes[:attachments] || {}
-          }
-          %i[from header_image reply_to unsubscribe_url].each do |key|
-            value = attributes[key]
-            mail_attributes[key] = value if value.present?
-          end
-
-          @mail = Shark::MailingService::Mail.new(mail_attributes)
-        end
-
-        def renderer
-          @renderer ||= Renderers::ErbRenderer.new(template_path)
-        end
-      end
-    end
-  end
-end