jpmobile 5.1.1 → 5.2.0

data/lib/jpmobile/rack/params_filter.rb

@@ -7,17 +7,17 @@ module Jpmobile
 
     def call(env)
       # 入力
-      if (mobile = env['rack.jpmobile']) && mobile.apply_params_filter?
+      if (@mobile = env['rack.jpmobile']) && @mobile.apply_params_filter?
         # パラメータをkey, valueに分解
         # form_params
         unless env['REQUEST_METHOD'] == 'GET' || env['REQUEST_METHOD'] == 'HEAD'
-          unless env['CONTENT_TYPE'] =~ %r{application/json|application/xml}
-            env['rack.input'] = StringIO.new(parse_query(env['rack.input'].read, mobile))
+          unless env['CONTENT_TYPE'].match?(%r{application/json|application/xml})
+            env['rack.input'] = StringIO.new(parse_query(env['rack.input'].read))
           end
         end
 
         # query_params
-        env['QUERY_STRING'] = parse_query(env['QUERY_STRING'], mobile)
+        env['QUERY_STRING'] = parse_query(env['QUERY_STRING'])
       end
 
       status, env, body = @app.call(env)
@@ -27,18 +27,18 @@ module Jpmobile
 
     private
 
-    def to_internal(str, mobile)
-      ::Rack::Utils.escape(mobile.to_internal(::Rack::Utils.unescape(str)))
+    def to_internal(str)
+      ::Rack::Utils.escape(@mobile.to_internal(::Rack::Utils.unescape(str)))
     end
 
-    def parse_query(str, mobile)
+    def parse_query(str)
       return nil unless str
 
       new_array = []
       str.split('&').each do |param_pair|
         k, v = param_pair.split('=')
-        k = to_internal(k, mobile) if k
-        v = to_internal(v, mobile) if v
+        k = to_internal(k) if k
+        v = to_internal(v) if v
         new_array << "#{k}=#{v}" if k
       end
 

data/lib/jpmobile/rails.rb

@@ -46,7 +46,7 @@ module Jpmobile
         before_action :register_mobile
 
         self._view_paths = self._view_paths.dup
-        self.view_paths.unshift(*self.view_paths.map { |resolver| Jpmobile::Resolver.new(resolver.to_path) })
+        self.view_paths.unshift(*self.view_paths.map {|resolver| Jpmobile::Resolver.new(resolver.to_path) })
       end
     end
 

data/lib/jpmobile/resolver.rb

@@ -5,6 +5,7 @@ module Jpmobile
 
     def initialize(path, pattern = nil)
       raise ArgumentError, 'path already is a Resolver class' if path.is_a?(Resolver)
+
       super(path, pattern || DEFAULT_PATTERN)
       @path = File.expand_path(path)
     end
@@ -38,7 +39,7 @@ module Jpmobile
           virtual_path: virtual_path,
           format: format,
           variant: variant,
-          updated_at: mtime(template)
+          updated_at: mtime(template),
         )
       end
     end

data/lib/jpmobile/trans_sid.rb

@@ -5,8 +5,6 @@ module Jpmobile
   module SessionID
     require 'action_dispatch/middleware/session/abstract_store'
 
-    module_function
-
     extend ActionDispatch::Session::Compatibility
   end
 
@@ -32,6 +30,7 @@ module Jpmobile
       result = super || {}.with_indifferent_access
       return result unless request # for test process
       return result unless apply_trans_sid?
+
       result.merge({ session_key.to_sym => jpmobile_session_id })
     end
 
@@ -60,6 +59,7 @@ module Jpmobile
       return unless request # for test process
       return unless apply_trans_sid?
       return unless jpmobile_session_id
+
       response.body = response.body.gsub(%r{(</form>)}i, sid_hidden_field_tag + '\1')
     end
   end
@@ -69,7 +69,7 @@ module Jpmobile
       if apply_trans_sid? && jpmobile_session_id && options != :back && options !~ /^\w[\w+.-]*:.*/
         case options
         when String
-          unless options =~ /#{session_key}/
+          unless options.match?(/#{session_key}/)
             url = URI.parse(options)
             if url.query
               url.query += "&#{session_key}=#{jpmobile_session_id}"

data/lib/jpmobile/util.rb

@@ -206,7 +206,7 @@ module Jpmobile
       s = str.dup
       return str if detect_encoding(str) == to
 
-      to = SJIS if to =~ /shift_jis/i
+      to = SJIS if to.match?(/shift_jis/i)
 
       to_enc = ::Encoding.find(to)
       return str if s.encoding == to_enc
@@ -228,7 +228,7 @@ module Jpmobile
     end
 
     def set_encoding(str, encoding)
-      encoding = SJIS if encoding =~ /shift_jis/i
+      encoding = SJIS if encoding.match?(/shift_jis/i)
       str.force_encoding(encoding)
 
       str

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = '5.1.1'.freeze
+  VERSION = '5.2.0'.freeze
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # desc "Explaining what the task does"
 # task :jpmobile do
 #   # Task goes here
@@ -86,10 +85,10 @@ 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}
-END
+        file.write <<-SESSION_CONFIG
+        Rails.application.config.session_store :active_record_store, :key => '_session_id'
+        Rails.application.config.session_options = { :cookie_only => false }
+        SESSION_CONFIG
       end
     end
 
@@ -97,9 +96,9 @@ 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')
-END
+        file.write <<-GEMFILE
+        instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')
+        GEMFILE
       end
     end
 

data/spec/rack/jpmobile/android_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
+require File.join(__dir__, '../../rack_helper.rb')
 
 describe Jpmobile::MobileCarrier, 'android' do
   include Rack::Test::Methods
@@ -7,7 +7,7 @@ describe Jpmobile::MobileCarrier, 'android' 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]
 

data/spec/rack/jpmobile/au_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
+require File.join(__dir__, '../../rack_helper.rb')
 
 describe Jpmobile::MobileCarrier, 'au' do
   include Rack::Test::Methods
@@ -8,7 +8,7 @@ describe Jpmobile::MobileCarrier, 'au' 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_X_UP_SUBNO' => '00000000000000_mj.ezweb.ne.jp',
       )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
@@ -24,7 +24,7 @@ describe Jpmobile::MobileCarrier, 'au' 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]
 
@@ -37,7 +37,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        '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]
 
@@ -49,7 +49,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        '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]
 
@@ -61,7 +61,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        '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]
 
@@ -73,7 +73,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        '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]
 
@@ -85,7 +85,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        '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]
 
@@ -97,7 +97,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        '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]
 
@@ -109,7 +109,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        '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]
 
@@ -125,7 +125,7 @@ describe Jpmobile::MobileCarrier, 'au' 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]
 
@@ -137,7 +137,7 @@ describe Jpmobile::MobileCarrier, 'au' 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]
 
@@ -149,7 +149,7 @@ describe Jpmobile::MobileCarrier, 'au' 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]
 
@@ -165,7 +165,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        'REMOTE_ADDR' => '210.230.128.225',
       )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
@@ -176,7 +176,7 @@ describe Jpmobile::MobileCarrier, 'au' 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'
+        'REMOTE_ADDR' => '127.0.0.1',
       )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
@@ -191,7 +191,7 @@ describe Jpmobile::MobileCarrier, 'au' do
         '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_X_UP_DEVCAP_ISCOLOR' => '1',
       )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
@@ -204,7 +204,7 @@ describe Jpmobile::MobileCarrier, 'au' 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]
 

data/spec/rack/jpmobile/black_berry_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
+require File.join(__dir__, '../../rack_helper.rb')
 
 describe Jpmobile::MobileCarrier, 'Windows Phone' do
   include Rack::Test::Methods
@@ -7,7 +7,7 @@ describe Jpmobile::MobileCarrier, 'Windows Phone' 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]
 

data/spec/rack/jpmobile/docomo_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
+require File.join(__dir__, '../../rack_helper.rb')
 
 describe Jpmobile::MobileCarrier, 'docomo' do
   include Rack::Test::Methods
@@ -7,7 +7,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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
@@ -39,7 +39,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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
@@ -71,7 +71,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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
@@ -89,7 +89,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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
@@ -107,7 +107,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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
@@ -126,7 +126,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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'
+        'QUERY_STRING' => 'AREACODE=00100&ACTN=OK',
       )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
@@ -137,7 +137,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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'
+        '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]
 
@@ -153,7 +153,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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'
+        '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]
 
@@ -168,7 +168,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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'
+        '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]
 
@@ -181,7 +181,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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]
 
@@ -195,7 +195,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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]
 
@@ -212,7 +212,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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'
+        'REMOTE_ADDR' => '210.153.84.1',
       )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
@@ -223,7 +223,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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'
+        'REMOTE_ADDR' => '127.0.0.1',
       )
       env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
@@ -235,7 +235,7 @@ describe Jpmobile::MobileCarrier, 'docomo' 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]