Fixed custom message model - fixes #115

ankane · Oct 17, 2018 · 8c6f1e0 · 8c6f1e0
1 parent fbe46cc
commit 8c6f1e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.3 [unreleased]
+
+- Fixed custom message model
+
 ## 1.0.2
 
 - Fixed error with Ruby < 2.5

diff --git a/lib/ahoy_email.rb b/lib/ahoy_email.rb
@@ -65,8 +65,10 @@ module AhoyEmail
 
   self.preserve_callbacks = []
 
+  self.message_model = -> { ::Ahoy::Message }
+
   def self.message_model
-    model = (defined?(@message_model) && @message_model) || ::Ahoy::Message
+    model = defined?(@@message_model) && @@message_model
     model = model.call if model.respond_to?(:call)
     model
   end