escape_utils 0.2.2 → 0.2.3

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.2.3 (March 9th, 2011)
+* change encoding strategy to simply return strings in the encoding the input string was in, not taking into account Encoding.default_internal
+
 ## 0.2.2 (February 25th, 2011)
 * minor fix for Rubinius compatibility
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Brian Lopez - http://github.com/brianmario
+Copyright (c) 2010-2011 Brian Lopez - http://github.com/brianmario
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/ext/escape_utils/escape_utils.c

@@ -303,10 +303,6 @@ static VALUE rb_escape_html(int argc, VALUE * argv, VALUE self) {
   VALUE str, rb_secure;
   int secure = html_secure;
   VALUE rb_output_buf;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc;
-  rb_encoding *original_encoding;
-#endif
   unsigned char *inBuf, *outBuf;
   size_t len, new_len;
 
@@ -318,10 +314,6 @@ static VALUE rb_escape_html(int argc, VALUE * argv, VALUE self) {
 
   Check_Type(str, T_STRING);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  default_internal_enc = rb_default_internal_encoding();
-  original_encoding = rb_enc_get(str);
-#endif
   inBuf = (unsigned char*)RSTRING_PTR(str);
   len = RSTRING_LEN(str);
 
@@ -340,28 +332,17 @@ static VALUE rb_escape_html(int argc, VALUE * argv, VALUE self) {
   rb_str_resize(rb_output_buf, new_len);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(rb_output_buf, original_encoding);
-  if (default_internal_enc) {
-    rb_output_buf = rb_str_export_to_enc(rb_output_buf, default_internal_enc);
-  }
+  rb_enc_copy(rb_output_buf, str);
 #endif
   return rb_output_buf;
 }
 
 static VALUE rb_unescape_html(VALUE self, VALUE str) {
   VALUE rb_output_buf;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc;
-  rb_encoding *original_encoding;
-#endif
   unsigned char *inBuf, *outBuf;
   size_t len, new_len;
 
   Check_Type(str, T_STRING);
-#ifdef HAVE_RUBY_ENCODING_H
-  default_internal_enc = rb_default_internal_encoding();
-  original_encoding = rb_enc_get(str);
-#endif
   inBuf = (unsigned char*)RSTRING_PTR(str);
   len = RSTRING_LEN(str);
 
@@ -380,20 +361,13 @@ static VALUE rb_unescape_html(VALUE self, VALUE str) {
   rb_str_resize(rb_output_buf, new_len);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(rb_output_buf, original_encoding);
-  if (default_internal_enc) {
-    rb_output_buf = rb_str_export_to_enc(rb_output_buf, default_internal_enc);
-  }
+  rb_enc_copy(rb_output_buf, str);
 #endif
   return rb_output_buf;
 }
 
 static VALUE rb_escape_javascript(VALUE self, VALUE str) {
   VALUE rb_output_buf;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc;
-  rb_encoding *original_encoding;
-#endif
   unsigned char *inBuf, *outBuf;
   size_t len, new_len;
 
@@ -403,10 +377,6 @@ static VALUE rb_escape_javascript(VALUE self, VALUE str) {
 
   Check_Type(str, T_STRING);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  default_internal_enc = rb_default_internal_encoding();
-  original_encoding = rb_enc_get(str);
-#endif
   inBuf = (unsigned char*)RSTRING_PTR(str);
   len = RSTRING_LEN(str);
 
@@ -425,20 +395,13 @@ static VALUE rb_escape_javascript(VALUE self, VALUE str) {
   rb_str_resize(rb_output_buf, new_len);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(rb_output_buf, original_encoding);
-  if (default_internal_enc) {
-    rb_output_buf = rb_str_export_to_enc(rb_output_buf, default_internal_enc);
-  }
+  rb_enc_copy(rb_output_buf, str);
 #endif
   return rb_output_buf;
 }
 
 static VALUE rb_unescape_javascript(VALUE self, VALUE str) {
   VALUE rb_output_buf;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc;
-  rb_encoding *original_encoding;
-#endif
   unsigned char *inBuf, *outBuf;
   size_t len, new_len;
 
@@ -448,10 +411,6 @@ static VALUE rb_unescape_javascript(VALUE self, VALUE str) {
 
   Check_Type(str, T_STRING);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  default_internal_enc = rb_default_internal_encoding();
-  original_encoding = rb_enc_get(str);
-#endif
   inBuf = (unsigned char*)RSTRING_PTR(str);
   len = RSTRING_LEN(str);
 
@@ -470,29 +429,18 @@ static VALUE rb_unescape_javascript(VALUE self, VALUE str) {
   rb_str_resize(rb_output_buf, new_len);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(rb_output_buf, original_encoding);
-  if (default_internal_enc) {
-    rb_output_buf = rb_str_export_to_enc(rb_output_buf, default_internal_enc);
-  }
+  rb_enc_copy(rb_output_buf, str);
 #endif
   return rb_output_buf;
 }
 
 static VALUE rb_escape_url(VALUE self, VALUE str) {
   VALUE rb_output_buf;
-  #ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding *default_internal_enc;
-    rb_encoding *original_encoding;
-  #endif
   unsigned char *inBuf, *outBuf;
   size_t len, new_len;
 
   Check_Type(str, T_STRING);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  default_internal_enc = rb_default_internal_encoding();
-  original_encoding = rb_enc_get(str);
-#endif
   inBuf = (unsigned char*)RSTRING_PTR(str);
   len = RSTRING_LEN(str);
 
@@ -511,10 +459,7 @@ static VALUE rb_escape_url(VALUE self, VALUE str) {
   rb_str_resize(rb_output_buf, new_len);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(rb_output_buf, original_encoding);
-  if (default_internal_enc) {
-    rb_output_buf = rb_str_export_to_enc(rb_output_buf, default_internal_enc);
-  }
+  rb_enc_copy(rb_output_buf, str);
 #endif
   return rb_output_buf;
 }
@@ -523,10 +468,6 @@ static VALUE rb_unescape_url(VALUE self, VALUE str) {
   Check_Type(str, T_STRING);
 
   VALUE rb_output_buf;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc = rb_default_internal_encoding();
-  rb_encoding *original_encoding = rb_enc_get(str);
-#endif
   unsigned char *inBuf = (unsigned char*)RSTRING_PTR(str);
   size_t len = RSTRING_LEN(str);
 
@@ -546,10 +487,7 @@ static VALUE rb_unescape_url(VALUE self, VALUE str) {
   rb_str_resize(rb_output_buf, new_len);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(rb_output_buf, original_encoding);
-  if (default_internal_enc) {
-    rb_output_buf = rb_str_export_to_enc(rb_output_buf, default_internal_enc);
-  }
+  rb_enc_copy(rb_output_buf, str);
 #endif
   return rb_output_buf;
 }
@@ -558,10 +496,6 @@ static VALUE rb_escape_uri(VALUE self, VALUE str) {
   Check_Type(str, T_STRING);
 
   VALUE rb_output_buf;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc = rb_default_internal_encoding();
-  rb_encoding *original_encoding = rb_enc_get(str);
-#endif
   unsigned char *inBuf = (unsigned char*)RSTRING_PTR(str);
   size_t len = RSTRING_LEN(str);
   unsigned char *outBuf;
@@ -581,10 +515,7 @@ static VALUE rb_escape_uri(VALUE self, VALUE str) {
   rb_str_resize(rb_output_buf, new_len);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(rb_output_buf, original_encoding);
-  if (default_internal_enc) {
-    rb_output_buf = rb_str_export_to_enc(rb_output_buf, default_internal_enc);
-  }
+  rb_enc_copy(rb_output_buf, str);
 #endif
   return rb_output_buf;
 }
@@ -593,10 +524,6 @@ static VALUE rb_unescape_uri(VALUE self, VALUE str) {
   Check_Type(str, T_STRING);
 
   VALUE rb_output_buf;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc = rb_default_internal_encoding();
-  rb_encoding *original_encoding = rb_enc_get(str);
-#endif
   unsigned char *inBuf = (unsigned char*)RSTRING_PTR(str);
   size_t len = RSTRING_LEN(str);
   unsigned char *outBuf;
@@ -616,10 +543,7 @@ static VALUE rb_unescape_uri(VALUE self, VALUE str) {
   rb_str_resize(rb_output_buf, new_len);
 
 #ifdef HAVE_RUBY_ENCODING_H
-  rb_enc_associate(rb_output_buf, original_encoding);
-  if (default_internal_enc) {
-    rb_output_buf = rb_str_export_to_enc(rb_output_buf, default_internal_enc);
-  }
+  rb_enc_copy(rb_output_buf, str);
 #endif
   return rb_output_buf;
 }

data/lib/escape_utils/version.rb

@@ -1,3 +1,3 @@
 module EscapeUtils
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/html/escape_spec.rb

@@ -33,18 +33,11 @@ describe EscapeUtils, "escape_html" do
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = "<b>Bourbon & Branch</b>"
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "<b>Bourbon & Branch</b>".encode('us-ascii')
       EscapeUtils.escape_html(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.escape_html("<b>Bourbon & Branch</b>").encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.escape_html("<b>Bourbon & Branch</b>").encoding.should eql(Encoding.default_internal)
+      str = "<b>Bourbon & Branch</b>".encode('utf-8')
+      EscapeUtils.escape_html(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/html/unescape_spec.rb

@@ -28,18 +28,11 @@ describe EscapeUtils, "unescape_html" do
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = "<b>Bourbon & Branch</b>"
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "<b>Bourbon & Branch</b>".encode('us-ascii')
       EscapeUtils.unescape_html(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.unescape_html("<b>Bourbon & Branch</b>").encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.unescape_html("<b>Bourbon & Branch</b>").encoding.should eql(Encoding.default_internal)
+      str = "<b>Bourbon & Branch</b>".encode('utf-8')
+      EscapeUtils.unescape_html(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/javascript/escape_spec.rb

@@ -24,18 +24,11 @@ describe EscapeUtils, "escape_javascript" do
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = %(dont </close> tags)
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "dont </close> tags".encode('us-ascii')
       EscapeUtils.escape_javascript(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.escape_javascript(%(dont </close> tags)).encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.escape_javascript(%(dont </close> tags)).encoding.should eql(Encoding.default_internal)
+      str = "dont </close> tags".encode('utf-8')
+      EscapeUtils.escape_javascript(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/javascript/unescape_spec.rb

@@ -28,18 +28,11 @@ describe EscapeUtils, "unescape_javascript" do
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = %(dont <\\/close> tags)
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "dont <\\/close> tags".encode('us-ascii')
       EscapeUtils.unescape_javascript(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.unescape_javascript(%(dont <\\/close> tags)).encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.unescape_javascript(%(dont <\\/close> tags)).encoding.should eql(Encoding.default_internal)
+      str = "dont <\\/close> tags".encode('utf-8')
+      EscapeUtils.unescape_javascript(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/query/escape_spec.rb

@@ -28,27 +28,18 @@ describe EscapeUtils, "escape_url" do
 
   # NOTE: from Rack's test suite
   it "should escape correctly for multibyte characters" do
-    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsumoto
-    matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8" # Matsumoto
     EscapeUtils.escape_url(matz_name).should eql('%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8')
-    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsu moto
-    matz_name_sep.force_encoding("UTF-8") if matz_name_sep.respond_to? :force_encoding
+    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8" # Matsu moto
     EscapeUtils.escape_url(matz_name_sep).should eql('%E3%81%BE%E3%81%A4+%E3%82%82%E3%81%A8')
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = "http://www.homerun.com/"
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "http://www.homerun.com/".encode('us-ascii')
       EscapeUtils.escape_url(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.escape_url("http://www.homerun.com/").encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.escape_url("http://www.homerun.com/").encoding.should eql(Encoding.default_internal)
+      str = "http://www.homerun.com/".encode('utf-8')
+      EscapeUtils.escape_url(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/query/unescape_spec.rb

@@ -28,27 +28,18 @@ describe EscapeUtils, "unescape_url" do
 
   # NOTE: from Rack's test suite
   it "should unescape correctly for multibyte characters" do
-    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsumoto
-    matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8" # Matsumoto
     EscapeUtils.unescape_url('%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8').should eql(matz_name)
-    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsu moto
-    matz_name_sep.force_encoding("UTF-8") if matz_name_sep.respond_to? :force_encoding
+    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8" # Matsu moto
     EscapeUtils.unescape_url('%E3%81%BE%E3%81%A4+%E3%82%82%E3%81%A8').should eql(matz_name_sep)
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = "http%3A%2F%2Fwww.homerun.com%2F"
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "http%3A%2F%2Fwww.homerun.com%2F".encode('us-ascii')
       EscapeUtils.unescape_url(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.unescape_url("http%3A%2F%2Fwww.homerun.com%2F").encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.unescape_url("http%3A%2F%2Fwww.homerun.com%2F").encoding.should eql(Encoding.default_internal)
+      str = "http%3A%2F%2Fwww.homerun.com%2F".encode('utf-8')
+      EscapeUtils.unescape_url(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/uri/escape_spec.rb

@@ -27,27 +27,18 @@ describe EscapeUtils, "escape_uri" do
 
   # NOTE: from Rack's test suite
   it "should escape correctly for multibyte characters" do
-    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsumoto
-    matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8" # Matsumoto
     EscapeUtils.escape_uri(matz_name).should eql('%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8')
-    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsu moto
-    matz_name_sep.force_encoding("UTF-8") if matz_name_sep.respond_to? :force_encoding
+    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8" # Matsu moto
     EscapeUtils.escape_uri(matz_name_sep).should eql('%E3%81%BE%E3%81%A4%20%E3%82%82%E3%81%A8')
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = "http://www.homerun.com/"
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "http://www.homerun.com/".encode('us-ascii')
       EscapeUtils.escape_uri(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.escape_uri("http://www.homerun.com/").encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.escape_uri("http://www.homerun.com/").encoding.should eql(Encoding.default_internal)
+      str = "http://www.homerun.com/".encode('utf-8')
+      EscapeUtils.escape_uri(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/uri/unescape_spec.rb

@@ -39,27 +39,18 @@ describe EscapeUtils, "unescape_uri" do
 
   # NOTE: from Rack's test suite
   it "should unescape correctly for multibyte characters" do
-    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsumoto
-    matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8" # Matsumoto
     EscapeUtils.unescape_uri('%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8').should eql(matz_name)
-    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsu moto
-    matz_name_sep.force_encoding("UTF-8") if matz_name_sep.respond_to? :force_encoding
+    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8" # Matsu moto
     EscapeUtils.unescape_uri('%E3%81%BE%E3%81%A4%20%E3%82%82%E3%81%A8').should eql(matz_name_sep)
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = "http%3A%2F%2Fwww.homerun.com%2F"
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "http%3A%2F%2Fwww.homerun.com%2F".encode('us-ascii')
       EscapeUtils.unescape_uri(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.unescape_uri("http%3A%2F%2Fwww.homerun.com%2F").encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.unescape_uri("http%3A%2F%2Fwww.homerun.com%2F").encoding.should eql(Encoding.default_internal)
+      str = "http%3A%2F%2Fwww.homerun.com%2F".encode('utf-8')
+      EscapeUtils.unescape_uri(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/url/escape_spec.rb

@@ -36,27 +36,18 @@ describe EscapeUtils, "escape_url" do
 
   # NOTE: from Rack's test suite
   it "should escape correctly for multibyte characters" do
-    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsumoto
-    matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8" # Matsumoto
     EscapeUtils.escape_url(matz_name).should eql('%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8')
-    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsu moto
-    matz_name_sep.force_encoding("UTF-8") if matz_name_sep.respond_to? :force_encoding
+    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8" # Matsu moto
     EscapeUtils.escape_url(matz_name_sep).should eql('%E3%81%BE%E3%81%A4+%E3%82%82%E3%81%A8')
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = "http://www.homerun.com/"
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "http://www.homerun.com/".encode('us-ascii')
       EscapeUtils.escape_url(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.escape_url("http://www.homerun.com/").encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.escape_url("http://www.homerun.com/").encoding.should eql(Encoding.default_internal)
+      str = "http://www.homerun.com/".encode('utf-8')
+      EscapeUtils.escape_url(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

data/spec/url/unescape_spec.rb

@@ -39,27 +39,18 @@ describe EscapeUtils, "unescape_url" do
 
   # NOTE: from Rack's test suite
   it "should unescape correctly for multibyte characters" do
-    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsumoto
-    matz_name.force_encoding("UTF-8") if matz_name.respond_to? :force_encoding
+    matz_name = "\xE3\x81\xBE\xE3\x81\xA4\xE3\x82\x82\xE3\x81\xA8" # Matsumoto
     EscapeUtils.unescape_url('%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8').should eql(matz_name)
-    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8".unpack("a*")[0] # Matsu moto
-    matz_name_sep.force_encoding("UTF-8") if matz_name_sep.respond_to? :force_encoding
+    matz_name_sep = "\xE3\x81\xBE\xE3\x81\xA4 \xE3\x82\x82\xE3\x81\xA8" # Matsu moto
     EscapeUtils.unescape_url('%E3%81%BE%E3%81%A4%20%E3%82%82%E3%81%A8').should eql(matz_name_sep)
   end
 
   if RUBY_VERSION =~ /^1.9/
-    it "should default to the original string's encoding if Encoding.default_internal is nil" do
-      Encoding.default_internal = nil
-      str = "http%3A%2F%2Fwww.homerun.com%2F"
-      str = str.encode('us-ascii')
+    it "return value should be in original string's encoding" do
+      str = "http%3A%2F%2Fwww.homerun.com%2F".encode('us-ascii')
       EscapeUtils.unescape_url(str).encoding.should eql(Encoding.find('us-ascii'))
-    end
-
-    it "should use Encoding.default_internal" do
-      Encoding.default_internal = Encoding.find('utf-8')
-      EscapeUtils.unescape_url("http%3A%2F%2Fwww.homerun.com%2F").encoding.should eql(Encoding.default_internal)
-      Encoding.default_internal = Encoding.find('us-ascii')
-      EscapeUtils.unescape_url("http%3A%2F%2Fwww.homerun.com%2F").encoding.should eql(Encoding.default_internal)
+      str = "http%3A%2F%2Fwww.homerun.com%2F".encode('utf-8')
+      EscapeUtils.unescape_url(str).encoding.should eql(Encoding.find('utf-8'))
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: escape_utils
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Brian Lopez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Faster string escaping routines for your web apps