jpmobile 4.2.5 → 5.0.0.beta1

data/spec/rack/jpmobile/black_berry_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::Rack::MobileCarrier, "Windows Phone" do
+describe Jpmobile::MobileCarrier, "Windows Phone" do
   include Rack::Test::Methods
 
   context "端末種別で" do
@@ -9,7 +9,7 @@ describe Jpmobile::Rack::MobileCarrier, "Windows Phone" 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')
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::BlackBerry)
       expect(env['rack.jpmobile'].position).to         be_nil

data/spec/rack/jpmobile/docomo_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::Rack::MobileCarrier, "docomo" do
+describe Jpmobile::MobileCarrier, "docomo" do
   include Rack::Test::Methods
 
   context "SH902i のとき" do
@@ -9,7 +9,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH902i(c100;TB;W24H16)')
-      @env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
     it "Jpmobile::Mobile::Docomo のインスタンスが env['rack.mobile'] にあること" do
@@ -40,7 +40,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/1.0/SO506iC/c20/TB/W20H10")
-      @env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
     it "Jpmobile::Mobile::Docomo のインスタンスが env['rack.mobile'] にあること" do
@@ -71,7 +71,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/2.0 P09A3(c500;TB;W20H12)")
-      @env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
     it "#supports_cookie? が true になること" do
@@ -88,7 +88,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/2.0 P07A3(c500;TB;W24H15)")
-      @env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
     it "#supports_cookie? が true になること" do
@@ -105,7 +105,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/2.0 L01B(c500;TB;W40H10)")
-      @env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      @env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
     end
 
     it "#supports_cookie? が true になること" do
@@ -123,7 +123,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/1.0/SO506iC/c20/TB/W20H10",
         "QUERY_STRING" => "AREACODE=00100&ACTN=OK")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].areacode).to eq("00100")
     end
@@ -133,7 +133,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         '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")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].areacode).to eq("00100")
 
@@ -148,7 +148,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         '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")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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)
@@ -162,7 +162,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         '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")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       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)
@@ -174,7 +174,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/1.0/SO505iS/c20/TC/W30H16/serXXXXX000000")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      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")
@@ -187,7 +187,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/2.0 D902i(c100;TB;W23H16;ser999999999999999;icc0000000000000000000f)")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      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")
@@ -203,7 +203,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/2.0 SH902i(c100;TB;W24H12)",
         "REMOTE_ADDR" => "210.153.84.1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].valid_ip?).to be_truthy
     end
@@ -213,7 +213,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/2.0 SH902i(c100;TB;W24H12)",
         "REMOTE_ADDR" => "127.0.0.1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].valid_ip?).to be_falsey
     end
@@ -224,7 +224,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "DoCoMo/1.0/SO506iC/c20/TB/W20H10")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].display.browser_width).to  eq(240)
       expect(env['rack.jpmobile'].display.browser_height).to eq(256)

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -29,23 +29,23 @@ describe "絵文字が" do
     end
 
     it "docomo 絵文字が変換されないこと" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
       expect(response_body(response)).to eq(@docomo_cr)
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(@docomo_utf8)
     end
 
     it "au 絵文字が変換されないこと" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
       expect(response_body(response)).to eq(@au_cr)
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(@au_utf8)
     end
 
     it "softbank 絵文字が変換されないこと" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
       expect(response_body(response)).to eq(@softbank_cr)
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(@softbank_utf8)
     end
   end
@@ -73,38 +73,38 @@ describe "絵文字が" do
     end
 
     it "docomo 絵文字が画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "docomo 絵文字コードが画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "au 絵文字が画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "au 絵文字コードが画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "softbank 絵文字が画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "softbank 絵文字コードが画像に変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
       expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "Content-Type が変換できないものである場合には変換しないこと" do
       @res = Rack::MockRequest.env_for("/", 'Content-Type' => 'image/jpeg')
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(@softbank_utf8)
     end
   end
@@ -118,26 +118,26 @@ describe "絵文字が" do
     end
 
     it "docomo 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
 
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf9\x79"))
     end
 
     it "au 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
     end
 
     it "softbank 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf8\x9f"))
     end
 
@@ -149,7 +149,7 @@ describe "絵文字が" do
         "REQUEST_METHOD" => "GET",
         'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
         'Content-Type' => 'text/html; charset=utf-8')
-      res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+      res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
       expect(req.params['q']).to eq(utf8("\xee\x98\xbe"))
       expect(response_body(res)).to eq(sjis("\xf8\x9f"))
@@ -165,26 +165,26 @@ describe "絵文字が" do
     end
 
     it "docomo 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
 
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
       expect(response_body(response)).to eq(utf8_to_sjis("［ドコモポイント］"))
     end
 
     it "au 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
     end
 
     it "softbank 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
       expect(response_body(response)).to eq(sjis("\xf6\x60"))
     end
 
@@ -196,7 +196,7 @@ describe "絵文字が" do
         "REQUEST_METHOD" => "GET",
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         'Content-Type' => 'text/html; charset=utf-8')
-      res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+      res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
       expect(req.params['q']).to eq([0xe488].pack("U"))
       expect(response_body(res)).to eq(sjis("\xf6\x60"))
@@ -212,26 +212,26 @@ describe "絵文字が" do
     end
 
     it "docomo 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
       expect(response_body(response)).to eq([0xe04a].pack('U'))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
       expect(response_body(response)).to eq([0xe04a].pack('U'))
 
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
       expect(response_body(response)).to eq("［ドコモポイント］")
     end
 
     it "au 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
       expect(response_body(response)).to eq([0xe04a].pack('U'))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
       expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
     it "softbank 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
       expect(response_body(response)).to eq([0xe04a].pack('U'))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
       expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
@@ -243,7 +243,7 @@ describe "絵文字が" do
         "REQUEST_METHOD" => "GET",
         'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
         'Content-Type' => 'text/html; charset=utf-8')
-      res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+      res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
       expect(req.params['q']).to eq([0xf04a].pack("U"))
       expect(response_body(res)).to eq([0xe04a].pack('U'))
@@ -259,9 +259,9 @@ describe "絵文字が" do
     end
 
     it "softbank 絵文字が変換されること" do
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
       expect(response_body(response)).to eq([0xe04a].pack('U'))
-      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+      response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
       expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
@@ -273,7 +273,7 @@ describe "絵文字が" do
         "REQUEST_METHOD" => "GET",
         'HTTP_USER_AGENT' => "Vodafone/1.0/V705SH/SHJ001/SN000000000000000 Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
         'Content-Type' => 'text/html; charset=utf-8')
-      res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+      res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
       expect(req.params['q']).to eq([0xf04a].pack("U"))
       expect(response_body(res)).to eq([0xe04a].pack('U'))
@@ -290,9 +290,9 @@ describe "絵文字が" do
       end
 
       it 'should convert Softbank emoticon' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
         expect(response_body(response)).to eq([0xe04a].pack('U'))
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
         expect(response_body(response)).to eq([0xe04a].pack('U'))
       end
 
@@ -304,14 +304,14 @@ describe "絵文字が" do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0_1 like Mac OS X; ja-jp) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A306 Safari/6531.22.7",
           'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+        res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
         expect(req.params['q']).to eq([0xf04a].pack("U"))
         expect(response_body(res)).to eq([0xe04a].pack('U'))
       end
 
       it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
         expect(response_body(response)).to eq('〓')
       end
     end
@@ -327,9 +327,9 @@ describe "絵文字が" do
       end
 
       it "should convert Unicode emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_single))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@unicode_single))).call(@res)[2]
         expect(response_body(response)).to eq([0x2600].pack('U*'))
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_multi))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@unicode_multi))).call(@res)[2]
         expect(response_body(response)).to eq([0x26C5].pack('U*'))
       end
 
@@ -341,14 +341,14 @@ describe "絵文字が" do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0_1 like Mac OS X; ja-jp) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A306 Safari/6531.22.7",
           'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+        res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
         expect(req.params['q']).to eq([0x26C5].pack("U"))
         expect(response_body(res)).to eq([0x26C5].pack('U'))
       end
 
       it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
         expect(response_body(response)).to eq('〓')
       end
     end
@@ -369,9 +369,9 @@ describe "絵文字が" do
       end
 
       it "should convert Google emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
         expect(response_body(response)).to eq([0xFE000].pack('U*'))
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
         expect(response_body(response)).to eq([0xFE00F].pack('U*'))
       end
 
@@ -383,14 +383,14 @@ describe "絵文字が" do
           "REQUEST_METHOD" => "GET",
           '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',
           'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+        res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
         expect(req.params['q']).to eq([0xe63e, 0xe63f].pack("U*"))
         expect(response_body(res)).to eq([0xfe000, 0xfe001].pack("U*"))
       end
 
       it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
         expect(response_body(response)).to eq('〓')
       end
     end
@@ -404,9 +404,9 @@ describe "絵文字が" do
       end
 
       it "should convert Google emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
         expect(response_body(response)).to eq([0xFE000].pack('U*'))
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
         expect(response_body(response)).to eq([0xFE00F].pack('U*'))
       end
 
@@ -418,14 +418,14 @@ describe "絵文字が" do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
           'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+        res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
         expect(req.params['q']).to eq([0xe63e, 0xe63f].pack("U*"))
         expect(response_body(res)).to eq([0xfe000, 0xfe001].pack("U*"))
       end
 
       it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
+        response = Jpmobile::MobileCarrier.new(Jpmobile::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
         expect(response_body(response)).to eq('〓')
       end
 
@@ -437,7 +437,7 @@ describe "絵文字が" do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',
           'Content-Type' => 'text/html; charset=utf-8')
-        res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
+        res = Jpmobile::MobileCarrier.new(Jpmobile::ParamsFilter.new(Jpmobile::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
         expect(req.params['q']).to eq('〓')
         expect(response_body(res)).to eq('〓')