the CharDet module should not be included

jmhodges · Aug 22, 2008 · c6a152c · c6a152c
1 parent cdbfd0d
commit c6a152c
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/lib/rchardet.rb b/lib/rchardet.rb
@@ -14,6 +14,9 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301  USA
 ######################### END LICENSE BLOCK #########################
+
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
+
 require 'rchardet/charsetprober'
 require 'rchardet/mbcharsetprober'
 
@@ -51,11 +54,13 @@
 require 'rchardet/sjisprober'
 require 'rchardet/universaldetector'
 require 'rchardet/utf8prober'
-include CharDet
+
-def CharDet.detect(aBuf)
+module CharDet
-  u = UniversalDetector.new
+  def CharDet.detect(aBuf)
-  u.reset
+    u = UniversalDetector.new
-  u.feed(aBuf)
+    u.reset
-  u.close
+    u.feed(aBuf)
-  return u.result
+    u.close
-end
+    u.result
+  end
+end