Change charset with hankaku_filter :input => true jpmobilegh-26

komagata · Sep 13, 2011 · 3f2a0c5 · 3f2a0c5
1 parent 6485238
commit 3f2a0c5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/lib/jpmobile/filter.rb b/lib/jpmobile/filter.rb
@@ -40,6 +40,9 @@ def before(controller, options = {})
     # 内部コードから外部コードに変換
     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 @@ def to_external(str, options = {})
 
         doc = convert_text_content(doc)
 
-        doc.to_html.gsub("\xc2\xa0","&nbsp;")
+        html = doc.to_html.gsub("\xc2\xa0","&nbsp;")
+        html = html.gsub(/charset=[a-z0-9\-]+/i, "charset=#{options[:charset]}") if options[:charset]
+        html
       end
     end
 

diff --git a/test/rails/overrides/app/controllers/hankaku_input_filter_controller.rb b/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
diff --git a/test/rails/overrides/app/views/hankaku_input_filter/with_charset.html.erb b/test/rails/overrides/app/views/hankaku_input_filter/with_charset.html.erb
@@ -0,0 +1 @@
+<%= link_to 'リンク', '#' -%>
diff --git a/test/rails/overrides/app/views/layouts/with_charset.html.erb b/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>