escape_utils 0.1.6 → 0.1.7

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 0.1.5 (September 6th, 2010)
+## 0.1.7 (September 29th, 2010)
+* fix URI escaping to act according to the RFC
+* add specs for URL escaping
+
+## 0.1.6 (September 6th, 2010)
 * support for URI escaping added (thanks to @joshbuddy)
 * bugfix to ensure we don't drop opening tags during escape_javascript (thanks to @nagybence)
 

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/escape_utils.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{escape_utils}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez"]
-  s.date = %q{2010-09-06}
+  s.date = %q{2010-09-29}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
@@ -53,7 +53,9 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/uri/escape_spec.rb",
-     "spec/uri/unescape_spec.rb"
+     "spec/uri/unescape_spec.rb",
+     "spec/url/escape_spec.rb",
+     "spec/url/unescape_spec.rb"
   ]
   s.homepage = %q{http://github.com/brianmario/escape_utils}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -70,7 +72,9 @@ Gem::Specification.new do |s|
      "spec/query/unescape_spec.rb",
      "spec/spec_helper.rb",
      "spec/uri/escape_spec.rb",
-     "spec/uri/unescape_spec.rb"
+     "spec/uri/unescape_spec.rb",
+     "spec/url/escape_spec.rb",
+     "spec/url/unescape_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/ext/escape_utils.c

@@ -7,8 +7,8 @@ static rb_encoding *utf8Encoding;
 #define IS_HEX(c) (c >= 48 || c <= 57) && (c >= 65 || c <= 70) && (c >= 97 || c <= 102)
 #define NOT_HEX(c) (c < 48 || c > 57) && (c < 65 || c > 90) && (c < 97 || c > 122)
 #define UNHEX(c) (c >= '0' && c <= '9' ? c - '0' : c >= 'A' && c <= 'F' ? c - 'A' + 10 : c - 'a' + 10)
-#define URI_SAFE(c) (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= 38 && c <= 47) || c == 33 || c == 36 || c == 58 || c == 59 || c == 61 || c == 63 || c == 64 || c == 91 || c == 93 || c == 95 || c == 126
-//              \.:\/?\[\]\-_~\!\$&'\(\)\*\+,;=@
+#define URI_SAFE(c) (c >= '0' && c <= '9') || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= 38 && c <= 47) || c == 95 || c == 126
+//                  ALPHA / DIGIT / "-" / "." / "_" / "~"
 
 static size_t escape_html(unsigned char *out, const unsigned char *in, size_t in_len) {
   size_t total = 0;

data/lib/escape_utils.rb

@@ -4,7 +4,7 @@ require 'escape_utils_ext'
 
 EscapeUtils.send(:extend, EscapeUtils)
 module EscapeUtils
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 
   autoload :HtmlSafety, 'escape_utils/html_safety'
 end

data/spec/uri/escape_spec.rb

@@ -7,7 +7,7 @@ describe EscapeUtils, "escape_uri" do
   end
 
   it "should escape a basic url" do
-    EscapeUtils.escape_uri("http://www.homerun.com/").should eql("http://www.homerun.com/")
+    EscapeUtils.escape_uri("http://www.homerun.com/").should eql("http%3A//www.homerun.com/")
   end
 
   # NOTE: from Rack's test suite
@@ -23,7 +23,7 @@ describe EscapeUtils, "escape_uri" do
 
   # NOTE: from Rack's test suite
   it "should escape a string of mixed characters" do
-    EscapeUtils.escape_uri("q1!2\"'w$5&7/z8)?\\").should eql("q1!2%22'w$5&7/z8)?%5C")
+    EscapeUtils.escape_uri("q1!2\"'w$5&7/z8)?\\").should eql("q1%212%22'w%245&7/z8)%3F%5C")
   end
 
   # NOTE: from Rack's test suite

data/spec/url/escape_spec.rb

@@ -0,0 +1,52 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+
+describe EscapeUtils, "escape_url" do
+  it "should respond to escape_url" do
+    EscapeUtils.should respond_to(:escape_url)
+  end
+
+  it "should escape a basic url" do
+    EscapeUtils.escape_url("http://www.homerun.com/").should eql("http%3A%2F%2Fwww.homerun.com%2F")
+  end
+
+  # NOTE: from Rack's test suite
+  it "should escape a url containing tags" do
+    EscapeUtils.escape_url("fo<o>bar").should eql("fo%3Co%3Ebar")
+  end
+
+  # NOTE: from Rack's test suite
+  it "should escape a url with spaces" do
+    EscapeUtils.escape_url("a space").should eql("a+space")
+    EscapeUtils.escape_url("a   sp ace ").should eql("a+++sp+ace+")
+  end
+
+  # NOTE: from Rack's test suite
+  it "should escape a string of mixed characters" do
+    EscapeUtils.escape_url("q1!2\"'w$5&7/z8)?\\").should eql("q1%212%22%27w%245%267%2Fz8%29%3F%5C")
+  end
+
+  # 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
+    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
+    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 utf-8 if Encoding.default_internal is nil" do
+      Encoding.default_internal = nil
+      EscapeUtils.escape_url("http://www.homerun.com/").encoding.should eql(Encoding.find('utf-8'))
+    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)
+    end
+  end
+end

data/spec/url/unescape_spec.rb

@@ -0,0 +1,55 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+
+describe EscapeUtils, "unescape_uri" do
+  it "should respond to unescape_uri" do
+    EscapeUtils.should respond_to(:unescape_uri)
+  end
+
+  it "should unescape a basic url" do
+    EscapeUtils.unescape_uri("http%3A%2F%2Fwww.homerun.com%2F").should eql("http://www.homerun.com/")
+    EscapeUtils.unescape_uri("http://www.homerun.com/").should eql("http://www.homerun.com/")
+  end
+
+  # NOTE: from Rack's test suite
+  it "should unescape a url containing tags" do
+    EscapeUtils.unescape_uri("fo%3Co%3Ebar").should eql("fo<o>bar")
+  end
+
+  # NOTE: from Rack's test suite
+  it "should unescape a url with spaces" do
+    EscapeUtils.unescape_uri("a%20space").should eql("a space")
+    EscapeUtils.unescape_uri("a%20%20%20sp%20ace%20").should eql("a   sp ace ")
+    EscapeUtils.unescape_uri("a+space").should eql("a+space")
+  end
+
+  # NOTE: from Rack's test suite
+  it "should unescape a string of mixed characters" do
+    EscapeUtils.unescape_uri("q1%212%22%27w%245%267%2Fz8%29%3F%5C").should eql("q1!2\"'w$5&7/z8)?\\")
+    EscapeUtils.unescape_uri("q1!2%22'w$5&7/z8)?%5C").should eql("q1!2\"'w$5&7/z8)?\\")
+  end
+
+  # 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
+    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
+    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 utf-8 if Encoding.default_internal is nil" do
+      Encoding.default_internal = nil
+      EscapeUtils.unescape_uri("http%3A%2F%2Fwww.homerun.com%2F").encoding.should eql(Encoding.find('utf-8'))
+    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)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: escape_utils
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Brian Lopez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 -07:00
+date: 2010-09-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -66,6 +66,8 @@ files:
 - spec/spec_helper.rb
 - spec/uri/escape_spec.rb
 - spec/uri/unescape_spec.rb
+- spec/url/escape_spec.rb
+- spec/url/unescape_spec.rb
 has_rdoc: true
 homepage: http://github.com/brianmario/escape_utils
 licenses: []
@@ -112,3 +114,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/uri/escape_spec.rb
 - spec/uri/unescape_spec.rb
+- spec/url/escape_spec.rb
+- spec/url/unescape_spec.rb