0
@@ -10,46 +10,32 @@ if defined?(Merb::Plugins)
0
   end
0
   
0
   Merb::BootLoader.after_app_loads do
0
-    # require code that must be loaded before the application
0
     require "merb-mailer"
0
     require "merb_sequel"
0
     require "sequel"
0
     
0
-    class SequelMailer < Merb::Mailer      
0
-      @@email_class = Merb::Mailer.config[:sequel_mailer_class] || Email
0
-  
0
-      ##
0
-      # Current email class for deliveries.
0
-      def self.email_class
0
-        @@email_class
0
-      end
0
-  
0
-      ##
0
-      # Sets the email class for deliveries.
0
-  
0
-      def self.email_class=(klass)
0
-        @@email_class = klass
0
-      end
0
-  
0
-      ##
0
-      # Adds +mail+ to the Email table.  Only the first From address for +mail+ is
0
-      # used.
0
-  
0
-      def sequel
0
-        debugger
0
-        @mail.to.each do |destination|
0
-          r = @@email_class.create({
0
-            :mail => @mail.to_s, 
0
-            :to_address => destination,
0
-            :from_address => @mail.from.first, 
0
-            :created_on => Time.now
0
-          })
0
+    module Sequel
0
+      class Mailer < Merb::Mailer
0
+        @@email_class = Merb::Mailer.config[:sequel_mailer_class] || Email rescue
0
+  
0
+        ##
0
+        # Adds +mail+ to the Email table.  Only the first From address for +mail+ is
0
+        # used.
0
+        def sequel
0
+          @mail.to.each do |destination|
0
+            r = @@email_class.create({
0
+              :mail => @mail.to_s, 
0
+              :to_address => destination,
0
+              :from_address => @mail.from.first, 
0
+              :created_on => Time.now
0
+            })
0
+          end
0
         end
0
       end
0
-    end
0
     
0
-    class SequelMailController < Merb::MailController
0
-      self._mailer_klass = SequelMailer
0
+      class MailController < Merb::MailController
0
+        self._mailer_klass = Sequel::Mailer
0
+      end
0
     end
0
   end
0