Dependencies now work correctly. Added specs.

hannesg · Nov 27, 2011 · 7ff7a20 · 7ff7a20
1 parent b5d9ce6
commit 7ff7a20
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 27 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,4 +2,5 @@
 source "http://rubygems.org"
 gemspec
 
-gem 'escape_utils', :group=>:development, :platforms => [:ruby_19]
+gem 'escape_utils', :group=>:development, :platforms => [:mri_19]
+gem 'simplecov', :group=>:development, :platforms => [:mri_19]
diff --git a/lib/uri_template/utils.rb b/lib/uri_template/utils.rb
@@ -79,11 +79,8 @@ module StringEncoding
       # @param String
       # @return String
       # @visibility public
-      def to_ascii_force_encoding(str)
-        if str.frozen?
-          return str.encode(Encoding::ASCII)
-        end
-        str.force_encoding(Encoding::ASCII)
+      def to_ascii_encode(str)
+        str.encode(Encoding::ASCII)
       end
 
       # @method to_utf8(string)
@@ -93,17 +90,6 @@ def to_ascii_force_encoding(str)
       # @param String
       # @return String
       # @visibility public
-      def to_utf8_force_encoding(str)
-        if str.frozen?
-          return str.encode(Encoding::UTF_8)
-        end
-        str.force_encoding(Encoding::UTF_8)
-      end
-
-      def to_ascii_encode(str)
-        str.encode(Encoding::ASCII)
-      end
-
       def to_utf8_encode(str)
         str.encode(Encoding::UTF_8)
       end
@@ -116,12 +102,7 @@ def to_utf8_fallback(str)
         str
       end
 
-      if "".respond_to?(:force_encoding)
-        # @private
-        alias_method :to_ascii, :to_ascii_force_encoding
-        # @private
-        alias_method :to_utf8, :to_utf8_force_encoding
-      elsif "".respond_to?(:encode)
+      if "".respond_to?(:encode)
         # @private
         alias_method :to_ascii, :to_ascii_encode
         # @private
@@ -156,15 +137,15 @@ module Pure
         PCT = /%(\h\h)/.freeze
 
         def escape_url(s)
-          to_ascii( s.to_s.gsub(URL_ESCAPED){
+          to_utf8(s.to_s).gsub(URL_ESCAPED){
             '%'+$1.unpack('H2'*$1.bytesize).join('%').upcase
-          } )
+          }
         end
 
         def escape_uri(s)
-          to_ascii( s.to_s.gsub(URI_ESCAPED){
+          to_utf8(s.to_s).gsub(URI_ESCAPED){
             '%'+$1.unpack('H2'*$1.bytesize).join('%').upcase
-          } )
+          }
         end
 
         def unescape_url(s)

diff --git a/spec/uri_template_spec.rb b/spec/uri_template_spec.rb
@@ -185,6 +185,54 @@ class << obj
 
     end
 
+    describe "escape utils", :if => URITemplate::Utils.using_escape_utils? do
+
+      if URITemplate::Utils.using_escape_utils?
+
+        pure = Object.new
+        pure.extend(URITemplate::Utils::Escaping::Pure)
+        escape_utils = Object.new
+        escape_utils.extend(URITemplate::Utils::Escaping::EscapeUtils)
+
+        [
+          "",
+          "a",
+          " ",
+          "%%%",
+          "a".encode('ISO-8859-1'),
+          "öüä".encode('ISO-8859-1'),
+          "+",
+          "öäü"
+        ].each do |str|
+          it "should correctly escape #{str.inspect} ( encoding: #{str.encoding} )" do
+            escape_utils.escape_uri(str).should == pure.escape_uri(str)
+            escape_utils.escape_url(str).should == pure.escape_url(str)
+          end
+        end
+
+        [
+          "",
+          "a",
+          " ",
+          "a".encode('ISO-8859-1'),
+          "+",
+          "%20%30%40",
+          # errors:
+          "%",
+          "%%%",
+          "%gh",
+          "%a"
+        ].each do |str|
+          it "should correctly unescape #{str.inspect} ( encoding: #{str.encoding} )" do
+            escape_utils.unescape_uri(str).should == pure.unescape_uri(str)
+            escape_utils.unescape_url(str).should == pure.unescape_url(str)
+          end
+        end
+
+      end
+
+    end
+
   end
 
 end