jpmobile 5.2.5 → 6.1.2

data/spec/unit/email_spec.rb

@@ -56,7 +56,7 @@ describe 'Jpmobile::Email' do
 
   describe 'japanese_mail_address_regexp' do
     before do
-      Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z\.\-]|$)/)
+      Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z.\-]|$)/)
     end
 
     it '#detect_from_mail_header should return Jpmobile::Mobile::AbstractMobile when the header contains .jp address' do

data/spec/unit/receive_mail_spec.rb

@@ -7,7 +7,7 @@ describe 'Jpmobile::Mail#receive' do
 
   before(:each) do
     @to = 'info@jpmobile-rails.org'
-    Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z\.\-]/)
+    Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z.\-]/)
   end
 
   describe 'PC mail' do
@@ -84,7 +84,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Docomo' do
       context 'with sjis decomail' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/docomo-gmail-sjis.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -129,7 +129,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'Au' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/au-decomail.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml')).read)
       end
 
       it 'subject should be parsed correctly' do
@@ -151,7 +151,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Softbank' do
       context 'Shift_JIS' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/softbank-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-sjis.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -170,7 +170,7 @@ describe 'Jpmobile::Mail#receive' do
 
       context 'UTF-8' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/softbank-gmail-utf8.eml')).read)
+          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-utf8.eml')).read)
         end
 
         it 'subject should be parsed correctly' do
@@ -304,13 +304,13 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'From au iPhone' do
       it 'charset should be UTF-8' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-message.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
         expect(@mail.mobile).to be_a(Jpmobile::Mobile::Au)
         expect(@mail.charset).to match(/utf-8/i)
       end
 
       it 'should be encoded correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-message.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
         expect(@mail.encoded).to match(Regexp.escape("%[\e$B1`;yL>\e(B]%\e$B$N\e(B%[\e$BJ]8n<TL>\e(B]%"))
       end
 
@@ -435,7 +435,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'bounced mail' do
     context 'has jp address' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/bounced-jp.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/bounced-jp.eml')).read)
       end
 
       it 'mobile should abstract mobile' do
@@ -447,7 +447,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'non-Japanese mail' do
     context 'us-ascii' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/non-jp.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/non-jp.eml')).read)
       end
 
       it 'mobile should be nil' do
@@ -458,7 +458,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'no From header' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/mobile_mailer/no-from.eml')).read)
+        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/no-from.eml')).read)
       end
 
       it 'mobile should be nil' do

data/spec/unit/util_spec.rb

@@ -197,10 +197,10 @@ describe Jpmobile::Util do
       hash = invert_table(
         {
           [0x1F1E8, 0x1F1F3] => 0x3013,
-          0x1F1FF            => 0x3013,
-          0x1F526            => 0xE6FB,
-          [0x0023, 0x20E3]   => 0xE6E0,
-          0x1F354            => 0xE673,
+          0x1F1FF => 0x3013,
+          0x1F526 => 0xE6FB,
+          [0x0023, 0x20E3] => 0xE6E0,
+          0x1F354 => 0xE673,
         },
       )
       expect(hash[0x3013]).to eq([0x1F1E8, 0x1F1F3])

data/test/rails/overrides/Gemfile.jpmobile

@@ -4,7 +4,7 @@ gem 'jpmobile',             path: './vendor/jpmobile'
 gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
 gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
-gem 'activerecord-session_store', '~> 1.1.1'
+gem 'activerecord-session_store', git: 'https://github.com/rails/activerecord-session_store.git', ref: 'f188efbc49a522123cc8acc805143824176d01c1'
 
 gem 'pry'
 gem 'pry-byebug'

data/test/rails/overrides/app/controllers/mobile_spec_controller.rb

@@ -5,7 +5,7 @@ class MobileSpecController < ApplicationController
   end
 
   def file_render
-    render file: File.join(Rails.public_path, '422')
+    render file: File.join(Rails.public_path, '422.html')
   end
 
   def no_mobile

data/test/rails/overrides/app/mailboxes/application_mailbox.rb

@@ -0,0 +1,3 @@
+class ApplicationMailbox < ActionMailbox::Base
+  routing(/.*/ => :mobile_mailer)
+end

data/test/rails/overrides/app/mailboxes/mobile_mailer_mailbox.rb

@@ -0,0 +1,5 @@
+class MobileMailerMailbox < ApplicationMailbox
+  def process
+    mail
+  end
+end

data/test/rails/overrides/app/mailers/decorated_mailer.rb

@@ -3,7 +3,7 @@ class DecoratedMailer < Jpmobile::Mailer::Base
   default to: 'info@jp.mobile'
 
   def deco_mail(to_mail)
-    attachments.inline['photo.jpg'] = File.open(File.join(Rails.root, 'spec/fixtures/mobile_mailer/photo.jpg')).read
+    attachments.inline['photo.jpg'] = File.open(File.join(Rails.root, 'spec/fixtures/files/mobile_mailer/photo.jpg')).read
 
     mail(to: to_mail, subject: '題名', decorated: true)
   end

data/test/rails/overrides/db/migrate/20201111033056_create_active_storage_tables.active_storage.rb

@@ -0,0 +1,36 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    create_table :active_storage_blobs do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum,     null: false
+      t.datetime :created_at,   null: false
+
+      t.index [:key], unique: true
+    end
+
+    create_table :active_storage_attachments do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false
+      t.references :blob,     null: false
+
+      t.datetime :created_at, null: false
+
+      t.index [:record_type, :record_id, :name, :blob_id], name: 'index_active_storage_attachments_uniqueness', unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records do |t|
+      t.belongs_to :blob, null: false, index: false
+      t.string :variation_digest, null: false
+
+      t.index %i[blob_id variation_digest], name: 'index_active_storage_variant_records_uniqueness', unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/test/rails/overrides/db/migrate/20201111033057_create_action_mailbox_tables.action_mailbox.rb

@@ -0,0 +1,14 @@
+# This migration comes from action_mailbox (originally 20180917164000)
+class CreateActionMailboxTables < ActiveRecord::Migration[6.0]
+  def change
+    create_table :action_mailbox_inbound_emails do |t|
+      t.integer :status, default: 0, null: false
+      t.string  :message_id, null: false
+      t.string  :message_checksum, null: false
+
+      t.timestamps
+
+      t.index [:message_id, :message_checksum], name: 'index_action_mailbox_inbound_emails_uniqueness', unique: true
+    end
+  end
+end

data/test/rails/overrides/spec/controllers/docomo_guid_spec.rb

@@ -6,7 +6,7 @@ shared_examples_for 'docomo_guid が起動しないとき' do
   it 'で link_to の自動書き換えが行われない' do
     get :link
 
-    expect(response.body).to match(%r{href=\".+/link\"})
+    expect(response.body).to match(%r{href=".+/link"})
   end
 end
 
@@ -14,7 +14,7 @@ shared_examples_for 'docomo_guid が起動するとき' do
   it 'で link_to の自動書き換えが行われる' do
     get :link
 
-    expect(response.body).to match(%r{href=\".+/link\?guid=ON\"})
+    expect(response.body).to match(%r{href=".+/link\?guid=ON"})
   end
 end
 

data/test/rails/overrides/spec/controllers/hankaku_filter_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Jpmobile::HankakuFilterController, type: :controller do
+describe HankakuFilterController, type: :controller do
   describe '#index' do
     let(:params) { { prefecture_ids: ['1', '2'] } }
 

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

@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe TemplatePathController, type: :controller do
+  render_views
+
   before do
     request.user_agent = user_agent
   end

data/test/rails/overrides/spec/mailboxes/mobile_mailer_mailbox_spec.rb

@@ -0,0 +1,265 @@
+require 'rails_helper'
+require 'action_mailbox/test_helper'
+
+describe MobileMailerMailbox, type: :mailbox do
+  include ActionMailbox::TestHelper
+
+  describe 'blank mail' do
+    it 'softbank からの空メールがで受信できること' do
+      expect {
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/softbank-blank.eml')
+
+        expect(inbound_email.mail.subject).to be_blank
+        expect(inbound_email.mail.body).to be_blank
+      }.to_not raise_error
+    end
+  end
+
+  describe 'docomo からのメールを受信するとき' do
+    it '漢字コードを適切に変換できること' do
+      inbound_email = receive_inbound_email_from_fixture('mobile_mailer/docomo-emoji.eml')
+
+      expect(inbound_email.mail.subject).to match(/題名/)
+      expect(inbound_email.mail.body).to match(/本文/)
+    end
+
+    it '絵文字が数値参照に変わること' do
+      inbound_email = receive_inbound_email_from_fixture('mobile_mailer/docomo-emoji.eml')
+
+      expect(inbound_email.mail.subject).to match(//)
+      expect(inbound_email.mail.body).to match(//)
+    end
+
+    describe 'jis コードの場合に' do
+      it '適切に変換できること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/docomo-jis.eml')
+
+        expect(inbound_email.mail.subject).to match(/テスト/)
+        expect(inbound_email.mail.body).to match(/テスト本文/)
+      end
+    end
+  end
+
+  describe 'au からのメールを受信するとき' do
+    describe 'jpmobile で送信したメールの場合' do
+      it '漢字コードを適切に変換できること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/au-emoji.eml')
+
+        expect(inbound_email.mail.subject).to match(/題名/)
+        expect(inbound_email.mail.body).to match(/本文/)
+      end
+
+      it '絵文字が数値参照に変わること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/au-emoji.eml')
+
+        expect(inbound_email.mail.subject).to match(//)
+        expect(inbound_email.mail.body).to match(//)
+      end
+    end
+
+    describe '実機からのメールの場合' do
+      it '漢字コードを適切に変換できること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/au-emoji2.eml')
+
+        expect(inbound_email.mail.subject).to match(/題名/)
+        expect(inbound_email.mail.body).to match(/本文/)
+      end
+
+      it '絵文字が数値参照に変わること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/au-emoji2.eml')
+
+        expect(inbound_email.mail.subject).to match(//)
+        expect(inbound_email.mail.body).to match(//)
+      end
+    end
+  end
+
+  describe 'softbank からのメールを受信するとき' do
+    describe 'shift_jis のとき' do
+      it '漢字コードを適切に変換できること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/softbank-emoji.eml')
+
+        expect(inbound_email.mail.subject).to match(/題名/)
+        expect(inbound_email.mail.body).to match(/本文/)
+      end
+
+      it '絵文字が数値参照に変わること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/softbank-emoji.eml')
+
+        expect(inbound_email.mail.subject).to match(//)
+        expect(inbound_email.mail.body).to match(//)
+      end
+    end
+
+    describe 'utf-8 のとき' do
+      it '漢字コードを適切に変換できること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/softbank-emoji.eml')
+
+        expect(inbound_email.mail.subject).to match(/題名/)
+        expect(inbound_email.mail.body).to match(/本文/)
+      end
+
+      it '絵文字が数値参照に変わること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/softbank-emoji-utf8.eml')
+
+        expect(inbound_email.mail.subject).to match(//)
+        expect(inbound_email.mail.body).to match(//)
+      end
+    end
+  end
+
+  describe 'multipart メールを受信するとき' do
+    describe 'docomo の場合' do
+      # NOTE: キャリアメールサーバで絵文字を変換するため検証は困難
+      it '正常に受信できること' do
+        expect {
+          receive_inbound_email_from_fixture('mobile_mailer/docomo-gmail-sjis.eml')
+        }.not_to raise_exception
+      end
+
+      it '絵文字が変換されること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/docomo-gmail-sjis.eml')
+
+        expect(inbound_email.mail.subject).to match(//)
+
+        expect(inbound_email.mail.parts.size).to eq(1)
+        expect(inbound_email.mail.parts.first.parts.size).to eq(2)
+
+        parts = inbound_email.mail.parts.first.parts
+        expect(parts.first.body).to match('テストです')
+        expect(parts.last.body.raw_source).to match('テストです')
+      end
+    end
+
+    describe 'au の場合' do
+      it '正常に受信できること' do
+        expect {
+          receive_inbound_email_from_fixture('mobile_mailer/au-decomail.eml')
+        }.not_to raise_exception
+      end
+
+      it '絵文字が変換されること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/au-decomail.eml')
+
+        expect(inbound_email.mail.subject).to match(//)
+
+        expect(inbound_email.mail.parts.size).to eq(1)
+        expect(inbound_email.mail.parts.first.parts.size).to eq(2)
+
+        parts = inbound_email.mail.parts.first.parts
+        expect(parts.first.body).to match(/テストです/)
+        expect(parts.last.body.raw_source).to match(/テストです/)
+      end
+
+      context 'iPhone' do
+        it 'should parse correctly' do
+          expect {
+            inbound_email = receive_inbound_email_from_fixture('mobile_mailer/iphone-message.eml')
+            inbound_email.mail.encoded
+          }.not_to raise_error
+        end
+      end
+    end
+
+    describe 'softbank(sjis) の場合' do
+      # NOTE: キャリアメールサーバで絵文字を変換するため検証は困難
+      it '正常に受信できること' do
+        expect {
+          receive_inbound_email_from_fixture('mobile_mailer/softbank-gmail-sjis.eml')
+        }.not_to raise_exception
+      end
+
+      it '絵文字が変換されること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/softbank-gmail-sjis.eml')
+
+        expect(inbound_email.mail.subject).to match(//)
+
+        expect(inbound_email.mail.parts.size).to eq(2)
+
+        expect(inbound_email.mail.parts.first.body).to match(/テストです/)
+        expect(inbound_email.mail.parts.last.body.raw_source).to match(/テストです/)
+      end
+    end
+
+    describe 'softbank(utf8) の場合' do
+      # NOTE: キャリアメールサーバで絵文字を変換するため検証は困難
+      it '正常に受信できること' do
+        expect {
+          receive_inbound_email_from_fixture('mobile_mailer/softbank-gmail-utf8.eml')
+        }.not_to raise_exception
+      end
+
+      it '絵文字が変換されること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/softbank-gmail-utf8.eml')
+
+        expect(inbound_email.mail.subject).to match(/テストです/)
+
+        expect(inbound_email.mail.parts.size).to eq(2)
+
+        expect(inbound_email.mail.parts.first.body).to match(/テストです/)
+        expect(inbound_email.mail.parts.last.body.raw_source).to match(/テストです/)
+      end
+    end
+
+    describe '添付ファイルがある場合' do
+      # NOTE: au のみテスト
+      it '正常に受信できること' do
+        expect {
+          receive_inbound_email_from_fixture('mobile_mailer/au-attached.eml')
+        }.not_to raise_exception
+      end
+
+      it '添付ファイルが壊れないこと' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/au-attached.eml')
+
+        expect(inbound_email.mail.subject).to match(//)
+
+        expect(inbound_email.mail.parts.size).to eq(2)
+
+        expect(inbound_email.mail.parts.first.body).to match(/カレンダーだ/)
+
+        expect(inbound_email.mail.has_attachments?).to be_truthy
+        expect(inbound_email.mail.attachments.size).to eq(1)
+        expect(inbound_email.mail.attachments['20098calendar01.jpg'].content_type).to match('image/jpeg')
+        expect(inbound_email.mail.attachments['20098calendar01.jpg'].body.to_s.size).to eq(86412)
+        expect(inbound_email.mail.attachments['20098calendar01.jpg'].body.to_s[6..9]).to eq('JFIF')
+      end
+    end
+  end
+
+  describe 'PCからメールを受信するとき' do
+    describe '日本語ではない場合' do
+      before(:each) do
+        @email = file_fixture('mobile_mailer/non-jp.eml').read
+      end
+
+      it '正常に受信できること' do
+        expect {
+          receive_inbound_email_from_fixture('mobile_mailer/non-jp.eml')
+        }.not_to raise_exception
+      end
+
+      it 'mobile が nil であること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/non-jp.eml')
+        expect(inbound_email.mail.mobile).to be_nil
+      end
+    end
+
+    describe 'From がない場合' do
+      before(:each) do
+        @email = file_fixture('mobile_mailer/no-from.eml').read
+      end
+
+      it '正常に受信できること' do
+        expect {
+          receive_inbound_email_from_fixture('mobile_mailer/no-from.eml')
+        }.not_to raise_exception
+      end
+
+      it 'mobile が nil であること' do
+        inbound_email = receive_inbound_email_from_fixture('mobile_mailer/no-from.eml')
+        expect(inbound_email.mail.mobile).to be_nil
+      end
+    end
+  end
+end