From 14023c4e5a3241d06a8a021bab1183e4a9742b28 Mon Sep 17 00:00:00 2001
From: Saito <saitowu@gmail.com>
Date: Fri, 30 Dec 2011 21:41:39 +0800
Subject: [PATCH] remove charencode.

---
 app/helpers/application_helper.rb      |  1 -
 app/models/commit.rb                   |  7 +++----
 app/views/commits/_text_file.html.haml |  2 +-
 app/views/refs/_tree.html.haml         |  4 ++--
 lib/graph_commit.rb                    |  5 ++---
 lib/utils.rb                           | 16 +---------------
 6 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4b00c9ab7..99ef30aef 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,5 @@
 require 'digest/md5'
 module ApplicationHelper
-  include Utils::CharEncode
 
   def gravatar_icon(user_email, size = 40)
     gravatar_host = request.ssl? ? "https://secure.gravatar.com" :  "http://www.gravatar.com"
diff --git a/app/models/commit.rb b/app/models/commit.rb
index c97aec28c..33d3b202e 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -1,5 +1,4 @@
 class Commit
-  include Utils::CharEncode
 
   attr_accessor :commit
   attr_accessor :head
@@ -22,7 +21,7 @@ class Commit
   end
 
   def safe_message
-    encode(message)
+    message
   end
 
   def created_at
@@ -30,11 +29,11 @@ class Commit
   end
 
   def author_email
-    encode(author.email)
+    author.email
   end
 
   def author_name
-    encode(author.name)
+    author.name
   end
 
   def prev_commit
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index 22fe5582d..954722b1f 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -1,7 +1,7 @@
 %table
   - line_old = 0
   - line_new = 0
-  - diff_str = encode(diff.diff)
+  - diff_str = diff.diff
   - lines_arr = diff_str.lines.to_a
   - lines_arr.each do |line|
     - next if line.match(/^--- \/dev\/null/)
diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml
index 07bab2129..b7b3fd2ca 100644
--- a/app/views/refs/_tree.html.haml
+++ b/app/views/refs/_tree.html.haml
@@ -40,9 +40,9 @@
         %h3= content.name
         .readme
           - if content.name =~ /\.(md|markdown)$/i
-            = markdown(encode content.data)
+            = markdown(content.data)
           - else
-            = simple_format(encode content.data)
+            = simple_format(content.data)
 
 :javascript
   $(function(){
diff --git a/lib/graph_commit.rb b/lib/graph_commit.rb
index 1fcb9e78e..54550d99c 100644
--- a/lib/graph_commit.rb
+++ b/lib/graph_commit.rb
@@ -1,7 +1,6 @@
 require "grit"
 
 class GraphCommit
-  include Utils::CharEncode
   attr_accessor :time, :space
   attr_accessor :refs
 
@@ -97,13 +96,13 @@ class GraphCommit
     h[:parents] = self.parents.collect do |p|
       [p.id,0,0]
     end
-    h[:author]  = encode(author.name)
+    h[:author]  = author.name
     h[:time]    = time
     h[:space]   = space
     h[:refs]    = refs.collect{|r|r.name}.join(" ") unless refs.nil?
     h[:id]      = sha
     h[:date]    = date
-    h[:message] = encode(message)
+    h[:message] = message
     h[:login]   = author.email
     h
   end
diff --git a/lib/utils.rb b/lib/utils.rb
index 2de147614..677322c98 100644
--- a/lib/utils.rb
+++ b/lib/utils.rb
@@ -16,28 +16,14 @@ module Utils
     end
   end
 
-  module CharEncode
-    def encode(string)
-      return '' unless string
-      cd = CharDet.detect(string)
-      if cd.confidence > 0.6
-        string.force_encoding(cd.encoding)
-      end
-      string.encode("utf-8", :undef => :replace, :replace => "?", :invalid => :replace)
-    rescue
-      "Invalid Encoding"
-    end
-  end
-
   module Colorize
-    include CharEncode
     def colorize
       system_colorize(data, name)
     end
 
     def system_colorize(data, file_name)
       ft = handle_file_type(file_name)
-      Pygments.highlight(encode(data), :lexer => ft, :options => { :encoding => 'utf-8', :linenos => 'True' })
+      Pygments.highlight(data, :lexer => ft, :options => { :encoding => 'utf-8', :linenos => 'True' })
     end
 
     def handle_file_type(file_name, mime_type = nil)
-- 
2.11.0