addressable 2.0.1 → 2.0.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== Addressable 2.0.2
+  * fixed issue with URI template expansion
+  * fixed issue with percent escaping characters 0-15
+
 === Addressable 2.0.1
   * fixed issue with query string assignment
   * fixed issue with improperly encoded components

data/lib/addressable/uri.rb

@@ -281,7 +281,10 @@ module Addressable
     #   <tt>false</tt> otherwise.  An <tt>InvalidTemplateValueError</tt>
     #   exception will be raised if the value is invalid.  The
     #   <tt>transform</tt> method should return the transformed variable
-    #   value as a <tt>String</tt>.
+    #   value as a <tt>String</tt>.  If a <tt>transform</tt> method is used,
+    #   the value will not be percent encoded automatically.  Unicode
+    #   normalization will be performed both before and after sending the
+    #   value to the transform method.
     #
     # @return [Addressable::URI] The expanded URI template.
     #
@@ -336,22 +339,27 @@ module Addressable
           raise TypeError,
             "Can't convert #{value.class} into String or Array."
         end
-        transformed_value =
+
+        value =
           value.respond_to?(:to_ary) ? value.to_ary : value.to_str
+        # Handle unicode normalization
+        if value.kind_of?(Array)
+          value.map! { |val| Addressable::IDNA.unicode_normalize_kc(val) }
+        else
+          value = Addressable::IDNA.unicode_normalize_kc(value)
+        end
 
-        # Handle percent escaping, and unicode normalization
-        if transformed_value.kind_of?(Array)
-          transformed_value.map! do |value|
-            self.encode_component(
-              Addressable::IDNA.unicode_normalize_kc(value),
-              Addressable::URI::CharacterClasses::UNRESERVED
-            )
+        if processor == nil || !processor.respond_to?(:transform)
+          # Handle percent escaping
+          if value.kind_of?(Array)
+            transformed_value = value.map do |val|
+              self.encode_component(
+                val, Addressable::URI::CharacterClasses::UNRESERVED)
+            end
+          else
+            transformed_value = self.encode_component(
+              value, Addressable::URI::CharacterClasses::UNRESERVED)
           end
-        else
-          transformed_value = self.encode_component(
-            Addressable::IDNA.unicode_normalize_kc(transformed_value),
-            Addressable::URI::CharacterClasses::UNRESERVED
-          )
         end
 
         # Process, if we've got a processor
@@ -365,6 +373,14 @@ module Addressable
           end
           if processor.respond_to?(:transform)
             transformed_value = processor.transform(name, value)
+            if transformed_value.kind_of?(Array)
+              transformed_value.map! do |val|
+                Addressable::IDNA.unicode_normalize_kc(val)
+              end
+            else
+              transformed_value =
+                Addressable::IDNA.unicode_normalize_kc(transformed_value)
+            end
           end
         end
 
@@ -958,7 +974,7 @@ module Addressable
         character_class = /[^#{character_class}]/
       end
       return component.gsub(character_class) do |sequence|
-        (sequence.unpack('C*').map { |c| "%#{c.to_s(16).upcase}" }).join("")
+        (sequence.unpack('C*').map { |c| "%" + ("%02x" % c).upcase }).join("")
       end
     end
 

data/lib/addressable/version.rb

@@ -27,7 +27,7 @@ if !defined?(Addressable::VERSION)
     module VERSION #:nodoc:
       MAJOR = 2
       MINOR = 0
-      TINY  = 1
+      TINY  = 2
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/addressable/uri_spec.rb

@@ -69,6 +69,12 @@ class SlashlessProcessor
   end
 end
 
+class NoOpProcessor
+  def self.transform(name, value)
+    value
+  end
+end
+
 describe Addressable::URI, "when created with a non-numeric port number" do
   it "should raise an error" do
     (lambda do
@@ -3571,6 +3577,15 @@ describe Addressable::URI, "when given a mapping that contains an Array" do
       @mapping).to_s.should ==
         "http://example.com/search/an+example+search+query/"
   end
+
+  it "should result in 'http://example.com/search/an+example+search+query/'" +
+      " when used to expand 'http://example.com/search/{-list|+|query}/'" +
+      " with a NoOpProcessor" do
+    Addressable::URI.expand_template(
+      "http://example.com/search/{-list|+|query}/",
+      @mapping, NoOpProcessor).to_s.should ==
+        "http://example.com/search/an+example+search+query/"
+  end
 end
 
 class SuperString
@@ -3617,6 +3632,18 @@ describe Addressable::URI, "when encoding a multibyte string" do
   end
 end
 
+describe Addressable::URI, "when encoding a string with ASCII chars 0-15" do
+  it "should result in correct percent encoded sequence" do
+    Addressable::URI.encode_component("one\ntwo").should == "one%0Atwo"
+  end
+
+  it "should result in correct percent encoded sequence" do
+    Addressable::URI.encode_component(
+      "one\ntwo", /[^a-zA-Z0-9\:\/\?\#\[\]\@\!\$\&\'\(\)\*\+\,\;\=\-\.\_\~]/
+    ).should == "one%0Atwo"
+  end
+end
+
 describe Addressable::URI, "when unencoding a multibyte string" do
   it "should result in correct percent encoded sequence" do
     Addressable::URI.unencode_component("g%C3%BCnther").should == "günther"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: addressable
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Bob Aman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-02 00:00:00 -05:00
+date: 2009-01-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency