jpmobile 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3659619243b8dff1161041cd0ff72c112feebad
-  data.tar.gz: c866458af576914e147de23255a34f007a9e87a3
+  metadata.gz: e92e1817ef365d523478348f5a7f3de6a1dabbdd
+  data.tar.gz: 9190f78e5db8ecf7250b2a30cd5433527418d51b
 SHA512:
-  metadata.gz: da4606fadb165fdfaaee693d00e25f4ba85131cbae645d03f7a3d560f05e21d8d1d1cf64f4752b369a48e4c48b815222d80fa6fa7edfc5cda1fd554e526f3ecb
-  data.tar.gz: 79c74f5121aa6d0948171a1847242b323efbb31deafed177d15e279c9e38a14caeb1e973962d2b17eb923cc9f638ee7cf0c72120658d19d4731953ce9df45667
+  metadata.gz: 87d2739e8e85d116fd397067dbc580b0c871d5a6d84fab6ad502a9208c7395ec5aef2012d4cd5b09f88a0c527e3217765505c18ecb721f2379e2f04ad696a05b
+  data.tar.gz: 746f7be69f65c94eed3b1037abc464f2a46304a508b605d434b14521c95f7aa2ba04a736d90a587a8bf8b3d374066cd41a38807d4fdbfa15902c24bb7e009aac

data/CONTRIBUTING.md

@@ -0,0 +1,28 @@
+# CONTRIBUTING
+## 環境構築方法
+jpmobile-ipaddressesとjpmobile-terminfoのgemをインストールしていない場合。
+
+```
+$ git clone git@github.com:jpmobile/jpmobile.git
+$ bundle install
+$ cd vendor
+$ git clone git@github.com:jpmobile/jpmobile-ipaddresses.git
+$ git clone git@github.com:jpmobile/jpmobile-terminfo.git
+```
+
+## テスト
+テストにはSMTP通信を行うものも含まれるため、
+[koseki-mocksmtpd](https://github.com/koseki/mocksmtpd)などの、
+smtpdのmockを利用する必要があります。
+
+### 必要なgemパッケージ
+テストを実行するためには以下のgemパッケージが必要です。
+* rails (include rack)
+* sqlite3
+* nokogiri
+* rspec
+* rspec-rails
+* rspec-fixture
+* rack-test
+* mocha
+* geokit

data/README.rdoc

@@ -80,6 +80,11 @@
     スマートフォンからのアクセスではありません。
   <% end %>
 
+  <% if request.tablet? %>
+    タブレットからのアクセスです。
+  <% else %>
+    タブレットからのアクセスではありません。
+  <% end %>
 
 
 ==== 別に用意した携帯電話用コントローラへリダイレクトする例
@@ -114,7 +119,7 @@ Rack::Request#mobile.position に位置情報が格納されます。
 
 ==== {GeoKit}[http://geokit.rubyforge.org] との連携
 
-vandor/plugins/geokit以下にGeoKitがインストールされていると、Jpmobile::PositionにGeoKit::Mappableがincludeされる。したがって、
+vendor/plugins/geokit以下にGeoKitがインストールされていると、Jpmobile::PositionにGeoKit::Mappableがincludeされる。したがって、
 
   request.mobile.position.distance_to('札幌駅')
 
@@ -288,17 +293,9 @@ trans_sid を使用する際には、例えば config/initializers/session_store
 * オプションに :decorated => true を追加すると、各キャリアのデコメに適したフォーマットで送信します。
   * ただし docomo/SoftBank でテスト出来ていないため、実験版とします。
 
-== テストに必要なgemパッケージ
-テストを実行するためには以下のgemパッケージが必要です。
-* rails (include rack)
-* sqlite3-ruby
-* nokogiri
-* rspec
-* rspec-rails
-* rspec-fixture
-* rack-test
-* mocha
-* geokit
+== jpmobileの開発方法
+
+jpmobileの開発に関しては {こちら}[https://github.com/jpmobile/jpmobile/blob/master/CONTRIBUTING.md] へ
 
 == リンク
 

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', '~> 4.2.0'
+  gem.add_development_dependency 'rails'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'

data/lib/jpmobile/configuration.rb

@@ -15,5 +15,13 @@ module Jpmobile
     def mobile_filter
       ::Jpmobile::Rack.mount_middlewares
     end
+
+    def session_store(&block)
+      @session_store = block
+    end
+
+    def mount_session_store
+      @session_store && @session_store.call
+    end
   end
 end

data/lib/jpmobile/hook_action_controller.rb

@@ -10,8 +10,8 @@ module ActionController
           expected_view_file = lookup_context.find_template(options[:template], options[:prefixes])
 
           _candidates = lookup_context.mobile.map { |variant|
-            target_templat = options[:template] + '_' + variant
-            expected_view_file.virtual_path.match(target_templat)
+            target_template = options[:template] + '_' + variant
+            expected_view_file.virtual_path.match(target_template)
           }.compact
 
           if _candidates.empty?

data/lib/jpmobile/mail.rb

@@ -4,17 +4,6 @@ require 'mail'
 module Mail
   # encoding patch
   Ruby19.class_eval do
-    def self.b_value_decode(str, encoding = nil)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.*)\?\=/m)
-      if match
-        charset = match[1]
-        str = self.decode_base64(match[2])
-        str = charset_encoder.encode(str, charset)
-      end
-      decoded = str.encode(Encoding::UTF_8, :invalid => :replace, :replace => "") rescue Jpmobile::Util.ascii_8bit(str)
-      # decoded.valid_encoding? ? decoded : decoded.encode(Encoding::UTF_16LE, :invalid => :replace, :replace => "").encode(Encoding::UTF_8)
-    end
-
     # change encoding
     def self.b_value_encode(str, encoding = nil)
       str = Jpmobile::Util.encode(str, encoding.to_s)
@@ -36,7 +25,7 @@ module Mail
         header['subject'].mobile = @mobile if header['subject']
         header['from'].mobile    = @mobile if header['from']
         header['to'].mobile      = @mobile if header['to']
-        self.charset             = @mobile.mail_charset
+        self.charset             = @mobile.mail_charset unless multipart?
 
         ready_to_send!
 
@@ -113,7 +102,6 @@ module Mail
 
         if @body.multipart?
           @body.parts.each do |p|
-            p.charset = @mobile.mail_charset(p.charset)
             p.mobile  = @mobile
           end
         end
@@ -130,6 +118,10 @@ module Mail
       separate_parts_without_jpmobile
     end
 
+    def add_charset_with_jpmobile
+      add_charset_without_jpmobile unless multipart? && @mobile
+    end
+
     alias_method :encoded_without_jpmobile, :encoded
     alias_method :encoded, :encoded_with_jpmobile
 
@@ -142,6 +134,9 @@ module Mail
     alias_method :separate_parts_without_jpmobile, :separate_parts
     alias_method :separate_parts, :separate_parts_with_jpmobile
 
+    alias_method :add_charset_without_jpmobile, :add_charset
+    alias_method :add_charset, :add_charset_with_jpmobile
+
 # -- docomo
 # multipart/mixed
 #   |- multipart/related
@@ -248,17 +243,9 @@ module Mail
       end
 
       # convert header(s)
-      if self.header[:subject]
-        subject_charset = Jpmobile::Util.extract_charset(self.header[:subject].value)
-        self.header[:subject].charset = subject_charset unless subject_charset.blank?
-
-        if @mobile
-          subject_value = Jpmobile::Util.ascii_8bit(self.header[:subject].value.dup)
-          subject_value = Encodings.value_decode(subject_value)
-          subject_converting_encoding = Jpmobile::Util.detect_encoding(subject_value)
-          v = @mobile.to_mail_internal(subject_value, subject_converting_encoding)
-          self.header[:subject].value = Jpmobile::Util.force_encode(v, @mobile.mail_charset(subject_charset), Jpmobile::Util::UTF8)
-        end
+      if header[:subject] && @mobile
+        header[:subject].mobile = @mobile
+        header[:subject].value = header[:subject].decoded
       end
 
       if @body_part_jpmobile and @mobile and !@charset.blank?
@@ -267,10 +254,6 @@ module Mail
           @body_part_jpmobile = Jpmobile::Util.decode(@body_part_jpmobile, self.content_transfer_encoding, @charset)
           self.content_transfer_encoding = @mobile.class::MAIL_CONTENT_TRANSFER_ENCODING
         end
-        unless Jpmobile::Util.check_charset(@body_part_jpmobile, @charset)
-          @body_part_jpmobile = Jpmobile::Util.correct_encoding(@body_part_jpmobile)
-          @charset            = @body_part_jpmobile.encoding.to_s
-        end
         @body_part_jpmobile = @mobile.decode_transfer_encoding(@body_part_jpmobile, @charset)
       end
     end
@@ -464,8 +447,39 @@ module Mail
       end
     end
 
+    def decoded_with_jpmobile
+      if @mobile
+        return value unless value =~ /\=\?[^?]+\?([QB])\?[^?]*?\?\=/mi
+        Encodings.collapse_adjacent_encodings(value).each do |line|
+          line.gsub!(/\=\?[^?]+\?([QB])\?[^?]*?\?\=/mi) do |string|
+            case $1
+            when 'B','b' then decode_b_value_for_mobile(string)
+            when 'Q','q' then Encodings.q_value_decode(string)
+            else line
+            end
+          end
+        end.join("")
+      else
+        decoded_without_jpmobile
+      end
+    end
+
     alias_method :encoded_without_jpmobile, :encoded
     alias_method :encoded, :encoded_with_jpmobile
+
+    alias_method :decoded_without_jpmobile, :decoded
+    alias_method :decoded, :decoded_with_jpmobile
+
+    def decode_b_value_for_mobile(str)
+      match = str.match(/\=\?(.+)?\?[Bb]\?(.*)\?\=/m)
+      if match
+        charset = match[1]
+        str = Ruby19.decode_base64(match[2])
+        @mobile.decode_transfer_encoding(str, charset)
+      else
+        str
+      end
+    end
   end
 
   class StructuredField

data/lib/jpmobile/mobile/ipad.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# =Android
+# =iPad
 
 module Jpmobile::Mobile
   # ==iPad

data/lib/jpmobile/request_with_mobile.rb

@@ -36,6 +36,11 @@ module Jpmobile
       mobile and mobile.smart_phone?
     end
 
+    # タブレットからであれば +true+を、そうでなければ +false+ を返す
+    def tablet?
+      mobile and mobile.tablet?
+    end
+
     # 携帯電話の機種に応じて Mobile::xxx を返す。
     # 携帯電話でない場合はnilを返す。
     def mobile

data/lib/jpmobile/resolver.rb

@@ -11,7 +11,7 @@ module Jpmobile
 
     private
 
-    def query(path, details, formats)
+    def query(path, details, formats, _)
       query = build_query(path, details)
 
       begin

data/lib/jpmobile/session/active_record_store.rb

@@ -1,11 +1,13 @@
-module ActiveRecord
-  class SessionStore
-    def destroy_session_with_jpmobile(env, session_id, options)
-      destroy_session_without_jpmobile(env, session_id, options)
+module ActionDispatch
+  module Session
+    class ActiveRecordStore
+      def destroy_session_with_jpmobile(env, session_id, options)
+        destroy_session_without_jpmobile(env, session_id, options)
 
-      session_id || Jpmobile::SessionID.generate_sid
-    end
+        session_id || Jpmobile::SessionID.generate_sid
+      end
 
-    alias_method_chain :destroy_session, :jpmobile
+      alias_method_chain :destroy_session, :jpmobile
+    end
   end
 end

data/lib/jpmobile/session/mem_cache_store.rb

@@ -1,6 +1,6 @@
-module Rack
+module ActionDispatch
   module Session
-    class Memcache
+    class MemCacheStore
       def destroy_session_with_jpmobile(env, session_id, options)
         destroy_session_without_jpmobile(env, session_id, options)
 

data/lib/jpmobile/trans_sid.rb

@@ -29,6 +29,8 @@ module Jpmobile
       when "ActiveRecord::SessionStore"
         require 'jpmobile/session/active_record_store'
         ActionDispatch::Session::AbstractStore.send :include, ParamsOverCookie
+      else
+        Rails.application.config.jpmobile.mount_session_store
       end
     end
   end

data/lib/jpmobile/util.rb

@@ -250,7 +250,17 @@ module Jpmobile
         s.force_encoding(from) unless s.encoding == from_enc
       end
 
-      s.encode(to)
+      begin
+        s.encode(to)
+      rescue ::Encoding::InvalidByteSequenceError, ::Encoding::UndefinedConversionError => e
+        # iPhone MailがISO-2022-JPに半角カナや①などのCP50220文字を含めてくる問題対策
+        if s.encoding == ::Encoding::ISO2022_JP
+          s.force_encoding(::Encoding::CP50220)
+          retry
+        else
+          raise e
+        end
+      end
     end
 
     def set_encoding(str, encoding)
@@ -346,28 +356,5 @@ module Jpmobile
       charset = _extract_charset unless _extract_charset.blank? or _extract_charset == charset
       Jpmobile::Util.set_encoding(_str, charset)
     end
-
-    def check_charset(str, charset)
-      # use NKF.guess
-      ::Encoding.compatible?(guess_encoding(str), ::Encoding.find(charset))
-    end
-
-    def correct_encoding(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.2.0"
+  VERSION = "4.2.1"
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -84,6 +84,16 @@ END
       end
     end
 
+    unless skip
+      # add gems for jpmobile spec
+      config_path = File.join(rails_root, 'Gemfile')
+      File.open(config_path, 'a+') do |file|
+        file.write <<-END
+instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')
+END
+      end
+    end
+
     # run tests in rails
     cd rails_root
     ruby "-S bundle install"

data/spec/unit/email-fixtures/docomo-decomail.eml

@@ -0,0 +1,49 @@
+Return-Path: <docomo@docomo.ne.jp>
+Delivered-To: info@jpm-rails.org
+Date: Sun, 06 Feb 2011 17:30:48 +0900 (JST)
+From: docomo@docomo.ne.jp
+To: info@jpm-rails.org
+Subject: =?iso-2022-jp?B?GyRCJUYlOSVIGyhC?=
+Message-ID: <IMTM0i3E149a62f10PSW@docomo.ne.jp>
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="RHe5pb6n_0_"
+Content-Transfer-Encoding: 7bit
+
+--RHe5pb6n_0_
+Content-Type: multipart/related; boundary="RHe5pb6n"
+
+--RHe5pb6n
+Content-Type: multipart/alternative; boundary="AzHFwESQ"
+
+--AzHFwESQ
+Content-Type: text/plain; charset="iso-2022-jp"
+Content-Transfer-Encoding: 7bit
+
+ 
+
+$B%F%9%H$G$9(B 
+--AzHFwESQ
+Content-Type: text/html; charset="iso-2022-jp"
+Content-Transfer-Encoding: quoted-printable
+
+<HTML><HEAD><META http-equiv=3D"Content-Type" content=3D"text/html; charset=
+=3Diso-2022-jp"></HEAD><BODY><DIV align=3D"center"><FONT color=3D"#FF4BFF">=
+=1B$B%F%9%H$G$9=1B(B<IMG src=3D"cid:03@110206.172728@______F03B@docomo.ne.j=
+p"></FONT></DIV></BODY></HTML>
+--AzHFwESQ--
+
+--RHe5pb6n
+Content-Type: image/gif;
+ name="ao_hatena.gif"
+Content-Transfer-Encoding: base64
+Content-ID: <03@110206.172728@______F03B@docomo.ne.jp>
+
+R0lGODlhFAAUAHAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJMgAEACwAAAAAFAAUAIIjZqoDoO0s
+xf////////8AAAAAAAAAAAAIagAJCBxIsKBBgwASJjyIEIAAAQEiLmRIwOHDixADAGDocMAAjA8l
+Huw4QGPCABk1FrQIcaNAiyIJslT5MiTNgQAixqyY0qVMhTh7UpSpc+LQlzuPvjSqtClFoE55towK
+06fSnEmvMo1KMSAAIfkECTIABAAsAAAAABQAFACCI2aqA6DtLMX/////////AAAAAAAAAAAACGMA
+CQgcSLCgwYMIEypcSACAQ4cMGwIQICCARYgJJ1LcWDEAAIQTBwzgSPGiQY0iPToM0NFjQY0VPwrU
+aJIgAIs1G7aUafPhwIk4eSq8eVHo0JwRfUZcmhHjUppGjyJlqJTpwoAAOw==
+--RHe5pb6n
+--RHe5pb6n_0_--
+

data/spec/unit/email-fixtures/iphone-circled-numbers-in-jis.eml

@@ -0,0 +1,16 @@
+Return-Path: <softbank@i.softbank.jp>
+X-Original-To: info@jpmobile-rails.org
+Delivered-To: info@jpmobile-rails.org
+Subject: =?iso-2022-jp?B?GyRCJUYlOSVILSEbKEI=?=
+From: <softbank@i.softbank.jp>
+X-Mailer: iPhone Mail (12B435)
+Message-Id: <107E70FB-4920-45C4-B0DA-000000000000@i.softbank.jp>
+Date: Mon, 29 Dec 2014 13:02:07 +0900
+To: info@jpmobile-rails.org
+Mime-Version: 1.0 (1.0)
+X-SB-Service: Virus-Checked
+Content-Type: text/plain; charset="iso-2022-jp"
+Content-Transfer-Encoding: 7bit
+
+$B4]?t;z$N%F%9%H$G$9-"|r(B
+

data/spec/unit/email-fixtures/iphone-unicode-emoji.eml

@@ -0,0 +1,15 @@
+Delivered-To: info@jpmobile.jp
+Subject: =?utf-8?B?57W15paH5a2X8J+OhQ==?=
+From: "jpmobile@i.softbank.jp" <jpmobile@i.softbank.jp>
+Content-Type: text/plain;
+  charset=utf-8
+X-Mailer: iPhone Mail (12B435)
+Message-Id: <6D20A3C2-DCE3-4A62-95EB-000000000000@i.softbank.jp>
+Date: Wed, 17 Dec 2014 19:13:03 +0900
+To: "info@jpmobile.jp" <info@jpmobile.jp>
+Content-Transfer-Encoding: base64
+Mime-Version: 1.0 (1.0)
+X-SB-Service: Virus-Checked
+
+8J+OhOKdow==
+

data/spec/unit/receive_mail_spec.rb

@@ -83,23 +83,48 @@ describe "Jpmobile::Mail#receive" do
     end
 
     describe "Docomo" do
-      before(:each) do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "../../test/rails/overrides/spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml")).read)
-      end
+      context "with sjis decomail" do
+        before(:each) do
+          @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "../../test/rails/overrides/spec/fixtures/mobile_mailer/docomo-gmail-sjis.eml")).read)
+        end
 
-      it "subject should be parsed correctly" do
-        expect(@mail.subject).to eq("テスト")
-      end
+        it "subject should be parsed correctly" do
+          expect(@mail.subject).to eq("テスト")
+        end
 
-      it "body should be parsed correctly" do
-        expect(@mail.body.parts.size).to eq(1)
-        @mail.body.parts.first.parts.size == 2
-        expect(@mail.body.parts.first.parts.first.body).to match("テストです")
-        expect(@mail.body.parts.first.parts.last.body.raw_source).to match("テストです")
+        it "body should be parsed correctly" do
+          expect(@mail.body.parts.size).to eq(1)
+          @mail.body.parts.first.parts.size == 2
+          expect(@mail.body.parts.first.parts.first.body).to match("テストです")
+          expect(@mail.body.parts.first.parts.last.body.raw_source).to match("テストです")
+        end
+
+        it "should encode correctly" do
+          expect(@mail.to_s).to match(Regexp.escape("g2WDWINn+ZE"))
+        end
+
+        it "does not cause double-conversion on reparsing" do
+          @reparsed = Mail.new(@mail.to_s)
+          expect(@reparsed.to_s).to match(Regexp.escape("g2WDWINn+ZE"))
+          expect(@reparsed.body.parts.first.parts.first.body).to match("テストです")
+        end
       end
 
-      it "should encode correctly" do
-        expect(@mail.to_s).to match(Regexp.escape("g2WDWINn+ZE"))
+      context "with jis decomail" do
+        before(:each) do
+          @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/docomo-decomail.eml")).read)
+        end
+
+        it "does not contain charset within multipart Content-Type" do
+          expect(@mail.to_s.scan(/Content-Type:\s+multipart(?:.+;\r\n)*.+[^;]\r\n/)).
+            to satisfy{|matches| matches.all?{|type| !type.include?('charset')}}
+        end
+
+        it "does not cause double-conversion on reparsing" do
+          @reparsed = Mail.new(@mail.to_s)
+          expect(@reparsed.to_s).to match(Regexp.escape("g2WDWINn"))
+          expect(@reparsed.parts.first.parts.first.parts.first.body.decoded).to match("テストです")
+        end
       end
     end
 
@@ -207,6 +232,20 @@ describe "Jpmobile::Mail#receive" do
         expect(@mail.to_s).to match(sjis_regexp(sjis("\x89\xEF\x8Bc\x82\xAA\x8AJ\x8D\xC3\xF8\xA7")))
       end
     end
+
+    context "JIS mail" do
+      before(:each) do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/docomo-jis.eml")).read)
+      end
+
+      it "subject should be parsed correctly" do
+        expect(@mail.subject).to eq("テスト")
+      end
+
+      it "body should be parsed correctly" do
+        expect(@mail.body.to_s).to eq("テスト本文\n\n")
+      end
+    end
   end
 
   describe "Au" do
@@ -338,44 +377,58 @@ describe "Jpmobile::Mail#receive" do
         expect(@mail.to_s).to match(sjis_regexp(utf8_to_sjis("会議が開催") + sjis("\xf7\xdf")))
       end
     end
-  end
 
-  describe "Softbank blank-mail" do
-    before(:each) do
-      @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/softbank-blank.eml")).read)
-    end
+    describe "blank-mail" do
+      before(:each) do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/softbank-blank.eml")).read)
+      end
 
-    it "subject should be parsed correctly" do
-      expect(@mail.subject).to be_blank
-    end
+      it "subject should be parsed correctly" do
+        expect(@mail.subject).to be_blank
+      end
 
-    it "body should be parsed correctly" do
-      expect(@mail.body.to_s).to be_blank
+      it "body should be parsed correctly" do
+        expect(@mail.body.to_s).to be_blank
+      end
     end
   end
 
-  describe "JIS mail" do
-    context "Docomo" do
+  describe "iPhone" do
+    context "JIS mail" do
       before(:each) do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/docomo-jis.eml")).read)
+        @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
+
+    context "when the mail contains UTF-8 emojis" do
+      before(:each) do
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-unicode-emoji.eml")).read)
       end
 
       it "subject should be parsed correctly" do
-        expect(@mail.subject).to eq("テスト")
+        expect(@mail.subject).to eq("絵文字\u{1F385}")
       end
 
       it "body should be parsed correctly" do
-        expect(@mail.body.to_s).to eq("テスト本文\n\n")
+        expect(@mail.body.to_s).to eq("\u{1F384}\u2763")
       end
     end
 
-    context "iPhone" do
+    context "when the mail contains circled-numbers" do
       before(:each) do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-jis.eml")).read)
+        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-circled-numbers-in-jis.eml")).read)
+      end
+
+      it "subject should be parsed correctly" do
+        expect(@mail.subject).to eq("テスト①")
       end
 
       it "body should be parsed correctly" do
-        expect(@mail.body.to_s).to eq("(=ﾟωﾟ)ﾉ\n\n\n")
+        expect(@mail.body.to_s).to eq("丸数字のテストです②ⅱ\n\n")
       end
     end
   end

data/spec/unit/util_spec.rb

@@ -79,6 +79,16 @@ describe Jpmobile::Util do
     expect(jis_to_utf8("JIS\rSAMPLE\nTEXT\r\n")).to eq(utf8("JIS\nSAMPLE\nTEXT\n"))
   end
 
+  describe '#force_encode' do
+    it 'converts ISO-2022-JP string which contains halfwidth-kana' do
+      expect(force_encode("\e\x28\x49\x43\x3D\x44\e\x28\x42".force_encoding('ISO-2022-JP'), 'iso-2022-jp', 'UTF-8')).to eq 'ﾃｽﾄ'
+    end
+
+    it 'does not enter infinite loop on retry' do
+      expect{ force_encode("\e\x28\x49\x9a\x43\x3D\x44\e\x28\x42".force_encoding('ISO-2022-JP'), 'iso-2022-jp', 'UTF-8') }.to raise_error ::Encoding::InvalidByteSequenceError
+    end
+  end
+
   it "fold_textでUTF-8の日本語文字列が指定文字数で折り返された配列で返ること" do
     expect(fold_text('長い日本語の題名で折り返されるかようにするには事前に分割していないとダメなことがわかりましたよ', 15)).to eq([
       '長い日本語の題名で折り返される',
@@ -132,32 +142,4 @@ describe Jpmobile::Util do
       expect(hash[0xE6FB]).to eq(0x1F526)
     end
   end
-
-  describe 'check_charset' do
-    it 'returns true if compatible' do
-      str = 'ABC'.force_encoding('ASCII-8BIT')
-      expect(check_charset(str, 'UTF-8')).to be_truthy
-    end
-
-    it 'returns false if incompatible' do
-      str = '再現'.encode('ISO-2022-JP')
-      expect(check_charset(str, 'UTF-8')).to be_falsey
-    end
-  end
-
-  describe 'correct_encoding' do
-    it 'updates encoding correctly' do
-      str = '再現'.force_encoding('ISO-2022-JP')
-      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/Gemfile.jpmobile

@@ -0,0 +1,16 @@
+gem 'geokit'
+
+gem 'jpmobile',             path: './vendor/jpmobile'
+gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
+gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
+
+gem 'activerecord-session_store'
+
+# Bundle gems for certain environments:
+group :development, :test do
+  gem "rspec"
+  gem "rspec-rails"
+  gem 'capybara'
+  gem 'capybara-webkit'
+  gem 'pry'
+end

data/test/rails/overrides/config/initializers/jpmobile_generator.rb

@@ -1,2 +1,12 @@
 Rails.application.config.jpmobile.mobile_filter
 Rails.application.config.jpmobile.form_accept_charset_conversion = true
+
+Rails.application.config.jpmobile.session_store do
+  # # MemCacheStore
+  # require 'jpmobile/session/mem_cache_store'
+  # ActionDispatch::Session::MemCacheStore.send :include, Jpmobile::TransSid::ParamsOverCookie
+
+  # # ActiveRecordStore
+  # require 'jpmobile/session/active_record_store'
+  # ActionDispatch::Session::AbstractStore.send :include, Jpmobile::TransSid::ParamsOverCookie
+end

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

@@ -37,7 +37,7 @@ describe "trans_sid functional", :type => :request do
     it "で redirect の自動書き換えが行われない" do
       res = get_with_session(@controller, "redirect", @user_agent)
 
-      res.response.header['Location'] =~ /\/$/
+      expect(res.response.header['Location']).to match(/\/$/)
     end
   end
 
@@ -59,7 +59,7 @@ describe "trans_sid functional", :type => :request do
     it "で redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect", @user_agent)
 
-      res.response.header['Location'] =~ /\?_session_id=[a-zA-Z0-9]{32}$/
+      expect(res.response.header['Location']).to match(/\?_session_id=[a-zA-Z0-9]{32}$/)
     end
 
     # resource paths
@@ -76,7 +76,7 @@ describe "trans_sid functional", :type => :request do
     it "で @path の redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect_path", @user_agent)
 
-      res.response.header['Location'] =~ /\?_session_id=[a-zA-Z0-9]{32}$/
+      expect(res.response.header['Location']).to match(/\?_session_id=[a-zA-Z0-9]{32}$/)
     end
 
     # resource path with prefix
@@ -93,7 +93,7 @@ describe "trans_sid functional", :type => :request do
     it "で [:admin, @path] の redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect_path_admin", @user_agent)
 
-      res.response.header['Location'] =~ /\?_session_id=[a-zA-Z0-9]{32}$/
+      expect(res.response.header['Location']).to match(/\?_session_id=[a-zA-Z0-9]{32}$/)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
 - README
@@ -248,13 +249,16 @@ files:
 - spec/unit/email-fixtures/au-emoji5.eml
 - spec/unit/email-fixtures/au-kigou.eml
 - spec/unit/email-fixtures/bounce_with_utf8_part.eml
+- spec/unit/email-fixtures/docomo-decomail.eml
 - 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-circled-numbers-in-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/iphone-unicode-emoji.eml
 - spec/unit/email-fixtures/pc-mail-attached-without-subject.eml
 - spec/unit/email-fixtures/pc-mail-multi.eml
 - spec/unit/email-fixtures/pc-mail-single.eml
@@ -277,7 +281,7 @@ files:
 - spec/unit/variants_spec.rb
 - test/rails/.gitignore
 - test/rails/overrides/.rspec
-- test/rails/overrides/Gemfile
+- test/rails/overrides/Gemfile.jpmobile
 - test/rails/overrides/app/controllers/admin/top_controller.rb
 - test/rails/overrides/app/controllers/application_controller.rb
 - test/rails/overrides/app/controllers/docomo_guid_always_controller.rb
@@ -430,7 +434,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails plugin for mobile devices in Japan
@@ -459,13 +463,16 @@ test_files:
 - spec/unit/email-fixtures/au-emoji5.eml
 - spec/unit/email-fixtures/au-kigou.eml
 - spec/unit/email-fixtures/bounce_with_utf8_part.eml
+- spec/unit/email-fixtures/docomo-decomail.eml
 - 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-circled-numbers-in-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/iphone-unicode-emoji.eml
 - spec/unit/email-fixtures/pc-mail-attached-without-subject.eml
 - spec/unit/email-fixtures/pc-mail-multi.eml
 - spec/unit/email-fixtures/pc-mail-single.eml
@@ -488,7 +495,7 @@ test_files:
 - spec/unit/variants_spec.rb
 - test/rails/.gitignore
 - test/rails/overrides/.rspec
-- test/rails/overrides/Gemfile
+- test/rails/overrides/Gemfile.jpmobile
 - test/rails/overrides/app/controllers/admin/top_controller.rb
 - test/rails/overrides/app/controllers/application_controller.rb
 - test/rails/overrides/app/controllers/docomo_guid_always_controller.rb