addressable 2.0.0 → 2.0.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== Addressable 2.0.1
+  * fixed issue with query string assignment
+  * fixed issue with improperly encoded components
+
 === Addressable 2.0.0
   * the initialize method now takes an options hash as its only parameter
   * added query_values method to URI class

data/README

@@ -14,11 +14,25 @@ Example usage:
   uri.path
   #=> "/path/to/resource/"
 
+  uri = Addressable::URI.parse("http://www.詹姆斯.com/")
+  uri.normalize
+  #=> #<Addressable::URI:0xc9a4c8 URI:http://www.xn--8ws00zhy3a.com/>
+
   Addressable::URI.expand_template("http://example.com/{-list|+|query}/", {
     "query" => "an example query".split(" ")
   })
   #=> #<Addressable::URI:0xc9d95c URI:http://example.com/an+example+query/>
 
-  uri = Addressable::URI.parse("http://www.詹姆斯.com/")
-  uri.normalize
-  #=> #<Addressable::URI:0xc9a4c8 URI:http://www.xn--8ws00zhy3a.com/>
+  Addressable::URI.parse(
+    "http://example.com/a/b/c/?one=1&two=2#foo"
+  ).extract_mapping(
+    "http://{host}/{-suffix|/|segments}?{-join|&|one,two,bogus}\#{fragment}"
+  )
+  #=>
+  # {
+  #   "host" => "example.com",
+  #   "segments" => ["a", "b", "c"],
+  #   "one" => "1",
+  #   "two" => "2",
+  #   "fragment" => "foo"
+  # }

data/lib/addressable/uri.rb

@@ -990,7 +990,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       result = uri.to_str.gsub(/%[0-9a-f]{2}/i) do |sequence|
         sequence[1..3].to_i(16).chr
@@ -1030,7 +1031,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_str)
       encoded_uri = Addressable::URI.new(
@@ -1077,7 +1079,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_str)
       components = {
@@ -1099,9 +1102,9 @@ module Addressable
         :scheme => self.encode_component(components[:scheme],
           Addressable::URI::CharacterClasses::SCHEME),
         :user => self.encode_component(components[:user],
-          Addressable::URI::CharacterClasses::AUTHORITY),
+          Addressable::URI::CharacterClasses::UNRESERVED),
         :password => self.encode_component(components[:password],
-          Addressable::URI::CharacterClasses::AUTHORITY),
+          Addressable::URI::CharacterClasses::UNRESERVED),
         :host => components[:host],
         :port => components[:port],
         :path => self.encode_component(components[:path],
@@ -1245,7 +1248,12 @@ module Addressable
           if self.scheme =~ /^\s*ssh\+svn\s*$/i
             "svn+ssh"
           else
-            self.scheme.strip.downcase
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(
+                  self.scheme.strip.downcase)),
+              Addressable::URI::CharacterClasses::SCHEME
+            )
           end
         else
           nil
@@ -1284,7 +1292,11 @@ module Addressable
               (!self.password || self.password.strip == "")
             nil
           else
-            self.user.strip
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(self.user.strip)),
+              Addressable::URI::CharacterClasses::UNRESERVED
+            )
           end
         else
           nil
@@ -1333,7 +1345,11 @@ module Addressable
               (!self.user || self.user.strip == "")
             nil
           else
-            self.password.strip
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(self.password.strip)),
+              Addressable::URI::CharacterClasses::UNRESERVED
+            )
           end
         else
           nil
@@ -1608,6 +1624,9 @@ module Addressable
     #
     # @param [String, Integer, #to_s] new_port The new port component.
     def port=(new_port)
+      if new_port != nil && new_port.respond_to?(:to_str)
+        new_port = Addressable::URI.unencode_component(new_port.to_str)
+      end
       if new_port != nil && !(new_port.to_s =~ /^\d+$/)
         raise InvalidURIError,
           "Invalid port number: #{new_port.inspect}"
@@ -1659,7 +1678,12 @@ module Addressable
     # @return [String] The path component, normalized.
     def normalized_path
       @normalized_path ||= (begin
-        result = self.class.normalize_path(self.path.strip)
+        result = Addressable::URI.encode_component(
+          Addressable::IDNA.unicode_normalize_kc(
+            Addressable::URI.unencode_component(self.path.strip)),
+          Addressable::URI::CharacterClasses::PATH
+        )
+        result = self.class.normalize_path(result)
         if result == "" &&
             ["http", "https", "ftp", "tftp"].include?(self.normalized_scheme)
           result = "/"
@@ -1714,7 +1738,17 @@ module Addressable
     #
     # @return [String] The query component, normalized.
     def normalized_query
-      @normalized_query ||= (self.query ? self.query.strip : nil)
+      @normalized_query ||= (begin
+        if self.query
+          Addressable::URI.encode_component(
+            Addressable::IDNA.unicode_normalize_kc(
+              Addressable::URI.unencode_component(self.query.strip)),
+            Addressable::URI::CharacterClasses::QUERY
+          )
+        else
+          nil
+        end
+      end)
     end
 
     ##
@@ -1722,7 +1756,7 @@ module Addressable
     #
     # @param [String, #to_str] new_query The new query component.
     def query=(new_query)
-      @query = new_query.to_str
+      @query = new_query ? new_query.to_str : nil
 
       # Reset dependant values
       @normalized_query = nil
@@ -1840,7 +1874,17 @@ module Addressable
     #
     # @return [String] The fragment component, normalized.
     def normalized_fragment
-      @normalized_fragment ||= (self.fragment ? self.fragment.strip : nil)
+      @normalized_fragment ||= (begin
+        if self.fragment
+          Addressable::URI.encode_component(
+            Addressable::IDNA.unicode_normalize_kc(
+              Addressable::URI.unencode_component(self.fragment.strip)),
+            Addressable::URI::CharacterClasses::FRAGMENT
+          )
+        else
+          nil
+        end
+      end)
     end
 
     ##
@@ -2171,15 +2215,12 @@ module Addressable
         end
       end
 
-      return Addressable::URI.normalized_encode(
-        Addressable::URI.new(
-          :scheme => normalized_scheme,
-          :authority => normalized_authority,
-          :path => normalized_path,
-          :query => normalized_query,
-          :fragment => normalized_fragment
-        ),
-        ::Addressable::URI
+      return Addressable::URI.new(
+        :scheme => normalized_scheme,
+        :authority => normalized_authority,
+        :path => normalized_path,
+        :query => normalized_query,
+        :fragment => normalized_fragment
       )
     end
 

data/lib/addressable/version.rb

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

data/spec/addressable/uri_spec.rb

@@ -584,6 +584,14 @@ describe Addressable::URI, " when parsed from " +
     @uri.to_s.should == "http://newuser@example.com"
   end
 
+  it "should have the correct username after assignment" do
+    @uri.user = "user@123!"
+    @uri.user.should == "user@123!"
+    @uri.normalized_user.should == "user%40123%21"
+    @uri.password.should == nil
+    @uri.normalize.to_s.should == "http://user%40123%21@example.com/"
+  end
+
   it "should have the correct password after assignment" do
     @uri.password = "newpass"
     @uri.password.should == "newpass"
@@ -591,6 +599,14 @@ describe Addressable::URI, " when parsed from " +
     @uri.to_s.should == "http://:newpass@example.com"
   end
 
+  it "should have the correct password after assignment" do
+    @uri.password = "secret@123!"
+    @uri.password.should == "secret@123!"
+    @uri.normalized_password.should == "secret%40123%21"
+    @uri.user.should == ""
+    @uri.normalize.to_s.should == "http://:secret%40123%21@example.com/"
+  end
+
   it "should have the correct user/pass after repeated assignment" do
     @uri.user = nil
     @uri.user.should == nil
@@ -831,6 +847,8 @@ describe Addressable::URI, " when parsed from " +
   it "should not change if encoded with the normalizing algorithm" do
     Addressable::URI.normalized_encode(@uri).to_s.should ==
       "http://example.com/%C3%87"
+    Addressable::URI.normalized_encode(@uri, Addressable::URI).to_s.should ===
+      "http://example.com/%C3%87"
   end
 
   it "should raise an error if encoding with an unexpected return type" do
@@ -1128,6 +1146,25 @@ describe Addressable::URI, " when parsed from " +
   end
 end
 
+describe Addressable::URI, " when parsed from " +
+    "'http://example.com:%38%30/'" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com:%38%30/")
+  end
+
+  it "should have the correct port" do
+    @uri.port.should == 80
+  end
+
+  it "should not be considered to be in normal form" do
+    @uri.normalize.should_not be_eql(@uri)
+  end
+
+  it "should normalize to 'http://example.com/'" do
+    @uri.normalize.should === "http://example.com/"
+  end
+end
+
 describe Addressable::URI, " when parsed from " +
     "'http://example.com/path/to/resource/'" do
   before do
@@ -1788,6 +1825,11 @@ describe Addressable::URI, " when parsed from " +
     @uri.scheme.should == "ftp"
     @uri.to_s.should ==
       "ftp://user:pass@example.com/path/to/resource?query=x#fragment"
+    @uri.scheme = "bogus!"
+    @uri.scheme.should == "bogus!"
+    @uri.normalized_scheme.should == "bogus%21"
+    @uri.normalize.to_s.should ==
+      "bogus%21://user:pass@example.com/path/to/resource?query=x#fragment"
   end
 
   it "should have the correct authority segment after assignment" do
@@ -1862,6 +1904,10 @@ describe Addressable::URI, " when parsed from " +
     @uri.query.should == "newquery=x"
     @uri.to_s.should ==
       "http://user:pass@example.com/path/to/resource?newquery=x#fragment"
+    @uri.query = nil
+    @uri.query.should == nil
+    @uri.to_s.should ==
+      "http://user:pass@example.com/path/to/resource#fragment"
   end
 
   it "should have the correct query string after hash assignment" do

data/website/index.html

@@ -102,6 +102,9 @@
             vendor/gems/addressable
         </code>
       </p>
+      <p>
+        Addressable works in Ruby 1.8.x, 1.9.x, and JRuby.
+      </p>
     </div>
   </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: addressable
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors: 
 - Bob Aman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-15 00:00:00 -05:00
+date: 2008-12-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: addressable
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: URI Implementation