jpmobile 0.1.0.pre.2 → 0.1.0.pre.3

data/README.rdoc

@@ -135,6 +135,13 @@ jpmobileを読み込むとDoCoMo、Au、SoftBankの絵文字を透過的に扱
   # Rack middleware を追加するメソッド
   Rails.application.config.jpmobile.mobile_fiter
 
+** 下記の設定を追加することで、<form> タグの accept-charset が変更される。
+
+  # <form accept-charset="Shift_JIS" ...> などに変更する
+  Rails.application.config.jpmobile.form_accept_charset_conversion = true
+
+携帯電話上では特に問題とならない。PCブラウザでテストする際に問題となるためのオプション。
+
 * Sinatra の場合は下記のように指定する。
 
   $LOAD_PATH << './lib/jpmobile/lib'

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 1
 :patch: 0
-:build: pre.2
+:build: pre.3

data/init.rb

@@ -1,3 +1,3 @@
 # Include hook code here
 
-require 'jpmobile'
+require File.join(File.dirname(__FILE__), 'lib/jpmobile')

data/jpmobile.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jpmobile}
-  s.version = "0.1.0.pre.2"
+  s.version = "0.1.0.pre.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]

data/lib/jpmobile.rb

@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
+                                          $:.include?(File.expand_path(File.dirname(__FILE__)))
+
 module Jpmobile
   autoload :Email,             'jpmobile/email'
   autoload :Emoticon,          'jpmobile/emoticon'

data/lib/jpmobile/hook_action_view.rb

@@ -66,4 +66,22 @@ module ActionView
       end
     end
   end
+
+  module Helpers
+    module FormTagHelper
+      private
+      def html_options_for_form(url_for_options, options, *parameters_for_url)
+        accept_charset = (Rails.application.config.jpmobile.form_accept_charset_conversion && request && request.mobile && request.mobile.default_charset) || "UTF-8"
+
+        options.stringify_keys.tap do |html_options|
+          html_options["enctype"] = "multipart/form-data" if html_options.delete("multipart")
+          # The following URL is unescaped, this is just a hash of options, and it is the
+          # responsability of the caller to escape all the values.
+          html_options["action"]  = url_for(url_for_options, *parameters_for_url)
+          html_options["accept-charset"] = accept_charset
+          html_options["data-remote"] = true if html_options.delete("remote")
+        end
+      end
+    end
+  end
 end

data/lib/jpmobile/rack.rb

@@ -12,6 +12,12 @@ module Jpmobile
   end
 
   class Configuration
+    attr_accessor :form_accept_charset_conversion
+
+    def initialize
+      @form_accept_charset_conversion = false
+    end
+
     def mobile_filter
       ::Jpmobile::Rack.mount_middlewares
     end

data/lib/jpmobile/rack/filter.rb

@@ -21,7 +21,10 @@ module Jpmobile
             charset = nil
           end
 
-          response, charset = mobile.to_external(response_to_body(response), type, charset)
+          body = response_to_body(response)
+          body = body.sub('<input name="_snowman" type="hidden" value="&#9731;" />', ' ')
+
+          response, charset = mobile.to_external(body, type, charset)
 
           if type and charset
             env['Content-Type'] = "#{type}; charset=#{charset}"

data/lib/jpmobile/trans_sid.rb

@@ -7,9 +7,9 @@ module ParamsOverCookie
     base.class_eval do
       # cookie よりも params を先に見るパッチ
       def extract_session_id_with_jpmobile(env)
-        request = Rack::Request.new(env)
+        request = ActionDispatch::Request.new(env.dup)
         if request.params[@key] and !@cookie_only
-          sid = request.params[@key] unless @cookie_only
+          sid = request.params[@key]
         end
         sid ||= request.cookies[@key]
         sid

data/lib/jpmobile/util.rb

@@ -65,17 +65,17 @@ module Jpmobile
 
     def utf8_to_sjis(utf8_str)
       if utf8_str.respond_to?(:encode)
-        utf8_str.encode("Shift_JIS")
+        utf8_str.encode("Shift_JIS", :crlf_newline => true)
       else
-        NKF.nkf("-m0 -x -Ws", utf8_str)
+        NKF.nkf("-m0 -x -Ws", utf8_str).gsub(/\n/, "\r\n")
       end
     end
 
     def sjis_to_utf8(sjis_str)
       if sjis_str.respond_to?(:encode)
-        sjis_str.encode("UTF-8")
+        sjis_str.encode("UTF-8", :universal_newline => true)
       else
-        NKF.nkf("-m0 -x -Sw", sjis_str)
+        NKF.nkf("-m0 -x -Sw", sjis_str).gsub(/\r\n/, "\n")
       end
     end
 

data/spec/rack/jpmobile/filter_spec.rb

@@ -7,7 +7,7 @@ describe Jpmobile::Rack::Filter do
 
   context "漢字コード変換" do
     before(:each) do
-      @utf8 = "ゆーてぃーえふえいとの日本語ですが何か"
+      @utf8 = "ゆーてぃーえふえいとの\n日本語ですが何か"
       @sjis = utf8_to_sjis(@utf8)
     end
 
@@ -19,7 +19,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
         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) == @sjis
+        response_body(res).should == @sjis
       end
     end
 
@@ -31,7 +31,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
         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) == @sjis
+        response_body(res).should == @sjis
       end
     end
 
@@ -43,9 +43,19 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
         res[1]['Content-Type'].should == "text/html"
-        response_body(res) == @utf8
+        response_body(res).should == @utf8
       end
     end
+
+    it "_snowman が出力されないこと" do
+      res = Rack::MockRequest.env_for(
+        "/",
+        "REQUEST_METHOD" => "GET",
+        'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
+      res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('<input name="_snowman" type="hidden" value="&#9731;" />'))).call(res)
+      res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
+      response_body(res).should == " "
+    end
   end
 
   context "絵文字変換" do
@@ -61,7 +71,7 @@ describe Jpmobile::Rack::Filter do
       @sjis           = utf8_to_sjis(@utf8)
       @docomo_emoji   = sjis("\xf8\xac")
       @au_emoji       = sjis("\xf6\x6c")
-      @softbank_emoji = utf8("\x1b\x24Fd\x0f")
+      @softbank_emoji = utf8("\356\211\204")
     end
 
     context "docomo のとき" do
@@ -71,7 +81,7 @@ describe Jpmobile::Rack::Filter do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_cr))).call(res)
-        response_body(res) == @sjis + @docomo_emoji
+        response_body(res).should == @sjis + @docomo_emoji
       end
 
       it "docomo のUTF-8絵文字が変換されること" do
@@ -80,7 +90,7 @@ describe Jpmobile::Rack::Filter do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
-        response_body(res) == @sjis + @docomo_emoji
+        response_body(res).should == @sjis + @docomo_emoji
       end
 
       it "au のUTF-8絵文字が変換されること" do
@@ -89,7 +99,7 @@ describe Jpmobile::Rack::Filter do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
-        response_body(res) == @sjis + @docomo_emoji
+        response_body(res).should == @sjis + @docomo_emoji
       end
 
       it "softbank のUTF-8絵文字が変換されること" do
@@ -98,7 +108,7 @@ describe Jpmobile::Rack::Filter do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
-        response_body(res) == @sjis + @docomo_emoji
+        response_body(res).should == @sjis + @docomo_emoji
       end
     end
 
@@ -109,7 +119,7 @@ describe Jpmobile::Rack::Filter do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_cr))).call(res)
-        response_body(res) == @sjis + @au_emoji
+        response_body(res).should == @sjis + @au_emoji
       end
 
       it "docomo のUTF-8絵文字が変換されること" do
@@ -118,7 +128,7 @@ describe Jpmobile::Rack::Filter do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
-        response_body(res) == @sjis + @au_emoji
+        response_body(res).should == @sjis + @au_emoji
       end
 
       it "au のUTF-8絵文字が変換されること" do
@@ -127,7 +137,7 @@ describe Jpmobile::Rack::Filter do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
-        response_body(res) == @sjis + @au_emoji
+        response_body(res).should == @sjis + @au_emoji
       end
 
       it "softbank のUTF-8絵文字が変換されること" do
@@ -136,7 +146,7 @@ describe Jpmobile::Rack::Filter do
           "REQUEST_METHOD" => "GET",
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
-        response_body(res) == @sjis + @au_emoji
+        response_body(res).should == @sjis + @au_emoji
       end
     end
 
@@ -147,7 +157,7 @@ describe Jpmobile::Rack::Filter 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")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_cr))).call(res)
-        response_body(res) == @utf8 + @softbank_emoji
+        response_body(res).should == @utf8 + @softbank_emoji
       end
 
       it "docomo のUTF-8絵文字が変換されること" do
@@ -156,7 +166,7 @@ describe Jpmobile::Rack::Filter 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")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
-        response_body(res) == @utf8 + @softbank_emoji
+        response_body(res).should == @utf8 + @softbank_emoji
       end
 
       it "au のUTF-8絵文字が変換されること" do
@@ -165,7 +175,7 @@ describe Jpmobile::Rack::Filter 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")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
-        response_body(res) == @utf8 + @softbank_emoji
+        response_body(res).should == @utf8 + @softbank_emoji
       end
 
       it "softbank のUTF-8絵文字が変換されること" do
@@ -174,7 +184,7 @@ describe Jpmobile::Rack::Filter 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")
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
-        response_body(res) == @utf8 + @softbank_emoji
+        response_body(res).should == @utf8 + @softbank_emoji
       end
     end
   end

data/spec/unit/util_spec.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'stringio'
+require 'nkf'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe Jpmobile::Util, ".deep_apply" do
@@ -26,5 +27,8 @@ describe Jpmobile::Util, ".deep_apply" do
     string_io = StringIO.new('test')
     Jpmobile::Util.deep_apply(string_io) {|obj| obj }.should equal(string_io)
   end
-end
 
+  it "utf8_to_sjis で改行コードが CRLF に変更されること" do
+    Jpmobile::Util.utf8_to_sjis("UTF8\nTEXT\n").should == Jpmobile::Util.sjis("UTF8\r\nTEXT\r\n")
+  end
+end

data/test/rails/overrides/config/initializers/jpmobile_generator.rb

@@ -1 +1,2 @@
 Rails.application.config.jpmobile.mobile_filter
+Rails.application.config.jpmobile.form_accept_charset_conversion = true

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

@@ -131,12 +131,12 @@ describe TransSidAlwaysAndSessionOffController, "という trans_sid :always が
 end
 
 # NOTE: 3.0.0RC では accept-charset は UTF-8 で埋め込まれるので保留
-describe_mobile_with_ua "DoCoMo/2.0 SH902i(c100;TB;W24H12)", "UTF-8" do
+describe_mobile_with_ua "DoCoMo/2.0 SH902i(c100;TB;W24H12)", "Shift_JIS" do
   it_should_behave_like "trans_sid が起動するとき"
 end
 
 # NOTE: 3.0.0RC では accept-charset は UTF-8 で埋め込まれるので保留
-describe_mobile_with_ua "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0", "UTF-8" do
+describe_mobile_with_ua "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0", "Shift_JIS" do
   it_should_behave_like "trans_sid が起動しないとき"
 end
 

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - pre
-  - 2
-  version: 0.1.0.pre.2
+  - 3
+  version: 0.1.0.pre.3
 platform: ruby
 authors: 
 - Yoji Shidara