jpmobile 0.1.6 → 1.0.0.pre

data/test/rails/overrides/spec/models/normal_mailer_spec.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe NormalMailer do
+  include Jpmobile::Util
+
+  before(:each) do
+    ActionMailer::Base.deliveries = []
+
+    @to      = ["outer@jp.mobile", "outer1@jp.mobile"]
+    @subject = "日本語題名"
+    @text    = "日本語テキスト"
+  end
+
+  context "PC宛メール" do
+    it "正常に送信できること" do
+      email = NormalMailer.msg(@to, "題名", "本文").deliver
+
+      ActionMailer::Base.deliveries.size.should == 1
+      (email.to - @to).should be_empty
+    end
+
+    it "UTF-8のままであること" do
+      email = NormalMailer.msg(@to, @subject, @text).deliver
+
+      ActionMailer::Base.deliveries.size.should == 1
+
+      raw_mail = ascii_8bit(email.to_s)
+      raw_mail.should match(/UTF-8/i)
+      raw_mail.should match(Regexp.escape("=E6=97=A5=E6=9C=AC=E8=AA=9E=E9=A1=8C=E5=90=8D"))
+      raw_mail.should match(Regexp.escape([@text].pack("m").strip))
+    end
+  end
+end

data/test/rails/overrides/spec/requests/template_path_spec.rb

@@ -13,7 +13,7 @@ describe TemplatePathController, "DoCoMo SH902i からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'mobile_docomo', 'mobile' ]
+    controller.lookup_context.mobile.should == [ 'mobile_docomo', 'mobile' ]
   end
 end
 
@@ -24,7 +24,7 @@ describe TemplatePathController, "au CA32 からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'mobile_au', 'mobile' ]
+    controller.lookup_context.mobile.should == [ 'mobile_au', 'mobile' ]
   end
 end
 
@@ -35,7 +35,7 @@ describe TemplatePathController, "Vodafone V903T からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'mobile_vodafone', 'mobile_softbank', 'mobile' ]
+    controller.lookup_context.mobile.should == [ 'mobile_vodafone', 'mobile_softbank', 'mobile' ]
   end
 end
 
@@ -46,7 +46,7 @@ describe TemplatePathController, "SoftBank 910T からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'mobile_softbank', 'mobile' ]
+    controller.lookup_context.mobile.should == [ 'mobile_softbank', 'mobile' ]
   end
 end
 
@@ -57,7 +57,7 @@ describe TemplatePathController, "iPhone からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'smart_phone_iphone', 'smart_phone' ]
+    controller.lookup_context.mobile.should == [ 'smart_phone_iphone', 'smart_phone' ]
   end
 end
 
@@ -68,7 +68,7 @@ describe TemplatePathController, "Android からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'smart_phone_android', 'smart_phone' ]
+    controller.lookup_context.mobile.should == [ 'smart_phone_android', 'smart_phone' ]
   end
 end
 
@@ -79,7 +79,7 @@ describe TemplatePathController, "Windows Phone からのアクセス" do
   it 'テンプレートの探索順が正しいこと' do
     get "/template_path/index", {}, { "HTTP_USER_AGENT" => @user_agent}
 
-    controller.view_paths.mobile_template_candidates.should == [ 'smart_phone_windows_phone', 'smart_phone' ]
+    controller.lookup_context.mobile.should == [ 'smart_phone_windows_phone', 'smart_phone' ]
   end
 end
 
@@ -111,6 +111,12 @@ describe TemplatePathController, "integrated_views" do
 
         response.should have_tag("h1", :content => "show_mobile_docomo.html.erb")
       end
+
+      it 'disable_mobile_view! のときには index.html.erb が使用されること' do
+        get "/template_path/index", {:pc => true}, { "HTTP_USER_AGENT" => @user_agent}
+
+        response.should have_tag("h1", :content => "index.html.erb")
+      end
     end
 
     context "SoftBankからのアクセスの場合" do

data/test/rails/overrides/spec/spec_helper.rb

@@ -27,6 +27,12 @@ RSpec.configure do |config|
   config.include Webrat::HaveTagMatcher
   config.include Jpmobile::Util
   config.before(:each) { Webrat.configuration.mode = :rails }
+
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+  config.color_enabled = true
+  config.filter_run_excluding :broken => true
+  # config.full_backtrace = true
 end
 
 require 'pp'

data/test/rails/rails_root/app/controllers/application_controller.rb

@@ -1,5 +1,6 @@
-require 'rubygems'
-require 'action_controller'
+# require 'rubygems'
+# require 'action_controller'
 
 class ApplicationController < ActionController::Base
+  include Jpmobile::ViewSelector
 end

data/test/rails/rails_root/app/controllers/template_path_controller.rb

@@ -1,9 +1,17 @@
 class TemplatePathController < ApplicationController
   def index
     @q = params[:q]
+
+    if params[:pc]
+      disable_mobile_view!
+    end
   end
 
   def show
   end
+
+  def optioned_index
+    render :action => "index"
+  end
 end
 

data/test/rails/rails_root/app/models/mobile_mailer.rb

@@ -11,7 +11,8 @@ class MobileMailer < Jpmobile::Mailer::Base
     email
   end
 
-  def multi_message(to_mail, subject_text, text)
+  def multi_message(to_mail, subject_text, text, html)
+    @html = html
     @text = text
     mail(:to => to_mail, :subject => subject)
   end

data/test/rails/rails_root/app/models/normal_mailer.rb

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+class NormalMailer < ActionMailer::Base
+  default :from => "info@jp.mobile"
+
+  def msg(to_mail, subject_text, text)
+    @text = text
+    mail(:to => to_mail, :subject => subject_text)
+  end
+end

data/test/rails/rails_root/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-RailsRoot::Application.config.secret_token = 'd8432b7143e2cf7e88965fc1f4c6e5cb51218a48d2235876c7fe47351d599793242abd6636307611e7a1a1dde90d5466139bcce0e44342450902fc7a3c676168'
+RailsRoot::Application.config.secret_token = '23417af8bf908eea220f39faa992f7a25a753df87b6f0f4bfd9fec3ccf0dad629004cc608a9aaed4532f58231f16dfa9875cd21fbb4c58bde26bdc4aa9103979'

data/test/rails/rails_root/spec/models/mobile_mailer_spec.rb

@@ -85,7 +85,7 @@ describe MobileMailer do
 
       raw_mail = email.to_s
       raw_mail.should match(/shift_jis/i)
-      # raw_mail.should match(/For docomo/) # TODO: revise Resolver in view selector
+      # raw_mail.should match(/For docomo/)
       raw_mail.should match(Regexp.escape("k/qWe4zqkeiWvA=="))
       raw_mail.should match(Regexp.compile(utf8_to_sjis(@text)))
     end
@@ -99,7 +99,7 @@ describe MobileMailer do
       ActionMailer::Base.deliveries.size.should == 1
 
       raw_mail = email.to_s
-      # raw_mail.should match(/For docomo/) # TODO: revise Resolver in view selector
+      raw_mail.should match(/For docomo/)
       raw_mail.should match(Regexp.escape("k/qWe4zqkeiWvPjX"))
       raw_mail.should match(regexp_to_sjis("\xf8\xec"))
     end
@@ -113,7 +113,7 @@ describe MobileMailer do
       ActionMailer::Base.deliveries.size.should == 1
 
       raw_mail = email.to_s
-      # raw_mail.should match(/For docomo/) # TODO: revise Resolver in view selector
+      raw_mail.should match(/For docomo/)
       raw_mail.should match(Regexp.escape("k/qWe4zqkeiWvLnesNE="))
       raw_mail.should match(Regexp.compile(Regexp.escape(utf8_to_sjis(half_kana_text))))
     end
@@ -154,7 +154,7 @@ describe MobileMailer do
       ActionMailer::Base.deliveries.size.should == 1
 
       raw_mail = ascii_8bit(email.to_s)
-      # raw_mail.should match(/For au/) # TODO: revise Resolver in view selector
+      raw_mail.should match(/For au/)
       raw_mail.should match(Regexp.escape("GyRCRnxLXDhsQmpMPhsoQhskQnZeGyhC"))
       raw_mail.should match(Regexp.compile(ascii_8bit("\x76\x21")))
     end
@@ -182,7 +182,7 @@ describe MobileMailer do
 
       raw_mail = email.to_s
       raw_mail.should match(/shift_jis/i)
-      # raw_mail.should match(/For softbank/) # TODO: revise Resolver in view selector
+      raw_mail.should match(/For softbank/)
       raw_mail.should match(Regexp.escape("k/qWe4zqkeiWvA=="))
       raw_mail.should match(Regexp.compile(utf8_to_sjis(@text)))
     end
@@ -196,7 +196,7 @@ describe MobileMailer do
       ActionMailer::Base.deliveries.size.should == 1
 
       raw_mail = email.to_s
-      # raw_mail.should match(/For softbank/) # TODO: revise Resolver in view selector
+      raw_mail.should match(/For softbank/)
       raw_mail.should match(Regexp.escape("k/qWe4zqkeiWvPl8"))
       raw_mail.should match(regexp_to_sjis("\xf7\x6a"))
     end
@@ -224,7 +224,7 @@ describe MobileMailer do
 
       raw_mail = email.to_s
       raw_mail.should match(/shift_jis/i)
-      # raw_mail.should match(/For softbank/) # TODO: revise Resolver in view selector
+      raw_mail.should match(/For vodafone/)
       raw_mail.should match(Regexp.escape("k/qWe4zqkeiWvA=="))
       raw_mail.should match(Regexp.compile(utf8_to_sjis(@text)))
     end
@@ -238,7 +238,7 @@ describe MobileMailer do
       ActionMailer::Base.deliveries.size.should == 1
 
       raw_mail = email.to_s
-      # raw_mail.should match(/For softbank/) # TODO: revise Resolver in view selector
+      raw_mail.should match(/For vodafone/)
       raw_mail.should match(Regexp.escape("k/qWe4zqkeiWvPl8"))
       raw_mail.should match(regexp_to_sjis("\xf7\x6a"))
     end
@@ -276,6 +276,7 @@ describe MobileMailer do
 
       @subject = "題名"
       @text    = "本文"
+      @html    = "万葉"
     end
 
     describe "PC の場合" do
@@ -283,8 +284,8 @@ describe MobileMailer do
         @to = "gate@bill.com"
       end
 
-      it "漢字コードが変換されること", :focus => true do
-        email = MobileMailer.multi_message(@to, @subject, @text).deliver
+      it "漢字コードが変換されること" do
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
         ActionMailer::Base.deliveries.size.should == 1
 
@@ -292,7 +293,7 @@ describe MobileMailer do
 
         raw_mail = ascii_8bit(email.to_s)
         raw_mail.should match(Regexp.escape(ascii_8bit(utf8_to_jis(@text))))
-        raw_mail.should match(Regexp.escape(ascii_8bit(utf8_to_jis("万葉"))))
+        raw_mail.should match(Regexp.escape(ascii_8bit(utf8_to_jis(@html))))
       end
     end
 
@@ -302,31 +303,29 @@ describe MobileMailer do
       end
 
       it "漢字コードが変換されること" do
-        MobileMailer.multi_message(@to, @subject, @text).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
-        emails = ActionMailer::Base.deliveries
-        emails.size.should == 1
-        email = emails.first
+        ActionMailer::Base.deliveries.size.should == 1
 
         email.parts.size.should == 2
 
-        email.parts.first.body.unpack("m").first.should match(Regexp.compile(Regexp.escape(NKF.nkf("-sWx", @html), 's'), nil, 's'))
-
-        email.parts.last.charset.should match(/^shift_jis$/i)
-        email.parts.last.body.should match(/#{Regexp.escape(NKF.nkf("-sWx", @plain))}/)
+        raw_mail = email.to_s
+        raw_mail.should match(sjis_regexp(utf8_to_sjis(@text)))
+        raw_mail.should match(sjis_regexp(utf8_to_sjis(@html)))
       end
 
       it "絵文字が変換されること" do
         @text  += ""
-        MobileMailer.multi_message(@to, @subject, @text).deliver
+        @html  += ""
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
-        emails = ActionMailer::Base.deliveries
-        emails.size.should == 1
-        email = emails.first
+        ActionMailer::Base.deliveries.size.should == 1
 
         email.parts.size.should == 2
-        email.parts.first.body.unpack("m").first.should match(Regexp.compile(Regexp.escape([0xf8ec].pack('n'), 's'), nil, 's'))
-        email.parts.last.body.should match(Regexp.compile(Regexp.escape([0xf8d7].pack('n'), 's'), nil, 's'))
+
+        raw_mail = email.to_s
+        raw_mail.should match(sjis_regexp(sjis("\xf8\xec")))
+        raw_mail.should match(sjis_regexp(sjis("\xf8\xd7")))
       end
     end
 
@@ -336,32 +335,29 @@ describe MobileMailer do
       end
 
       it "漢字コードが変換されること" do
-        MobileMailer.multi_message(@to, @subject, @text).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
-        emails = ActionMailer::Base.deliveries
-        emails.size.should == 1
-        email = emails.first
+        ActionMailer::Base.deliveries.size.should == 1
 
         email.parts.size.should == 2
 
-        NKF.nkf("-mQ", email.parts.first.body).should match(/#{Regexp.escape(NKF.nkf("-jWx", @html))}/)
-
-        email.parts.last.charset.should match(/^iso-2022-jp$/i)
-        email.parts.last.body.should match(/#{Regexp.escape(NKF.nkf("-jWx", @plain))}/)
+        raw_mail = ascii_8bit(email.to_s)
+        raw_mail.should match(Regexp.escape(ascii_8bit(utf8_to_jis(@text))))
+        raw_mail.should match(Regexp.escape(ascii_8bit(utf8_to_jis(@html))))
       end
 
       it "絵文字が変換されること" do
-        @text += ""
-        MobileMailer.multi_message(@to, @subject, @text).deliver
+        @text += ""
+        @html += ""
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
-        emails = ActionMailer::Base.deliveries
-        emails.size.should == 1
-        email = emails.first
+        ActionMailer::Base.deliveries.size.should == 1
 
         email.parts.size.should == 2
 
-        NKF.nkf("-mQ", email.parts.first.body).should match(/#{Regexp.escape([0x7621].pack('n'))}/)
-        email.parts.last.body.should match(/#{Regexp.escape([0x765e].pack('n'))}/)
+        raw_mail = ascii_8bit(email.to_s)
+        raw_mail.should match(jis_regexp("\x76\x21"))
+        raw_mail.should match(jis_regexp("\x76\x5e"))
       end
     end
 
@@ -371,31 +367,29 @@ describe MobileMailer do
       end
 
       it "漢字コードが変換されること" do
-        MobileMailer.multi_message(@to, @subject, @text).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
-        emails = ActionMailer::Base.deliveries
-        emails.size.should == 1
-        email = emails.first
+        ActionMailer::Base.deliveries.size.should == 1
 
         email.parts.size.should == 2
 
-        email.parts.first.body.unpack("m").first.should match(Regexp.compile(Regexp.escape(NKF.nkf("-sWx", @html), 's'), nil, 's'))
-
-        email.parts.last.charset.should match(/^shift_jis$/i)
-        email.parts.last.body.should match(/#{Regexp.escape(NKF.nkf("-sWx", @plain))}/)
+        raw_mail = email.to_s
+        raw_mail.should match(sjis_regexp(utf8_to_sjis(@text)))
+        raw_mail.should match(sjis_regexp(utf8_to_sjis(@html)))
       end
 
       it "絵文字が変換されること" do
         @text  += ""
-        MobileMailer.multi_message(@to, @subject, @text).deliver
+        @html  += ""
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
-        emails = ActionMailer::Base.deliveries
-        emails.size.should == 1
-        email = emails.first
+        ActionMailer::Base.deliveries.size.should == 1
 
         email.parts.size.should == 2
-        email.parts.first.body.unpack("m").first.should match(Regexp.compile(Regexp.escape([0xf76a].pack('n'), 's'), nil, 's'))
-        email.parts.last.body.should match(Regexp.compile(Regexp.escape([0xf97c].pack('n'), 's'), nil, 's'))
+
+        raw_mail = email.to_s
+        raw_mail.should match(sjis_regexp(sjis("\xf7\x6a")))
+        raw_mail.should match(sjis_regexp(sjis("\xf9\x7c")))
       end
     end
 
@@ -405,31 +399,29 @@ describe MobileMailer do
       end
 
       it "漢字コードが変換されること" do
-        MobileMailer.multi_message(@to, @subject, @text).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
-        emails = ActionMailer::Base.deliveries
-        emails.size.should == 1
-        email = emails.first
+        ActionMailer::Base.deliveries.size.should == 1
 
         email.parts.size.should == 2
 
-        NKF.nkf("-mQ", email.parts.first.body).should match(/#{Regexp.escape(NKF.nkf("-jWx", @html))}/)
-
-        email.parts.last.charset.should match(/^iso-2022-jp$/i)
-        email.parts.last.body.should match(/#{Regexp.escape(NKF.nkf("-jWx", @plain))}/)
+        raw_mail = email.to_s
+        raw_mail.should match(sjis_regexp(utf8_to_sjis(@text)))
+        raw_mail.should match(sjis_regexp(utf8_to_sjis(@html)))
       end
 
       it "絵文字が変換されること" do
         @text  += ""
-        MobileMailer.multi_message(@to, @subject, @text).deliver
+        @html  += ""
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
 
-        emails = ActionMailer::Base.deliveries
-        emails.size.should == 1
-        email = emails.first
+        ActionMailer::Base.deliveries.size.should == 1
 
         email.parts.size.should == 2
-        NKF.nkf("-mQwJ", email.parts.first.body).should match(/〓/)
-        NKF.nkf("-wJ", email.parts.last.body).should match(/〓/)
+
+        raw_mail = email.to_s
+        raw_mail.should match(sjis_regexp(sjis("\xf7\x6a")))
+        raw_mail.should match(sjis_regexp(sjis("\xf9\x7c")))
       end
     end
   end
@@ -604,7 +596,7 @@ describe MobileMailer, "receiving" do
         email.body.should match(/本文/)
       end
 
-      it "絵文字が数値参照に変わること", :broken => true do
+      it "絵文字が数値参照に変わること" do
         email = MobileMailer.receive(@email)
 
         email.subject.should match(//)
@@ -613,9 +605,9 @@ describe MobileMailer, "receiving" do
     end
   end
 
-  describe "multipart メールを受信するとき", :broken => true do
+  describe "multipart メールを受信するとき" do
     describe "docomo の場合" do
-      # NOTE: 要検証
+      # NOTE: キャリアメールサーバで絵文字を変換するため検証は困難
       before(:each) do
         @email = open(Rails.root + "spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml").read
       end
@@ -635,8 +627,8 @@ describe MobileMailer, "receiving" do
         email.parts.first.parts.size == 2
 
         parts = email.parts.first.parts
-        parts.first.body.should match(/テストです/)
-        parts.last.body.should match(/テストです/)
+        parts.first.body.should match("テストです")
+        parts.last.body.raw_source.should  match("テストです")
       end
     end
 
@@ -661,12 +653,12 @@ describe MobileMailer, "receiving" do
 
         parts = email.parts.first.parts
         parts.first.body.should match(/テストです/)
-        parts.last.body.should match(/テストです/)
+        parts.last.body.raw_source.should match(/テストです/)
       end
     end
 
     describe "softbank(sjis) の場合" do
-      # NOTE: 要検証
+      # NOTE: キャリアメールサーバで絵文字を変換するため検証は困難
       before(:each) do
         @email = open(Rails.root + "spec/fixtures/mobile_mailer/softbank-gmail-sjis.eml").read
       end
@@ -685,12 +677,12 @@ describe MobileMailer, "receiving" do
         email.parts.size.should == 2
 
         email.parts.first.body.should match(/テストです/)
-        email.parts.last.body.should match(/テストです/)
+        email.parts.last.body.raw_source.should match(/テストです/)
       end
     end
 
     describe "softbank(utf8) の場合" do
-      # NOTE: 要検証
+      # NOTE: キャリアメールサーバで絵文字を変換するため検証は困難
       before(:each) do
         @email = open(Rails.root + "spec/fixtures/mobile_mailer/softbank-gmail-utf8.eml").read
       end
@@ -709,7 +701,7 @@ describe MobileMailer, "receiving" do
         email.parts.size.should == 2
 
         email.parts.first.body.should match(/テストです/)
-        email.parts.last.body.should match(/テストです/)
+        email.parts.last.body.raw_source.should match(/テストです/)
       end
     end
 
@@ -736,8 +728,9 @@ describe MobileMailer, "receiving" do
 
         email.has_attachments?.should be_true
         email.attachments.size.should == 1
-        email.attachments.first.content_type.should == "image/jpeg"
-        email.attachments.first.read[6..9].should == "JFIF"
+        email.attachments['20098calendar01.jpg'].content_type.should match("image/jpeg")
+        email.attachments['20098calendar01.jpg'].body.to_s[2..6] == "JFIF"
+        email.attachments['20098calendar01.jpg'].body.to_s.size == 86412
       end
     end
   end