effective_email_templates 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b4cba485f59818cdff525e1a105ce1e61e82741b416291ea48721da04ac148
-  data.tar.gz: 96dabdd42fa0e1dc26a6e1c7fbe497f471ba06b67234f852ba3ca41816ccf58e
+  metadata.gz: f6f761daef6975677ea045c02bec4fe35c12613428d7a471ea96090d9ff4f8ee
+  data.tar.gz: 643bb762e01e5f086d90fe91465dc150033f27e2cd913f3295b02c1d35e0cff0
 SHA512:
-  metadata.gz: 54dbf79839ab5bc46073a9aeb59ae30de17c89a6b5e7d0efaf54f5703c9761118f8e8713f0cc4fbe2acfc066c5ebdc9be4f307433cce9680d73e89eced6ca409
-  data.tar.gz: baed2e7069b501209ba92605dd023c4f18d4e8dcbf79861b195c15c268cbc5d7d8025b14ff27a07473a9a46a99dae26b55ef446df46cf02553dc288916dd7be5
+  metadata.gz: d516cd29cdbf67641658d726e3d6ac3c670d25f1a563827516e05f8bb78aeb31c316f3270c4cdf981d74cd5d0efb8f980bb4035b6bdca61738000f4a344b7d20
+  data.tar.gz: 1e10e8b93b994cbbb3a8b715a97d039648655cd2f307fbbdf5cf3caafae73fd4c735ead6a8461e9e5c209a00ddb5dc4dc9d773919192d92a29d1b5a1d3cfe8d1

data/app/mailers/concerns/effective_email_templates_mailer.rb

@@ -18,7 +18,7 @@ module EffectiveEmailTemplatesMailer
     email_template.subject = subject if subject.present?
 
     # Add any _url helpers
-    assigns = route_url_assigns(email_template).merge(assigns)
+    assigns = route_url_assigns(email_template, assigns).merge(assigns)
 
     # Render from the template, possibly with updated body
     rendered = email_template.render(assigns)
@@ -28,8 +28,12 @@ module EffectiveEmailTemplatesMailer
 
   private
 
-  def route_url_assigns(email_template)
-    email_template.template_variables.select { |name| name.ends_with?('_url') }.inject({}) do |h, name|
+  def route_url_assigns(email_template, existing)
+    route_variables = email_template.template_variables
+      .select { |name| name.ends_with?('_url') }
+      .reject { |name| existing.key?(name) || existing.key?(name.to_sym) }
+    
+    route_variables.inject({}) do |h, name|
       h[name] = public_send(name) if respond_to?(name); h
     end
   end

data/lib/effective_email_templates/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEmailTemplates
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_email_templates
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails