jpmobile 0.1.3 → 0.1.4

data/Gemfile

@@ -1,10 +1,12 @@
 source 'http://rubygems.org'
 
-gem 'jeweler'
-gem 'rails', '>= 3.0.1'
-gem 'rspec', '>= 2.0.0'
-gem 'rspec-rails', '>= 2.0.0'
-gem 'webrat'
-gem 'geokit'
-gem 'sqlite3-ruby'
-gem 'hpricot'
+group :development, :test do
+  gem 'jeweler'
+  gem 'rails', '>= 3.0.3'
+  gem 'rspec', '>= 2.3.0'
+  gem 'rspec-rails', '>= 2.3.0'
+  gem 'webrat'
+  gem 'geokit'
+  gem 'sqlite3-ruby'
+  gem 'hpricot'
+end

data/README.rdoc

@@ -25,7 +25,7 @@
 ==== IPアドレス検証が必要な場合
   % rails plugin install git://github.com/jpmobile/jpmobile-ipaddresses.git
 ==== ディスプレイ情報を取得する必要がある場合
-  % rails plugin install git://github.com/jpmobile/jpmobile-ipaddresses.git
+  % rails plugin install git://github.com/jpmobile/jpmobile-terminfo.git
 
 === gemでインストールする場合
   % gem install jpmobile

data/Rakefile

@@ -5,6 +5,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'fileutils'
 require 'pathname'
+require 'git'
 include FileUtils
 
 begin
@@ -14,14 +15,21 @@ begin
     gem.summary = "A Rails plugin for Japanese mobile-phones"
     gem.description = "A Rails plugin for Japanese mobile-phones"
     gem.email = "dara@shidara.net"
-    gem.homepage = "http://github.com/jpmobile/jpmobile"
+    gem.homepage = "http://jpmobile-rails.org"
     gem.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]
 
-    gem.test_files.exclude 'test/rails/rails_root'
+    gem.files.exclude 'test'
+    gem.files.exclude 'spec'
 
-    gem.add_development_dependency('rspec', '2.0.0.beta.17')
-    gem.add_development_dependency('rspec-rails', '2.0.0.beta.17')
-    gem.add_development_dependency('jeweler', '>=1.4.0')
+    gem.add_development_dependency('jeweler', '>=1.5.1')
+    gem.add_development_dependency('rspec', '>=2.3.0')
+    gem.add_development_dependency('rspec-rails', '>=2.3.0')
+    gem.add_development_dependency('webrat', '>=0.7.2')
+    gem.add_development_dependency('geokit', '>=1.5.0')
+    gem.add_development_dependency('sqlite3-ruby', '>=1.3.2')
+    gem.add_development_dependency('hpricot', '>=0.8.3')
+    gem.add_development_dependency('git', '>=1.2.5')
+    gem.add_development_dependency('rails', '>=3.0.3')
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 3
+:patch: 4
 :build: 

data/lib/jpmobile/helpers.rb

@@ -168,7 +168,7 @@ module Jpmobile
     private
     # 外部へのリンク
     def link_to_url(str, url)
-      %{<a href="#{url}">#{str}</a>}.html_safe
+      %{<a href="#{html_escape(url)}">#{html_escape(str)}</a>}.html_safe
     end
   end
 end

data/lib/jpmobile/rack/filter.rb

@@ -13,13 +13,8 @@ module Jpmobile
 
         status, env, response = @app.call(env)
 
-        if mobile
-          if content_type = env['Content-Type']
-            type, charset = content_type.split(/;\s*charset=/)
-          else
-            type    = nil
-            charset = nil
-          end
+        if mobile and env['Content-Type'] =~ %r!text/html|application/xhtml\+xml!
+          type, charset = env['Content-Type'].split(/;\s*charset=/)
 
           body = response_to_body(response)
           body = body.gsub(/<input name="utf8" type="hidden" value="#{[0x2713].pack("U")}"[^>]*?>/, ' ')

data/lib/tasks/jpmobile_tasks.rake

@@ -39,7 +39,7 @@ namespace :test do
   task :rails, [:versions] do |t, args|
     rails_root     = "test/rails/rails_root"
     relative_root  = "../../../"
-    rails_versions = args.versions.split("/") rescue ["3.0.2"]
+    rails_versions = args.versions.split("/") rescue ["3.0.x"]
 
     puts "Running tests in Rails #{rails_versions.join(', ')}"
 

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -19,7 +19,7 @@ describe "絵文字が" do
 
   context "PC のとき" do
     before(:each) do
-      @res = Rack::MockRequest.env_for("/")
+      @res = Rack::MockRequest.env_for("/", 'Content-Type' => 'text/html; charset=utf-8')
     end
 
     it "docomo 絵文字が変換されないこと" do
@@ -48,7 +48,8 @@ describe "絵文字が" do
     before(:each) do
       @res = Rack::MockRequest.env_for(
         "/",
-        'HTTP_USER_AGENT' => "DoCoMo/2.0 SH902i(c100;TB;W24H12)")
+        'HTTP_USER_AGENT' => "DoCoMo/2.0 SH902i(c100;TB;W24H12)",
+        'Content-Type' => 'text/html; charset=utf-8')
     end
 
     it "docomo 絵文字が変換されること" do
@@ -84,7 +85,8 @@ describe "絵文字が" do
       res = Rack::MockRequest.env_for(
         "/?#{query_string}",
         "REQUEST_METHOD" => "GET",
-        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+        '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)
       req = Rack::Request.new(res[1])
       req.params['q'].should == utf8("\xee\x98\xbe")
@@ -96,7 +98,8 @@ describe "絵文字が" do
     before(:each) do
       @res = Rack::MockRequest.env_for(
         "/",
-        '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",
+        'Content-Type' => 'text/html; charset=utf-8')
     end
 
     it "docomo 絵文字が変換されること" do
@@ -132,7 +135,8 @@ describe "絵文字が" do
       res = Rack::MockRequest.env_for(
         "/?#{query_string}",
         "REQUEST_METHOD" => "GET",
-        '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",
+        'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
       req.params['q'].should == [0xe488].pack("U")
@@ -144,7 +148,8 @@ describe "絵文字が" do
     before(:each) do
       @res = Rack::MockRequest.env_for(
         "/",
-        'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+        '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')
     end
 
     it "docomo 絵文字が変換されること" do
@@ -177,7 +182,8 @@ describe "絵文字が" do
       res = Rack::MockRequest.env_for(
         "/?#{query_string}",
         "REQUEST_METHOD" => "GET",
-        'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+        '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)
       req = Rack::Request.new(res[1])
       req.params['q'].should == [0xf04a].pack("U")
@@ -189,7 +195,8 @@ describe "絵文字が" do
     before(:each) do
       @res = Rack::MockRequest.env_for(
         "/",
-        'HTTP_USER_AGENT' => "Vodafone/1.0/V705SH/SHJ001/SN000000000000000 Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+        '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')
     end
 
     it "softbank 絵文字が変換されること" do
@@ -205,7 +212,8 @@ describe "絵文字が" do
       res = Rack::MockRequest.env_for(
         "/?#{query_string}",
         "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")
+        '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)
       req = Rack::Request.new(res[1])
       req.params['q'].should == [0xf04a].pack("U")

data/spec/rack/jpmobile/filter_spec.rb

@@ -16,11 +16,69 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
         res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
         response_body(res).should == @sjis
       end
+
+      context "Content-Type" do
+        it "が application/xhtml+xml のときに変換されること" do
+          res = Rack::MockRequest.env_for(
+            "/",
+            "REQUEST_METHOD" => "GET",
+            'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+            'Content-Type' => 'application/xhtml+xml; charset=utf-8')
+          res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
+          res[1]['Content-Type'].should == "application/xhtml+xml; charset=Shift_JIS"
+          response_body(res).should == @sjis
+        end
+
+        it "が application/xml のときに変換されないこと" do
+          res = Rack::MockRequest.env_for(
+            "/",
+            "REQUEST_METHOD" => "GET",
+            'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+            'Content-Type' => 'application/xml; charset=utf-8')
+          res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
+          res[1]['Content-Type'].should == "application/xml; charset=utf-8"
+          response_body(res).should == @utf8
+        end
+
+        it "が image/jpeg のときに変換されないこと" do
+          res = Rack::MockRequest.env_for(
+            "/",
+            "REQUEST_METHOD" => "GET",
+            'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+            'Content-Type' => 'image/jpeg')
+          res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
+          res[1]['Content-Type'].should == "image/jpeg"
+          response_body(res).should == @utf8
+        end
+
+        it "が application/octet-stream のときに変換されないこと" do
+          res = Rack::MockRequest.env_for(
+            "/",
+            "REQUEST_METHOD" => "GET",
+            'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+            'Content-Type' => 'application/octet-stream')
+          res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
+          res[1]['Content-Type'].should == "application/octet-stream"
+          response_body(res).should == @utf8
+        end
+
+        it "が video/mpeg のときに変換されないこと" do
+          res = Rack::MockRequest.env_for(
+            "/",
+            "REQUEST_METHOD" => "GET",
+            'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+            'Content-Type' => 'video/mpeg')
+          res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
+          res[1]['Content-Type'].should == "video/mpeg"
+          response_body(res).should == @utf8
+        end
+      end
     end
 
     context "au のとき" do
@@ -28,7 +86,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          '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",
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
         res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
         response_body(res).should == @sjis
@@ -40,9 +99,10 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+          '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::Filter.new(UnitApplication.new(@utf8))).call(res)
-        res[1]['Content-Type'].should == "text/html"
+        res[1]['Content-Type'].should == "text/html; charset=utf-8"
         response_body(res).should == @utf8
       end
     end
@@ -51,7 +111,8 @@ describe Jpmobile::Rack::Filter do
       req = Rack::MockRequest.env_for(
         "/",
         "REQUEST_METHOD" => "GET",
-        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+        'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('<input name="utf8" type="hidden" value="&#x2713;" />'))).call(req)
       res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
       response_body(res).should == " "
@@ -65,7 +126,8 @@ describe Jpmobile::Rack::Filter do
       req = Rack::MockRequest.env_for(
         "/",
         "REQUEST_METHOD" => "GET",
-        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+        'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new("<input name=\"utf8\" type=\"hidden\" value=\"#{[10003].pack("U")}\" />"))).call(req)
       res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
       response_body(res).should == " "
@@ -97,7 +159,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_cr))).call(res)
         response_body(res).should == @sjis + @docomo_emoji
       end
@@ -106,7 +169,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
         response_body(res).should == @sjis + @docomo_emoji
       end
@@ -115,7 +179,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
         response_body(res).should == @sjis + @docomo_emoji
       end
@@ -124,7 +189,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+          'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
         response_body(res).should == @sjis + @docomo_emoji
       end
@@ -135,7 +201,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          '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",
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_cr))).call(res)
         response_body(res).should == @sjis + @au_emoji
       end
@@ -144,7 +211,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          '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",
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
         response_body(res).should == @sjis + @au_emoji
       end
@@ -153,7 +221,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          '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",
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
         response_body(res).should == @sjis + @au_emoji
       end
@@ -162,7 +231,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          '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",
+          'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
         response_body(res).should == @sjis + @au_emoji
       end
@@ -173,7 +243,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+          '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::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_cr))).call(res)
         response_body(res).should == @utf8 + @softbank_emoji
       end
@@ -182,7 +253,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+          '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::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
         response_body(res).should == @utf8 + @softbank_emoji
       end
@@ -191,7 +263,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+          '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::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
         response_body(res).should == @utf8 + @softbank_emoji
       end
@@ -200,7 +273,8 @@ describe Jpmobile::Rack::Filter do
         res = Rack::MockRequest.env_for(
           "/",
           "REQUEST_METHOD" => "GET",
-          'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
+          '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::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
         response_body(res).should == @utf8 + @softbank_emoji
       end

data/spec/rack_helper.rb

@@ -4,7 +4,9 @@ require 'rack/test'
 require 'rspec'
 require 'jpmobile'
 require 'jpmobile/rack'
+require 'nkf'
 require 'pp' # for debug
+
 begin
   require File.dirname(__FILE__)+'/../vendor/jpmobile-ipaddresses/lib/jpmobile-ipaddresses'
 rescue LoadError

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ unless RSpec.const_defined?(:Rails)
 
   # jpmobileの読み込み
   require 'rubygems'
-  require 'action_controller'
-  require 'action_mailer'
   require 'initializer'
   require dir+'/../lib/jpmobile'
   begin
@@ -20,29 +18,5 @@ unless RSpec.const_defined?(:Rails)
     puts "Terminal display information test requires jpmobile-terminfo module"
   end
 
-  # set (dummy) RAILS_ROOT
-  RAILS_ROOT=dir+"/.."
-
-  # load RSpec on Rails
-  rspec_base = dir + '/../vendor/plugins/rspec-rails/lib'
-  $LOAD_PATH.unshift rspec_base
-  ActiveSupport::Dependencies.load_paths.unshift rspec_base
-  ActiveSupport::Dependencies.load_once_paths.unshift rspec_base
-
-  # application.rb を先に読ませる
-  $LOAD_PATH.unshift "#{dir}/../spec_resources/controllers"
-  require 'application'
-
-  # setup resources
-  Dir[File.expand_path("#{dir}/../spec_resources/**/*.rb")].sort.each do |file|
-    require file
-  end
-
-  # setup routes
-  ActionController::Routing::Routes.draw do |map|
-    map.connect ':controller/:action/:id.:format'
-    map.connect ':controller/:action/:id'
-  end
-
   require 'rspec/rails'
 end