jpmobile 5.0.0 → 5.0.1

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "5.0.0"
+  VERSION = '5.0.1'.freeze
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -19,30 +19,28 @@ begin
     end
   end
 rescue LoadError
-  warn "RSpec is not installed. Some tasks were skipped. please install rspec"
+  warn 'RSpec is not installed. Some tasks were skipped. please install rspec'
 end
 
 namespace :test do
-  desc "Generate rails app and run jpmobile tests in the app"
-  task :rails, [:skip] do |t, args|
-    rails_root     = "test/rails/rails_root"
-    relative_root  = "../../../"
+  desc 'Generate rails app and run jpmobile tests in the app'
+  task :rails, [:skip] do |_, args|
+    rails_root = 'test/rails/rails_root'
 
-    puts "Running tests in Rails"
-    skip = args.skip == "true"
+    puts 'Running tests in Rails'
+    skip = args.skip == 'true'
 
     unless skip
       # generate rails app
-      FileUtils.rm_rf("Gemfile.lock")
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      `rails new #{rails_root} --skip-bundle`
+      `rails _5.0.3_ new #{rails_root} --skip-bundle`
     end
 
     # setup jpmobile
     plugin_path = File.join(rails_root, 'vendor', 'jpmobile')
     FileUtils.mkdir_p(plugin_path)
-    FileList["*"].exclude("test").exclude("spec").exclude('vendor').each do |file|
+    FileList['*'].exclude('test').exclude('spec').exclude('vendor').each do |file|
       FileUtils.cp_r(file, plugin_path)
     end
 
@@ -50,37 +48,37 @@ namespace :test do
     begin
       plugin_path = File.join(rails_root, 'vendor', 'jpmobile-ipaddresses')
       FileUtils.mkdir_p(plugin_path)
-      FileList["vendor/jpmobile-ipaddresses/*"].exclude("test").each do |file|
+      FileList['vendor/jpmobile-ipaddresses/*'].exclude('test').each do |file|
         FileUtils.cp_r(file, plugin_path)
       end
     rescue LoadError
-      puts "IP Address test requires jpmobile-ipaddresses module"
+      puts 'IP Address test requires jpmobile-ipaddresses module'
     end
 
     # setup jpmobile-terminfo
     begin
       plugin_path = File.join(rails_root, 'vendor', 'jpmobile-terminfo')
       FileUtils.mkdir_p(plugin_path)
-      FileList["vendor/jpmobile-terminfo/*"].exclude("test").each do |file|
+      FileList['vendor/jpmobile-terminfo/*'].exclude('test').each do |file|
         FileUtils.cp_r(file, plugin_path)
       end
     rescue LoadError
-      puts "Terminal display information test requires jpmobile-terminfo module"
+      puts 'Terminal display information test requires jpmobile-terminfo module'
     end
 
     # setup activerecord-session_store
     begin
       plugin_path = File.join(rails_root, 'vendor', 'activerecord-session_store')
       FileUtils.mkdir_p(plugin_path)
-      FileList["../activerecord-session_store/*"].exclude("test").each do |file|
+      FileList['../activerecord-session_store/*'].exclude('test').each do |file|
         FileUtils.cp_r(file, plugin_path)
       end
     rescue LoadError
-      puts "Terminal display information test requires jpmobile-terminfo module"
+      puts 'Terminal display information test requires jpmobile-terminfo module'
     end
 
     # setup tests
-    FileList["test/rails/overrides/*"].each do |file|
+    FileList['test/rails/overrides/*'].each do |file|
       FileUtils.cp_r(file, rails_root)
     end
 
@@ -88,9 +86,9 @@ namespace :test do
       # for cookie_only option
       config_path = File.join(rails_root, 'config', 'initializers', 'session_store.rb')
       File.open(config_path, 'w') do |file|
-        file.write <<-END
-Rails.application.config.session_store :active_record_store, :key => '_session_id'
-Rails.application.config.session_options = {:cookie_only => false}
+        file.write <<~END
+          Rails.application.config.session_store :active_record_store, :key => '_session_id'
+          Rails.application.config.session_options = {:cookie_only => false}
 END
       end
     end
@@ -99,20 +97,29 @@ END
       # 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')
+        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"
-    ruby "-S rails db:migrate RAILS_ENV=test" unless skip
-    ruby "-S rails spec"
-    # ruby "-S rspec -b --color spec/features/filter_spec.rb"
+    Dir.chdir(rails_root) do
+      Bundler.with_clean_env do
+        original_env = ENV.to_hash
+
+        ENV.update('RBENV_VERSION' => nil)
+        ENV.update('RBENV_DIR' => nil)
+
+        system 'bundle install'
+        system 'bin/rails db:migrate RAILS_ENV=test' unless skip
+        system 'bin/rails spec'
+
+        ENV.replace(original_env)
+      end
+    end
   end
-  desc "Run sinatra on jpmobile tests"
+  desc 'Run sinatra on jpmobile tests'
   Rake::TestTask.new(:sinatra) do |t|
     t.libs << 'lib'
     t.libs << 'test/sinatra'

data/spec/rack/jpmobile/android_spec.rb

@@ -1,14 +1,14 @@
-# -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::MobileCarrier, "android" do
+describe Jpmobile::MobileCarrier, 'android' do
   include Rack::Test::Methods
 
-  context "端末種別で" do
-    it "Android を判別できること" do
+  context '端末種別で' do
+    it 'Android を判別できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        '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')
+        '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::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::Android)

data/spec/rack/jpmobile/au_spec.rb

@@ -1,184 +1,198 @@
-# -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::MobileCarrier, "au" do
+describe Jpmobile::MobileCarrier, 'au' do
   include Rack::Test::Methods
 
-  context "端末種別で" do
-    it "KDDI-CA32 で判別できること" do
+  context '端末種別で' do
+    it 'KDDI-CA32 で判別できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "HTTP_X_UP_SUBNO" => "00000000000000_mj.ezweb.ne.jp")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        'HTTP_X_UP_SUBNO' => '00000000000000_mj.ezweb.ne.jp'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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")
+      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')
 
       expect(env['rack.jpmobile'].position).to be_nil
       expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
-    it "TK22 で判別できること" do
+    it 'TK22 で判別できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
+        'HTTP_USER_AGENT' => 'UP.Browser/3.04-KCTA UP.Link/3.4.5.9'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Au)
     end
   end
 
-  context "GPS で" do
-    it "緯度経度を取得できること(dgree)" do
+  context 'GPS で' do
+    it '緯度経度を取得できること(dgree)' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "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")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        '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::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to eq(43.07772)
       expect(env['rack.jpmobile'].position.lon).to eq(141.34114)
     end
 
-    it "緯度経度を取得できること(dms)" do
+    it '緯度経度を取得できること(dms)' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "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")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        '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::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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
+    it '緯度経度を取得できること(dgree_tokyo)' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "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")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        '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::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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
+    it '緯度経度を取得できること(dgree_tokyo)' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "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")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        '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::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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
+    it '緯度経度を取得できること(dms_tokyo)' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "QUERY_STRING" => "datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        'QUERY_STRING' => 'datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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
+    it '緯度経度を取得できること(antenna)' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "QUERY_STRING" => "datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        'QUERY_STRING' => 'datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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
+    it 'GeoKit がある場合に取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "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")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        '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::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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")
+      expect(env['rack.jpmobile'].position.ll).to  eq('43.07772,141.34114')
       if env['rack.jpmobile'].position.respond_to?(:distance_to) # GeoKit method
         expect(env['rack.jpmobile'].position.distance_to(env['rack.jpmobile'].position)).to eq(0)
       end
     end
 
-    context "古い機種での取得可否で" do
-      it "W31CA を判定できること" do
+    context '古い機種での取得可否で' do
+      it 'W31CA を判定できること' do
         res = Rack::MockRequest.env_for(
           'http://jpmobile-rails.org/',
-          'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
+          'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0'
+        )
         env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-        expect(env['rack.jpmobile'].device_id).to eq("CA32")
+        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
+      it 'A1402S を判定できること' do
         res = Rack::MockRequest.env_for(
           'http://jpmobile-rails.org/',
-          'HTTP_USER_AGENT' => "KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0")
+          'HTTP_USER_AGENT' => 'KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0'
+        )
         env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-        expect(env['rack.jpmobile'].device_id).to eq("SN26")
+        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
+      it 'TK22 を判定できること' do
         res = Rack::MockRequest.env_for(
           'http://jpmobile-rails.org/',
-          'HTTP_USER_AGENT' => "UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
+          'HTTP_USER_AGENT' => 'UP.Browser/3.04-KCTA UP.Link/3.4.5.9'
+        )
         env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-        expect(env['rack.jpmobile'].device_id).to eq("KCTA")
+        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
 
-  context "IPアドレス制限で" do
-    it "正しいIPアドレス空間からのアクセスを判断できること" do
+  context 'IPアドレス制限で' do
+    it '正しいIPアドレス空間からのアクセスを判断できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "REMOTE_ADDR" => "210.230.128.225")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        'REMOTE_ADDR' => '210.230.128.225'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].valid_ip?).to be_truthy
     end
 
-    it "正しくないIPアドレス空間からのアクセスを判断できること" do
+    it '正しくないIPアドレス空間からのアクセスを判断できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-        "REMOTE_ADDR" => "127.0.0.1")
+        'HTTP_USER_AGENT' => 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0',
+        'REMOTE_ADDR' => '127.0.0.1'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].valid_ip?).to be_falsey
     end
   end
 
-  context "画面情報で" do
-    it "端末の画面サイズを正しく取得できること" do
+  context '画面情報で' do
+    it '端末の画面サイズを正しく取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0",
-        "HTTP_X_UP_DEVCAP_SCREENDEPTH" => "16,RGB565",
-        "HTTP_X_UP_DEVCAP_SCREENPIXELS" => "240,346",
-        "HTTP_X_UP_DEVCAP_ISCOLOR" => "1")
+        'HTTP_USER_AGENT' => 'KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0',
+        'HTTP_X_UP_DEVCAP_SCREENDEPTH' => '16,RGB565',
+        'HTTP_X_UP_DEVCAP_SCREENPIXELS' => '240,346',
+        'HTTP_X_UP_DEVCAP_ISCOLOR' => '1'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].display.width).to  eq(240)
@@ -187,10 +201,11 @@ describe Jpmobile::MobileCarrier, "au" do
       expect(env['rack.jpmobile'].display.colors).to eq(65536)
     end
 
-    it "端末の画面情報が渡ってない場合に正しく動作すること" do
+    it '端末の画面情報が渡ってない場合に正しく動作すること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0")
+        'HTTP_USER_AGENT' => 'KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].display.width).to  be_nil

data/spec/rack/jpmobile/black_berry_spec.rb

@@ -1,14 +1,14 @@
-# -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::MobileCarrier, "Windows Phone" do
+describe Jpmobile::MobileCarrier, 'Windows Phone' do
   include Rack::Test::Methods
 
-  context "端末種別で" do
-    it "BlackBerryを判別できること" do
+  context '端末種別で' do
+    it 'BlackBerryを判別できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => 'BlackBerry9000/4.6.0.224 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/220')
+        'HTTP_USER_AGENT' => 'BlackBerry9000/4.6.0.224 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/220'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::BlackBerry)

data/spec/rack/jpmobile/docomo_spec.rb

@@ -1,14 +1,14 @@
-# -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::MobileCarrier, "docomo" do
+describe Jpmobile::MobileCarrier, 'docomo' do
   include Rack::Test::Methods
 
-  context "SH902i のとき" do
+  context 'SH902i のとき' do
     before(:each) do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH902i(c100;TB;W24H16)')
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH902i(c100;TB;W24H16)'
+      )
       @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
@@ -16,7 +16,7 @@ describe Jpmobile::MobileCarrier, "docomo" do
       expect(@env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Docomo)
     end
 
-    it "#position などが nil になること" do
+    it '#position などが nil になること' do
       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
@@ -26,20 +26,21 @@ describe Jpmobile::MobileCarrier, "docomo" do
       expect(@env['rack.jpmobile'].ident_subscriber).to be_nil
     end
 
-    it "#supports_cookie? などが false になること" do
+    it '#supports_cookie? などが false になること' do
       expect(@env['rack.jpmobile'].supports_cookie?).to be_falsey
     end
 
-    it "#imode_browser_versionが1.0になること" do
+    it '#imode_browser_versionが1.0になること' do
       expect(@env['rack.jpmobile'].imode_browser_version).to eq('1.0')
     end
   end
 
-  context "SO506iC のとき" do
+  context 'SO506iC のとき' do
     before(:each) do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/1.0/SO506iC/c20/TB/W20H10")
+        'HTTP_USER_AGENT' => 'DoCoMo/1.0/SO506iC/c20/TB/W20H10'
+      )
       @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
@@ -47,7 +48,7 @@ describe Jpmobile::MobileCarrier, "docomo" do
       expect(@env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Docomo)
     end
 
-    it "#position などが nil になること" do
+    it '#position などが nil になること' do
       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
@@ -57,97 +58,103 @@ describe Jpmobile::MobileCarrier, "docomo" do
       expect(@env['rack.jpmobile'].ident_subscriber).to be_nil
     end
 
-    it "#supports_cookie? などが false になること" do
+    it '#supports_cookie? などが false になること' do
       expect(@env['rack.jpmobile'].supports_cookie?).to be_falsey
     end
 
-    it "#imode_browser_versionが1.0になること" do
+    it '#imode_browser_versionが1.0になること' do
       expect(@env['rack.jpmobile'].imode_browser_version).to eq('1.0')
     end
   end
 
-  context "P09A3で" do
+  context 'P09A3で' do
     before(:each) do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 P09A3(c500;TB;W20H12)")
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 P09A3(c500;TB;W20H12)'
+      )
       @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
-    it "#supports_cookie? が true になること" do
+    it '#supports_cookie? が true になること' do
       expect(@env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
-    it "#imode_browser_versionが2.0になること" do
+    it '#imode_browser_versionが2.0になること' do
       expect(@env['rack.jpmobile'].imode_browser_version).to eq('2.0')
     end
   end
 
-  context "P07A3で" do
+  context 'P07A3で' do
     before(:each) do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 P07A3(c500;TB;W24H15)")
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 P07A3(c500;TB;W24H15)'
+      )
       @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
-    it "#supports_cookie? が true になること" do
+    it '#supports_cookie? が true になること' do
       expect(@env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
-    it "#imode_browser_versionが2.0になること" do
+    it '#imode_browser_versionが2.0になること' do
       expect(@env['rack.jpmobile'].imode_browser_version).to eq('2.0')
     end
   end
 
-  context "L01Bで" do
+  context 'L01Bで' do
     before(:each) do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 L01B(c500;TB;W40H10)")
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 L01B(c500;TB;W40H10)'
+      )
       @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
-    it "#supports_cookie? が true になること" do
+    it '#supports_cookie? が true になること' do
       expect(@env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
-    it "#imode_browser_versionが2.0になること" do
+    it '#imode_browser_versionが2.0になること' do
       expect(@env['rack.jpmobile'].imode_browser_version).to eq('2.0LE')
     end
   end
 
-  context "iエリアで" do
-    it "データが取得できること" do
+  context 'iエリアで' do
+    it 'データが取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/1.0/SO506iC/c20/TB/W20H10",
-        "QUERY_STRING" => "AREACODE=00100&ACTN=OK")
+        'HTTP_USER_AGENT' => 'DoCoMo/1.0/SO506iC/c20/TB/W20H10',
+        'QUERY_STRING' => 'AREACODE=00100&ACTN=OK'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      expect(env['rack.jpmobile'].areacode).to eq("00100")
+      expect(env['rack.jpmobile'].areacode).to eq('00100')
     end
 
-    it "位置情報も取得できること" do
+    it '位置情報も取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/1.0/SO506iC/c20/TB/W20H10",
-        "QUERY_STRING" => "LAT=%2B35.00.35.600&LON=%2B135.41.35.600&GEO=wgs84&POSINFO=2&AREACODE=00100&ACTN=OK")
+        'HTTP_USER_AGENT' => 'DoCoMo/1.0/SO506iC/c20/TB/W20H10',
+        'QUERY_STRING' => 'LAT=%2B35.00.35.600&LON=%2B135.41.35.600&GEO=wgs84&POSINFO=2&AREACODE=00100&ACTN=OK'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      expect(env['rack.jpmobile'].areacode).to eq("00100")
+      expect(env['rack.jpmobile'].areacode).to eq('00100')
 
       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
 
-  context "GPS で" do
-    it "位置が取得できること" do
+  context 'GPS で' do
+    it '位置が取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 SA702i(c100;TB;W30H15)",
-        "QUERY_STRING" => "lat=%2B35.00.35.600&lon=%2B135.41.35.600&geo=wgs84&x-acc=3")
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SA702i(c100;TB;W30H15)',
+        'QUERY_STRING' => 'lat=%2B35.00.35.600&lon=%2B135.41.35.600&geo=wgs84&x-acc=3'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(35.00988889)
@@ -157,11 +164,12 @@ describe Jpmobile::MobileCarrier, "docomo" do
     # DoCoMo, 903i, GPS
     # "WGS84"が大文字。altで高度が取得できているようだ。どちらも仕様書には記述がない。
     # http://www.nttdocomo.co.jp/service/imode/make/content/html/outline/gps.html
-    it "903iでは高度があるが、正確にデータが取得できること" do
+    it '903iでは高度があるが、正確にデータが取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 SH903i(c100;TB;W24H16)",
-        "QUERY_STRING" => "lat=%2B35.00.35.600&lon=%2B135.41.35.600&geo=WGS84&alt=%2B64.000&x-acc=1")
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH903i(c100;TB;W24H16)',
+        'QUERY_STRING' => 'lat=%2B35.00.35.600&lon=%2B135.41.35.600&geo=WGS84&alt=%2B64.000&x-acc=1'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(35.00988889)
@@ -169,61 +177,66 @@ describe Jpmobile::MobileCarrier, "docomo" do
     end
   end
 
-  context "端末番号が" do
-    it "mova で取得できること" do
+  context '端末番号が' do
+    it 'mova で取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/1.0/SO505iS/c20/TC/W30H16/serXXXXX000000")
+        'HTTP_USER_AGENT' => 'DoCoMo/1.0/SO505iS/c20/TC/W30H16/serXXXXX000000'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      expect(env['rack.jpmobile'].serial_number).to eq("XXXXX000000")
-      expect(env['rack.jpmobile'].ident).to         eq("XXXXX000000")
+      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_device).to eq('XXXXX000000')
       expect(env['rack.jpmobile'].ident_subscriber).to be_nil
     end
 
-    it "FOMA で取得できること" do
+    it 'FOMA で取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 D902i(c100;TB;W23H16;ser999999999999999;icc0000000000000000000f)")
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 D902i(c100;TB;W23H16;ser999999999999999;icc0000000000000000000f)'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      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")
+      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
 
-  context "IPアドレス制限で" do
-    it "正しいIPアドレス空間からのアクセスを判断できること" do
+  context 'IPアドレス制限で' do
+    it '正しいIPアドレス空間からのアクセスを判断できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 SH902i(c100;TB;W24H12)",
-        "REMOTE_ADDR" => "210.153.84.1")
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH902i(c100;TB;W24H12)',
+        'REMOTE_ADDR' => '210.153.84.1'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].valid_ip?).to be_truthy
     end
 
-    it "正しくないIPアドレス空間からのアクセスを判断できること" do
+    it '正しくないIPアドレス空間からのアクセスを判断できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 SH902i(c100;TB;W24H12)",
-        "REMOTE_ADDR" => "127.0.0.1")
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH902i(c100;TB;W24H12)',
+        'REMOTE_ADDR' => '127.0.0.1'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].valid_ip?).to be_falsey
     end
   end
 
-  context "端末サイズ" do
-    it "SO506iCのサイズを適切に取得できること" do
+  context '端末サイズ' do
+    it 'SO506iCのサイズを適切に取得できること' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
-        'HTTP_USER_AGENT' => "DoCoMo/1.0/SO506iC/c20/TB/W20H10")
+        'HTTP_USER_AGENT' => 'DoCoMo/1.0/SO506iC/c20/TB/W20H10'
+      )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].display.browser_width).to  eq(240)
@@ -231,7 +244,7 @@ describe Jpmobile::MobileCarrier, "docomo" do
       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)
+      expect(env['rack.jpmobile'].display.colors).to eq(262144)
     end
   end
 end