ateam-merb-auth-old 0.0.7 → 0.0.8

data/app/mailers/user_mailer.rb

@@ -6,19 +6,32 @@ class MerbAuth::UserMailer < Merb::MailController
     @ivar = params[MA[:single_resource]]
     Merb.logger.info "Sending Signup to #{@ivar.email} with code #{@ivar.activation_code}"
     instance_variable_set("@#{MA[:single_resource]}", @ivar )
-    render_mail :text => :signup, :layout => nil
+    render_utf8_mail :text => :signup, :layout => nil
   end
   
   def activation
     @ivar = params[MA[:single_resource]]
     Merb.logger.info "Sending Activation email to #{@ivar.email}"
     instance_variable_set("@#{MA[:single_resource]}", @ivar )
-    render_mail :text => :activation, :layout => nil
+    render_utf8_mail :text => :activation, :layout => nil
   end
   
   def forgot_password
     @ivar = params[MA[:single_resource]]
     instance_variable_set("@#{MA[:single_resource]}", @ivar )
-    render_mail :text => :forgot_password, :layout => nil
+    render_utf8_mail :text => :forgot_password, :layout => nil
   end    
-end
+
+  private
+
+  def render_utf8_mail(options)
+    mail = render_mail options
+    mail.text = Base64.encode64(unix2dos(mail.text))
+    mail
+  end
+
+  def unix2dos(text)
+    text.gsub(%r{\n$|\r\n$}, "\r\n")
+  end
+
+end

data/lib/merb-auth/adapters/common.rb

@@ -125,7 +125,6 @@ module MerbAuth
           return if defined?(Merb) && Merb.testing?
           from = MA[:from_email]
 
-          params[:text] = Base64.encode64(unix2dos(params[:text]))
           params[:subject] = unix2dos(params[:subject])
 
           MA::UserMailer.dispatch_and_deliver(action, params.merge(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ateam-merb-auth-old
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - ateam