jpmobile 2.0.11 → 3.0.0

data/lib/jpmobile/mailer.rb

@@ -21,7 +21,7 @@ module Jpmobile
                     # for multi to addresses
                     Jpmobile::Mobile::AbstractMobile.new(nil, nil)
                   end
-        self.lookup_context.mobile = @mobile.mail_variants
+        self.lookup_context.mobile = @mobile.variants
 
         @mobile.decorated = headers.delete(:decorated)
 

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -29,6 +29,16 @@ module Jpmobile::Mobile
     # 端末を識別する文字列があれば返す。
     def ident_device; nil; end
 
+    # 当該キャリアのIPアドレス帯域からのアクセスであれば +true+ を返す。
+    # そうでなければ +false+ を返す。
+    # IP空間が定義されていない場合は +nil+ を返す。
+    def self.valid_ip? remote_addr
+      @ip_list ||= ip_address_class
+      return false unless @ip_list
+
+      @ip_list.valid_ip?(remote_addr)
+    end
+
     def valid_ip?
       @__valid_ip ||= self.class.valid_ip? @request.ip
     end
@@ -50,11 +60,6 @@ module Jpmobile::Mobile
       false
     end
 
-    # tablet かどうか
-    def tablet?
-      false
-    end
-
     # Jpmobile::Rack::Filter を適用するかどうか
     def apply_filter?
       true
@@ -80,12 +85,11 @@ module Jpmobile::Mobile
     def variants
       return @_variants if @_variants
 
-      @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/ && c.to_s !~ /Emoticon/}.map do |klass|
+      @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/}.map do |klass|
         klass = klass.to_s.
           gsub(/Jpmobile::/, '').
           gsub(/AbstractMobile::/, '').
           gsub(/Mobile::SmartPhone/, 'smart_phone').
-          gsub(/Mobile::Tablet/, 'tablet').
           gsub(/::/, '_').
           gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
           gsub(/([a-z\d])([A-Z])/, '\1_\2').
@@ -93,24 +97,17 @@ module Jpmobile::Mobile
         klass =~ /abstract/ ? "mobile" : klass
       end
 
-      if @_variants.include?('tablet')
-        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile_/, "tablet_")}
-      elsif @_variants.include?("smart_phone")
-        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile_/, "smart_phone_")}
+      if @_variants.include?("smart_phone")
+        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile/, "smart_phone")}
       end
 
       @_variants || []
     end
-    def mail_variants
-      return @_mail_variants if @_mail_variants
-
-      @_mail_variants = variants == ['mobile'] ? [] : variants
-    end
 
     # メール送信用
     def to_mail_subject(str)
       Jpmobile::Util.fold_text(Jpmobile::Emoticon.unicodecr_to_utf8(str)).
-        map{|text| "=?#{mail_charset}?B?" + [to_mail_encoding(text)].pack('m').gsub(/\n/, '') + "?=" }.
+        map{|text| "=?#{mail_charset}?B?" + [to_mail_encoding(text)].pack('m').strip + "?=" }.
         join("\n\s")
     end
     def to_mail_body(str)
@@ -118,8 +115,7 @@ module Jpmobile::Mobile
     end
     def mail_charset(charset = nil)
       # (charset.nil? or charset == "") ? self.class::MAIL_CHARSET : charset
-      # self.class::MAIL_CHARSET
-      charset.nil? || charset == '' || charset =~ /US-ASCII/i ? self.class::MAIL_CHARSET : charset
+      self.class::MAIL_CHARSET
     end
     def content_transfer_encoding(headers)
       transfer_encoding = headers['Content-Transfer-Encoding']
@@ -178,47 +174,10 @@ module Jpmobile::Mobile
       @decorated
     end
 
-    class << self
-      # 当該キャリアのIPアドレス帯域からのアクセスであれば +true+ を返す。
-      # そうでなければ +false+ を返す。
-      # IP空間が定義されていない場合は +nil+ を返す。
-      def valid_ip? remote_addr
-        @ip_list ||= ip_address_class
-        return false unless @ip_list
-
-        @ip_list.valid_ip?(remote_addr)
-      end
-
-      # リクエストがこのクラスに属するか調べる
-      # メソッド名に関して非常に不安
-      def check_carrier(env)
-        user_agent_regexp && user_agent_regexp.match(env['HTTP_USER_AGENT'])
-      end
-
-      def user_agent_regexp
-        @_user_agent_regexp ||= self::USER_AGENT_REGEXP
-      end
-
-      def add_user_agent_regexp(regexp)
-        @_user_agent_regexp = Regexp.union(user_agent_regexp, regexp)
-      end
-
-      def carrier(env)
-        ::Jpmobile::Mobile.carriers.each do |const|
-          c = ::Jpmobile::Mobile.const_get(const)
-          if c.check_carrier(env)
-            res = ::Rack::Request.new(env)
-            return c.new(env, res)
-          end
-        end
-
-        nil
-      end
-
-      #
-      def ip_address_class
-        eval("::Jpmobile::Mobile::IpAddresses::#{self.to_s.split(/::/).last}").new rescue nil
-      end
+    # リクエストがこのクラスに属するか調べる
+    # メソッド名に関して非常に不安
+    def self.check_carrier(env)
+      self::USER_AGENT_REGEXP && env['HTTP_USER_AGENT'] =~ self::USER_AGENT_REGEXP
     end
 
     #XXX: lib/jpmobile.rbのautoloadで先に各キャリアの定数を定義しているから動くのです
@@ -231,6 +190,18 @@ module Jpmobile::Mobile
       end
     end
 
+    def self.carrier(env)
+      ::Jpmobile::Mobile.carriers.each do |const|
+        c = ::Jpmobile::Mobile.const_get(const)
+        if c.check_carrier(env)
+          res = ::Rack::Request.new(env)
+          return c.new(env, res)
+        end
+      end
+
+      nil
+    end
+
     private
     # リクエストのパラメータ。
     def params
@@ -240,5 +211,10 @@ module Jpmobile::Mobile
         @request.params
       end
     end
+
+    #
+    def self.ip_address_class
+      eval("::Jpmobile::Mobile::IpAddresses::#{self.to_s.split(/::/).last}").new rescue nil
+    end
   end
 end

data/lib/jpmobile/mobile/android.rb

@@ -6,7 +6,5 @@ module Jpmobile::Mobile
   class Android < SmartPhone
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /Android/
-
-    include Jpmobile::Mobile::GoogleEmoticon
   end
 end

data/lib/jpmobile/mobile/iphone.rb

@@ -7,6 +7,30 @@ module Jpmobile::Mobile
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /iPhone/
 
-    include Jpmobile::Mobile::UnicodeEmoticon
+    # Jpmobile::Rack::Filter を適用する
+    def apply_filter?
+      true
+    end
+
+    # Jpmobile::Rack::ParamsFilter を適用する
+    def apply_params_filter?
+      true
+    end
+
+    # 文字コード変換
+    def to_internal(str)
+      # 絵文字を数値参照に変換
+      str = Jpmobile::Emoticon.external_to_unicodecr_softbank(Jpmobile::Util.utf8(str))
+      # 数値参照を UTF-8 に変換
+      Jpmobile::Emoticon.unicodecr_to_utf8(str)
+    end
+    def to_external(str, content_type, charset)
+      # UTF-8を数値参照に
+      str = Jpmobile::Emoticon.utf8_to_unicodecr(str)
+      # 数値参照を絵文字コードに変換
+      str = Jpmobile::Emoticon.unicodecr_to_external(str, Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, false)
+
+      [str, charset]
+    end
   end
 end

data/lib/jpmobile/rack.rb

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 require 'rack/utils'
-require 'singleton'
 
 module Jpmobile
   module Rack
@@ -13,14 +12,10 @@ module Jpmobile
   end
 
   class Configuration
-    include Singleton
-
     attr_accessor :form_accept_charset_conversion
-    attr_accessor :smart_phone_emoticon_compatibility
 
     def initialize
-      @form_accept_charset_conversion     = false
-      @smart_phone_emoticon_compatibility = false
+      @form_accept_charset_conversion = false
     end
 
     def mobile_filter

data/lib/jpmobile/rails.rb

@@ -19,7 +19,7 @@ ActiveSupport.on_load(:before_configuration) do
     class Application
       class Configuration
         def jpmobile
-          @jpmobile ||= ::Jpmobile.config
+          @jpmobile ||= ::Jpmobile::Configuration.new
         end
       end
     end
@@ -45,7 +45,7 @@ module Jpmobile
     end
 
     def disable_mobile_view!
-      self.lookup_context.mobile = nil
+      self.lookup_context.mobile = []
     end
   end
 end

data/lib/jpmobile/resolver.rb

@@ -13,26 +13,31 @@ module Jpmobile
 
     def query(path, details, formats)
       query = build_query(path, details)
-      templates = []
-      sanitizer = Hash.new { |h,k| h[k] = Dir["#{File.dirname(k)}/*"] }
 
-      Dir[query].each do |p|
-        next if File.directory?(p) || !sanitizer[p].include?(p)
+      # deals with case-insensitive file systems.
+      sanitizer = Hash.new { |h,dir| h[dir] = Dir["#{dir}/*"] }
 
-        handler, format = extract_handler_and_format(p, formats)
-        contents = File.open(p, "rb") { |io| io.read }
+      template_paths = Dir[query].reject { |filename|
+        File.directory?(filename) ||
+          !sanitizer[File.dirname(filename)].include?(filename)
+      }
+
+      template_paths.map { |template|
+        handler, format = extract_handler_and_format(template, formats)
+        contents = File.binread template
 
         if format
-          variant = p.match(/.+#{path}(.+)\.#{format.to_sym.to_s}.*$/) ? $1 : ''
+          variant = template.match(/.+#{path}(.+)\.#{format.to_sym.to_s}.*$/) ? $1 : ''
+          virtual_path = variant.blank? ? nil : path + variant
         else
-          variant = ''
+          virtual_path = path.virtual
         end
 
-        templates << ActionView::Template.new(contents, File.expand_path(p), handler,
-          :virtual_path => path.name + variant, :format => format, :updated_at => mtime(p))
-      end
-
-      templates
+        ActionView::Template.new(contents, File.expand_path(template), handler,
+          :virtual_path => virtual_path,
+          :format       => format,
+          :updated_at   => mtime(template))
+      }
     end
   end
 end

data/lib/jpmobile/trans_sid.rb

@@ -21,18 +21,19 @@ module Jpmobile
       end
     end
 
-    case Rails.application.config.session_store.to_s
-    when "ActionDispatch::Session::MemCacheStore"
-      require 'jpmobile/session/mem_cache_store'
-      ActionDispatch::Session::MemCacheStore.send :include, ParamsOverCookie
-    when "ActiveRecord::SessionStore"
-      require 'jpmobile/session/active_record_store'
-      ActionDispatch::Session::AbstractStore.send :include, ParamsOverCookie
+    ActiveSupport.on_load(:after_initialize) do
+      case Rails.application.config.session_store.to_s
+      when "ActionDispatch::Session::MemCacheStore"
+        require 'jpmobile/session/mem_cache_store'
+        ActionDispatch::Session::MemCacheStore.send :include, ParamsOverCookie
+      when "ActiveRecord::SessionStore"
+        require 'jpmobile/session/active_record_store'
+        ActionDispatch::Session::AbstractStore.send :include, ParamsOverCookie
+      end
     end
   end
 
   module SessionID
-    require 'action_dispatch/middleware/session/abstract_store'
     module_function
 
     extend ActionDispatch::Session::Compatibility

data/lib/jpmobile/util.rb

@@ -91,13 +91,6 @@ module Jpmobile
       str
     end
 
-    def ascii_compatible!(str)
-      if str.respond_to?(:encoding) and !str.encoding.ascii_compatible?
-        str.force_encoding(BINARY)
-      end
-      str
-    end
-
     def utf8_to_sjis(utf8_str)
       # 波ダッシュ対策
       utf8_str = wavedash_to_fullwidth_tilde(utf8_str)
@@ -194,7 +187,7 @@ module Jpmobile
     end
 
     def jis_string_regexp
-      Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42")) + "(.+?)" + Regexp.escape(ascii_8bit("\x1b\x28\x42")))
+      Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42")) + "(.+)" + Regexp.escape(ascii_8bit("\x1b\x28\x42")))
     end
 
     def encode(str, charset)
@@ -386,51 +379,5 @@ module Jpmobile
       end
 
     end
-
-    def invert_table(hash)
-      result = {}
-      hash.keys.each do |key|
-        if result[hash[key]]
-          if !key.kind_of?(Array) and !result[hash[key]].kind_of?(Array) and result[hash[key]] > key
-            result[hash[key]] = key
-          end
-        else
-          result[hash[key]] = key
-        end
-      end
-      result
-    end
-
-    def decode(str, encoding, charset)
-      _str = case encoding
-             when /quoted-printable/i
-               str.unpack('M').first.strip
-             when /base64/i
-               str.unpack('m').first.strip
-             else
-               str
-             end
-
-      _extract_charset = Jpmobile::Util.extract_charset(_str)
-      charset = _extract_charset unless _extract_charset.blank? or _extract_charset == charset
-      Jpmobile::Util.set_encoding(_str, charset)
-    end
-
-    def check_charset(str, charset)
-      if Object.const_defined?(:Encoding)
-        # use NKF.guess
-        ::Encoding.compatible?(NKF.guess(str), ::Encoding.find(charset))
-      else
-        true
-      end
-    end
-
-    def correct_encoding(str)
-      if str.encoding != ::Encoding::ASCII_8BIT and NKF.guess(str) != str.encoding
-        str.force_encoding(NKF.guess(str))
-      end
-
-      str
-    end
   end
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -46,7 +46,7 @@ namespace :test do
     end
 
     # setup jpmobile
-    plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile')
+    plugin_path = File.join(rails_root, 'lib', 'jpmobile')
     FileUtils.mkdir_p(plugin_path)
     FileList["*"].exclude("test").exclude("spec").exclude('vendor').each do |file|
       FileUtils.cp_r(file, plugin_path)
@@ -54,7 +54,7 @@ namespace :test do
 
     # setup jpmobile-ipaddresses
     begin
-      plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile-ipaddresses')
+      plugin_path = File.join(rails_root, 'lib', 'jpmobile-ipaddresses')
       FileUtils.mkdir_p(plugin_path)
       FileList["vendor/jpmobile-ipaddresses/*"].exclude("test").each do |file|
         FileUtils.cp_r(file, plugin_path)
@@ -65,7 +65,7 @@ namespace :test do
 
     # setup jpmobile-terminfo
     begin
-      plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile-terminfo')
+      plugin_path = File.join(rails_root, 'lib', 'jpmobile-terminfo')
       FileUtils.mkdir_p(plugin_path)
       FileList["vendor/jpmobile-terminfo/*"].exclude("test").each do |file|
         FileUtils.cp_r(file, plugin_path)
@@ -92,7 +92,7 @@ END
 
     # run tests in rails
     cd rails_root
-    # ruby "-S bundle install"
+    ruby "-S bundle install"
     ruby "-S rake db:migrate test" unless skip
     ruby "-S rake spec"
     # ruby "-S rspec -b --color spec/requests/filter_spec.rb -e 'jpmobile integration spec HankakuInputFilterController SoftBank 910T からのアクセス it should behave like hankaku_filter :input => true のとき はtextareaの中では半角に変換されないこと'"

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -7,8 +7,6 @@ describe "絵文字が" do
   include Jpmobile::Util
 
   before(:each) do
-    Jpmobile.config.smart_phone_emoticon_compatibility = true
-
     @docomo_cr          = "";
     @docomo_utf8        = [0xe63e].pack("U")
     @docomo_docomopoint = ""
@@ -273,169 +271,4 @@ describe "絵文字が" do
       response_body(res).should == [0xe04a].pack('U')
     end
   end
-
-  context 'for iPhone' do
-    context 'lower iOS 4' do
-      before(:each) do
-        @res = Rack::MockRequest.env_for(
-          "/",
-          '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')
-      end
-
-      it 'should convert Softbank emoticon' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-        response_body(response).should == [0xe04a].pack('U')
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-        response_body(response).should == [0xe04a].pack('U')
-      end
-
-      it "converts query parameters" do
-        query_string = "q=" + URI.encode([0xe04A].pack("U"))
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "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)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xf04a].pack("U")
-        response_body(res).should == [0xe04a].pack('U')
-      end
-
-      it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
-      end
-    end
-
-    context 'upper iOS 5' do
-      before(:each) do
-        @res = Rack::MockRequest.env_for(
-          "/",
-          'HTTP_USER_AGENT' => "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Mobile/9A334 Safari/7534.48.3",
-          'Content-Type' => 'text/html; charset=utf-8')
-        @unicode_single = "\342\230\200"
-        @unicode_multi  = "\342\233\205"
-      end
-
-      it "should convert Unicode emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_single))).call(@res)[2]
-        response_body(response).should == [0x2600].pack('U*')
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_multi))).call(@res)[2]
-        response_body(response).should == [0x26C5].pack('U*')
-      end
-
-      it "converts query parameters" do
-        query_string = "q=" + URI.encode(@unicode_multi)
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "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)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == [0x26C5].pack("U")
-        response_body(res).should == [0x26C5].pack('U')
-      end
-
-      it 'should not convert 〓' do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
-      end
-    end
-  end
-
-  context 'for Android' do
-    before(:each) do
-      @google_single = "\363\276\200\200"
-      @google_multi  = "\363\276\200\217"
-    end
-
-    context 'mobile' do
-      before(:each) do
-        @res = Rack::MockRequest.env_for(
-          "/",
-          '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')
-      end
-
-      it "should convert Google emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
-        response_body(response).should == [0xFE000].pack('U*')
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
-        response_body(response).should == [0xFE00F].pack('U*')
-      end
-
-      it "converts query parameters irreversibly" do
-        query_string = "q=" + URI.encode(@google_multi)
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "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)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xe63e, 0xe63f].pack("U*")
-        response_body(res).should == [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_body(response).should == '〓'
-      end
-    end
-
-    context 'tablet' do
-      before(:each) do
-        @res = Rack::MockRequest.env_for(
-          "/",
-          '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')
-      end
-
-      it "should convert Google emoticon" do
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
-        response_body(response).should == [0xFE000].pack('U*')
-        response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
-        response_body(response).should == [0xFE00F].pack('U*')
-      end
-
-      it "converts query parameters irreversibly" do
-        query_string = "q=" + URI.encode(@google_multi)
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "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)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xe63e, 0xe63f].pack("U*")
-        response_body(res).should == [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_body(response).should == '〓'
-      end
-
-      it 'should convert unsupported emoticon to "〓"' do
-        query_string = "q=" + URI.encode("\xF3\xBE\x93\xA4")
-
-        res = Rack::MockRequest.env_for(
-          "/?#{query_string}",
-          "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)
-        req = Rack::Request.new(res[1])
-        req.params['q'].should == '〓'
-        response_body(res).should == '〓'
-      end
-    end
-  end
 end