letter_opener-iso-2022-jp 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05d36f6bf7d62eb19cf128784d479e20306ea254
-  data.tar.gz: cebd7677f679f64a2db72166b72b908e5231e9cf
+  metadata.gz: 1e8c3d9bb75446b0e397d703921c4c6c1362db23
+  data.tar.gz: 0562da1afc83a54ddab58461b08cfbed2b50cd33
 SHA512:
-  metadata.gz: e398ab898f26d9204bcb6be1bc9095bd85f5fcdab1842e3584c983bbabaf8f1da6b973ac0bf188ff83bdc9ff9ceb7ae1f4aee5e66f1d08e3afb1f82ded3b69a5
-  data.tar.gz: cae46c624f2890d010f8a6fd0138a3a0e4632606ab32eaafd8026aab6bdc5270c12271a3820817c98260ddc50f756d8b992efdecfccf0f41785a333c33b166b1
+  metadata.gz: 54796e81b98f1207261139220d259d71eb262f5933070e26c096303fc273118ec1dff70ae6e24f7549844907474f7961e424635fe686f1885c52257e67938736
+  data.tar.gz: 206940ca0dc6853fdef7437493c096a2f97834f70b1f9436ebbf799fa1be30d937e343322f38083d4c04e949143e37177fe26b0cf0b2e4595b2d805e5590e8ef

data/README.md

@@ -1,6 +1,6 @@
 # letter_opener-iso-2022-jp
 
-TODO: Write a gem description
+This patch provides 'letter_opener' gem with iso-2022-jp conversion capability.
 
 ## Installation
 
@@ -16,10 +16,6 @@ Or install it yourself as:
 
     $ gem install letter_opener-iso-2022-jp
 
-## Usage
-
-TODO: Write usage instructions here
-
 ## Contributing
 
 1. Fork it
@@ -27,3 +23,4 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/letter_opener-iso-2022-jp.gemspec

@@ -4,10 +4,10 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "letter_opener-iso-2022-jp"
-  spec.version       = "0.0.1"
+  spec.version       = "0.1.0"
   spec.authors       = ["hamajyotan"]
   spec.email         = ["takashi.sakaguchi@ummm.info"]
-  spec.description   = "gem letter_opener will not be able to correctly display ISO-2022-JP encoded email. This gem will eliminate the problem."
+  spec.description   = "This patch provides 'letter_opener' gem with iso-2022-jp conversion capability."
   spec.summary       = "letter_opener with iso-2022-jp encoding."
   spec.homepage      = "http://github.com/ummm/letter_opener-iso-2022-jp"
   spec.license       = "MIT"

data/lib/letter_opener/mail_with_iso_2022_jp.rb

@@ -1,35 +1,39 @@
 
 module LetterOpener
-  class MailWithIso2022Jp
-    extend Forwardable
-
-    def initialize mail
-      @mail = mail
-    end
-
-    def_delegators :@mail, :attachments, :multipart?, :content_type
+  class MailWithIso2022Jp < SimpleDelegator
 
     def subject
-      @subject ||= Iso2022JpToUtf8.decode(@mail.subject)
+      Iso2022JpToUtf8.decode(super)
     end
 
     def body
-      @mail.body.to_s.encode("UTF-8", "ISO-2022-JP")
+      Mail::Body.new(super.raw_source.encode("UTF-8", "ISO-2022-JP"))
     end
 
     def html_part &block
-      part = @mail.html_part(&block)
-      MailWithIso2022Jp.new(part) if part
+      if part = super
+        MailWithIso2022Jp.new(part)
+      end
     end
 
     def text_part &block
-      part = @mail.text_part(&block)
-      MailWithIso2022Jp.new(part) if part
+      if part = super
+        MailWithIso2022Jp.new(part)
+      end
     end
 
     def [] key
-      Array(@mail[key]).map { |header| Iso2022JpToUtf8.decode(header.value) }.join(", ")
+      Array(super).map { |f| PlainField.new(f.name, Iso2022JpToUtf8.decode(f.value), f.charset) }
     end
   end
+
+  class PlainField
+    def initialize name, value, charset
+      @name, @value, @charset = name, value, charset
+    end
+    attr_reader :name, :value, :charset
+
+    def to_str; @value; end
+  end
 end
 

data/lib/letter_opener-iso-2022-jp.rb

@@ -1,7 +1,7 @@
 
 require 'letter_opener'
 require 'nkf'
-require 'forwardable'
+require 'delegate'
 
 require 'letter_opener/iso_2022_jp_to_utf8'
 require 'letter_opener/mail_with_iso_2022_jp'

data/spec/mail_spec.rb

@@ -2,90 +2,140 @@
 
 require "spec_helper"
 
-describe Mail do
-  let(:location) { Mail.delivery_method.settings[:location] }
+describe LetterOpener, launchy_mock: true do
 
-  context "given utf-8 encoded mail" do
-    before do
-      mail = Mail.new(charset: "UTF-8") do
-        from            "差出人 <foo@example.com>"
-        to              "宛先 <bar@example.com>"
-        subject         "日本語のタイトル"
-        content_type    "text/plain; charset=UTF-8"
-        body            "日本語の本文 (UTF-8)"
+  describe "text mail" do
+    context "given utf-8 encoded mail" do
+      before do
+        Mail.new(charset: "UTF-8") {
+          from            "差出人 <foo@example.com>"
+          to              "宛先 <bar@example.com>"
+          subject         "日本語のタイトル"
+          content_type    "text/plain; charset=UTF-8"
+          body            "日本語の本文 (UTF-8)"
+        }.deliver
       end
 
-      mail.deliver
+      describe "messages" do
+        subject     { messages }
+        its(:size)  { should == 1 }
+      end
+      describe "messages[#{0}]" do
+        subject     { messages[0] }
+        its(:type)  { should == :text }
+        its(:raw)   { should match "<dd>&quot;差出人&quot; &lt;foo@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd>&quot;宛先&quot; &lt;bar@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd><strong>日本語のタイトル</strong></dd>" }
+        its(:raw)   { should match '<pre id=\"message_body\">日本語の本文 \(UTF-8\)</pre>' }
+      end
     end
 
-    subject { 1 + 2 }
-    it { expect(subject).to be 3 }
-  end
-
-  context "given iso-2022-jp encoded mail" do
-    before do
-      mail = Mail.new(charset: "ISO-2022-JP") do
-        from            "差出人 <foo@example.com>"
-        to              "宛先 <bar@example.com>"
-        subject         "日本語のタイトル"
-        content_type    "text/plain; charset=ISO-2022-JP"
-        body            "日本語の本文 (ISO-2022-JP)"
+    context "given iso-2022-jp encoded mail" do
+      before do
+        Mail.new(charset: "ISO-2022-JP") {
+          from            "差出人 <foo@example.com>"
+          to              "宛先 <bar@example.com>"
+          subject         "とてもとてもとてもとてもとてもとても very とてもとてもとてもとてもとてもとても長い日本語のタイトル"
+          content_type    "text/plain; charset=ISO-2022-JP"
+          body            "日本語の本文 ISO-2022-JP バージョン"
+        }.deliver
       end
 
-      mail.deliver
+      describe "messages" do
+        subject     { messages }
+        its(:size)  { should == 1 }
+      end
+      describe "messages[#{0}]" do
+        subject     { messages[0] }
+        its(:type)  { should == :text }
+        its(:raw)   { should match "<dd>差出人 &lt;foo@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd>宛先 &lt;bar@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd><strong>とてもとてもとてもとてもとてもとても very とてもとてもとてもとてもとてもとても長い日本語のタイトル</strong></dd>" }
+        its(:raw)   { should match '<pre id=\"message_body\">日本語の本文 ISO-2022-JP バージョン</pre>' }
+      end
     end
-
-    subject { 1 + 2 }
-    it { expect(subject).to be 3 }
   end
 
   context "given multipart mail" do
     context "given utf-8 encoded mail" do
       before do
-        mail = Mail.new(charset: "UTF-8") do
+        Mail.new(charset: "UTF-8") {
           from            "差出人 <foo@example.com>"
           to              "宛先 <bar@example.com>"
           subject         "日本語のタイトル"
 
-          text_part do
+          text_part {
             content_type  "text/plain; charset=UTF-8"
             body          "日本語の本文 (UTF-8)"
-          end.charset = "UTF-8"
-          html_part do
-            content_type  "text/html; charset=UTF-8"
-            body          "日本語の本文 (UTF-8)"
-          end.charset = "UTF-8"
-        end
+          }.charset = "UTF-8"
 
-        mail.deliver
+          html_part {
+            content_type  "text/html; charset=UTF-8"
+            body          "<h1>日本語の本文 (UTF-8)</h1>"
+          }.charset = "UTF-8"
+        }.deliver
       end
 
-      subject { 1 + 2 }
-      it { expect(subject).to be 3 }
+      describe "messages" do
+        subject     { messages }
+        its(:size)  { should == 2 }
+      end
+      describe "messages[#{0}]" do
+        subject     { messages[0] }
+        its(:type)  { should == :text }
+        its(:raw)   { should match "<dd>&quot;差出人&quot; &lt;foo@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd>&quot;宛先&quot; &lt;bar@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd><strong>日本語のタイトル</strong></dd>" }
+        its(:raw)   { should match '<pre id=\"message_body\">日本語の本文 \(UTF-8\)</pre>' }
+      end
+      describe "messages[#{1}]" do
+        subject     { messages[1] }
+        its(:type)  { should == :html }
+        its(:raw)   { should match "<dd>&quot;差出人&quot; &lt;foo@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd>&quot;宛先&quot; &lt;bar@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd><strong>日本語のタイトル</strong></dd>" }
+        its(:raw)   { should match "<h1>日本語の本文 \\(UTF-8\\)</h1>" }
+      end
     end
 
-  context "given iso-2022-jp encoded mail" do
+    context "given iso-2022-jp encoded mail" do
       before do
-        mail = Mail.new(charset: "ISO-2022-JP") do
+        Mail.new(charset: "ISO-2022-JP") {
           from            "差出人 <foo@example.com>"
           to              "宛先 <bar@example.com>"
-          subject         "日本語のタイトル"
+          subject         "とてもとてもとてもとてもとてもとても very とてもとてもとてもとてもとてもとても長い日本語のタイトル"
 
-          text_part do
+          text_part {
             content_type  "text/plain; charset=ISO-2022-JP"
-            body          "日本語の本文 (ISO-2022-JP)"
-          end.charset = "ISO-2022-JP"
-          html_part do
+            body          "日本語の本文 ISO-2022-JP バージョン"
+          }.charset = "ISO-2022-JP"
+          html_part {
             content_type  "text/html; charset=ISO-2022-JP"
-            body          "日本語の本文 (ISO-2022-JP)"
-          end.charset = "ISO-2022-JP"
-        end
-
-        mail.deliver
+            body          "<h1>日本語の本文 ISO-2022-JP バージョン</h1>"
+          }.charset = "ISO-2022-JP"
+        }.deliver
       end
 
-      subject { 1 + 2 }
-      it { expect(subject).to be 3 }
+      describe "messages" do
+        subject     { messages }
+        its(:size)  { should == 2 }
+      end
+      describe "messages[#{0}]" do
+        subject     { messages[0] }
+        its(:type)  { should == :text }
+        its(:raw)   { should match "<dd>差出人 &lt;foo@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd>宛先 &lt;bar@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd><strong>とてもとてもとてもとてもとてもとても very とてもとてもとてもとてもとてもとても長い日本語のタイトル</strong></dd>" }
+        its(:raw)   { should match '<pre id=\"message_body\">日本語の本文 ISO-2022-JP バージョン</pre>' }
+      end
+      describe "messages[#{1}]" do
+        subject     { messages[1] }
+        its(:type)  { should == :html }
+        its(:raw)   { should match "<dd>差出人 &lt;foo@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd>宛先 &lt;bar@example.com&gt;</dd>" }
+        its(:raw)   { should match "<dd><strong>とてもとてもとてもとてもとてもとても very とてもとてもとてもとてもとてもとても長い日本語のタイトル</strong></dd>" }
+        its(:raw)   { should match "<h1>日本語の本文 ISO-2022-JP バージョン</h1>" }
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 
+require "letter_opener"
 require "mail-iso-2022-jp"
 require "pry-debugger"
 
 require "letter_opener-iso-2022-jp"
 
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+
 RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true

data/spec/support/launchy_mock.rb

@@ -0,0 +1,29 @@
+
+class MockMessage
+  def initialize filename
+    @filename = filename
+    @raw = File.read(filename)
+  end
+
+  def type
+    case File.basename(@filename)
+    when "plain.html"; :text
+    when "rich.html" ; :html
+    end
+  end
+  attr_reader :raw
+end
+
+shared_context 'mimiced to receive mail', launchy_mock: true do
+  before do
+    Launchy.stub!(:open).and_return do |uri|
+      path = URI.parse(uri).path
+      dir = File.dirname(path)
+
+      messages.clear
+      Dir[File.join(dir, "**")].sort.each { |msg| messages << MockMessage.new(msg) }
+    end
+  end
+  let(:messages) { @messages ||= [] }
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: letter_opener-iso-2022-jp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - hamajyotan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-01 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,8 +94,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: gem letter_opener will not be able to correctly display ISO-2022-JP encoded
-  email. This gem will eliminate the problem.
+description: This patch provides 'letter_opener' gem with iso-2022-jp conversion capability.
 email:
 - takashi.sakaguchi@ummm.info
 executables: []
@@ -114,6 +113,7 @@ files:
 - lib/letter_opener/message_with_iso_2022_jp.rb
 - spec/mail_spec.rb
 - spec/spec_helper.rb
+- spec/support/launchy_mock.rb
 homepage: http://github.com/ummm/letter_opener-iso-2022-jp
 licenses:
 - MIT
@@ -141,3 +141,4 @@ summary: letter_opener with iso-2022-jp encoding.
 test_files:
 - spec/mail_spec.rb
 - spec/spec_helper.rb
+- spec/support/launchy_mock.rb