bootstrap-email 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb329e67fb8b535a16ee1215af017f799873acbaf4282971555bdb546e5138b
-  data.tar.gz: 14a664c9e97bfcb6846866ffdfa99809cc007646361e9db733aaffaaf53dee45
+  metadata.gz: 0af8d16392d189b851cad1448686b2fda2a322b61c0b98553090394a598d0b32
+  data.tar.gz: '009e81f356b5f8519113b32f44b1c82cac62692b1bf035b2449da4dea46e60a0'
 SHA512:
-  metadata.gz: 35bfed648f7f86be0eb2bcbd5dba531d785f0c2b1bc82af1100806896f2480e1816a9275fd9678fcb86700cc4ae9c4052be7ebb33e614300a8ffcf005178cb53
-  data.tar.gz: d409bb910231e9e157ff375c379bc059e573a2ca44c860af183a72851b8ce825c3f52c193ade74d61551575dfa1bbfa4dadb6b7890ef8bfe3fe9dbcd530dcff1
+  metadata.gz: 2f2f9702d22b020da0968896dd7e3134a716c450492569fd3597676e4ad8305c340ba7abc26bd93b6d0b78b5f60de70a0d7bca2b0f310ccd15c73763e0bc3ca2
+  data.tar.gz: fd7db09c66be97a4082768c8b66025f714932dc356bac007033bb7f7a333d722d45caac63818cfca54344c23cf74bbd882045fc8cfeb11e2fef50217799a34a3

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/bootstrap-email/rails/mail_builder.rb

@@ -3,39 +3,50 @@
 module BootstrapEmail
   module Rails
     class MailBuilder
-      attr_reader :mail, :bootstrap_email
+      attr_reader :message, :bootstrap_email
 
       def self.perform(mail)
-        new(mail) if mail
+        new(mail).perform if mail
       end
 
-      private
-
       def initialize(mail)
-        @mail = mail
-        @bootstrap_email = BootstrapEmail::Compiler.new(html_part, type: :string)
-        perform
+        @message = mail
+        @bootstrap_email = BootstrapEmail::Compiler.new(html_part.decoded, type: :string)
       end
 
       def perform
-        add_mail_parts
-        mail
+        replace_html_part(generate_html_part_replacement)
+        message
       end
 
-      def html_part
-        (mail.html_part || mail).body.raw_source
+      private
+
+      # Much of this files derives from: https://github.com/fphilipe/premailer-rails/blob/2870060f9740de1c3f7a1da0acfc7b88e3181077/lib/premailer/rails/hook.rb
+
+      def message_contains_html?
+        html_part.present?
+      end
+
+      # Returns true if the message itself has a content type of text/html, thus
+      # it does not contain other parts such as alternatives and attachments.
+      def pure_html_message?
+        message.content_type&.include?('text/html')
       end
 
-      def add_mail_parts
-        if BootstrapEmail.static_config.generate_rails_text_part
-          mail.parts << build_alternative_part
+      def generate_html_part_replacement
+        if generate_text_part?
+          generate_alternative_part
         else
-          html = bootstrap_email.perform_full_compile
-          mail.parts << build_html_part(html)
+          html = bootstrap_email.perform_html_compile
+          build_html_part(html)
         end
       end
 
-      def build_alternative_part
+      def generate_text_part?
+        BootstrapEmail.static_config.generate_rails_text_part && !message.text_part
+      end
+
+      def generate_alternative_part
         compiled = bootstrap_email.perform_multipart_compile
 
         part = Mail::Part.new(content_type: 'multipart/alternative')
@@ -47,7 +58,7 @@ module BootstrapEmail
 
       def build_html_part(html)
         Mail::Part.new do
-          content_type "text/html; charset=#{html.encoding}"
+          content_type 'text/html; charset=UTF-8'
           body html
         end
       end
@@ -58,6 +69,47 @@ module BootstrapEmail
           body text
         end
       end
+
+      def html_part
+        if pure_html_message?
+          message
+        else
+          message.html_part
+        end
+      end
+
+      def replace_html_part(new_part)
+        if pure_html_message?
+          replace_in_pure_html_message(new_part)
+        else
+          replace_part_in_list(message.parts, html_part, new_part)
+        end
+      end
+
+      # If the new part is a pure text/html part, the body and its content type
+      # are used for the message. If the new part is
+      def replace_in_pure_html_message(new_part)
+        if new_part.content_type.include?('text/html')
+          message.body = new_part.decoded
+          message.content_type = new_part.content_type
+        else
+          message.body = nil
+          message.content_type = new_part.content_type
+          new_part.parts.each do |part|
+            message.add_part(part)
+          end
+        end
+      end
+
+      def replace_part_in_list(parts_list, old_part, new_part)
+        if (index = parts_list.index(old_part))
+          parts_list[index] = new_part
+        else
+          parts_list.any? do |part|
+            replace_part_in_list(part.parts, old_part, new_part) if part.respond_to?(:parts)
+          end
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Stuart Yamartino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-03 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier