bootstrap-email 1.7.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4f28b1a2fa40f3a861f83e6e816ac561b3a9f458eea687f54e02066a3d587b
-  data.tar.gz: de4bc2816167bb1d57b9a3075debc44c2cf981048d4cfbdd8b3999b673d78476
+  metadata.gz: fe52b04e27f9f7e347eb90042033cad29b2095a737b8e08f444a42f4afabc0d7
+  data.tar.gz: 8386cb5e25c04d7106a5a1a3f81d1ed43cb77d4ccce6d2b84d0c2d6f40c0527d
 SHA512:
-  metadata.gz: e9561a847b402c882897680695d56bd4d226ec40e331d29df3d49ced0405964372304ee631646a4e70af1d216cdde01f674f742dcb906e0eae59909362d635c6
-  data.tar.gz: 25ee5b14236ea8d58228a5bfc95b0d2b4bbc2c75e63daab5b818414bc0d02c336a5ca49718adbf3ef84299dff1b58a52b6939b5277194003a054b383daa7da72
+  metadata.gz: e269f13af8280a7b07bf95a429ef0aff6fcf8bdfb4ea58e91c8cd95db0644da585f34fe75254f61ecc5b35d92e2a295a9a0e90db1a733e9418439fb8d2d1af6e
+  data.tar.gz: 6277a8b81b14c259701bd6ed406c76fda715b3af62e98e57ab4dc2fefac0c4756e81fe4d29ee32bdd9de769e9fd56af3c2cccddf617cc3a517aa2a86099e2d8d

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.8.1

data/lib/bootstrap-email/config_store.rb

@@ -3,14 +3,15 @@
 module BootstrapEmail
   class ConfigStore
     OPTIONS = [
-      :sass_email_location,     # path to main sass file
-      :sass_head_location,      # path to head sass file
-      :sass_email_string,       # main sass file passed in as a string
-      :sass_head_string,        # head sass file passed in as a string
-      :sass_load_paths,         # array of directories for loading sass imports
-      :sass_cache_location,     # path to tmp folder for sass cache
-      :sass_log_enabled,        # turn on or off sass log when caching new sass
-      :generate_rails_text_part # boolean for whether or not to generate the text part in rails, default: true
+      :sass_email_location,      # path to main sass file
+      :sass_head_location,       # path to head sass file
+      :sass_email_string,        # main sass file passed in as a string
+      :sass_head_string,         # head sass file passed in as a string
+      :sass_load_paths,          # array of directories for loading sass imports
+      :sass_cache_location,      # path to tmp folder for sass cache
+      :sass_log_enabled,         # turn on or off sass log when caching new sass
+      :generate_rails_text_part, # boolean for whether or not to generate the text part in rails, default: true
+      :override_mail_method      # boolean to override the mail method in rails, default: false
     ].freeze
 
     attr_accessor(*OPTIONS)
@@ -28,6 +29,7 @@ module BootstrapEmail
 
     def defaults
       self.generate_rails_text_part = true
+      self.override_mail_method = false
     end
   end
 end

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

@@ -2,8 +2,16 @@
 
 ActiveSupport.on_load(:action_mailer, { yield: true }) do |action_mailer|
   action_mailer.class_eval do # To support Rails less than 6
+    # Only override mail method if override_mail_method is enabled
+    if BootstrapEmail.static_config.override_mail_method
+      alias_method :rails_mail, :mail unless method_defined?(:rails_mail)
+      def mail(*args, &block)
+        bootstrap_mail(*args, &block)
+      end
+    end
+
     def bootstrap_mail(*args, &block)
-      message = mail(*args, &block)
+      message = respond_to?(:rails_mail) ? rails_mail(*args, &block) : mail(*args, &block)
       BootstrapEmail::Rails::MailBuilder.perform(message)
     end
     alias_method :bootstrap_email, :bootstrap_mail

data/lib/bootstrap-email.rb

@@ -11,8 +11,10 @@ require 'fileutils'
 require 'htmlbeautifier'
 
 begin
+  require 'logger' # Required for Rails 6.1+ compatibility with Ruby 3.4+
   require 'rails'
-rescue LoadError; end
+rescue LoadError
+end
 
 require 'action_mailer' if defined?(Rails)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-email
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Stuart Yamartino