effective_email_templates 1.1.4 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a2f895f0cecf93fc54a7e2bc9498970a22523bc07da7188cd74e3b6a3b80009
-  data.tar.gz: 2e3731ad4ca65b2db718d07cde969c56167403c80bfe0ce396d3454a6f70f05b
+  metadata.gz: 9b1b5ced42deba88bc8a04fa40e1c5468ce63afcc1973b739e56567a42117e80
+  data.tar.gz: e9c50773c03d2786dd13ef629f39e2780b8637004f746132e21e16232d86e604
 SHA512:
-  metadata.gz: 0afb4d07dce4adb35ca0921361f7be65cd350dcd1c0fa9b995071ae839c62c2a38d8602d39852484cecc0a7a9fc6b270f42df7c4d919e943c3fb2ae05b4c1af1
-  data.tar.gz: dc7fb47226b0117134be8dcedd4f368551e3f1aced4d53b28f8091347f74ce51555afecc0d6420df815ddfe44125525e5b204c195e6bef499b34e707a4baf7a8
+  metadata.gz: ecbb4090d883a34dac59d42e7e2ff48f3206c71f4db3dba146d7a6e6a999ca563961735fb6e8e05357e65eceaa6257e6ea57a2a017585bcec8d2d6e2c73a93c9
+  data.tar.gz: 9f34ecd94ffadbf2850fc23db24b353aa03fafab12745b6dd854d25b7d0a362e3305aa2adaf5a2e02cefe0ac8b4c33168250f74b0294d5c57645770a6f0eaa10

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -4,7 +4,9 @@ module EffectiveEmailTemplatesMailer
   extend ActiveSupport::Concern
 
   def mail(headers = {}, &block)
-    email_template = Effective::EmailTemplate.where(template_name: action_name).first!
+    email_template = Effective::EmailTemplate.where(template_name: action_name).first
+    return super() if email_template.blank?
+
     assigns = (@assigns || {})
 
     # Parse assigns. Special keys for body and subject.

data/lib/effective_email_templates/importer.rb

@@ -11,7 +11,12 @@ module EffectiveEmailTemplates
     def execute(overwrite:, paths: nil, quiet: false)
       return false unless ActiveRecord::Base.connection.table_exists?(EffectiveEmailTemplates.email_templates_table_name)
 
-      paths ||= ActionController::Base.view_paths.map(&:path)
+      paths ||= if defined?(Tenant)
+        raise('expected a tenant') unless Tenant.current.present?
+        ActionController::Base.view_paths.reject { |view| view.path.include?('/apps/') }.map(&:path) + Tenant.view_paths.map(&:to_s)
+      else
+        ActionController::Base.view_paths.map(&:path)
+      end
 
       paths.each do |path|
         Dir[Rails.root.join(path, '**', '*_mailer/', '*.liquid')].each do |filepath|

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.1.4'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails