app/controllers/ahoy/messages_controller.rb in ahoy_email-1.1.0 vs app/controllers/ahoy/messages_controller.rb in ahoy_email-1.1.1

@@ -6,10 +6,11 @@
     skip_around_action(*filters, raise: false)
 
     before_action :set_message
 
     def open
+      # TODO move to MessageSubscriber in 2.0
       if @message && !@message.opened_at
         @message.opened_at = Time.now
         @message.save!
       end
 
@@ -17,10 +18,11 @@
 
       send_data Base64.decode64("R0lGODlhAQABAPAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=="), type: "image/gif", disposition: "inline"
     end
 
     def click
+      # TODO move to MessageSubscriber in 2.0
       if @message && !@message.clicked_at
         @message.clicked_at = Time.now
         @message.opened_at ||= @message.clicked_at if @message.respond_to?(:opened_at=)
         @message.save!
       end
@@ -35,24 +37,33 @@
       if ActiveSupport::SecurityUtils.secure_compare(user_signature, signature)
         publish :click, url: params[:url]
 
         redirect_to url
       else
+        # TODO show link expired page with link to invalid redirect url in 2.0
         redirect_to AhoyEmail.invalid_redirect_url || main_app.root_url
       end
     end
 
     protected
 
     def set_message
-      @message = AhoyEmail.message_model.where(token: params[:id]).first
+      @token =  params[:id]
+
+      model = AhoyEmail.message_model
+
+      return if model.respond_to?(:column_names) && !model.column_names.include?("token")
+
+      @message = model.where(token: @token).first
     end
 
     def publish(name, event = {})
       AhoyEmail.subscribers.each do |subscriber|
+        subscriber = subscriber.new if subscriber.is_a?(Class) && !subscriber.respond_to?(name)
         if subscriber.respond_to?(name)
           event[:message] = @message
           event[:controller] = self
+          event[:token] = @token
           subscriber.send name, event
         end
       end
     end
   end