jpmobile 2.0.1 → 2.0.2

data/README.rdoc

@@ -1,7 +1,7 @@
 = jpmobile: A Rails plugin for Japanese mobile-phones
 
 == jpmobileとは
-携帯電話特有の機能を Rails 3.0 や Rack middleware で利用するためのプラグイン。
+携帯電話特有の機能を Rails 3.1 や Rack middleware で利用するためのプラグイン。
 以下の機能を備える。
 
 * 携帯電話のキャリア判別
@@ -18,7 +18,7 @@
 * メールの受信(experimental)
   * 絵文字と漢字コードの変換
 
-また Rails 3.0 に以下の機能を追加する
+また Rails 3.1 に以下の機能を追加する
 * ビューへの自動振分け
 * 位置情報取得などのリンクヘルパーの追加
 * セッションIDをフォーム／リンクに付与(Trans SID)
@@ -223,7 +223,7 @@ Androidの場合はindex_smart_phone_android.html.erb、Windows Phoneの場合
 === 位置情報の取得用リンクの生成
 
 以下のようなコードで、端末に位置情報を要求するリンクを出力する。
-  <%= get_position_link_to(:action=>:gps) %>
+  <%= get_position_link_to("位置情報を取得する", :action=>:gps) %>
 
 === セッションIDの付与(Trans SID)
 ==== Cookie非対応携帯だけに付与する
@@ -237,7 +237,7 @@ Androidの場合はindex_smart_phone_android.html.erb、Windows Phoneの場合
   end
 
 trans_sid 機能を使う場合には cookie session store を使用することができません。
-また Rails 3.0 では Cookie が使える場合にはそちらが優先されてしまうため、:always を指定した場合に問題になる場合があります。
+また Rails 3.1 では Cookie が使える場合にはそちらが優先されてしまうため、:always を指定した場合に問題になる場合があります。
 trans_sid を使用する際には、例えば config/initializers/session_store.rb で
   Rails.application.config.session_store :active_record_store
   Rails.application.config.session_options = {:cookie_only => false}

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 0
-:patch: 1
+:patch: 2
 :build: !!null 

data/lib/jpmobile/emoticon.rb

@@ -153,7 +153,7 @@ module Jpmobile
     def self.unicodecr_to_au_email(in_str)
       str = Jpmobile::Util.ascii_8bit(in_str)
       regexp = Regexp.compile(Jpmobile::Util.ascii_8bit("&#x([0-9a-f]{4});"), Regexp::IGNORECASE)
-      str.gsub(regexp) do |match|
+      str = str.gsub(regexp) do |match|
         unicode = $1.scanf("%x").first
         converted = CONVERSION_TABLE_TO_AU[unicode]
 
@@ -176,6 +176,8 @@ module Jpmobile
           match
         end
       end
+      regexp = Regexp.compile(Regexp.escape(Jpmobile::Util.ascii_8bit("\x1b\x28\x42\x1b\x24\x42")), Regexp::IGNORECASE)
+      str.gsub(regexp, '')
     end
 
     # +str+ のなかでUnicode数値文字参照で表記された絵文字をメール送信用JISコードに変換する

data/lib/jpmobile/filter.rb

@@ -40,6 +40,9 @@ module Jpmobile
     # 内部コードから外部コードに変換
     def after(controller, options = {})
       if apply_outgoing?(controller) and controller.response.body.is_a?(String)
+        if controller.request.mobile?
+          options.merge!(:charset => controller.request.mobile.default_charset)
+        end
         controller.response.body = to_external(controller.response.body, options)
       end
     end
@@ -64,7 +67,9 @@ module Jpmobile
 
         doc = convert_text_content(doc)
 
-        doc.to_html.gsub("\xc2\xa0"," ")
+        html = doc.to_html.gsub("\xc2\xa0"," ")
+        html = html.gsub(/charset=[a-z0-9\-]+/i, "charset=#{options[:charset]}") if options[:charset]
+        html
       end
     end
 

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -58,6 +58,16 @@ module Jpmobile::Mobile
       false
     end
 
+    # Jpmobile::Rack::Filter を適用するかどうか
+    def apply_filter?
+      true
+    end
+
+    # Jpmobile::Rack::ParamsFilter を適用するかどうか
+    def apply_params_filter?
+      true
+    end
+
     # エンコーディング変換用
     def to_internal(str)
       str

data/lib/jpmobile/mobile/iphone.rb

@@ -7,6 +7,16 @@ module Jpmobile::Mobile
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /iPhone/
 
+    # Jpmobile::Rack::Filter を適用する
+    def apply_filter?
+      true
+    end
+
+    # Jpmobile::Rack::ParamsFilter を適用する
+    def apply_params_filter?
+      true
+    end
+
     # 文字コード変換
     def to_internal(str)
       # 絵文字を数値参照に変換

data/lib/jpmobile/mobile/smart_phone.rb

@@ -17,5 +17,15 @@ module Jpmobile::Mobile
     def smart_phone?
       true
     end
+
+    # Jpmobile::Rack::Filter は適用しない
+    def apply_filter?
+      false
+    end
+
+    # Jpmobile::Rack::ParamsFilter は適用しない
+    def apply_params_filter?
+      false
+    end
   end
 end

data/lib/jpmobile/rack/filter.rb

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 # 出力変換
+require 'scanf'
+
 module Jpmobile
   module Rack
     class Filter
@@ -13,7 +15,7 @@ module Jpmobile
 
         status, env, response = @app.call(env)
 
-        if mobile and env['Content-Type'] =~ %r!text/html|application/xhtml\+xml!
+        if mobile and mobile.apply_filter? and env['Content-Type'] =~ %r!text/html|application/xhtml\+xml!
           type, charset = env['Content-Type'].split(/;\s*charset=/)
 
           body = response_to_body(response)
@@ -25,6 +27,17 @@ module Jpmobile
           if type and charset
             env['Content-Type'] = "#{type}; charset=#{charset}"
           end
+        elsif pc_emoticon?
+          body = response_to_body(response)
+
+          response = body.gsub(/&#x([0-9a-f]{4});/i) do |match|
+            img = @pc_emoticon_hash[$1.upcase] || (@pc_emoticon_hash[("%x" % ($1.scanf("%x").first - 0x1000)).upcase] rescue nil)
+            if img
+              "<img src=\"#{@@pc_emoticon_image_path}/#{img}.gif\" alt=\"#{img}\" />"
+            else
+              ""
+            end
+          end
         end
 
         new_response = ::Rack::Response.new(response, status, env)
@@ -32,6 +45,25 @@ module Jpmobile
       end
 
       private
+      def pc_emoticon?
+        if @@pc_emoticon_yaml and File.exist?(@@pc_emoticon_yaml) and
+            @@pc_emoticon_image_path and FileTest.directory?(@@pc_emoticon_image_path)
+
+          unless @pc_emoticon_hash
+            begin
+              yaml_hash = YAML.load_file(@@pc_emoticon_yaml)
+              @pc_emoticon_hash = Hash[*(yaml_hash.values.inject([]){ |r, v| r += v.to_a.flatten; r})]
+              @@pc_emoticon_image_path.chop if @@pc_emoticon_image_path.match(/\/$/)
+
+              return true
+            rescue => ex
+            end
+          end
+        end
+
+        return false
+      end
+
       def response_to_body(response)
         if response.respond_to?(:to_str)
           response.to_str
@@ -45,6 +77,18 @@ module Jpmobile
           body
         end
       end
+
+      @@pc_emoticon_image_path = nil
+      @@pc_emoticon_yaml       = nil
+      class << self
+        def pc_emoticon_image_path=(path)
+          @@pc_emoticon_image_path = path
+        end
+
+        def pc_emoticon_yaml=(file)
+          @@pc_emoticon_yaml = file
+        end
+      end
     end
   end
 end

data/lib/jpmobile/rack/params_filter.rb

@@ -9,7 +9,7 @@ module Jpmobile
 
       def call(env)
         # 入力
-        if @mobile = env['rack.jpmobile']
+        if @mobile = env['rack.jpmobile'] and @mobile.apply_params_filter?
           # パラメータをkey, valueに分解
           # form_params
           if env['REQUEST_METHOD'] == 'POST'

data/lib/jpmobile/sinatra.rb

@@ -0,0 +1,16 @@
+module Jpmobile
+  module Sinatra
+    class Base < ::Sinatra::Base
+      # Calls the given block for every possible template file in views,
+      # named name.ext, where ext is registered on engine.
+      def find_template(views, name, engine)
+        if env['rack.jpmobile'] and !env['rack.jpmobile'].variants.empty?
+          env['rack.jpmobile'].variants.each do |variant|
+            yield ::File.join(views, "#{name}_#{variant}.#{@preferred_extension}")
+          end
+        end
+        super
+      end
+    end
+  end
+end

data/lib/jpmobile/trans_sid.rb

@@ -27,7 +27,7 @@ module Jpmobile
   module SessionID
     module_function
 
-    include ActionDispatch::Session::Compatibility
+    extend ActionDispatch::Session::Compatibility
   end
 end
 

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -16,6 +16,9 @@ describe "絵文字が" do
 
     @softbank_cr        = ""
     @softbank_utf8      = [0xf04a].pack("U")
+
+    @emoticon_yaml   = File.join(File.expand_path(File.dirname(__FILE__)), "../../../tmp/emoticon.yml")
+    @emoticon_images = File.join(File.expand_path(File.dirname(__FILE__)), "../../../tmp/emoticons")
   end
 
   context "PC のとき" do
@@ -45,6 +48,55 @@ describe "絵文字が" do
     end
   end
 
+  context "PC で絵文字を変換するとき" do
+    before(:each) do
+      unless FileTest.exist?(File.join(File.expand_path(File.dirname(__FILE__)), '../../../tmp/emoticon.yaml')) and
+          FileTest.directory?(File.join(File.expand_path(File.dirname(__FILE__)), '../../../tmp/emoticons'))
+        pending "emoticon.yaml and emoticons directory don't exists"
+      end
+
+      @res = Rack::MockRequest.env_for("/", 'Content-Type' => 'text/html; charset=utf-8')
+
+      Jpmobile::Rack::Filter.pc_emoticon_yaml               = "tmp/emoticon.yaml"
+      Jpmobile::Rack::Filter.pc_emoticon_image_path = @path = "tmp/emoticons"
+    end
+
+    after(:each) do
+      Jpmobile::Rack::Filter.pc_emoticon_yaml       = nil
+      Jpmobile::Rack::Filter.pc_emoticon_image_path = nil
+    end
+
+    it "docomo 絵文字が画像に変換されること" do
+      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
+      response_body(response).should == "<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_body(response).should == @docomo_utf8
+    end
+
+    it "au 絵文字が画像に変換されること" do
+      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
+      response_body(response).should == "<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_body(response).should == @au_utf8
+    end
+
+    it "softbank 絵文字が画像に変換されること" do
+      response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
+      response_body(response).should == "<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_body(response).should == @softbank_utf8
+    end
+  end
+
   context "docomo のとき" do
     before(:each) do
       @res = Rack::MockRequest.env_for(

data/spec/unit/emoticon_spec.rb

@@ -85,6 +85,10 @@ describe Jpmobile::Emoticon do
       it "should not convert ascii string to unicodecr" do
         Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("-------=_NextPart_15793_72254_63179")).should_not match(/e5c2/i)
       end
+
+      it "should not include extra JIS escape sequence between Kanji-code and emoticon" do
+        Jpmobile::Emoticon.unicodecr_to_au_email(utf8_to_jis("掲示板")).should == Jpmobile::Util.ascii_8bit("\x1b\x24\x42\x75\x3a\x37\x47\x3C\x28\x48\x44\x1b\x28\x42")
+      end
     end
   end
 end

data/spec/unit/encoding_spec.rb

@@ -59,7 +59,7 @@ describe "Jpmobile::Mobile" do
       end
 
       it "should convert emoticon  to \x75\x41 in B-Encoding" do
-        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMhsoQhskQnVBGyhC?="
+        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMnVBGyhC?="
       end
     end
 
@@ -69,7 +69,7 @@ describe "Jpmobile::Mobile" do
       end
 
       it "should convert emoticon  to \x75\x41" do
-        ascii_8bit(@mobile.to_mail_body("ほげ")).should == ascii_8bit(utf8_to_jis("ほげ") + jis("\x1b\x24\x42\x75\x41\x1b\x28\x42"))
+        ascii_8bit(@mobile.to_mail_body("ほげ")).should == ascii_8bit(jis("\e\x24\x42\x24\x5B\x24\x32\x75\x41\x1b\x28\x42"))
       end
     end
   end

data/spec/unit/mail_spec.rb

@@ -111,8 +111,8 @@ describe "Jpmobile::Mail" do
         @mail.subject += ""
         @mail.body = "#{@mail.body}"
 
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVRsoQhskQnVBGyhC?=")))
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x75\x41\x1b\x28\x42"))))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVXVBGyhC?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\e\x24\x42\x24\x5B\x24\x32\x75\x41\e\x28\x42"))))
       end
     end
   end

data/spec/unit/receive_mail_spec.rb

@@ -105,7 +105,7 @@ describe "Jpmobile::Mail#receive" do
       end
 
       it "should encode correctly" do
-        ascii_8bit(@mail.to_s).should match(Regexp.escape("GyRCJUYlOSVIGyhCGyRCdk8bKEI="))
+        ascii_8bit(@mail.to_s).should match(Regexp.escape("GyRCJUYlOSVIdk8bKEI="))
       end
     end
 
@@ -201,23 +201,23 @@ describe "Jpmobile::Mail#receive" do
 
     context "to_s" do
       it "should have subject which is same as original" do
-        ascii_8bit(@mail.to_s).should match(Regexp.escape("GyRCQmpMPhsoQhskQnZeGyhC"))
+        ascii_8bit(@mail.to_s).should match(Regexp.escape("GyRCQmpMPnZeGyhC"))
       end
 
       it "should have body which is same as original" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit(utf8_to_jis("本文")))))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\e\x24\x42\x4B\x5C\x4A\x38\x76\x7D\e\x28\x42"))))
       end
     end
 
     context "modify and to_s" do
       it "should encode subject correctly" do
         @mail.subject = "大江戸"
-        ascii_8bit(@mail.to_s).should match("GyRCQmc5PjhNGyhCGyRCdUEbKEI=")
+        ascii_8bit(@mail.to_s).should match(/\?GyRCQmc5PjhNdUEbKEI=/)
       end
 
       it "should encode body correctly" do
         @mail.body = "会議が開催"
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x32\x71\x35\x44\x24\x2C\x33\x2B\x3A\x45\x1b\x28\x42\x1b\x24\x42\x75\x48\x1b\x28\x42"))))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x32\x71\x35\x44\x24\x2C\x33\x2B\x3A\x45\x75\x48\x1b\x28\x42"))))
       end
     end
   end

data/test/rails/overrides/app/controllers/hankaku_input_filter_controller.rb

@@ -4,4 +4,7 @@ class HankakuInputFilterController < FilterControllerBase
   def index_xhtml
     render "index_xhtml", :layout => "xhtml"
   end
+
+  def with_charset
+  end
 end

data/test/rails/overrides/app/views/hankaku_input_filter/with_charset.html.erb

@@ -0,0 +1 @@
+<%= link_to 'リンク', '#' -%>

data/test/rails/overrides/app/views/layouts/with_charset.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>RailsRoot</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <%= csrf_meta_tag %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/rails/overrides/spec/models/mobile_mailer_spec.rb

@@ -163,7 +163,7 @@ describe MobileMailer do
 
       raw_mail = ascii_8bit(email.to_s)
       raw_mail.should match(/For au/)
-      raw_mail.should match(Regexp.escape("GyRCRnxLXDhsQmpMPhsoQhskQnZeGyhC"))
+      raw_mail.should match(Regexp.escape("GyRCRnxLXDhsQmpMPnZeGyhC"))
       raw_mail.should match(Regexp.compile(ascii_8bit("\x76\x21")))
     end
 

data/test/rails/overrides/spec/requests/filter_spec.rb

@@ -215,6 +215,11 @@ describe "jpmobile integration spec" do
     end
     it_should_behave_like "Shift_JISで通信する端末との通信(半角変換付き)"
     it_should_behave_like "hankaku_filter :input => true のとき"
+
+    it "Content-Type が Shift_JIS であること" do
+      get "/#{@controller}/with_charset", {}, {"HTTP_USER_AGENT" => @user_agent}
+      body.should match(/Shift_JIS/)
+    end
   end
 
   describe HankakuInputFilterController, "SoftBank 910T からのアクセス" do
@@ -225,5 +230,10 @@ describe "jpmobile integration spec" do
     end
     it_should_behave_like "UTF-8で通信する端末との通信(半角変換付き)"
     it_should_behave_like "hankaku_filter :input => true のとき"
+
+    it "Content-Type が UTF-8 であること" do
+      get "/#{@controller}/with_charset", {}, {"HTTP_USER_AGENT" => @user_agent}
+      body.should match(/UTF-8/)
+    end
   end
 end

data/test/sinatra/config.ru

@@ -0,0 +1,2 @@
+require './guestbook'
+run Guestbook

data/test/sinatra/guestbook.rb

@@ -1,26 +1,25 @@
 require 'rubygems'
 require 'sinatra'
-require 'jpmobile'
+require File.join(File.dirname(__FILE__), '../../lib/jpmobile')
 require 'jpmobile/rack'
 require 'singleton'
 require 'pp'
 
-require 'jpmobile'
-require 'jpmobile/rack'
+require 'jpmobile/sinatra'
 
 class SinatraTestHelper
   include Singleton
   attr_accessor :last_app
 end
 
-class Guestbook < Sinatra::Base
+class Guestbook < Jpmobile::Sinatra::Base
   use Jpmobile::Rack::MobileCarrier
   use Jpmobile::Rack::ParamsFilter
   use Jpmobile::Rack::Filter
 
   def call(env)
     _dup = dup
-    SinatraTestHelper.instance.last_app = _dup
+    ::SinatraTestHelper.instance.last_app = _dup
     _dup.call!(env)
   end
 
@@ -35,6 +34,8 @@ class Guestbook < Sinatra::Base
   post '/' do
     @p = params[:p]
   end
-end
 
-Guestbook.run
+  get '/top' do
+    erb :index
+  end
+end

data/test/sinatra/test/filter_test.rb

@@ -36,4 +36,14 @@ class SinatraOnJpmobile < Test::Unit::TestCase
     assert_equal last_app.assigns(:p), "けーたい"
     assert_equal last_response.body, utf8_to_sjis("けーたい")
   end
+
+  # def test_view_selector_pc
+  #   get '/top', {}, {"HTTP_USER_AGENT" => "Mozilla"}
+  #   assert_equal last_response.body, 'PC'
+  # end
+
+  # def test_view_selector_mobile
+  #   get '/top', {}, {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)"}
+  #   assert_equal last_response.body, 'MOBILE'
+  # end
 end

data/test/sinatra/views/index.erb

@@ -0,0 +1 @@
+PC

data/test/sinatra/views/index_mobile.erb

@@ -0,0 +1 @@
+MOBILE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23576180 !ruby/object:Gem::Requirement
+  requirement: &20415560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23576180
+  version_requirements: *20415560
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23575080 !ruby/object:Gem::Requirement
+  requirement: &20415080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *23575080
+  version_requirements: *20415080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23574220 !ruby/object:Gem::Requirement
+  requirement: &20393360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23574220
+  version_requirements: *20393360
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &23573240 !ruby/object:Gem::Requirement
+  requirement: &20392880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23573240
+  version_requirements: *20392880
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &23572300 !ruby/object:Gem::Requirement
+  requirement: &20392400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23572300
+  version_requirements: *20392400
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &23571660 !ruby/object:Gem::Requirement
+  requirement: &20391920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23571660
+  version_requirements: *20391920
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &23570480 !ruby/object:Gem::Requirement
+  requirement: &20391440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23570480
+  version_requirements: *20391440
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &23569620 !ruby/object:Gem::Requirement
+  requirement: &20390860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23569620
+  version_requirements: *20390860
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &23568620 !ruby/object:Gem::Requirement
+  requirement: &20390380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *23568620
+  version_requirements: *20390380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23565280 !ruby/object:Gem::Requirement
+  requirement: &20389820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *23565280
+  version_requirements: *20389820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23564200 !ruby/object:Gem::Requirement
+  requirement: &20389320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *23564200
+  version_requirements: *20389320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &23561920 !ruby/object:Gem::Requirement
+  requirement: &20388840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *23561920
+  version_requirements: *20388840
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &23561000 !ruby/object:Gem::Requirement
+  requirement: &20388340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *23561000
+  version_requirements: *20388340
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &23559820 !ruby/object:Gem::Requirement
+  requirement: &20387800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *23559820
+  version_requirements: *20387800
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &23559020 !ruby/object:Gem::Requirement
+  requirement: &20387280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *23559020
+  version_requirements: *20387280
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &23557960 !ruby/object:Gem::Requirement
+  requirement: &20386760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: 0.8.3
   type: :development
   prerelease: false
-  version_requirements: *23557960
+  version_requirements: *20386760
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &23487920 !ruby/object:Gem::Requirement
+  requirement: &20386260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,7 +198,7 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *23487920
+  version_requirements: *20386260
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
 executables: []
@@ -259,6 +259,7 @@ files:
 - lib/jpmobile/rails.rb
 - lib/jpmobile/request_with_mobile.rb
 - lib/jpmobile/resolver.rb
+- lib/jpmobile/sinatra.rb
 - lib/jpmobile/trans_sid.rb
 - lib/jpmobile/util.rb
 - lib/tasks/jpmobile_tasks.rake
@@ -326,7 +327,9 @@ files:
 - test/rails/overrides/app/views/hankaku_filter/index.html.erb
 - test/rails/overrides/app/views/hankaku_input_filter/index.html.erb
 - test/rails/overrides/app/views/hankaku_input_filter/index_xhtml.html.erb
+- test/rails/overrides/app/views/hankaku_input_filter/with_charset.html.erb
 - test/rails/overrides/app/views/layouts/application_mobile.html.erb
+- test/rails/overrides/app/views/layouts/with_charset.html.erb
 - test/rails/overrides/app/views/layouts/xhtml.html.erb
 - test/rails/overrides/app/views/links/au_gps.html.erb
 - test/rails/overrides/app/views/links/au_location.html.erb
@@ -398,8 +401,11 @@ files:
 - test/rails/overrides/spec/requests/template_path_spec.rb
 - test/rails/overrides/spec/requests/trans_sid_spec.rb
 - test/rails/overrides/spec/spec_helper.rb
+- test/sinatra/config.ru
 - test/sinatra/guestbook.rb
 - test/sinatra/test/filter_test.rb
+- test/sinatra/views/index.erb
+- test/sinatra/views/index_mobile.erb
 - tools/emoji/genregexp.rb
 - tools/generate_au_emoticon_table.rb
 - tools/generate_docomo_emoticon_table.rb