jpmobile 0.1.2 → 0.1.3

data/Gemfile

@@ -0,0 +1,10 @@
+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'

data/README.rdoc

@@ -98,7 +98,6 @@
   end
 
   class MobileController < ApplicationController
-     mobile_filter
   end
 
 === 位置情報の取得
@@ -173,10 +172,14 @@ jpmobileを読み込むとDoCoMo、Au、SoftBankの絵文字を透過的に扱
 Rails のみ半角・全角の自動変換フィルターが用意されている。用いるには
 
  class MyController
-   mobile_filter :hankaku=>true
+   hankaku_filter
  end
 
-と指定する。
+と指定する。またtextareaやhidden/text/passwordのinputタグで半角に変換したくない場合は :input => true を指定する。
+
+ class MyController
+   hankaku_filter :input => true
+ end
 
 Jpmobile内では、各キャリアの絵文字はUnicode私的領域上にマッピングされ、管理される。
 このとき、DoCoMo、Auは公式サイト記載のマッピングが使用される。

data/VERSION.yml

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

data/lib/jpmobile/filter.rb

@@ -1,15 +1,19 @@
 # -*- coding: utf-8 -*-
-# = 文字コードフィルタ
+# = 半角変換フィルター
 # thanks to masuidrive <masuidrive (at) masuidrive.jp>
 
 class ActionController::Base #:nodoc:
+  def self.hankaku_filter(options={})
+    options = {:input => false}.update(options)
+
+    before_filter lambda {|controller| Jpmobile::HankakuFilter.before(controller, options)}
+    after_filter  lambda {|controller| Jpmobile::HankakuFilter.after(controller, options)}
+  end
+
   def self.mobile_filter(options={})
-    options = {:emoticon=>true, :hankaku=>false}.update(options)
+    STDERR.puts "Method mobile_filter is now deprecated. Use hankaku_filter instead for Hankaku-conversion."
 
-    if options[:hankaku]
-      before_filter lambda {|controller| Jpmobile::HankakuFilter.before(controller)}
-      after_filter  lambda {|controller| Jpmobile::HankakuFilter.after(controller)}
-    end
+    self.hankaku_filter(options)
   end
 end
 
@@ -26,28 +30,44 @@ module Jpmobile
         [nil, "text/html", "application/xhtml+xml"].include?(controller.response.content_type)
     end
 
-    def before(controller)
+    def before(controller, options = {})
       if apply_incoming?(controller)
         Util.deep_apply(controller.params) do |value|
-          value = to_internal(value)
+          value = to_internal(value, options)
         end
       end
     end
     # 内部コードから外部コードに変換
-    def after(controller)
+    def after(controller, options = {})
       if apply_outgoing?(controller) and controller.response.body.is_a?(String)
-        controller.response.body = to_external(controller.response.body)
+        controller.response.body = to_external(controller.response.body, options)
       end
     end
 
-    @@internal = %w(ガ ギ グ ゲ ゴ ザ ジ ズ ゼ ゾ ダ ヂ ヅ デ ド バ ビ ブ ベ ボ パ ピ プ ペ ポ ヴ ア イ ウ エ オ カ キ ク ケ コ サ シ ス セ ソ タ チ ツ テ ト ナ ニ ヌ ネ ノ ハ ヒ フ ヘ ホ マ ミ ム メ モ ヤ ユ ヨ ラ リ ル レ ロ ワ ヲ ン ャ ュ ョ ァ ィ ゥ ェ ォ ッ ゛ ゜ ー 。 「 」 、 ・).freeze
-    @@external = %w(ｶﾞ ｷﾞ ｸﾞ ｹﾞ ｺﾞ ｻﾞ ｼﾞ ｽﾞ ｾﾞ ｿﾞ ﾀﾞ ﾁﾞ ﾂﾞ ﾃﾞ ﾄﾞ ﾊﾞ ﾋﾞ ﾌﾞ ﾍﾞ ﾎﾞ ﾊﾟ ﾋﾟ ﾌﾟ ﾍﾟ ﾎﾟ ｳﾞ ｱ ｲ ｳ ｴ ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ﾃ ﾄ ﾅ ﾆ ﾇ ﾈ ﾉ ﾊ ﾋ ﾌ ﾍ ﾎ ﾏ ﾐ ﾑ ﾒ ﾓ ﾔ ﾕ ﾖ ﾗ ﾘ ﾙ ﾚ ﾛ ﾜ ｦ ﾝ ｬ ｭ ｮ ｧ ｨ ｩ ｪ ｫ ｯ ﾞ ﾟ ｰ ｡ ｢ ｣ ､ ･).freeze
-    def to_internal(str)
+    @@internal = %w(ガ ギ グ ゲ ゴ ザ ジ ズ ゼ ゾ ダ ヂ ヅ デ ド バ ビ ブ ベ ボ パ ピ プ ペ ポ ヴ ア イ ウ エ オ カ キ ク ケ コ サ シ ス セ ソ タ チ ツ テ ト ナ ニ ヌ ネ ノ ハ ヒ フ ヘ ホ マ ミ ム メ モ ヤ ユ ヨ ラ リ ル レ ロ ワ ヲ ン ャ ュ ョ ァ ィ ゥ ェ ォ ッ ゛ ゜ ー 。 「 」 、 ・ ！ ？).freeze
+    @@external = %w(ｶﾞ ｷﾞ ｸﾞ ｹﾞ ｺﾞ ｻﾞ ｼﾞ ｽﾞ ｾﾞ ｿﾞ ﾀﾞ ﾁﾞ ﾂﾞ ﾃﾞ ﾄﾞ ﾊﾞ ﾋﾞ ﾌﾞ ﾍﾞ ﾎﾞ ﾊﾟ ﾋﾟ ﾌﾟ ﾍﾟ ﾎﾟ ｳﾞ ｱ ｲ ｳ ｴ ｵ ｶ ｷ ｸ ｹ ｺ ｻ ｼ ｽ ｾ ｿ ﾀ ﾁ ﾂ ﾃ ﾄ ﾅ ﾆ ﾇ ﾈ ﾉ ﾊ ﾋ ﾌ ﾍ ﾎ ﾏ ﾐ ﾑ ﾒ ﾓ ﾔ ﾕ ﾖ ﾗ ﾘ ﾙ ﾚ ﾛ ﾜ ｦ ﾝ ｬ ｭ ｮ ｧ ｨ ｩ ｪ ｫ ｯ ﾞ ﾟ ｰ ｡ ｢ ｣ ､ ･ ! ?).freeze
+    def to_internal(str, options = {})
       filter(str, @@external, @@internal)
     end
-    def to_external(str)
-      filter(str, @@internal, @@external)
+    def to_external(str, options = {})
+      unless options[:input]
+        filter(str, @@internal, @@external)
+      else
+        encoding = (str =~ /^\s*<[^Hh>]*html/) and str.respond_to?(:encoding)
+        nokogiri_klass =
+          (str =~ /^\s*<[^Hh>]*html/) ? Nokogiri::HTML::Document : Nokogiri::HTML::DocumentFragment
+        doc = if encoding
+                nokogiri_klass.parse(str, nil, "UTF-8")
+              else
+                nokogiri_klass.parse(str)
+              end
+
+        doc = convert_text_content(doc)
+
+        doc.to_html
+      end
     end
+
     def filter(str, from, to)
       str = str.clone
 
@@ -69,5 +89,25 @@ module Jpmobile
 
       str
     end
+
+    # 再帰的に探す
+    def convert_text_content(document)
+      document.children.each do |element|
+        if element.kind_of?(Nokogiri::XML::Text)
+          unless element.parent.node_name == "textarea"
+            # textarea 以外のテキストなら content を変換
+            element.content = filter(element.content, @@internal, @@external)
+          end
+        elsif element.node_name == "input" and ["submit", "reset", "button"].include?(element["type"])
+          # テキスト以外でもボタンの value は変換
+          element["value"] = filter(element["value"], @@internal, @@external)
+        elsif element.children.any?
+          # 子要素があれば再帰的に変換
+          element = convert_text_content(element)
+        end
+      end
+
+      document
+    end
   end
 end

data/lib/jpmobile/rack/filter.rb

@@ -22,7 +22,8 @@ module Jpmobile
           end
 
           body = response_to_body(response)
-          body = body.sub('<input name="utf8" type="hidden" value="&#x2713;" />', ' ')
+          body = body.gsub(/<input name="utf8" type="hidden" value="#{[0x2713].pack("U")}"[^>]*?>/, ' ')
+          body = body.gsub(/<input name="utf8" type="hidden" value="&#x2713;"[^>]*?>/, ' ')
 
           response, charset = mobile.to_external(body, type, charset)
 

data/lib/jpmobile/trans_sid.rb

@@ -61,7 +61,7 @@ module ActionController
     alias_method_chain :redirect_to, :jpmobile
   end
 
-  class Base #:nodoc:
+  class Metal #:nodoc:
     class_inheritable_accessor :trans_sid_mode
 
     class << self
@@ -128,6 +128,6 @@ module Jpmobile::TransSid #:nodoc:
     return unless request # for test process
     return unless apply_trans_sid?
     return unless jpmobile_session_id
-    response.body.gsub!(%r{(</form>)}i, sid_hidden_field_tag+'\1')
+    response.body = response.body.gsub(%r{(</form>)}i, sid_hidden_field_tag+'\1')
   end
 end

data/lib/jpmobile/util.rb

@@ -79,6 +79,14 @@ module Jpmobile
       end
     end
 
+    def regexp_utf8_to_sjis(utf8_str)
+      if Object.const_defined?(:Encoding)
+        Regexp.compile(Regexp.escape(utf8_to_sjis(utf8_str)))
+      else
+        Regexp.compile(Regexp.escape(utf8_to_sjis(utf8_str),"s"),nil,'s')
+      end
+    end
+
     def hash_to_utf8(hash)
       new_hash = {}
       hash.each do |keu, value|

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.0.rc"]
+    rails_versions = args.versions.split("/") rescue ["3.0.2"]
 
     puts "Running tests in Rails #{rails_versions.join(', ')}"
 
@@ -53,7 +53,7 @@ namespace :test do
       # setup jpmobile
       plugin_path = File.join(rails_root, 'vendor', 'plugins', 'jpmobile')
       FileUtils.mkdir_p(plugin_path)
-      FileList["*"].exclude("test").each do |file|
+      FileList["*"].exclude("test").exclude("spec").each do |file|
         FileUtils.cp_r(file, plugin_path)
       end
 
@@ -98,7 +98,7 @@ END
       # ruby "-S bundle install"
       ruby "-S rake db:migrate test"
       ruby "-S rake spec"
-      # ruby "-S rspec -b --color spec/requests/trans_sid_spec.rb"
+      # 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の中では半角に変換されないこと'"
 
       cd relative_root
     end

data/spec/rack/jpmobile/au_spec.rb

@@ -50,8 +50,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "ver=1&datum=0&unit=0&lat=%2b43.05.08.95&lon=%2b141.20.25.99&alt=155&time=20060521010328&smaj=76&smin=62&vert=65&majaa=49&fm=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_close(43.08581944, 1e-7)
-      env['rack.jpmobile'].position.lon.should be_close(141.3405528, 1e-7)
+      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(43.08581944)
+      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(141.3405528)
     end
 
     it "緯度経度を取得できること(dgree_tokyo)" do
@@ -61,8 +61,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "ver=1&datum=1&unit=1&lat=%2b43.07475&lon=%2b141.34259&alt=8&time=20061017182825&smaj=113&smin=76&vert=72&majaa=108&fm=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_close(43.07719289, 1e-4)
-      env['rack.jpmobile'].position.lon.should be_close(141.3389013, 1e-4)
+      env['rack.jpmobile'].position.lat.should be_within(1e-4).of(43.07719289)
+      env['rack.jpmobile'].position.lon.should be_within(1e-4).of(141.3389013)
     end
 
     it "緯度経度を取得できること(dgree_tokyo)" do
@@ -72,8 +72,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "ver=1&datum=1&unit=1&lat=%2b43.07475&lon=%2b141.34259&alt=8&time=20061017182825&smaj=113&smin=76&vert=72&majaa=108&fm=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_close(43.07719289, 1e-4)
-      env['rack.jpmobile'].position.lon.should be_close(141.3389013, 1e-4)
+      env['rack.jpmobile'].position.lat.should be_within(1e-4).of(43.07719289)
+      env['rack.jpmobile'].position.lon.should be_within(1e-4).of(141.3389013)
     end
 
     it "緯度経度を取得できること(dms_tokyo)" do
@@ -83,8 +83,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_close(43.08194444, 1e-7)
-      env['rack.jpmobile'].position.lon.should be_close(141.3474306, 1e-7)
+      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(43.08194444)
+      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(141.3474306)
     end
 
     it "緯度経度を取得できること(antenna)" do
@@ -94,8 +94,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "QUERY_STRING" => "datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_close(43.08194444, 1e-7)
-      env['rack.jpmobile'].position.lon.should be_close(141.3474306, 1e-7)
+      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(43.08194444)
+      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(141.3474306)
     end
 
     it "GeoKit がある場合に取得できること" do

data/spec/rack/jpmobile/docomo_spec.rb

@@ -137,8 +137,8 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
 
       env['rack.jpmobile'].areacode.should == "00100"
 
-      env['rack.jpmobile'].position.lat.should be_close(35.00988889, 1e-7)
-      env['rack.jpmobile'].position.lon.should be_close(135.6932222, 1e-7)
+      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(35.00988889)
+      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(135.6932222)
     end
   end
 
@@ -150,8 +150,8 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "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['rack.jpmobile'].position.lat.should be_close(35.00988889, 1e-7)
-      env['rack.jpmobile'].position.lon.should be_close(135.6932222, 1e-7)
+      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(35.00988889)
+      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(135.6932222)
     end
 
     # DoCoMo, 903i, GPS
@@ -164,8 +164,8 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "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['rack.jpmobile'].position.lat.should be_close(35.00988889, 1e-7)
-      env['rack.jpmobile'].position.lon.should be_close(135.6932222, 1e-7)
+      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(35.00988889)
+      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(135.6932222)
     end
   end
 

data/spec/rack/jpmobile/filter_spec.rb

@@ -48,11 +48,29 @@ describe Jpmobile::Rack::Filter do
     end
 
     it "_snowman が出力されないこと" do
-      res = Rack::MockRequest.env_for(
+      req = 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="utf8" type="hidden" value="&#x2713;" />'))).call(res)
+      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 == " "
+
+      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 == " "
+    end
+
+    it "Nokogiri 経由の _snowman が出力されないこと" do
+      req = 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=\"utf8\" type=\"hidden\" value=\"#{[10003].pack("U")}\" />"))).call(req)
+      res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
+      response_body(res).should == " "
+
+      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 == " "
     end

data/spec/rack/jpmobile/softbank_spec.rb

@@ -57,8 +57,8 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         "QUERY_STRING" => "pos=N43.3.18.42E141.21.1.88&geo=wgs84&x-acr=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_close(43.05511667, 1e-7)
-      env['rack.jpmobile'].position.lon.should be_close(141.3505222, 1e-7)
+      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(43.05511667)
+      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(141.3505222)
       env['rack.jpmobile'].position.options['pos'].should   == "N43.3.18.42E141.21.1.88"
       env['rack.jpmobile'].position.options['geo'].should   == "wgs84"
       env['rack.jpmobile'].position.options['x-acr'].should == "1"

data/spec/rack/jpmobile/willcom_spec.rb

@@ -38,8 +38,8 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
         "QUERY_STRING" => "pos=N43.04.34.049E141.21.03.279")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_close(43.078568, 1e-4)
-      env['rack.jpmobile'].position.lon.should be_close(141.347223, 1e-4)
+      env['rack.jpmobile'].position.lat.should be_within(1e-4).of(43.078568)
+      env['rack.jpmobile'].position.lon.should be_within(1e-4).of(141.347223)
     end
   end
 

data/test/rails/overrides/Gemfile

@@ -0,0 +1,33 @@
+source 'http://rubygems.org'
+
+gem 'rails', '>= 3.0.0'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3-ruby', :require => 'sqlite3'
+
+gem 'geokit'
+gem 'hpricot'
+
+# Use unicorn as the web server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri', '1.4.1'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
+# Bundle gems for certain environments:
+group :development, :test do
+  gem "rspec", ">= 2.0.0"
+  gem "rspec-rails", ">= 2.0.0"
+  gem 'webrat'
+end

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

@@ -1,3 +1,3 @@
 class FilterController < FilterControllerBase
-  mobile_filter
+  # mobile_filter
 end

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

@@ -16,4 +16,10 @@ class FilterControllerBase < ApplicationController
   def rawdata
     send_data "アブラカダブラ", :type => 'application/octet-stream'
   end
+  def textarea
+    render :text => '<textarea hoge="fuu">アブラカダブラ</textarea>'
+  end
+  def input_tag
+    render :text => '<input hoge="fuu" value="アブラカダブラ" />'
+  end
 end

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

@@ -1,3 +1,3 @@
 class HankakuFilterController < FilterControllerBase
-  mobile_filter :hankaku => true
+  hankaku_filter
 end

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

@@ -0,0 +1,7 @@
+class HankakuInputFilterController < FilterControllerBase
+  hankaku_filter :input => true
+
+  def index_xhtml
+    render "index_xhtml", :layout => "xhtml"
+  end
+end

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

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+class TransSidMetalController < ActionController::Metal
+  include ActionController::RackDelegation
+  include ActionController::UrlFor
+  include ActionController::Redirecting
+  include Rails.application.routes.url_helpers
+
+  # 事前にセッションを作成しないと trans_sid が有効にならない
+  # before_filter :session_init
+  # trans_sid :always
+
+  def redirect
+    redirect_to('/')
+  end
+end

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

@@ -0,0 +1 @@
+ぼでぃ

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

@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/1.1) 1.0//EN" "i-xhtml_4ja_10.dtd">
+<?xml version='1.0' encoding='Shift_JIS' ?>
+<html xml:lang="ja" xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <meta content="width=device-width; initial-scale=1.0" name="viewport">
+    <meta content="application/xhtml+xml; charset=Shift_JIS" http-equiv="Content-Type">
+    <title>じぇいぴぃもばいる</title>
+  </head>
+  <body>
+    <%= yield -%>
+  </body>
+</html>

data/test/rails/overrides/config/routes.rb

@@ -1,4 +1,4 @@
-RailsRoot::Application.routes.draw do |map|
+RailsRoot::Application.routes.draw do
   resources :users
   namespace :admin do
     resources :users

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

@@ -3,6 +3,29 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "jpmobile integration spec" do
   include Jpmobile::Util
+
+  shared_examples_for "hankaku_filter :input => true のとき" do
+    it "はtextareaの中では半角に変換されないこと" do
+      get "/#{@controller}/textarea", {}, {"HTTP_USER_AGENT" => @user_agent}
+      body.should == send(@conversion_method, '<textarea hoge="fuu">アブラカダブラ</textarea>')
+    end
+    it "はinputのvalueの中では半角に変換されないこと" do
+      get "/#{@controller}/input_tag", {}, {"HTTP_USER_AGENT" => @user_agent}
+      body.should == send(@conversion_method, '<input hoge="fuu" value="アブラカダブラ">')
+    end
+  end
+
+  shared_examples_for "hankaku_filter :input => false のとき" do
+    it "はtextareaの中でも半角に変換されること" do
+      get "/#{@controller}/textarea", {}, {"HTTP_USER_AGENT" => @user_agent}
+      body.should == send(@conversion_method, '<textarea hoge="fuu">ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ</textarea>')
+    end
+    it "はinputのvalueの中も半角に変換されること" do
+      get "/#{@controller}/input_tag", {}, {"HTTP_USER_AGENT" => @user_agent}
+      body.should == send(@conversion_method, '<input hoge="fuu" value="ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ" />')
+    end
+  end
+
   shared_examples_for "文字コードフィルタが動作しているとき" do
     it "はhtml以外は変換しないこと" do
       get "/#{@controller}/rawdata", {}, {"HTTP_USER_AGENT" => @user_agent}
@@ -157,15 +180,42 @@ describe "jpmobile integration spec" do
     before do
       @user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
       @controller = "hankaku_filter"
+      @conversion_method = :utf8_to_sjis
     end
     it_should_behave_like "Shift_JISで通信する端末との通信(半角変換付き)"
+    it_should_behave_like "hankaku_filter :input => false のとき"
   end
 
   describe HankakuFilterController, "SoftBank 910T からのアクセス" do
     before do
       @user_agent = "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
       @controller = "hankaku_filter"
+      @conversion_method = :utf8
+    end
+    it_should_behave_like "UTF-8で通信する端末との通信(半角変換付き)"
+    it_should_behave_like "hankaku_filter :input => false のとき"
+  end
+
+  #
+  # 半角フィルタ(input付き)
+  #
+  describe HankakuInputFilterController, "DoCoMo SH902i からのアクセス" do
+    before do
+      @user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+      @controller = "hankaku_input_filter"
+      @conversion_method = :utf8_to_sjis
+    end
+    it_should_behave_like "Shift_JISで通信する端末との通信(半角変換付き)"
+    it_should_behave_like "hankaku_filter :input => true のとき"
+  end
+
+  describe HankakuInputFilterController, "SoftBank 910T からのアクセス" do
+    before do
+      @user_agent = "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+      @controller = "hankaku_input_filter"
+      @conversion_method = :utf8
     end
     it_should_behave_like "UTF-8で通信する端末との通信(半角変換付き)"
+    it_should_behave_like "hankaku_filter :input => true のとき"
   end
 end

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

@@ -49,6 +49,10 @@ describe "trans_sid functional" do
 
       res.response.body.should =~ /<a href=\"\/.+?\/link\?_session_id=[a-zA-Z0-9]{32}\">linkto<\/a>/
     end
+    it "で form内にhiddenが差し込まれる" do
+      res = get_with_session(@controller, "form", @user_agent)
+      res.response.body.should =~ /<input type=\"hidden\" name=\".+\" value=\"[a-zA-Z0-9]{32}\"/
+    end
     it "で form の自動書き換えが行われる" do
       res = get_with_session(@controller, "form", @user_agent)
 
@@ -140,6 +144,20 @@ describe "trans_sid functional" do
     it_should_behave_like "trans_sid が起動するとき"
   end
 
+  describe TransSidMetalController, "という ActionController::Metal のコントローラ" do
+    before(:each) do
+      @controller = "trans_sid_metal"
+      @user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+      @charset    = "UTF-8"
+    end
+
+    it "で redirect_to がエラーにならない" do
+      res = get_with_session(@controller, "redirect", @user_agent)
+
+      res.response.should be_redirect
+    end
+  end
+
   describe TransSidMobileController, "という trans_sid :mobile が指定されているコントローラ" do
     before(:each) do
       @controller = "trans_sid_mobile"

data/test/rails/overrides/spec/spec_helper.rb

@@ -26,6 +26,7 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.include Webrat::HaveTagMatcher
   config.include Jpmobile::Util
+  config.before(:each) { Webrat.configuration.mode = :rails }
 end
 
 require 'pp'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -15,13 +15,122 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +09:00
+date: 2010-11-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: geokit
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -34,11 +143,11 @@ dependencies:
         - 17
         version: 2.0.0.beta.17
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -51,11 +160,11 @@ dependencies:
         - 17
         version: 2.0.0.beta.17
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,7 +175,8 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id011
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
 executables: []
@@ -76,7 +186,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - .rspec
 - CHANGELOG
 - Gemfile
@@ -154,17 +263,22 @@ files:
 - test/rails/overrides/app/controllers/filter_controller.rb
 - test/rails/overrides/app/controllers/filter_controller_base.rb
 - test/rails/overrides/app/controllers/hankaku_filter_controller.rb
+- test/rails/overrides/app/controllers/hankaku_input_filter_controller.rb
 - test/rails/overrides/app/controllers/links_controller.rb
 - test/rails/overrides/app/controllers/mobile_spec_controller.rb
 - test/rails/overrides/app/controllers/template_path_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_always_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_base_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_metal_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_mobile_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_none_controller.rb
 - test/rails/overrides/app/models/user.rb
 - test/rails/overrides/app/views/filter/index.html.erb
 - 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/layouts/xhtml.html.erb
 - test/rails/overrides/app/views/links/au_gps.html.erb
 - test/rails/overrides/app/views/links/au_location.html.erb
 - test/rails/overrides/app/views/links/docomo_foma_gps.html.erb
@@ -217,8 +331,8 @@ homepage: http://github.com/jpmobile/jpmobile
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -245,57 +359,59 @@ signing_key:
 specification_version: 3
 summary: A Rails plugin for Japanese mobile-phones
 test_files: 
-- spec/rack/jpmobile/emoticon_spec.rb
+- spec/rack/jpmobile/android_spec.rb
 - spec/rack/jpmobile/au_spec.rb
-- spec/rack/jpmobile/willcom_spec.rb
-- spec/rack/jpmobile/params_filter_spec.rb
 - spec/rack/jpmobile/docomo_spec.rb
+- spec/rack/jpmobile/emoticon_spec.rb
 - spec/rack/jpmobile/filter_spec.rb
-- spec/rack/jpmobile/windows_phone.rb
-- spec/rack/jpmobile/mobile_by_ua_spec.rb
 - spec/rack/jpmobile/iphone_spec.rb
+- spec/rack/jpmobile/mobile_by_ua_spec.rb
+- spec/rack/jpmobile/params_filter_spec.rb
 - spec/rack/jpmobile/softbank_spec.rb
-- spec/rack/jpmobile/android_spec.rb
+- spec/rack/jpmobile/willcom_spec.rb
+- spec/rack/jpmobile/windows_phone.rb
+- spec/rack_helper.rb
+- spec/spec_helper.rb
 - spec/unit/detect_by_email_spec.rb
+- spec/unit/is_carrier_spec.rb
 - spec/unit/spec_helper.rb
-- spec/unit/valid_ip_spec.rb
 - spec/unit/util_spec.rb
-- spec/unit/is_carrier_spec.rb
-- spec/spec_helper.rb
-- spec/rack_helper.rb
+- spec/unit/valid_ip_spec.rb
 - test/legacy/emoticon_test.rb
 - test/legacy/helper.rb
-- test/sinatra/guestbook.rb
-- test/sinatra/test/filter_test.rb
-- test/rails/overrides/spec/helpers/helpers_spec.rb
-- test/rails/overrides/spec/requests/softbank_emulator_spec.rb
-- test/rails/overrides/spec/requests/docomo_spec.rb
-- test/rails/overrides/spec/requests/helpers_spec.rb
-- test/rails/overrides/spec/requests/docomo_guid_spec.rb
-- test/rails/overrides/spec/requests/trans_sid_spec.rb
-- test/rails/overrides/spec/requests/template_path_spec.rb
-- test/rails/overrides/spec/requests/filter_spec.rb
-- test/rails/overrides/spec/requests/pc_spec.rb
-- test/rails/overrides/spec/requests/emobile_spec.rb
-- test/rails/overrides/spec/spec_helper.rb
-- test/rails/overrides/autotest/discover.rb
-- test/rails/overrides/app/models/user.rb
-- test/rails/overrides/app/controllers/trans_sid_always_controller.rb
-- test/rails/overrides/app/controllers/hankaku_filter_controller.rb
-- test/rails/overrides/app/controllers/filter_controller_base.rb
-- test/rails/overrides/app/controllers/links_controller.rb
-- test/rails/overrides/app/controllers/trans_sid_base_controller.rb
-- test/rails/overrides/app/controllers/trans_sid_none_controller.rb
-- test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb
-- test/rails/overrides/app/controllers/template_path_controller.rb
+- test/rails/overrides/app/controllers/application_controller.rb
+- test/rails/overrides/app/controllers/docomo_guid_always_controller.rb
+- test/rails/overrides/app/controllers/docomo_guid_base_controller.rb
 - test/rails/overrides/app/controllers/docomo_guid_docomo_controller.rb
 - test/rails/overrides/app/controllers/filter_controller.rb
+- test/rails/overrides/app/controllers/filter_controller_base.rb
+- test/rails/overrides/app/controllers/hankaku_filter_controller.rb
+- test/rails/overrides/app/controllers/hankaku_input_filter_controller.rb
+- test/rails/overrides/app/controllers/links_controller.rb
 - test/rails/overrides/app/controllers/mobile_spec_controller.rb
+- test/rails/overrides/app/controllers/template_path_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_always_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_base_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_metal_controller.rb
 - test/rails/overrides/app/controllers/trans_sid_mobile_controller.rb
-- test/rails/overrides/app/controllers/application_controller.rb
-- test/rails/overrides/app/controllers/docomo_guid_always_controller.rb
-- test/rails/overrides/app/controllers/docomo_guid_base_controller.rb
-- test/rails/overrides/db/migrate/20100824062306_create_users.rb
-- test/rails/overrides/db/migrate/001_add_sessions_table.rb
-- test/rails/overrides/config/routes.rb
+- test/rails/overrides/app/controllers/trans_sid_none_controller.rb
+- test/rails/overrides/app/models/user.rb
+- test/rails/overrides/autotest/discover.rb
 - test/rails/overrides/config/initializers/jpmobile_generator.rb
+- test/rails/overrides/config/routes.rb
+- test/rails/overrides/db/migrate/001_add_sessions_table.rb
+- test/rails/overrides/db/migrate/20100824062306_create_users.rb
+- test/rails/overrides/spec/helpers/helpers_spec.rb
+- test/rails/overrides/spec/requests/docomo_guid_spec.rb
+- test/rails/overrides/spec/requests/docomo_spec.rb
+- test/rails/overrides/spec/requests/emobile_spec.rb
+- test/rails/overrides/spec/requests/filter_spec.rb
+- test/rails/overrides/spec/requests/helpers_spec.rb
+- test/rails/overrides/spec/requests/pc_spec.rb
+- test/rails/overrides/spec/requests/softbank_emulator_spec.rb
+- 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/guestbook.rb
+- test/sinatra/test/filter_test.rb

data/.gitignore

@@ -1,7 +0,0 @@
-doc
-tmp
-pkg
-.bundle
-Gemfile
-Gemfile.lock
-vendor