Define encode helper in module

sstephenson · May 17, 2012 · 3514c7b · 3514c7b
1 parent 653e40e
commit 3514c7b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/lib/execjs/module.rb b/lib/execjs/module.rb
@@ -34,5 +34,34 @@ def root
     def windows?
       @windows ||= RbConfig::CONFIG["host_os"] =~ /mswin|mingw/
     end
+
+    if defined? Encoding
+      if (!defined?(RUBY_ENGINE) || (RUBY_ENGINE != "jruby" && RUBY_ENGINE != "rbx"))
+        def encode(string)
+          string.encode('UTF-8')
+        end
+      else
+        # workaround for jruby bug http://jira.codehaus.org/browse/JRUBY-6588
+        # workaround for rbx bug https://github.com/rubinius/rubinius/issues/1729
+        def encode(string)
+          if string.encoding.name == 'ASCII-8BIT'
+            data = string.dup
+            data.force_encoding('utf-8')
+
+            unless data.valid_encoding?
+              raise Encoding::UndefinedConversionError, "Could not encode ASCII-8BIT data #{string.dump} as UTF-8"
+            end
+          else
+            data = string.encode('utf-8')
+          end
+          data
+        end
+      end
+    else
+      # Define no-op on 1.8
+      def encode(string)
+        string
+      end
+    end
   end
 end
diff --git a/lib/execjs/runtimes.rb b/lib/execjs/runtimes.rb
@@ -90,33 +90,4 @@ def self.runtimes
   def self.runtimes
     Runtimes.runtimes
   end
-
-  if defined? Encoding
-    if (!defined?(RUBY_ENGINE) || (RUBY_ENGINE != "jruby" && RUBY_ENGINE != "rbx"))
-      def self.encode(string)
-        string.encode('UTF-8')
-      end
-    else
-      # workaround for jruby bug http://jira.codehaus.org/browse/JRUBY-6588
-      # workaround for rbx bug https://github.com/rubinius/rubinius/issues/1729
-      def self.encode(string)
-        if string.encoding.name == 'ASCII-8BIT'
-          data = string.dup
-          data.force_encoding('utf-8')
-
-          unless data.valid_encoding?
-            raise Encoding::UndefinedConversionError, "Could not encode ASCII-8BIT data #{string.dump} as UTF-8"
-          end
-        else
-          data = string.encode('utf-8')
-        end
-        data
-      end
-    end
-  else
-    # Define no-op on 1.8
-    def self.encode(string)
-      string
-    end
-  end
 end