jpmobile 4.1.5 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4087728fed83f93b1bc634817757c2737dbc1c6
-  data.tar.gz: deef1288401df95e41c266b15630f93904cf1950
+  metadata.gz: e3659619243b8dff1161041cd0ff72c112feebad
+  data.tar.gz: c866458af576914e147de23255a34f007a9e87a3
 SHA512:
-  metadata.gz: 4705b4a6bfd5544b3146dda02a7b61cb89d233c62d12b47babd6f9a822e0adc6de5b0e21c2c14759f99ebeed756f2226d06b67f6048def8480eea1d5acc1185a
-  data.tar.gz: 7eae1aead8165e2332a3a802a2315ce36f6396af9cc42f8707b7f2be2babd3a92b7474656a60dfbd8d62c765172af6dc577028293bc5ff91d450a0591288f6a0
+  metadata.gz: da4606fadb165fdfaaee693d00e25f4ba85131cbae645d03f7a3d560f05e21d8d1d1cf64f4752b369a48e4c48b815222d80fa6fa7edfc5cda1fd554e526f3ecb
+  data.tar.gz: 79c74f5121aa6d0948171a1847242b323efbb31deafed177d15e279c9e38a14caeb1e973962d2b17eb923cc9f638ee7cf0c72120658d19d4731953ce9df45667

data/jpmobile.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'rails'
+  gem.add_development_dependency 'rails', '~> 4.2.0'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'
@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'sqlite3-ruby'
   gem.add_development_dependency 'hpricot'
   gem.add_development_dependency 'git'
+  gem.add_development_dependency 'pry'
 end

data/lib/jpmobile/hook_action_controller.rb

@@ -1,25 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'jpmobile/lookup_context'
 
-module ActionController
-  class Base
-    include Jpmobile::Helpers
-
-    if Object.const_defined?(:GetText)
-      before_action :gettext_force_ja_for_mobile
-      # gettextが組み込まれている場合、携帯電話からのアクセスをjaロケールに強制する。
-      def gettext_force_ja_for_mobile
-        if request.mobile?
-          begin
-            ::GetText.locale = 'ja'
-          rescue NameError
-          end
-        end
-      end
-    end
-  end
-end
-
 module ActionController
   module Renderers
     def render_to_body_with_jpmobile(options)

data/lib/jpmobile/mail.rb

@@ -241,10 +241,8 @@ module Mail
 
       # override charset
       if self.header[:content_type]
-        content_type_charset = Jpmobile::Util.extract_charset(self.header[:content_type].value)
-        @charset = content_type_charset
-        unless content_type_charset.blank?
-          self.header[:content_type].parameters[:charset] = @charset
+        @charset = header[:content_type].parameters[:charset] || ''
+        unless @charset.blank?
           @mobile_main_type = self.header[:content_type].main_type
         end
       end

data/lib/jpmobile/mailer.rb

@@ -2,7 +2,7 @@
 require 'jpmobile/mail'
 require 'jpmobile/lookup_context'
 
-Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z\.\-]/)
+Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp(?:[^a-zA-Z\.\-]|$)/)
 
 module Jpmobile
   module Mailer

data/lib/jpmobile/rack.rb

@@ -12,27 +12,3 @@ module Jpmobile
     end
   end
 end
-
-module Rack
-  class Request
-    def params
-      self.GET.merge(self.POST)
-    end
-  end
-
-  # UTF-8 で match させるようにする
-  module Utils
-    def escape(s)
-      s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) {
-        '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
-      }.tr(' ', '+')
-    end
-    module_function :escape
-    def unescape(s)
-      s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/){
-        [$1.delete('%')].pack('H*')
-      }
-    end
-    module_function :unescape
-  end
-end

data/lib/jpmobile/resolver.rb

@@ -11,12 +11,11 @@ module Jpmobile
 
     private
 
-    def query(path, details, formats, outside_app_allowed)
+    def query(path, details, formats)
       query = build_query(path, details)
 
       begin
         template_paths = find_template_paths query
-        template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
       rescue NoMethodError
         self.class_eval do
           def find_template_paths(query)

data/lib/jpmobile/util.rb

@@ -349,15 +349,25 @@ module Jpmobile
 
     def check_charset(str, charset)
       # use NKF.guess
-      ::Encoding.compatible?(NKF.guess(str), ::Encoding.find(charset))
+      ::Encoding.compatible?(guess_encoding(str), ::Encoding.find(charset))
     end
 
     def correct_encoding(str)
-      if str.encoding != ::Encoding::ASCII_8BIT and NKF.guess(str) != str.encoding
-        str.force_encoding(NKF.guess(str))
+      if guess_encoding(str) != str.encoding
+        str.force_encoding(guess_encoding(str))
       end
 
       str
     end
+
+    def guess_encoding(str)
+      encoding = NKF.guess(str)
+      # ISO-2022-JPにおいて、JIS X201半角カナエスケープシーケンスが含まれていたらCP50220とみなす
+      if encoding == ::Encoding::ISO2022_JP && str.dup.force_encoding(BINARY).include?("\e(I")
+        ::Encoding::CP50220
+      else
+        encoding
+      end
+    end
   end
 end

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "4.1.5"
+  VERSION = "4.2.0"
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -36,7 +36,7 @@ namespace :test do
       FileUtils.rm_rf("Gemfile.lock")
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      `rails _4.1.11_ new #{rails_root} --skip-bundle`
+      `rails new #{rails_root} --skip-bundle`
     end
 
     # setup jpmobile

data/spec/rack/jpmobile/params_filter_spec.rb

@@ -41,11 +41,11 @@ describe Jpmobile::Rack::ParamsFilter do
           req = Rack::Request.new(res[1])
           expect(req.params.size).to eq(4)
 
-          expect(req.params[ascii_8bit(@query_params.keys.first.dup)]).to eq(ascii_8bit(@query_params[@query_params.keys.first]))
-          expect(req.params[ascii_8bit(@query_params.keys.last.dup)]).to  eq(ascii_8bit(@query_params[@query_params.keys.last]))
+          expect(req.params[@query_params.keys.first.dup]).to eq(@query_params[@query_params.keys.first])
+          expect(req.params[@query_params.keys.last.dup]).to  eq(@query_params[@query_params.keys.last])
 
-          expect(req.params[ascii_8bit(@form_params.keys.first.dup)]).to eq(ascii_8bit(@form_params[@form_params.keys.first]))
-          expect(req.params[ascii_8bit(@form_params.keys.last.dup)]).to  eq(ascii_8bit(@form_params[@form_params.keys.last]))
+          expect(req.params[@form_params.keys.first.dup]).to eq(@form_params[@form_params.keys.first])
+          expect(req.params[@form_params.keys.last.dup]).to  eq(@form_params[@form_params.keys.last])
         end
       end
 
@@ -62,11 +62,11 @@ describe Jpmobile::Rack::ParamsFilter do
           req = Rack::Request.new(res[1])
           expect(req.params.size).to eq(4)
 
-          expect(req.params[ascii_8bit(@query_params.keys.first.dup)]).to eq(ascii_8bit(@query_params[@query_params.keys.first]))
-          expect(req.params[ascii_8bit(@query_params.keys.last.dup)]).to  eq(ascii_8bit(@query_params[@query_params.keys.last]))
+          expect(req.params[@query_params.keys.first.dup]).to eq(@query_params[@query_params.keys.first])
+          expect(req.params[@query_params.keys.last.dup]).to  eq(@query_params[@query_params.keys.last])
 
-          expect(req.params[ascii_8bit(@form_params.keys.first.dup)]).to eq(ascii_8bit(@form_params[@form_params.keys.first]))
-          expect(req.params[ascii_8bit(@form_params.keys.last.dup)]).to  eq(ascii_8bit(@form_params[@form_params.keys.last]))
+          expect(req.params[@form_params.keys.first.dup]).to eq(@form_params[@form_params.keys.first])
+          expect(req.params[@form_params.keys.last.dup]).to  eq(@form_params[@form_params.keys.last])
         end
       end
     end
@@ -94,11 +94,11 @@ describe Jpmobile::Rack::ParamsFilter do
           req = Rack::Request.new(res[1])
           expect(req.params.size).to eq(4)
 
-          expect(req.params[ascii_8bit(@query_params.keys.first.dup)]).to eq(ascii_8bit(@query_params[@query_params.keys.first]))
-          expect(req.params[ascii_8bit(@query_params.keys.last.dup)]).to  eq(ascii_8bit(@query_params[@query_params.keys.last]))
+          expect(req.params[@query_params.keys.first.dup]).to eq(@query_params[@query_params.keys.first])
+          expect(req.params[@query_params.keys.last.dup]).to  eq(@query_params[@query_params.keys.last])
 
-          expect(req.params[ascii_8bit(@form_params.keys.first.dup)]).to eq(ascii_8bit(@form_params[@form_params.keys.first]))
-          expect(req.params[ascii_8bit(@form_params.keys.last.dup)]).to  eq(ascii_8bit(@form_params[@form_params.keys.last]))
+          expect(req.params[@form_params.keys.first.dup]).to eq(@form_params[@form_params.keys.first])
+          expect(req.params[@form_params.keys.last.dup]).to  eq(@form_params[@form_params.keys.last])
         end
       end
     end
@@ -121,8 +121,8 @@ describe Jpmobile::Rack::ParamsFilter do
         req = Rack::Request.new(res[1])
         expect(req.params.size).to eq(2)
 
-        expect(req.params["hoge"]).to eq(ascii_8bit("\356\230\276"))
-        expect(req.params["foo"]).to  eq(ascii_8bit("\356\231\200"))
+        expect(req.params["hoge"]).to eq("\356\230\276")
+        expect(req.params["foo"]).to  eq("\356\231\200")
       end
     end
 
@@ -142,8 +142,8 @@ describe Jpmobile::Rack::ParamsFilter do
         req = Rack::Request.new(res[1])
         expect(req.params.size).to eq(2)
 
-        expect(req.params["hoge"]).to eq(ascii_8bit("\356\222\201"))
-        expect(req.params["foo"]).to  eq(ascii_8bit("\356\224\242"))
+        expect(req.params["hoge"]).to eq("\356\222\201")
+        expect(req.params["foo"]).to  eq("\356\224\242")
       end
     end
 
@@ -163,8 +163,8 @@ describe Jpmobile::Rack::ParamsFilter do
         req = Rack::Request.new(res[1])
         expect(req.params.size).to eq(2)
 
-        expect(req.params["hoge"]).to eq(ascii_8bit("\xef\x80\x81"))
-        expect(req.params["foo"]).to  eq(ascii_8bit("\xef\x88\x9c"))
+        expect(req.params["hoge"]).to eq("\xef\x80\x81")
+        expect(req.params["foo"]).to  eq("\xef\x88\x9c")
       end
     end
   end

data/spec/rack_helper.rb

@@ -5,7 +5,6 @@ require 'rspec'
 require 'jpmobile'
 require 'jpmobile/rack'
 require 'nkf'
-require 'pp' # for debug
 
 begin
   require File.dirname(__FILE__)+'/../vendor/jpmobile-ipaddresses/lib/jpmobile-ipaddresses'
@@ -22,9 +21,6 @@ RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
   config.color = true
-  config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
-  end
 end
 
 class UnitApplication

data/spec/unit/email-fixtures/iphone-cp932.eml

@@ -0,0 +1,13 @@
+Delivered-To: info@jpmobile.jp
+Content-Transfer-Encoding: base64
+Content-Type: text/plain;
+  charset=cp932
+From: "cp932@ezweb.ne.jp" <cp932@ezweb.ne.jp>
+Mime-Version: 1.0 (1.0)
+Subject: =?iso-2022-jp?B?UmU6IBskQiFaGyhCTktTQxskQiFbGyhCdGVzdA==?=
+Message-Id: <3E458B9D-9044-46FE-8A8D-000000000000@ezweb.ne.jp>
+Date: Wed, 10 Dec 2014 17:01:30 +0900
+To: "info@jpmobile.jp" <info@jpmobile.jp>
+X-Mailer: iPhone Mail (12A405)
+
+g2WDWINngsWCt4FCh4o=

data/spec/unit/email-fixtures/iphone-jis.eml

@@ -0,0 +1,15 @@
+Delivered-To: info@jpmobile.jp
+From: "jis@i.softbank.jp" <jis@i.softbank.jp>
+Content-Type: text/plain;
+	charset=iso-2022-jp
+X-Mailer: iPhone Mail (12B435)
+Message-Id: <F574F824-7263-44E6-8423-000000000000@i.softbank.jp>
+Date: Fri, 5 Dec 2014 13:14:37 +0900
+To: "info@jpmobile.jp" <info@jpmobile.jp>
+Content-Transfer-Encoding: 7bit
+Mime-Version: 1.0 (1.0)
+X-SB-Service: Virus-Checked
+
+(=(I_$B&X(I_(B)(II(B
+
+

data/spec/unit/email_spec.rb

@@ -55,9 +55,18 @@ describe 'Jpmobile::Email' do
   end
 
   describe "japanese_mail_address_regexp" do
-    it "#detect_from_mail_header should return Jpmobile::Mobile::AbstractMobile when hoge.jp" do
-      Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z\.\-]/)
+    before do
+      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
       expect(Jpmobile::Email.detect_from_mail_header('From: Hoge Fuga <fuga@hoge.jp>')).to eq(Jpmobile::Mobile::AbstractMobile)
+      expect(Jpmobile::Email.detect_from_mail_header('From: fuga@hoge.jp')).to eq(Jpmobile::Mobile::AbstractMobile)
+    end
+
+    it "#detect_from_mail_header should return nil when the header does not contain .jp address" do
+      expect(Jpmobile::Email.detect_from_mail_header('From: Hoge Fuga <fuga@example.com>')).to eq(nil)
+      expect(Jpmobile::Email.detect_from_mail_header('From: fuga@example.com')).to eq(nil)
     end
   end
 

data/spec/unit/receive_mail_spec.rb

@@ -275,6 +275,12 @@ describe "Jpmobile::Mail#receive" do
         @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/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
+
+      it 'should decode cp932-encoded mail correctly' do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-cp932.eml")).read)
+        expect(@mail.subject).to eq 'Re: 【NKSC】test'
+        expect(@mail.body.to_s).to eq 'テストです。㈱'
+      end
     end
 
     context 'From iPad' do
@@ -362,6 +368,16 @@ describe "Jpmobile::Mail#receive" do
         expect(@mail.body.to_s).to eq("テスト本文\n\n")
       end
     end
+
+    context "iPhone" do
+      before(:each) do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-jis.eml")).read)
+      end
+
+      it "body should be parsed correctly" do
+        expect(@mail.body.to_s).to eq("(=ﾟωﾟ)ﾉ\n\n\n")
+      end
+    end
   end
 
   describe 'bounced mail' do

data/spec/unit/spec_helper.rb

@@ -19,8 +19,5 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.color = true
   config.filter_run_excluding :broken => true
-  config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
-  end
   # config.full_backtrace = true
 end

data/spec/unit/util_spec.rb

@@ -151,4 +151,13 @@ describe Jpmobile::Util do
       expect(correct_encoding(str).encoding).to eq(Encoding::UTF_8)
     end
   end
+
+  describe 'guess_encoding' do
+    it 'guesses encoding correclty' do
+      expect(guess_encoding('テスト')).to eq Encoding::UTF_8
+      expect(guess_encoding("\x83\x65\x83\x58\x83\x67")).to eq Encoding::Shift_JIS
+      expect(guess_encoding("\e\x24\x42\x25\x46\x25\x39\x25\x48\e\x28\x42")).to eq Encoding::ISO2022_JP
+      expect(guess_encoding("\e\x28\x49\x43\x3D\x44\e\x28\x42")).to eq Encoding::CP50220
+    end
+  end
 end

data/test/rails/overrides/db/migrate/001_add_sessions_table.rb

@@ -1,16 +1,13 @@
 class AddSessionsTable < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :sessions do |t|
       t.string :session_id, :null => false
       t.text :data
-      t.timestamps
+
+      t.timestamps null: false
     end
 
     add_index :sessions, :session_id
     add_index :sessions, :updated_at
   end
-
-  def self.down
-    drop_table :sessions
-  end
 end

data/test/rails/overrides/db/migrate/20100824062306_create_users.rb

@@ -1,13 +1,9 @@
 class CreateUsers < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :users do |t|
       t.string :name
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
-
-  def self.down
-    drop_table :users
-  end
 end

data/test/rails/overrides/spec/mailers/decorated_mailer_spec.rb

@@ -9,7 +9,7 @@ describe DecoratedMailer, :type => :mailer do
 
   shared_examples_for "content-type" do
     it "sends decorated mail successfully" do
-      DecoratedMailer.deco_mail(@to).deliver
+      DecoratedMailer.deco_mail(@to).deliver_now
 
       email = ActionMailer::Base.deliveries.first
       expect(email.header['Content-Type'].main_type).to eq('multipart')

data/test/rails/overrides/spec/mailers/mobile_mailer_spec.rb

@@ -15,14 +15,14 @@ describe MobileMailer, :type => :mailer do
 
   shared_examples_for "PC宛メール" do
     it "正常に送信できること" do
-      email = MobileMailer.view_selection(@to, "題名", "本文").deliver
+      email = MobileMailer.view_selection(@to, "題名", "本文").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
       expect(email.to.include?(@to)).to be_truthy
     end
 
     it "ISO-2022-JPに変換されること" do
-      email = MobileMailer.view_selection(@to, "題名", "本文").deliver
+      email = MobileMailer.view_selection(@to, "題名", "本文").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -33,7 +33,7 @@ describe MobileMailer, :type => :mailer do
     end
 
     it "絵文字がゲタ(〓)に変換されること" do
-      email = MobileMailer.view_selection(@to, "題名", "本文".html_safe).deliver
+      email = MobileMailer.view_selection(@to, "題名", "本文".html_safe).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -44,7 +44,7 @@ describe MobileMailer, :type => :mailer do
 
     it "quoted-printableではないときに勝手に変換されないこと" do
       email = MobileMailer.view_selection(@to, "題名",
-        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver
+        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -54,7 +54,7 @@ describe MobileMailer, :type => :mailer do
 
     context ":toの指定が" do
       it "ない場合でも正常に送信できること" do
-        email = MobileMailer.default_to_mail('題名', '本文').deliver
+        email = MobileMailer.default_to_mail('題名', '本文').deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
       end
@@ -69,7 +69,7 @@ describe MobileMailer, :type => :mailer do
     it_behaves_like "PC宛メール"
 
     it "複数に配信するときもISO-2022-JPに変換されること" do
-      email = MobileMailer.view_selection(@to, "題名", "本文").deliver
+      email = MobileMailer.view_selection(@to, "題名", "本文").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -87,7 +87,7 @@ describe MobileMailer, :type => :mailer do
     end
 
     it "subject/body が Shift-JIS になること" do
-      email = MobileMailer.view_selection(@to, @subject, @text).deliver
+      email = MobileMailer.view_selection(@to, @subject, @text).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -102,7 +102,7 @@ describe MobileMailer, :type => :mailer do
       emoji_subject = @subject + ""
       emoji_text = @text + ""
 
-      email = MobileMailer.view_selection(@to, emoji_subject, emoji_text.html_safe).deliver
+      email = MobileMailer.view_selection(@to, emoji_subject, emoji_text.html_safe).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -116,7 +116,7 @@ describe MobileMailer, :type => :mailer do
       half_kana_subject = @subject + "ｹﾞｰﾑ"
       half_kana_text    = @text + "ﾌﾞｯｸ"
 
-      email = MobileMailer.view_selection(@to, half_kana_subject, half_kana_text).deliver
+      email = MobileMailer.view_selection(@to, half_kana_subject, half_kana_text).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -128,7 +128,7 @@ describe MobileMailer, :type => :mailer do
 
     it "quoted-printable ではないときに勝手に変換されないこと" do
       email = MobileMailer.view_selection(@to, "題名",
-        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver
+        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -143,7 +143,7 @@ describe MobileMailer, :type => :mailer do
     end
 
     it "subject/body がISO-2022-JPになること" do
-      email = MobileMailer.view_selection(@to, @subject, @text).deliver
+      email = MobileMailer.view_selection(@to, @subject, @text).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -157,7 +157,7 @@ describe MobileMailer, :type => :mailer do
       emoji_subject = @subject + ""
       emoji_text    = @text    + ""
 
-      email = MobileMailer.view_selection(@to, emoji_subject, emoji_text.html_safe).deliver
+      email = MobileMailer.view_selection(@to, emoji_subject, emoji_text.html_safe).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -169,7 +169,7 @@ describe MobileMailer, :type => :mailer do
 
     it "quoted-printable ではないときに勝手に変換されないこと" do
       email = MobileMailer.view_selection(@to, "題名",
-        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver
+        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -184,7 +184,7 @@ describe MobileMailer, :type => :mailer do
     end
 
     it "subject/body が Shift_JIS になること" do
-      email = MobileMailer.view_selection(@to, @subject, @text).deliver
+      email = MobileMailer.view_selection(@to, @subject, @text).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -199,7 +199,7 @@ describe MobileMailer, :type => :mailer do
       emoji_subject = @subject + ""
       emoji_text    = @text    + ""
 
-      email = MobileMailer.view_selection(@to, emoji_subject, emoji_text.html_safe).deliver
+      email = MobileMailer.view_selection(@to, emoji_subject, emoji_text.html_safe).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -211,7 +211,7 @@ describe MobileMailer, :type => :mailer do
 
     it "quoted-printable ではないときに勝手に変換されないこと" do
       email = MobileMailer.view_selection(@to, "題名",
-        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver
+        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -226,7 +226,7 @@ describe MobileMailer, :type => :mailer do
     end
 
     it "subject/body が Shift_JIS になること" do
-      email = MobileMailer.view_selection(@to, @subject, @text).deliver
+      email = MobileMailer.view_selection(@to, @subject, @text).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -241,7 +241,7 @@ describe MobileMailer, :type => :mailer do
       emoji_subject = @subject + ""
       emoji_text    = @text    + ""
 
-      email = MobileMailer.view_selection(@to, emoji_subject, emoji_text.html_safe).deliver
+      email = MobileMailer.view_selection(@to, emoji_subject, emoji_text.html_safe).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -253,7 +253,7 @@ describe MobileMailer, :type => :mailer do
 
     it "quoted-printable ではないときに勝手に変換されないこと" do
       email = MobileMailer.view_selection(@to, "題名",
-        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver
+        "本文です\nhttp://test.rails/foo/bar/index?d=430d0d1cea109cdb384ec5554b890e3940f293c7&e=ZVG%0FE%16%5E%07%04%21P%5CZ%06%00%0D%1D%40L").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -293,7 +293,7 @@ describe MobileMailer, :type => :mailer do
       end
 
       it "漢字コードが変換されること" do
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -311,7 +311,7 @@ describe MobileMailer, :type => :mailer do
       end
 
       it "漢字コードが変換されること" do
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -325,7 +325,7 @@ describe MobileMailer, :type => :mailer do
       it "絵文字が変換されること" do
         @text  += ""
         @html  += ""
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -343,7 +343,7 @@ describe MobileMailer, :type => :mailer do
       end
 
       it "漢字コードが変換されること" do
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -357,7 +357,7 @@ describe MobileMailer, :type => :mailer do
       it "絵文字が変換されること" do
         @text += ""
         @html += ""
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -375,7 +375,7 @@ describe MobileMailer, :type => :mailer do
       end
 
       it "漢字コードが変換されること" do
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -389,7 +389,7 @@ describe MobileMailer, :type => :mailer do
       it "絵文字が変換されること" do
         @text  += ""
         @html  += ""
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -407,7 +407,7 @@ describe MobileMailer, :type => :mailer do
       end
 
       it "漢字コードが変換されること" do
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -421,7 +421,7 @@ describe MobileMailer, :type => :mailer do
       it "絵文字が変換されること" do
         @text  += ""
         @html  += ""
-        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver
+        email = MobileMailer.multi_message(@to, @subject, @text, @html).deliver_now
 
         expect(ActionMailer::Base.deliveries.size).to eq(1)
 
@@ -445,7 +445,7 @@ describe MobileMailer, " mail address", :type => :mailer do
 
   it "ピリオドが3つ以上連続するアドレスが有効になること" do
     to = "ruby...rails@domomo-ezweb.ne.jp"
-    MobileMailer.view_selection(to, @subject, @text).deliver
+    MobileMailer.view_selection(to, @subject, @text).deliver_now
 
     emails = ActionMailer::Base.deliveries
     expect(emails.size).to eq(1)
@@ -455,7 +455,7 @@ describe MobileMailer, " mail address", :type => :mailer do
 
   it "@マークの直前にピリオドあるアドレスが有効になること" do
     to = "ruby.rails.@domomo-ezweb.ne.jp"
-    MobileMailer.view_selection(to, @subject, @text).deliver
+    MobileMailer.view_selection(to, @subject, @text).deliver_now
 
     emails = ActionMailer::Base.deliveries
     expect(emails.size).to eq(1)
@@ -465,7 +465,7 @@ describe MobileMailer, " mail address", :type => :mailer do
 
   it "ピリオドから始まるアドレスが有効になること" do
     to = ".ruby.rails.@domomo-ezweb.ne.jp"
-    MobileMailer.view_selection(to, @subject, @text).deliver
+    MobileMailer.view_selection(to, @subject, @text).deliver_now
 
     emails = ActionMailer::Base.deliveries
     expect(emails.size).to eq(1)
@@ -475,7 +475,7 @@ describe MobileMailer, " mail address", :type => :mailer do
 
   it "複数のアドレスが有効になること" do
     to = [".ruby.rails.@domomo-ezweb.ne.jp", "ruby.rails.@domomo-ezweb.ne.jp", "ruby...rails@domomo-ezweb.ne.jp"]
-    MobileMailer.view_selection(to.join(", "), @subject, @text).deliver
+    MobileMailer.view_selection(to.join(", "), @subject, @text).deliver_now
 
     emails = ActionMailer::Base.deliveries
     expect(emails.size).to eq(1)

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

@@ -13,14 +13,14 @@ describe NormalMailer, :type => :mailer do
 
   context "PC宛メール" do
     it "正常に送信できること" do
-      email = NormalMailer.msg(@to, "題名", "本文").deliver
+      email = NormalMailer.msg(@to, "題名", "本文").deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
       expect(email.to - @to).to be_empty
     end
 
     it "UTF-8のままであること" do
-      email = NormalMailer.msg(@to, @subject, @text).deliver
+      email = NormalMailer.msg(@to, @subject, @text).deliver_now
 
       expect(ActionMailer::Base.deliveries.size).to eq(1)
 

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

@@ -3,25 +3,28 @@ ENV["RAILS_ENV"] ||= 'test'
 require 'spec_helper'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-# require 'capybara/rails'
-# require 'capybara/rspec'
+# Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
 # run as spec files by default. This means that files in spec/support that end
 # in _spec.rb will both be required and run as specs, causing the specs to be
 # run twice. It is recommended that you do not name files matching this glob to
-# end with _spec.rb. You can configure this pattern with with the --pattern
+# end with _spec.rb. You can configure this pattern with the --pattern
 # option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
-  # config.mock_with :rspec
-
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
@@ -52,9 +55,4 @@ RSpec.configure do |config|
   config.color = true
   config.filter_run_excluding broken: true
   # config.full_backtrace = true
-  config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
-  end
 end
-
-require 'pp'

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

@@ -32,7 +32,7 @@ describe "trans_sid functional", :type => :request do
     it "で form の自動書き換えが行われない" do
       res = get_with_session(@controller, "form", @user_agent)
 
-      expect(res.response.body).to match(/<form accept-charset="#{@charset}" action=\"\/.+?\/form\"/)
+      expect(res.response.body).to match(/<form.*action=\"\/.+?\/form\".*accept-charset="#{@charset}"/)
     end
     it "で redirect の自動書き換えが行われない" do
       res = get_with_session(@controller, "redirect", @user_agent)
@@ -54,7 +54,7 @@ describe "trans_sid functional", :type => :request do
     it "で form の自動書き換えが行われる" do
       res = get_with_session(@controller, "form", @user_agent)
 
-      expect(res.response.body).to match(/<form accept-charset="#{@charset}" action=\"\/.+?\/form\?_session_id=[a-zA-Z0-9]{32}\"/)
+      expect(res.response.body).to match(/<form.*action=\"\/.+?\/form\?_session_id=[a-zA-Z0-9]{32}\".*accept-charset="#{@charset}"/)
     end
     it "で redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect", @user_agent)
@@ -71,7 +71,7 @@ describe "trans_sid functional", :type => :request do
     it "で @user の form の自動書き換えが行われる" do
       res = get_with_session(@controller, "form_path", @user_agent)
 
-      expect(res.response.body).to match(/<form accept-charset="#{@charset}" action=\"\/users\/1\?_session_id=[a-zA-Z0-9]{32}\"/)
+      expect(res.response.body).to match(/<form.*action=\"\/users\/1\?_session_id=[a-zA-Z0-9]{32}\".*accept-charset="#{@charset}"/)
     end
     it "で @path の redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect_path", @user_agent)
@@ -88,7 +88,7 @@ describe "trans_sid functional", :type => :request do
     it "で [:admin, @user] の form の自動書き換えが行われる" do
       res = get_with_session(@controller, "form_path_admin", @user_agent)
 
-      expect(res.response.body).to match(/<form accept-charset="#{@charset}" action=\"\/admin\/users\/1\?_session_id=[a-zA-Z0-9]{32}\"/)
+      expect(res.response.body).to match(/<form.*action=\"\/admin\/users\/1\?_session_id=[a-zA-Z0-9]{32}\".* accept-charset="#{@charset}"/)
     end
     it "で [:admin, @path] の redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect_path_admin", @user_agent)

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

@@ -6,15 +6,38 @@
 # Given that it is always loaded, you are encouraged to keep this file as
 # light-weight as possible. Requiring heavyweight dependencies from this file
 # will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, make a
-# separate helper file that requires this one and then use it only in the specs
-# that actually need it.
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need it.
 #
 # The `.rspec` file also contains a few flags that are not defaults but that
 # users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    # be_bigger_than(2).and_smaller_than(4).description
+    #   # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #   # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin
@@ -25,6 +48,13 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  # Limits the available syntax to the non-monkey patched syntax that is recommended.
+  # For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.
@@ -51,28 +81,5 @@ RSpec.configure do |config|
   # test failures related to randomization by passing the same `--seed` value
   # as the one that triggered the failure.
   Kernel.srand config.seed
-
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # Enable only the newer, non-monkey-patching expect syntax.
-    # For more details, see:
-    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-    expectations.syntax = :expect
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Enable only the newer, non-monkey-patching expect syntax.
-    # For more details, see:
-    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-    mocks.syntax = :expect
-
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended.
-    mocks.verify_partial_doubles = true
-  end
 =end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.2.0
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 description: A Rails plugin for mobile devices in Japan
 email:
 - rust.stnard@gmail.com
@@ -237,6 +251,8 @@ files:
 - spec/unit/email-fixtures/docomo-emoji.eml
 - spec/unit/email-fixtures/docomo-gmail-sjis.eml
 - spec/unit/email-fixtures/docomo-jis.eml
+- spec/unit/email-fixtures/iphone-cp932.eml
+- spec/unit/email-fixtures/iphone-jis.eml
 - spec/unit/email-fixtures/iphone-mail3.eml
 - spec/unit/email-fixtures/iphone-message.eml
 - spec/unit/email-fixtures/pc-mail-attached-without-subject.eml
@@ -414,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Rails plugin for mobile devices in Japan
@@ -446,6 +462,8 @@ test_files:
 - spec/unit/email-fixtures/docomo-emoji.eml
 - spec/unit/email-fixtures/docomo-gmail-sjis.eml
 - spec/unit/email-fixtures/docomo-jis.eml
+- spec/unit/email-fixtures/iphone-cp932.eml
+- spec/unit/email-fixtures/iphone-jis.eml
 - spec/unit/email-fixtures/iphone-mail3.eml
 - spec/unit/email-fixtures/iphone-message.eml
 - spec/unit/email-fixtures/pc-mail-attached-without-subject.eml