Remove utf8 check tag

Signed-off-by: Shin-ichiro OGAWA <rust.stnard+git@gmail.com>
jpmobile · Sep 29, 2010 · 8cf9273 · 8cf9273
1 parent bd9ecd3
commit 8cf9273
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/lib/jpmobile/rack/filter.rb b/lib/jpmobile/rack/filter.rb
@@ -22,8 +22,8 @@ def call(env)
           end
 
           body = response_to_body(response)
-          body = body.sub(/<input name="utf8" type="hidden" value="#{[0x2713].pack("U")}"[^>]*?>/, ' ')
-          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)
 

diff --git a/spec/rack/jpmobile/filter_spec.rb b/spec/rack/jpmobile/filter_spec.rb
@@ -48,11 +48,29 @@
     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