decoration_mail 0.2.4 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8d0a474271ee1e5cd289bdba16b7130a1969f81b
+  data.tar.gz: 44cf247349b4ae24f86816a85499d8bb5988bd74
+SHA512:
+  metadata.gz: 4be509f5787e387a62e312a953a4903fef87ae247115154518be97354d439f7badc038dff2104e144022eae3ee5e6903a48fdcf36af4f04a593fb775c1ae5d07
+  data.tar.gz: 02f983ed779354de25dbc2f4b03e503e27fcabbf12e2c5fd089f101332134e3e689fd20bd1dc621a24e71604c5cab31b590e8965a44f1cc1590b231d8718d556

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -1,9 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'mail',     '>=2.2.9'
-gem 'hpricot',  '>=0.8.3'
-
-group :development, :test do
-  gem 'rspec',  '>=2.0'
-  gem 'jeweler'
-end
+gemspec

data/{MIT-LICENSE → LICENSE.txt}

@@ -1,4 +1,6 @@
-Copyright (c) 2011 [name of plugin creator]
+Copyright (c) 2011 Dai Akatsuka
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,16 +1,14 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
-task :default => :test
+task :default => :spec
 
 desc 'Test the decoration_mail plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ['-c --backtrace']
 end
 
 desc 'Generate documentation for the decoration_mail plugin.'
@@ -21,17 +19,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "decoration_mail"
-    gemspec.summary = "Decoration Mail Parser"
-    gemspec.email = "d.akatsuka@gmail.com"
-    gemspec.homepage = "https://github.com/dakatsuka/decoration_mail"
-    gemspec.description = "Decoration Mail Parser"
-    gemspec.authors = ["Dai Akatsuka"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end

data/decoration_mail.gemspec

@@ -1,77 +1,27 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'decoration_mail/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{decoration_mail}
-  s.version = "0.2.4"
+Gem::Specification.new do |spec|
+  spec.name          = "decoration_mail"
+  spec.version       = DecorationMail::VERSION
+  spec.authors       = ["Dai Akatsuka", "M.Shibuya"]
+  spec.email         = ["d.akatsuka@gmail.com", "mit.shibuya@gmail.com"]
+  spec.description   = %q{Decoration Mail Parser}
+  spec.summary       = %q{Decoration Mail Parser}
+  spec.homepage      = "https://github.com/dakatsuka/decoration_mail"
+  spec.license       = "MIT"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Dai Akatsuka"]
-  s.date = %q{2011-03-23}
-  s.description = %q{Decoration Mail Parser}
-  s.email = %q{d.akatsuka@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "MIT-LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "decoration_mail.gemspec",
-    "init.rb",
-    "lib/decoration_mail.rb",
-    "lib/decoration_mail/base.rb",
-    "lib/decoration_mail/converter.rb",
-    "lib/decoration_mail/image.rb",
-    "lib/decoration_mail/message.rb",
-    "spec/resources/au_decoration.eml",
-    "spec/resources/au_decoration_with_attachment.eml",
-    "spec/resources/docomo_decoration.eml",
-    "spec/resources/docomo_decoration_with_attachment.eml",
-    "spec/resources/other_decoration.eml",
-    "spec/resources/softbank_decoration.eml",
-    "spec/resources/softbank_decoration_with_attachment.eml",
-    "spec/spec_helper.rb",
-    "spec/unit/base_spec.rb",
-    "spec/unit/converter_spec.rb",
-    "spec/unit/image_spec.rb"
-  ]
-  s.homepage = %q{https://github.com/dakatsuka/decoration_mail}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Decoration Mail Parser}
-  s.test_files = [
-    "spec/spec_helper.rb",
-    "spec/unit/base_spec.rb",
-    "spec/unit/converter_spec.rb",
-    "spec/unit/image_spec.rb"
-  ]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mail>, [">= 2.2.9"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0.8.3"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<mail>, [">= 2.2.9"])
-      s.add_dependency(%q<hpricot>, [">= 0.8.3"])
-      s.add_dependency(%q<rspec>, [">= 2.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<mail>, [">= 2.2.9"])
-    s.add_dependency(%q<hpricot>, [">= 0.8.3"])
-    s.add_dependency(%q<rspec>, [">= 2.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  spec.add_dependency "mail", "~> 2.2"
+  spec.add_dependency "nokogiri"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "debugger"
 end
-

data/lib/decoration_mail/base.rb

@@ -6,86 +6,66 @@ module DecorationMail
     attr_reader :images, :subject
 
     def initialize(mail)
-      each_attachments(mail)
+      extract_attachments(mail)
       @subject     = mail.subject.blank? ? nil : mail.subject.toutf8
-      @body_text   = parse_text(mail.text_part)
-      @body_html   = parse_html(mail.html_part)
+      @text_body = mail.text_part.to_s.toutf8
+      @html_body = DecorationMail::HTML.new(mail.html_part.body.to_s.toutf8)
     end
 
     def save(options = {}, &block)
       @images.each do |image|
         image.instance_eval(&block)
 
-        if @body_html.inner_html =~ /#{image.content_id}/
-          @body_html.search("img").each do |element|
-            if element[:src] == image.content_id
-              element[:src] = (image.path ? image.path : image.filename.to_s)
-            end
-          end
+        if @html_body.match /#{image.content_id}/
+          @html_body.update_img_src(image.content_id, image.src)
         else
           case options[:other_images]
           when :top
-            @body_html = Hpricot("<div style='text-align:center;'><img src='#{image.path ? image.path : image.filename}' /></div><br />" + @body_html.to_html)
+            @html_body.prepend_img(image.src)
           when :bottom
-            @body_html = Hpricot(@body_html.to_html + "<br /><div style='text-align:center;'><img src='#{image.path ? image.path : image.filename}' /></div>")
+            @html_body.append_img(image.src)
           end
         end
       end
 
-      @body_html.to_html
+      @html_body.to_s
     end
 
-    private
-      def parse_text(text)
-        text.to_s.toutf8
-      end
-
-      def parse_html(html)
-        html = html.body.to_s.toutf8
-        html = Hpricot.parse(html)
-
-        if html.search("body").empty?
-          raise ArgumentError, 'invalid HTML'
-        else
-          html = DecorationMail::Converter.convert_to_xhtml(html).at('div')
-        end
-
-        html
-      end
+  private
 
-      def check_content_type(content_type)
-        case content_type
-        when /^image\/gif/
-          true
-        when /^image\/jpg/
-          true
-        when /^image\/jpeg/
-          true
-        when /^image\/png/
-          true
-        else
-          false
-        end
+    def check_content_type(content_type)
+      case content_type
+      when /^image\/gif/
+        true
+      when /^image\/jpg/
+        true
+      when /^image\/jpeg/
+        true
+      when /^image\/png/
+        true
+      else
+        false
       end
+    end
 
-      def each_attachments(part)
-        @images = [] unless defined?(@images)
+    def extract_attachments(part)
+      @images = [] unless defined?(@images)
 
-        if part.multipart?
-          part.parts.each do |part|
-            if part.multipart?
-              each_attachments(part)
-            else
-              content_type = part.header['content-type'].to_s
-              next unless check_content_type(content_type)
+      if part.multipart?
+        part.parts.each do |part|
+          if part.multipart?
+            extract_attachments(part)
+          else
+            content_type = part.header['content-type'].to_s
+            next unless check_content_type(content_type)
 
-              content_id   = part.header['content-id'].to_s.sub(/^</, '').sub(/>$/, '')
-              content_id   = part.filename if content_id.blank?
-              filename     = part.filename
-              @images << DecorationMail::Image.new(content_id, content_type, filename, part)
-            end
+            content_id   = part.header['content-id'].to_s.sub(/^</, '').sub(/>$/, '')
+            content_id   = part.filename if content_id.blank?
+            filename     = part.filename
+            @images << DecorationMail::Image.new(content_id, content_type, filename, part)
           end
         end
       end
+    end
   end
 end

data/lib/decoration_mail/{converter.rb → html.rb}

@@ -1,45 +1,65 @@
 # coding: utf-8
 
 module DecorationMail
-  module Converter
-    def self.convert_to_xhtml(html)
-      html = convert_body_to_div(html)
-      html = convert_font_color_to_css(html)
-      html = convert_font_size_to_css(html)
-      html = convert_align_to_css(html)
-      html = convert_blink_to_css(html)
-      html = convert_marquee_to_css(html)
+  class HTML
+    def initialize(str)
+      @tree = Nokogiri.HTML(str)
+      raise ArgumentError, 'invalid HTML' if @tree.search("body").empty?
+
+      convert_font_color_to_css
+      convert_font_size_to_css
+      convert_align_to_css
+      convert_blink_to_css
+      convert_marquee_to_css
     end
 
-    private
-    def self.convert_body_to_div(html)
-      html.search("body").each do |body|
-        if body[:bgcolor]
-          body.swap('<div style="background-color:' + body[:bgcolor] + ';">' + body.inner_html + '</div>')
-        else
-          body.swap("<div>#{body.inner_html}</div>")
-        end
+    def match(regexp)
+      @tree.css('body').to_html =~ regexp
+    end
+
+    def append_img(src)
+      @tree.css('body').children.after(%(<br /><div style="text-align:center;"><img src="#{src}" /></div>))
+    end
+
+    def prepend_img(src)
+      @tree.css('body').children.before(%(<div style="text-align:center;"><img src="#{src}" /></div><br />))
+    end
+
+    def update_img_src(from, to)
+      @tree.css("img[src=\"#{from}\"]").each{|e| e['src'] = to }
+    end
+
+    def to_s
+      to_div.to_html
+    end
+
+  private
+
+    def to_div
+      @tree.search('body').first.dup.tap do |body|
+        body.name = 'div'
+        bgcolor = body[:bgcolor]
+        body.attributes.each{|k, v| body.remove_attribute k}
+        body[:style] = "background-color:#{bgcolor};" if bgcolor
       end
-      html
     end
 
-    def self.convert_font_color_to_css(html)
-      html.search("font").each do |element|
+    def convert_font_color_to_css
+      @tree.search("font").each do |element|
         if element[:color]
           str = "<span>#{element.inner_html}</span>"
-          tmp = Hpricot.parse(str).search("span")
+          tmp = Nokogiri::HTML.fragment(str).search("span")
           tmp.first[:style] = "color:#{element[:color].downcase};"
           element.swap(tmp.to_html)
         end
       end
-      html
     end
 
-    def self.convert_font_size_to_css(html)
-      html.search("font").each do |element|
+    def convert_font_size_to_css
+      @tree.search("font").each do |element|
         if element[:size]
           str = "<span>#{element.inner_html}</span>"
-          tmp = Hpricot.parse(str).search("span")
+          tmp = Nokogiri::HTML.fragment(str).search("span")
 
           case element[:size]
           when "1"
@@ -62,31 +82,28 @@ module DecorationMail
           element.swap(tmp.to_html)
         end
       end
-      html
     end
 
-    def self.convert_align_to_css(html)
-      html.search("div").each do |element|
+    def convert_align_to_css
+      @tree.search("div").each do |element|
         if element[:align]
           str = "<div>#{element.inner_html}</div>"
-          tmp = Hpricot.parse(str).search "div"
+          tmp = Nokogiri::HTML.fragment(str).search "div"
 
           tmp.first[:style] = "text-align:#{element[:align]};"
           element.swap(tmp.to_html)
         end
       end
-      html
     end
 
-    def self.convert_blink_to_css(html)
-      html.search("blink").each do |element|
+    def convert_blink_to_css
+      @tree.search("blink").each do |element|
         element.swap('<span style="text-decoration:blink;">' + element.inner_html + '</span>')
       end
-      html
     end
 
-    def self.convert_marquee_to_css(html)
-      html.search("marquee").each do |element|
+    def convert_marquee_to_css
+      @tree.search("marquee").each do |element|
         if element[:behavior] == "scroll"
           element.swap('<div style="display:-wap-marquee;-wap-marquee-loop:infinite;">' + element.inner_html + '</div>')
         elsif element[:behavior] == "alternate"
@@ -95,7 +112,6 @@ module DecorationMail
           element.swap('<div style="display:-wap-marquee;-wap-marquee-loop:infinite;">' + element.inner_html + '</div>')
         end
       end
-      html
     end
   end
 end

data/lib/decoration_mail/image.rb

@@ -35,5 +35,9 @@ module DecorationMail
         nil
       end
     end
+
+    def src
+      path || filename
+    end
   end
 end

data/lib/decoration_mail/version.rb

@@ -0,0 +1,3 @@
+module DecorationMail
+  VERSION = "0.3.1"
+end

data/lib/decoration_mail.rb

@@ -2,11 +2,11 @@
 $:.unshift(File.dirname(__FILE__))
 
 require 'mail'
-require 'hpricot'
+require 'nokogiri'
 
-require 'decoration_mail/converter'
-require 'decoration_mail/image'
 require 'decoration_mail/base'
+require 'decoration_mail/html'
+require 'decoration_mail/image'
 require 'decoration_mail/message'
 
 Mail::Message.send :include, DecorationMail::Message

data/spec/{unit → decoration_mail}/base_spec.rb

@@ -38,25 +38,25 @@ describe DecorationMail::Base do
       it "HTMLが返るべき" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("div").should_not be_empty
+        Nokogiri.parse(html).search("div").should_not be_empty
       end
 
       it "HTMLにはHTMLタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("html").should be_empty
+        Nokogiri.parse(html).search("html").should be_empty
       end
 
       it "HTMLにはHEADタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("head").should be_empty
+        Nokogiri.parse(html).search("head").should be_empty
       end
 
       it "HTMLにはBODYタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("body").should be_empty
+        Nokogiri.parse(html).search("body").should be_empty
       end
 
       it "ブロック変数にパスを渡すとIMGタグのSRCが書き換わるべき" do
@@ -105,25 +105,25 @@ describe DecorationMail::Base do
       it "HTMLが返るべき" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("div").should_not be_empty
+        Nokogiri.parse(html).search("div").should_not be_empty
       end
 
       it "HTMLにはHTMLタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("html").should be_empty
+        Nokogiri.parse(html).search("html").should be_empty
       end
 
       it "HTMLにはHEADタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("head").should be_empty
+        Nokogiri.parse(html).search("head").should be_empty
       end
 
       it "HTMLにはBODYタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("body").should be_empty
+        Nokogiri.parse(html).search("body").should be_empty
       end
 
       it "ブロック変数にパスを渡すとIMGタグのSRCが書き換わるべき" do
@@ -172,25 +172,25 @@ describe DecorationMail::Base do
       it "HTMLが返るべき" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("div").should_not be_empty
+        Nokogiri.parse(html).search("div").should_not be_empty
       end
 
       it "HTMLにはHTMLタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("html").should be_empty
+        Nokogiri.parse(html).search("html").should be_empty
       end
 
       it "HTMLにはHEADタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("head").should be_empty
+        Nokogiri.parse(html).search("head").should be_empty
       end
 
       it "HTMLにはBODYタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("body").should be_empty
+        Nokogiri.parse(html).search("body").should be_empty
       end
 
       it "ブロック変数にパスを渡すとIMGタグのSRCが書き換わるべき" do
@@ -237,25 +237,25 @@ describe DecorationMail::Base do
       it "HTMLが返るべき" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("div").should_not be_empty
+        Nokogiri.parse(html).search("div").should_not be_empty
       end
 
       it "HTMLにはHTMLタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("html").should be_empty
+        Nokogiri.parse(html).search("html").should be_empty
       end
 
       it "HTMLにはHEADタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("head").should be_empty
+        Nokogiri.parse(html).search("head").should be_empty
       end
 
       it "HTMLにはBODYタグが含まれない" do
         html = subject.save do |image|
         end
-        Hpricot.parse(html).search("body").should be_empty
+        Nokogiri.parse(html).search("body").should be_empty
       end
 
       it "ブロック変数にパスを渡すとIMGタグのSRCが書き換わるべき" do

data/spec/decoration_mail/html_spec.rb

@@ -0,0 +1,171 @@
+# coding: utf-8
+require File.expand_path('../../spec_helper', __FILE__)
+
+
+describe DecorationMail::HTML do
+  context "with invalid HTML" do
+    it "raises ArgumentError" do
+      lambda{ DecorationMail::HTML.new('') }.should raise_error ArgumentError
+    end
+  end
+
+  describe "#match" do
+    subject{ DecorationMail::HTML.new('<body bgcolor="#ffffff">ほげほげ</body>') }
+
+    it "performs regexp matching within body" do
+      subject.match(/ほげ/).should be_true
+      subject.match(/#ffffff/).should be_true
+      subject.match(/もげ/).should be_false
+      subject.match(/html/).should be_false
+    end
+  end
+
+  describe "#append_img" do
+    subject{ DecorationMail::HTML.new('<body>ほげほげ</body>') }
+
+    it "inserts img tag after the content" do
+      subject.append_img('http://example.com/img.gif')
+      subject.to_s.should == %(<div>ほげほげ<br><div style="text-align:center;"><img src="http://example.com/img.gif"></div>\n</div>)
+    end
+  end
+
+  describe "#prepend_img" do
+    subject{ DecorationMail::HTML.new('<body>ほげほげ</body>') }
+
+    it "inserts img tag ahead of the content" do
+      subject.prepend_img('http://example.com/img.gif')
+      subject.to_s.should == %(<div>\n<div style="text-align:center;"><img src="http://example.com/img.gif"></div>\n<br>ほげほげ</div>)
+    end
+  end
+
+  describe "#update_img_src" do
+    subject{ DecorationMail::HTML.new('<body>ほげほげ<img src="cid:hoge"><img src="fuga.gif"></body>') }
+
+    it "changes img's src to new one" do
+      subject.update_img_src('cid:hoge', 'http://example.com/img.gif')
+      subject.to_s.should == %(<div>ほげほげ<img src="http://example.com/img.gif"><img src="fuga.gif">\n</div>)
+    end
+  end
+
+  describe "#to_s" do
+    it "should convert body to div" do
+      '<body>ほげほげ</body>'.should be_converted_to '<div>ほげほげ</div>'
+    end
+
+    context "with 'bgcolor' attribute" do
+      it "should convert body to div and inline css" do
+        '<body bgcolor="#ffffff">ほげほげ</body>'.
+          should be_converted_to '<div style="background-color:#ffffff;">ほげほげ</div>'
+      end
+    end
+
+    context "with 'onclick' attribute" do
+      it "should not contain it" do
+        '<body onclick="alert(\'a\')">ほげほげ</body>'.
+          should be_converted_to '<div>ほげほげ</div>'
+      end
+    end
+  end
+
+  describe "#convert_font_color_to_css" do
+    it "should convert font to span and inline css" do
+      '<body><font color="#ffffff">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="color:#ffffff;">ほげほげ</span></div>'
+    end
+  end
+
+  describe "#convert_font_size_to_css" do
+    it "should convert font(size=1) to span and inline css(xx-small)" do
+      '<body><font size="1">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="font-size:xx-small;">ほげほげ</span></div>'
+    end
+
+    it "should convert font(size=2) to span and inline css(x-small)" do
+      '<body><font size="2">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="font-size:x-small;">ほげほげ</span></div>'
+    end
+
+    it "should convert font(size=3) to span and inline css(small)" do
+      '<body><font size="3">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="font-size:small;">ほげほげ</span></div>'
+    end
+
+    it "should convert font(size=4) to span and inline css(medium)" do
+      '<body><font size="4">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="font-size:medium;">ほげほげ</span></div>'
+    end
+
+    it "should convert font(size=5) to span and inline css(large)" do
+      '<body><font size="5">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="font-size:large;">ほげほげ</span></div>'
+    end
+
+    it "should convert font(size=6) to span and inline css(x-large)" do
+      '<body><font size="6">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="font-size:x-large;">ほげほげ</span></div>'
+    end
+
+    it "should convert font(size=7) to span and inline css(xx-large)" do
+      '<body><font size="7">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="font-size:xx-large;">ほげほげ</span></div>'
+    end
+
+    it "should convert font of invalid size to span and inline css(x-small)" do
+      '<body><font size="10">ほげほげ</font></body>'.
+        should be_converted_to '<div><span style="font-size:x-small;">ほげほげ</span></div>'
+    end
+  end
+
+  describe "#convert_align_to_css" do
+    context "when align is left" do
+      it "should convert legacy attribute to inline css" do
+        '<body><div align="left">ほげほげ</div></body>'.
+          should be_converted_to '<div><div style="text-align:left;">ほげほげ</div></div>'
+      end
+    end
+
+    context "when align is right" do
+      it "should convert legacy attribute to inline css" do
+        '<body><div align="right">ほげほげ</div></body>'.
+          should be_converted_to '<div><div style="text-align:right;">ほげほげ</div></div>'
+      end
+    end
+
+    context "when align is center" do
+      it "should convert legacy attribute to inline css" do
+        '<body><div align="center">ほげほげ</div></body>'.
+          should be_converted_to '<div><div style="text-align:center;">ほげほげ</div></div>'
+      end
+    end
+  end
+
+  describe "#convert_blink_to_css" do
+    it "should convert blink to span and inline css" do
+      '<body><blink>ほげほげ</blink></body>'.
+        should be_converted_to '<div><span style="text-decoration:blink;">ほげほげ</span></div>'
+    end
+  end
+
+  describe "#convert_marquee_to_css" do
+    context "when behavior is scroll" do
+      it "should convert marquee to div and inline css" do
+        '<body><marquee behavior="scroll">ほげほげ</marquee></body>'.
+          should be_converted_to '<div><div style="display:-wap-marquee;-wap-marquee-loop:infinite;">ほげほげ</div></div>'
+      end
+    end
+
+    context "when behavior is alternate" do
+      it "should convert marquee to div and inline css" do
+        '<body><marquee behavior="alternate">ほげほげ</marquee></body>'.
+          should be_converted_to '<div><div style="display:-wap-marquee;-wap-marquee-style:alternate;-wap-marquee-loop:infinite;">ほげほげ</div></div>'
+      end
+    end
+
+    context "without attribute" do
+      it "should convert marquee to div and inline css" do
+        '<body><marquee>ほげほげ</marquee></body>'.
+          should be_converted_to '<div><div style="display:-wap-marquee;-wap-marquee-loop:infinite;">ほげほげ</div></div>'
+      end
+    end
+  end
+end

data/spec/{unit → decoration_mail}/image_spec.rb

@@ -14,8 +14,15 @@ describe DecorationMail::Image do
   subject { @image }
 
   it { should respond_to :path }
-  its(:read) { should eql @mail.attachments.first.decoded }
+  it("have the same content with attached file"){ subject.read.should eql @mail.attachments.first.decoded }
   its(:content_id) { should eql "cid:01@110207.142735@______F03B@docomo.ne.jp" }
   its(:filename) { should eql "06_gochisou_header.gif" }
   its(:extension) { should eql "gif" }
+  its(:src) { should eql "06_gochisou_header.gif" }
+
+  context "when path is given" do
+    before { @image.path = 'http://example.com/image.gif' }
+
+    its(:src) { should eql 'http://example.com/image.gif' }
+  end
 end

data/spec/spec_helper.rb

@@ -8,3 +8,20 @@ Bundler.setup
 Bundler.require
 
 require File.expand_path('../../lib/decoration_mail', __FILE__)
+
+RSpec::Matchers.define :be_converted_to do |expected|
+  match do |actual|
+    convert(actual) == expected
+  end
+
+  failure_message_for_should do
+    <<-MESSAGE
+expected #{expected}
+     got #{convert(actual)}
+    MESSAGE
+  end
+
+  def convert(str)
+    DecorationMail::HTML.new(str).to_s
+  end
+end

metadata

@@ -1,101 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: decoration_mail
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+version: !ruby/object:Gem::Version
+  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Dai Akatsuka
+- M.Shibuya
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-23 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-03-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mail
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 9
-        version: 2.2.9
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hpricot
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 3
-        version: 0.8.3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Decoration Mail Parser
-email: d.akatsuka@gmail.com
+email:
+- d.akatsuka@gmail.com
+- mit.shibuya@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
 - Gemfile
-- Gemfile.lock
-- MIT-LICENSE
+- LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - decoration_mail.gemspec
-- init.rb
 - lib/decoration_mail.rb
 - lib/decoration_mail/base.rb
-- lib/decoration_mail/converter.rb
+- lib/decoration_mail/html.rb
 - lib/decoration_mail/image.rb
 - lib/decoration_mail/message.rb
+- lib/decoration_mail/version.rb
+- spec/decoration_mail/base_spec.rb
+- spec/decoration_mail/html_spec.rb
+- spec/decoration_mail/image_spec.rb
 - spec/resources/au_decoration.eml
 - spec/resources/au_decoration_with_attachment.eml
 - spec/resources/docomo_decoration.eml
@@ -104,43 +126,39 @@ files:
 - spec/resources/softbank_decoration.eml
 - spec/resources/softbank_decoration_with_attachment.eml
 - spec/spec_helper.rb
-- spec/unit/base_spec.rb
-- spec/unit/converter_spec.rb
-- spec/unit/image_spec.rb
-has_rdoc: true
 homepage: https://github.com/dakatsuka/decoration_mail
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Decoration Mail Parser
-test_files: 
+test_files:
+- spec/decoration_mail/base_spec.rb
+- spec/decoration_mail/html_spec.rb
+- spec/decoration_mail/image_spec.rb
+- spec/resources/au_decoration.eml
+- spec/resources/au_decoration_with_attachment.eml
+- spec/resources/docomo_decoration.eml
+- spec/resources/docomo_decoration_with_attachment.eml
+- spec/resources/other_decoration.eml
+- spec/resources/softbank_decoration.eml
+- spec/resources/softbank_decoration_with_attachment.eml
 - spec/spec_helper.rb
-- spec/unit/base_spec.rb
-- spec/unit/converter_spec.rb
-- spec/unit/image_spec.rb

data/Gemfile.lock

@@ -1,39 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.3)
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    hpricot (0.8.3)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.0)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hpricot (>= 0.8.3)
-  jeweler
-  mail (>= 2.2.9)
-  rspec (>= 2.0)

data/VERSION

@@ -1 +0,0 @@
-0.2.4

data/init.rb

@@ -1,3 +0,0 @@
-# coding: utf-8
-
-require File.expand_path("../lib/decoration_mail", __FILE__)

data/spec/unit/converter_spec.rb

@@ -1,155 +0,0 @@
-# coding: utf-8
-require File.expand_path('../../spec_helper', __FILE__)
-
-
-describe DecorationMail::Converter do
-  describe "body tag" do
-    it "should convert body to div" do
-      html = Hpricot.parse('<body>ほげほげ</body>')
-      result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-      result.should eql '<div>ほげほげ</div>'
-    end
-
-    context "with bgcolor" do
-      it "should convert body to div and inline css" do
-        html = Hpricot.parse('<body bgcolor="#ffffff">ほげほげ</body>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<div style="background-color:#ffffff;">ほげほげ</div>'
-      end
-    end
-  end
-
-  describe "font tag" do
-    context "color" do
-      it "should convert font to span and inline css" do
-        html = Hpricot.parse('<font color="#ffffff">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="color:#ffffff;">ほげほげ</span>'
-      end
-    end
-
-    context "size = 1" do
-      it "should convert font to span and inline css (xx-small)" do
-        html = Hpricot.parse('<font size="1">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="font-size:xx-small;">ほげほげ</span>'
-      end
-    end
-
-    context "size = 2" do
-      it "should convert font to span and inline css (x-small)" do
-        html = Hpricot.parse('<font size="2">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="font-size:x-small;">ほげほげ</span>'
-      end
-    end
-
-    context "size = 3" do
-      it "should convert font to span and inline css (small)" do
-        html = Hpricot.parse('<font size="3">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="font-size:small;">ほげほげ</span>'
-      end
-    end
-
-    context "size = 4" do
-      it "should convert font to span and inline css (medium)" do
-        html = Hpricot.parse('<font size="4">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="font-size:medium;">ほげほげ</span>'
-      end
-    end
-
-    context "size = 5" do
-      it "should convert font to span and inline css (large)" do
-        html = Hpricot.parse('<font size="5">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="font-size:large;">ほげほげ</span>'
-      end
-    end
-
-    context "size = 6" do
-      it "should convert font to span and inline css (x-large)" do
-        html = Hpricot.parse('<font size="6">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="font-size:x-large;">ほげほげ</span>'
-      end
-    end
-
-    context "size = 7" do
-      it "should convert font to span and inline css (xx-large)" do
-        html = Hpricot.parse('<font size="7">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="font-size:xx-large;">ほげほげ</span>'
-      end
-    end
-
-    context "size = 10 (invalid value)" do
-      it "should convert font to span and inline css (x-small)" do
-        html = Hpricot.parse('<font size="10">ほげほげ</font>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<span style="font-size:x-small;">ほげほげ</span>'
-      end
-    end
-  end
-
-  describe "div tag" do
-    context "align = left" do
-      it "should convert legacy attribute to inline css" do
-        html = Hpricot.parse('<div align="left">ほげほげ</div>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<div style="text-align:left;">ほげほげ</div>'
-      end
-    end
-
-    context "align = right" do
-      it "should convert legacy attribute to inline css" do
-        html = Hpricot.parse('<div align="right">ほげほげ</div>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<div style="text-align:right;">ほげほげ</div>'
-      end
-    end
-
-    context "align = center" do
-      it "should convert legacy attribute to inline css" do
-        html = Hpricot.parse('<div align="center">ほげほげ</div>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<div style="text-align:center;">ほげほげ</div>'
-      end
-    end
-  end
-
-  describe "blink tag" do
-    it "should convert blink to span and inline css" do
-      html = Hpricot.parse('<blink>ほげほげ</blink>')
-      result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-      result.should eql '<span style="text-decoration:blink;">ほげほげ</span>'
-    end
-  end
-
-  describe "marquee tag" do
-    context "behavior = scroll" do
-      it "should convert marquee to div and inline css" do
-        html = Hpricot.parse('<marquee behavior="scroll">ほげほげ</marquee>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<div style="display:-wap-marquee;-wap-marquee-loop:infinite;">ほげほげ</div>'
-      end
-    end
-
-    context "behavior = alternate" do
-      it "should convert marquee to div and inline css" do
-        html = Hpricot.parse('<marquee behavior="alternate">ほげほげ</marquee>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<div style="display:-wap-marquee;-wap-marquee-style:alternate;-wap-marquee-loop:infinite;">ほげほげ</div>'
-      end
-    end
-
-    context "without attribute" do
-      it "should convert marquee to div and inline css" do
-        html = Hpricot.parse('<marquee>ほげほげ</marquee>')
-        result = DecorationMail::Converter.convert_to_xhtml(html).to_html
-        result.should eql '<div style="display:-wap-marquee;-wap-marquee-loop:infinite;">ほげほげ</div>'
-      end
-    end
-  end
-end