jpmobile 4.1.1 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f83dece3c3b1f70371b5aca9bcba8b1ded28abe
-  data.tar.gz: 28d2542170610c2d2fe9af4728c3b2b04301dc73
+  metadata.gz: c3144787e76be4d863f9196009d1e41b898d3562
+  data.tar.gz: 7b8a4479c9a57eefdba5c167ba322d6e23a8d8d7
 SHA512:
-  metadata.gz: bbba29855f49366f51dd5a172578181d1c9c887dd8e8d1c2a3211f8faf18e3f68868236d0fc11d7ba64f22062f600e6218938abf1a68ff6673a87ce1e0add9df
-  data.tar.gz: 01147d7316262342db4fc75a3aa74c4ea165592b1542bcd738f687098fb7987e00212ac7d477949d48ff3564372657f3d5e9667c6e880af6211cc657cf666dbb
+  metadata.gz: e028586f34450a8da47dfd7292886b2dab4b1d4745a2d49cdd7bf9a9f81891bd82572e15018968d0a2540d7c23429e92e471eab2558b543cc62fbf034f2dd659
+  data.tar.gz: cfcb93bb0eb1b8ba9dc4e73bbd77943c2d2eab47249c18afd1a15bffb9908df9c4c7bf81bf692c71c349a53210ccbf832f015fa8c88478d0e3ee22e120a0093d

data/jpmobile.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'sqlite3-ruby'
   gem.add_development_dependency 'hpricot'
   gem.add_development_dependency 'git'
+
+  gem.add_dependency 'rails', '~> 4.1.0'
 end

data/lib/jpmobile/emoticon.rb

@@ -159,11 +159,11 @@ module Jpmobile
           # 変換先がUnicodeで指定されている。つまり対応する絵文字がある。
           if sjis = UNICODE_TO_SJIS[converted]
             if to_sjis
-              sjis_emotion = Jpmobile::Util.sjis([sjis].pack('n'))
+              Jpmobile::Util.sjis([sjis].pack('n'))
             else
               [converted].pack("U")
             end
-          elsif webcode = SOFTBANK_UNICODE_TO_WEBCODE[converted-0x1000]
+          elsif SOFTBANK_UNICODE_TO_WEBCODE[converted-0x1000]
             [converted-0x1000].pack('U')
           elsif converted == GETA_CODE
             # PCで〓を表示する場合
@@ -295,7 +295,7 @@ module Jpmobile
             @@pc_emoticon_image_path.chop if @@pc_emoticon_image_path.match(/\/$/)
 
             return true
-          rescue => ex
+          rescue
           end
         else
           return true

data/lib/jpmobile/filter.rb

@@ -157,7 +157,7 @@ module Jpmobile
           end
         elsif element.node_name == "input" and ["submit", "reset", "button"].include?(element["type"])
           # テキスト以外でもボタンの value は変換
-          element["value"] = filter(:zenkaku, element["value"])
+          element["value"] = filter(:hankaku, element["value"])
         elsif element.children.any?
           # 子要素があれば再帰的に変換
           element = convert_text_content(element)

data/lib/jpmobile/mail.rb

@@ -4,7 +4,7 @@ require 'mail'
 module Mail
   # encoding patch
   Ruby19.class_eval do
-    def self.b_value_decode(str)
+    def self.b_value_decode(str, encoding = nil)
       match = str.match(/\=\?(.+)?\?[Bb]\?(.+)?\?\=/m)
       if match
         encoding = match[1]
@@ -17,7 +17,7 @@ module Mail
     end
 
     # change encoding
-    def self.b_value_encode(str, encoding)
+    def self.b_value_encode(str, encoding = nil)
       str = Jpmobile::Util.encode(str, encoding.to_s)
       [Ruby19.encode_base64(str), encoding]
     end
@@ -542,7 +542,7 @@ module Mail
       rescue NoMethodError => ex
         if ex.message.match(/undefined method `gsub' for nil:NilClass/)
           name = unquote(tree.display_name.text_value.strip.to_s)
-          str = strip_all_comments(name.to_s)
+          strip_all_comments(name.to_s)
         else
           raise ex
         end

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -8,8 +8,11 @@ module Jpmobile::Mobile
     MAIL_CHARSET = "ISO-2022-JP"
 
     def initialize(env, request)
-      @env     = env
-      @request = request
+      @env            = env
+      @request        = request
+      @_variants      = nil
+      @_mail_variants = nil
+      @decorated      = nil
     end
 
     # 対応するuser-agentの正規表現

data/lib/jpmobile/resolver.rb

@@ -14,7 +14,23 @@ module Jpmobile
     def query(path, details, formats)
       query = build_query(path, details)
 
-      template_paths = find_template_paths query
+      begin
+        template_paths = find_template_paths query
+      rescue NoMethodError
+        self.class_eval do
+          def find_template_paths(query)
+            # deals with case-insensitive file systems.
+            sanitizer = Hash.new { |h,dir| h[dir] = Dir["#{dir}/*"] }
+
+            Dir[query].reject { |filename|
+              File.directory?(filename) ||
+                !sanitizer[File.dirname(filename)].include?(filename)
+            }
+          end
+        end
+
+        retry
+      end
 
       template_paths.map { |template|
         handler, format, variant = extract_handler_and_format_and_variant(template, formats)

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "4.1.1"
+  VERSION = "4.1.4"
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -10,18 +10,12 @@ begin
   namespace :spec do
     desc 'run unit testing (core test)'
     RSpec::Core::RakeTask.new(:unit) do |t|
-      spec_dir = File.join(File.dirname(__FILE__), '../../', 'spec')
-      # t.spec_opts = File.read(File.join(spec_dir, 'spec.opts')).split
-      # t.spec_files = FileList[File.join(spec_dir, 'unit', '**', '*_spec.rb')]
-      t.pattern = "#{spec_dir}/unit/*_spec.rb"
+      t.pattern = 'spec/unit/**/*_spec.rb'
     end
 
     desc 'run rack testing'
     RSpec::Core::RakeTask.new(:rack) do |t|
-      spec_dir = File.join(File.dirname(__FILE__), '../../', 'spec')
-      # t.spec_opts = File.read(File.join(spec_dir, 'spec.opts')).split
-      # t.spec_files = FileList[File.join(spec_dir, 'rack', '**', '*_spec.rb')]
-      t.pattern = "#{spec_dir}/rack/**/*_spec.rb"
+      t.pattern = 'spec/rack/**/*_spec.rb'
     end
   end
 rescue LoadError
@@ -46,7 +40,7 @@ namespace :test do
     end
 
     # setup jpmobile
-    plugin_path = File.join(rails_root, 'lib', 'jpmobile')
+    plugin_path = File.join(rails_root, 'vendor', 'jpmobile')
     FileUtils.mkdir_p(plugin_path)
     FileList["*"].exclude("test").exclude("spec").exclude('vendor').each do |file|
       FileUtils.cp_r(file, plugin_path)
@@ -54,7 +48,7 @@ namespace :test do
 
     # setup jpmobile-ipaddresses
     begin
-      plugin_path = File.join(rails_root, 'lib', 'jpmobile-ipaddresses')
+      plugin_path = File.join(rails_root, 'vendor', 'jpmobile-ipaddresses')
       FileUtils.mkdir_p(plugin_path)
       FileList["vendor/jpmobile-ipaddresses/*"].exclude("test").each do |file|
         FileUtils.cp_r(file, plugin_path)
@@ -65,7 +59,7 @@ namespace :test do
 
     # setup jpmobile-terminfo
     begin
-      plugin_path = File.join(rails_root, 'lib', 'jpmobile-terminfo')
+      plugin_path = File.join(rails_root, 'vendor', 'jpmobile-terminfo')
       FileUtils.mkdir_p(plugin_path)
       FileList["vendor/jpmobile-terminfo/*"].exclude("test").each do |file|
         FileUtils.cp_r(file, plugin_path)

data/spec/rack/jpmobile/android_spec.rb

@@ -11,10 +11,10 @@ describe Jpmobile::Rack::MobileCarrier, "android" do
         'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1')
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should            == Jpmobile::Mobile::Android
-      env['rack.jpmobile'].position.should         be_nil
-      env['rack.jpmobile'].smart_phone?.should     be_truthy
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::Android)
+      expect(env['rack.jpmobile'].position).to         be_nil
+      expect(env['rack.jpmobile'].smart_phone?).to     be_truthy
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
   end
 end

data/spec/rack/jpmobile/au_spec.rb

@@ -12,13 +12,13 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "HTTP_X_UP_SUBNO" => "00000000000000_mj.ezweb.ne.jp")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should == Jpmobile::Mobile::Au
-      env['rack.jpmobile'].subno.should == "00000000000000_mj.ezweb.ne.jp"
-      env['rack.jpmobile'].ident.should == "00000000000000_mj.ezweb.ne.jp"
-      env['rack.jpmobile'].ident_subscriber.should == "00000000000000_mj.ezweb.ne.jp"
+      expect(env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Au)
+      expect(env['rack.jpmobile'].subno).to eq("00000000000000_mj.ezweb.ne.jp")
+      expect(env['rack.jpmobile'].ident).to eq("00000000000000_mj.ezweb.ne.jp")
+      expect(env['rack.jpmobile'].ident_subscriber).to eq("00000000000000_mj.ezweb.ne.jp")
 
-      env['rack.jpmobile'].position.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(env['rack.jpmobile'].position).to be_nil
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
     it "TK22 で判別できること" do
@@ -27,7 +27,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'HTTP_USER_AGENT' => "UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should == Jpmobile::Mobile::Au
+      expect(env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Au)
     end
   end
 
@@ -39,8 +39,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "ver=1&datum=0&unit=1&lat=%2b43.07772&lon=%2b141.34114&alt=64&time=20061016192415&smaj=69&smin=18&vert=21&majaa=115&fm=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should ==  43.07772
-      env['rack.jpmobile'].position.lon.should == 141.34114
+      expect(env['rack.jpmobile'].position.lat).to eq(43.07772)
+      expect(env['rack.jpmobile'].position.lon).to eq(141.34114)
     end
 
     it "緯度経度を取得できること(dms)" do
@@ -50,8 +50,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "ver=1&datum=0&unit=0&lat=%2b43.05.08.95&lon=%2b141.20.25.99&alt=155&time=20060521010328&smaj=76&smin=62&vert=65&majaa=49&fm=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(43.08581944)
-      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(141.3405528)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(43.08581944)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(141.3405528)
     end
 
     it "緯度経度を取得できること(dgree_tokyo)" do
@@ -61,8 +61,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "ver=1&datum=1&unit=1&lat=%2b43.07475&lon=%2b141.34259&alt=8&time=20061017182825&smaj=113&smin=76&vert=72&majaa=108&fm=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-4).of(43.07719289)
-      env['rack.jpmobile'].position.lon.should be_within(1e-4).of(141.3389013)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-4).of(43.07719289)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-4).of(141.3389013)
     end
 
     it "緯度経度を取得できること(dgree_tokyo)" do
@@ -72,8 +72,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "ver=1&datum=1&unit=1&lat=%2b43.07475&lon=%2b141.34259&alt=8&time=20061017182825&smaj=113&smin=76&vert=72&majaa=108&fm=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-4).of(43.07719289)
-      env['rack.jpmobile'].position.lon.should be_within(1e-4).of(141.3389013)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-4).of(43.07719289)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-4).of(141.3389013)
     end
 
     it "緯度経度を取得できること(dms_tokyo)" do
@@ -83,8 +83,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(43.08194444)
-      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(141.3474306)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(43.08194444)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(141.3474306)
     end
 
     it "緯度経度を取得できること(antenna)" do
@@ -94,8 +94,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(43.08194444)
-      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(141.3474306)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(43.08194444)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(141.3474306)
     end
 
     it "GeoKit がある場合に取得できること" do
@@ -105,11 +105,11 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "ver=1&datum=0&unit=1&lat=%2b43.07772&lon=%2b141.34114&alt=64&time=20061016192415&smaj=69&smin=18&vert=21&majaa=115&fm=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should == 43.07772
-      env['rack.jpmobile'].position.lon.should == 141.34114
-      env['rack.jpmobile'].position.ll.should  == "43.07772,141.34114"
+      expect(env['rack.jpmobile'].position.lat).to eq(43.07772)
+      expect(env['rack.jpmobile'].position.lon).to eq(141.34114)
+      expect(env['rack.jpmobile'].position.ll).to  eq("43.07772,141.34114")
       if env['rack.jpmobile'].position.respond_to?(:distance_to) # GeoKit method
-        env['rack.jpmobile'].position.distance_to(env['rack.jpmobile'].position).should == 0
+        expect(env['rack.jpmobile'].position.distance_to(env['rack.jpmobile'].position)).to eq(0)
       end
     end
 
@@ -120,9 +120,9 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
         env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-        env['rack.jpmobile'].device_id.should == "CA32"
-        env['rack.jpmobile'].supports_location?.should be_truthy
-        env['rack.jpmobile'].supports_gps?.should be_truthy
+        expect(env['rack.jpmobile'].device_id).to eq("CA32")
+        expect(env['rack.jpmobile'].supports_location?).to be_truthy
+        expect(env['rack.jpmobile'].supports_gps?).to be_truthy
       end
 
       it "A1402S を判定できること" do
@@ -131,9 +131,9 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
           'HTTP_USER_AGENT' => "KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0")
         env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-        env['rack.jpmobile'].device_id.should == "SN26"
-        env['rack.jpmobile'].supports_location?.should be_truthy
-        env['rack.jpmobile'].supports_gps?.should be_falsey
+        expect(env['rack.jpmobile'].device_id).to eq("SN26")
+        expect(env['rack.jpmobile'].supports_location?).to be_truthy
+        expect(env['rack.jpmobile'].supports_gps?).to be_falsey
       end
 
       it "TK22 を判定できること" do
@@ -142,9 +142,9 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
           'HTTP_USER_AGENT' => "UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
         env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-        env['rack.jpmobile'].device_id.should == "KCTA"
-        env['rack.jpmobile'].supports_location?.should be_falsey
-        env['rack.jpmobile'].supports_gps?.should be_falsey
+        expect(env['rack.jpmobile'].device_id).to eq("KCTA")
+        expect(env['rack.jpmobile'].supports_location?).to be_falsey
+        expect(env['rack.jpmobile'].supports_gps?).to be_falsey
       end
     end
   end
@@ -157,7 +157,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "REMOTE_ADDR" => "210.230.128.225")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_truthy
+      expect(env['rack.jpmobile'].valid_ip?).to be_truthy
     end
 
     it "正しくないIPアドレス空間からのアクセスを判断できること" do
@@ -167,7 +167,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "REMOTE_ADDR" => "127.0.0.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_falsey
+      expect(env['rack.jpmobile'].valid_ip?).to be_falsey
     end
   end
 
@@ -181,10 +181,10 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "HTTP_X_UP_DEVCAP_ISCOLOR" => "1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].display.width.should  == 240
-      env['rack.jpmobile'].display.height.should == 346
-      env['rack.jpmobile'].display.color?.should be_truthy
-      env['rack.jpmobile'].display.colors.should == 65536
+      expect(env['rack.jpmobile'].display.width).to  eq(240)
+      expect(env['rack.jpmobile'].display.height).to eq(346)
+      expect(env['rack.jpmobile'].display.color?).to be_truthy
+      expect(env['rack.jpmobile'].display.colors).to eq(65536)
     end
 
     it "端末の画面情報が渡ってない場合に正しく動作すること" do
@@ -193,14 +193,14 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'HTTP_USER_AGENT' => "KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].display.width.should  be_nil
-      env['rack.jpmobile'].display.height.should be_nil
-      env['rack.jpmobile'].display.browser_width.should   be_nil
-      env['rack.jpmobile'].display.browser_height.should  be_nil
-      env['rack.jpmobile'].display.physical_width.should  be_nil
-      env['rack.jpmobile'].display.physical_height.should be_nil
-      env['rack.jpmobile'].display.color?.should be_nil
-      env['rack.jpmobile'].display.colors.should be_nil
+      expect(env['rack.jpmobile'].display.width).to  be_nil
+      expect(env['rack.jpmobile'].display.height).to be_nil
+      expect(env['rack.jpmobile'].display.browser_width).to   be_nil
+      expect(env['rack.jpmobile'].display.browser_height).to  be_nil
+      expect(env['rack.jpmobile'].display.physical_width).to  be_nil
+      expect(env['rack.jpmobile'].display.physical_height).to be_nil
+      expect(env['rack.jpmobile'].display.color?).to be_nil
+      expect(env['rack.jpmobile'].display.colors).to be_nil
     end
   end
 end

data/spec/rack/jpmobile/black_berry_spec.rb

@@ -11,10 +11,10 @@ describe Jpmobile::Rack::MobileCarrier, "Windows Phone" do
         'HTTP_USER_AGENT' => 'BlackBerry9000/4.6.0.224 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/220')
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should            == Jpmobile::Mobile::BlackBerry
-      env['rack.jpmobile'].position.should         be_nil
-      env['rack.jpmobile'].smart_phone?.should     be_truthy
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::BlackBerry)
+      expect(env['rack.jpmobile'].position).to         be_nil
+      expect(env['rack.jpmobile'].smart_phone?).to     be_truthy
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
   end
 end

data/spec/rack/jpmobile/docomo_spec.rb

@@ -13,25 +13,25 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "Jpmobile::Mobile::Docomo のインスタンスが env['rack.mobile'] にあること" do
-      @env['rack.jpmobile'].class.should == Jpmobile::Mobile::Docomo
+      expect(@env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Docomo)
     end
 
     it "#position などが nil になること" do
-      @env['rack.jpmobile'].position.should be_nil
-      @env['rack.jpmobile'].areacode.should be_nil
-      @env['rack.jpmobile'].serial_number.should be_nil
-      @env['rack.jpmobile'].icc.should be_nil
-      @env['rack.jpmobile'].ident.should be_nil
-      @env['rack.jpmobile'].ident_device.should be_nil
-      @env['rack.jpmobile'].ident_subscriber.should be_nil
+      expect(@env['rack.jpmobile'].position).to be_nil
+      expect(@env['rack.jpmobile'].areacode).to be_nil
+      expect(@env['rack.jpmobile'].serial_number).to be_nil
+      expect(@env['rack.jpmobile'].icc).to be_nil
+      expect(@env['rack.jpmobile'].ident).to be_nil
+      expect(@env['rack.jpmobile'].ident_device).to be_nil
+      expect(@env['rack.jpmobile'].ident_subscriber).to be_nil
     end
 
     it "#supports_cookie? などが false になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_falsey
+      expect(@env['rack.jpmobile'].supports_cookie?).to be_falsey
     end
 
     it "#imode_browser_versionが1.0になること" do
-      @env['rack.jpmobile'].imode_browser_version.should == '1.0'
+      expect(@env['rack.jpmobile'].imode_browser_version).to eq('1.0')
     end
   end
 
@@ -44,25 +44,25 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "Jpmobile::Mobile::Docomo のインスタンスが env['rack.mobile'] にあること" do
-      @env['rack.jpmobile'].class.should == Jpmobile::Mobile::Docomo
+      expect(@env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Docomo)
     end
 
     it "#position などが nil になること" do
-      @env['rack.jpmobile'].position.should be_nil
-      @env['rack.jpmobile'].areacode.should be_nil
-      @env['rack.jpmobile'].serial_number.should be_nil
-      @env['rack.jpmobile'].icc.should be_nil
-      @env['rack.jpmobile'].ident.should be_nil
-      @env['rack.jpmobile'].ident_device.should be_nil
-      @env['rack.jpmobile'].ident_subscriber.should be_nil
+      expect(@env['rack.jpmobile'].position).to be_nil
+      expect(@env['rack.jpmobile'].areacode).to be_nil
+      expect(@env['rack.jpmobile'].serial_number).to be_nil
+      expect(@env['rack.jpmobile'].icc).to be_nil
+      expect(@env['rack.jpmobile'].ident).to be_nil
+      expect(@env['rack.jpmobile'].ident_device).to be_nil
+      expect(@env['rack.jpmobile'].ident_subscriber).to be_nil
     end
 
     it "#supports_cookie? などが false になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_falsey
+      expect(@env['rack.jpmobile'].supports_cookie?).to be_falsey
     end
 
     it "#imode_browser_versionが1.0になること" do
-      @env['rack.jpmobile'].imode_browser_version.should == '1.0'
+      expect(@env['rack.jpmobile'].imode_browser_version).to eq('1.0')
     end
   end
 
@@ -75,11 +75,11 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "#supports_cookie? が true になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(@env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
     it "#imode_browser_versionが2.0になること" do
-      @env['rack.jpmobile'].imode_browser_version.should == '2.0'
+      expect(@env['rack.jpmobile'].imode_browser_version).to eq('2.0')
     end
   end
 
@@ -92,11 +92,11 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "#supports_cookie? が true になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(@env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
     it "#imode_browser_versionが2.0になること" do
-      @env['rack.jpmobile'].imode_browser_version.should == '2.0'
+      expect(@env['rack.jpmobile'].imode_browser_version).to eq('2.0')
     end
   end
 
@@ -109,11 +109,11 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "#supports_cookie? が true になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(@env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
     it "#imode_browser_versionが2.0になること" do
-      @env['rack.jpmobile'].imode_browser_version.should == '2.0LE'
+      expect(@env['rack.jpmobile'].imode_browser_version).to eq('2.0LE')
     end
   end
 
@@ -125,7 +125,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "QUERY_STRING" => "AREACODE=00100&ACTN=OK")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].areacode.should == "00100"
+      expect(env['rack.jpmobile'].areacode).to eq("00100")
     end
 
     it "位置情報も取得できること" do
@@ -135,10 +135,10 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "QUERY_STRING" => "LAT=%2B35.00.35.600&LON=%2B135.41.35.600&GEO=wgs84&POSINFO=2&AREACODE=00100&ACTN=OK")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].areacode.should == "00100"
+      expect(env['rack.jpmobile'].areacode).to eq("00100")
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(35.00988889)
-      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(135.6932222)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(35.00988889)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(135.6932222)
     end
   end
 
@@ -150,8 +150,8 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "QUERY_STRING" => "lat=%2B35.00.35.600&lon=%2B135.41.35.600&geo=wgs84&x-acc=3")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(35.00988889)
-      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(135.6932222)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(35.00988889)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(135.6932222)
     end
 
     # DoCoMo, 903i, GPS
@@ -164,8 +164,8 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "QUERY_STRING" => "lat=%2B35.00.35.600&lon=%2B135.41.35.600&geo=WGS84&alt=%2B64.000&x-acc=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(35.00988889)
-      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(135.6932222)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(35.00988889)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(135.6932222)
     end
   end
 
@@ -176,11 +176,11 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         'HTTP_USER_AGENT' => "DoCoMo/1.0/SO505iS/c20/TC/W30H16/serXXXXX000000")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].serial_number.should == "XXXXX000000"
-      env['rack.jpmobile'].ident.should         == "XXXXX000000"
-      env['rack.jpmobile'].icc.should be_nil
-      env['rack.jpmobile'].ident_device.should  == "XXXXX000000"
-      env['rack.jpmobile'].ident_subscriber.should be_nil
+      expect(env['rack.jpmobile'].serial_number).to eq("XXXXX000000")
+      expect(env['rack.jpmobile'].ident).to         eq("XXXXX000000")
+      expect(env['rack.jpmobile'].icc).to be_nil
+      expect(env['rack.jpmobile'].ident_device).to  eq("XXXXX000000")
+      expect(env['rack.jpmobile'].ident_subscriber).to be_nil
     end
 
     it "FOMA で取得できること" do
@@ -189,11 +189,11 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         'HTTP_USER_AGENT' => "DoCoMo/2.0 D902i(c100;TB;W23H16;ser999999999999999;icc0000000000000000000f)")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].serial_number.should    == "999999999999999"
-      env['rack.jpmobile'].icc.should              == "0000000000000000000f"
-      env['rack.jpmobile'].ident.should            == "0000000000000000000f"
-      env['rack.jpmobile'].ident_device.should     == "999999999999999"
-      env['rack.jpmobile'].ident_subscriber.should == "0000000000000000000f"
+      expect(env['rack.jpmobile'].serial_number).to    eq("999999999999999")
+      expect(env['rack.jpmobile'].icc).to              eq("0000000000000000000f")
+      expect(env['rack.jpmobile'].ident).to            eq("0000000000000000000f")
+      expect(env['rack.jpmobile'].ident_device).to     eq("999999999999999")
+      expect(env['rack.jpmobile'].ident_subscriber).to eq("0000000000000000000f")
     end
   end
 
@@ -205,7 +205,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "REMOTE_ADDR" => "210.153.84.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_truthy
+      expect(env['rack.jpmobile'].valid_ip?).to be_truthy
     end
 
     it "正しくないIPアドレス空間からのアクセスを判断できること" do
@@ -215,7 +215,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "REMOTE_ADDR" => "127.0.0.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_falsey
+      expect(env['rack.jpmobile'].valid_ip?).to be_falsey
     end
   end
 
@@ -226,12 +226,12 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         'HTTP_USER_AGENT' => "DoCoMo/1.0/SO506iC/c20/TB/W20H10")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].display.browser_width.should  == 240
-      env['rack.jpmobile'].display.browser_height.should == 256
-      env['rack.jpmobile'].display.width.should          == 240
-      env['rack.jpmobile'].display.height.should         == 256
-      env['rack.jpmobile'].display.color?.should be_truthy
-      env['rack.jpmobile'].display.colors.should         == 262144
+      expect(env['rack.jpmobile'].display.browser_width).to  eq(240)
+      expect(env['rack.jpmobile'].display.browser_height).to eq(256)
+      expect(env['rack.jpmobile'].display.width).to          eq(240)
+      expect(env['rack.jpmobile'].display.height).to         eq(256)
+      expect(env['rack.jpmobile'].display.color?).to be_truthy
+      expect(env['rack.jpmobile'].display.colors).to         eq(262144)
     end
   end
 end