queued_mail 0.1.0 → 0.1.1

data/README.rdoc

@@ -31,7 +31,7 @@ ActionMailer::Base#deliverでを実際のメール送信ではなくジョブキ
 
 Gemfile
 
-    gem 'queued_mail', git: 'git://github.com/uzuki05/queued_mail.git'
+    gem 'queued_mail', '= 0.1.1'
 
     bundle install
 

data/lib/queued_mail/engine.rb

@@ -10,5 +10,6 @@ module QueuedMail
     config.mail_queue_service = :resque
     config.mail_queue_name = :mail_queue
     config.mail_queue_outbound_delivery_method = :sendmail
+    config.mail_queue_outbound_mailer = 'QueuedMail::Mailer'
   end
 end

data/lib/queued_mail/job.rb

@@ -6,10 +6,14 @@ module QueuedMail
       message = QueuedMail::Message.find(args["message_id"].to_i)
       
       message.lock!
-      QueuedMail::Mailer.original_email(message).deliver
+      mailer.original_email(message).deliver
       message.destroy
     rescue ActiveRecord::RecordNotFound => e
       # nothing raises
     end
+
+    def self.mailer
+      @mailer ||= instance_eval(Rails.application.config.mail_queue_outbound_mailer)
+    end
   end
 end

data/lib/queued_mail/mailer.rb

@@ -1,18 +1,5 @@
 module QueuedMail
   class Mailer < ActionMailer::Base
-    self.delivery_method = Rails.application.config.mail_queue_outbound_delivery_method
-    layout nil
-
-    def original_email(message)
-      mail = mail(:from => message.formatted_sender,
-                  :to => message.formatted_recipient,
-                  :reply_to => message.formatted_reply_to,
-                  :subject => message.subject,
-                  :content_type => message.content_type,
-                  :mime_version => message.mime_version,
-                  :content_transfer_encoding => message.content_transfer_encoding)
-      
-      mail.body = message.body
-    end
+    include QueuedMail::OutboundMail
   end
 end

data/lib/queued_mail/outbound_mail.rb

@@ -0,0 +1,24 @@
+module QueuedMail
+  module OutboundMail
+    def self.included(klass)
+      klass.class_eval do
+        self.delivery_method = Rails.application.config.mail_queue_outbound_delivery_method
+        layout nil
+      end
+    end
+
+    def original_email(message)
+      mail = mail(:from => message.formatted_sender,
+                  :to => message.formatted_recipient,
+                  :reply_to => message.formatted_reply_to,
+                  :subject => message.subject,
+                  :mime_version => message.mime_version,
+                  :content_transfer_encoding => message.content_transfer_encoding)
+      unless message.content_type.blank?
+        mail.header[:content_type].value = Mail::ContentTypeField.new(message.content_type).value
+      end
+      mail.body = message.body
+      mail
+    end
+  end
+end

data/lib/queued_mail/version.rb

@@ -1,3 +1,3 @@
 module QueuedMail
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/queued_mail.rb

@@ -3,6 +3,7 @@ require "queued_mail/engine"
 module QueuedMail
   autoload :DeliveryMethod,  'queued_mail/delivery_method'
   autoload :Mailer,          'queued_mail/mailer'
+  autoload :OutboundMail,    'queued_mail/outbound_mail'
   autoload :Job,             'queued_mail/job'
 
   module Queue

data/test/dummy/app/mailers/jp_sample_mailer.rb

@@ -0,0 +1,30 @@
+require 'jpmobile'
+class JpSampleMailer < Jpmobile::Mailer::Base
+  default from: "from@takeyu-web.com"
+
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.sample_mailer.simple.subject
+  #
+  def simple_test
+    @greeting = "Hi"
+
+    mail to: '"Yuichi Takeuchi" <uzuki05@takeyu-web.com>'
+  end
+
+  def multipart_test
+    mail to: '"Yuichi Takeuchi" <uzuki05@takeyu-web.com>'
+  end
+
+  def attachment_test
+    attachments['cat.jpg'] = File.read(File.join(Rails.root, 'file/cat.jpg'))
+    mail to: '"Yuichi Takeuchi" <uzuki05@takeyu-web.com>'
+  end
+
+  def inline_attachment_test
+    attachments.inline['cat.jpg'] = File.read(File.join(Rails.root, 'file/cat.jpg'))
+    mail to: '"Yuichi Takeuchi" <uzuki05@takeyu-web.com>'
+  end
+
+end

data/test/dummy/app/views/jp_sample_mailer/attachment_test.html.erb

@@ -0,0 +1,5 @@
+<p>こんにちは！
+日本語メールのテストです。
+</p>
+<p>Sending attachment in emails is easy.</p>
+

data/test/dummy/app/views/jp_sample_mailer/attachment_test.text.erb

@@ -0,0 +1,4 @@
+こんにちは！
+日本語メールのテストです。
+
+Sending attachment in emails is easy.

data/test/dummy/app/views/jp_sample_mailer/inline_attachment_test.html.erb

@@ -0,0 +1,5 @@
+<p>こんにちは！
+日本語メールのテストです。
+</p>
+<p>Sending attachment in emails is easy.</p>
+<p>inline:<%= image_tag attachments['cat.jpg'].url %></p>

data/test/dummy/app/views/jp_sample_mailer/inline_attachment_test.text.erb

@@ -0,0 +1,5 @@
+こんにちは！
+日本語メールのテストです。
+
+Sending attachment in emails is easy.
+

data/test/dummy/app/views/jp_sample_mailer/multipart_test.html.erb

@@ -0,0 +1,4 @@
+<p>こんにちは！<br />
+  日本語メールのテストです。
+</p>
+<p>Multipart messages can also be used implicitly because Action Mailer will automatically detect and use multipart templates, where each template is named after the name of the action, followed by the content type. Each such detected template will be added as a separate part to the message.</p>

data/test/dummy/app/views/jp_sample_mailer/multipart_test.text.erb

@@ -0,0 +1,4 @@
+こんにちは！
+日本語メールのテストです。
+
+Multipart messages can also be used implicitly because Action Mailer will automatically detect and use multipart templates, where each template is named after the name of the action, followed by the content type. Each such detected template will be added as a separate part to the message.

data/test/dummy/app/views/jp_sample_mailer/simple_test.text.erb

@@ -0,0 +1,6 @@
+JpSampleMailer#simple_test
+
+こんにちは！
+日本語メールのテストです。
+
+<%= @greeting %>, find me in app/views/app/views/jp_sample_mailer/simple_test.text.erb

data/test/dummy/config/environments/development.rb

@@ -36,5 +36,9 @@ Dummy::Application.configure do
   config.assets.debug = true
 
   #config.action_mailer.delivery_method = :sendmail
-  config.mail_queue_outbound_delivery_method = :sendmail
+  config.mail_queue_outbound_delivery_method = :smtp
+  if FileTest.file?("#{Rails.root.to_s}/config/smtp_settings.yml")
+    smtp_settings = YAML::load(File.open("#{Rails.root.to_s}/config/smtp_settings.yml"))
+    ActionMailer::Base.smtp_settings = smtp_settings[Rails.env] unless smtp_settings[Rails.env].nil?
+  end
 end

data/test/dummy/config/smtp_settings.yml

@@ -0,0 +1,7 @@
+development:
+  :address: smtp.gmail.com
+  :port: 587
+  :authentication: plain
+  :user_name: uzuki05@takeyu-web.com
+  :password: arowanadaisuki
+  :enable_starttls_auto: true