addressable 2.1.0 → 2.1.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+=== Addressable 2.1.1
+  * fixed some missing type checking
+  * fixed issue with unicode normalization
 === Addressable 2.1.0
   * refactored URI template support out into its own class
   * removed extract method due to being useless and unreliable

data/Rakefile

@@ -1,7 +1,3 @@
-lib_dir = File.expand_path(File.join(File.dirname(__FILE__), "lib"))
-$:.unshift(lib_dir)
-$:.uniq!
-
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
@@ -10,7 +6,7 @@ require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
-require File.join(File.dirname(__FILE__), 'lib/addressable', 'version')
+require File.join(File.dirname(__FILE__), 'lib', 'addressable', 'version')
 
 PKG_DISPLAY_NAME   = 'Addressable'
 PKG_NAME           = PKG_DISPLAY_NAME.downcase
@@ -31,6 +27,38 @@ Ruby's standard library. It more closely conforms to the relevant RFCs and
 adds support for IRIs and URI templates.
 TEXT
 
+desc "generates .gemspec file"
+task :gemspec do
+  spec = Gem::Specification.new do |p|
+    p.name = 'addressable'
+    p.version = PKG_VERSION
+
+    p.summary = PKG_SUMMARY
+    p.description = PKG_DESCRIPTION
+
+    p.author = 'Bob Aman'
+    p.email  = 'bob@sporkmonger.com'
+    p.homepage = 'http://github.com/mislav/addressable'
+    p.rubyforge_project = nil
+
+    p.files = FileList['Rakefile', '{bin,lib,tasks,spec}/**/*', 'README*', 'LICENSE*', 'CHANGELOG*'] & `git ls-files`.split
+
+    p.executables = Dir['bin/*'].map { |f| File.basename(f) }
+
+    p.has_rdoc = true
+  end
+  
+  spec_string = spec.to_ruby
+  
+  begin
+    Thread.new { eval("$SAFE = 3\n#{spec_string}", binding) }.join 
+  rescue
+    abort "unsafe gemspec: #{$!}"
+  else
+    File.open("#{spec.name}.gemspec", 'w') { |file| file.write spec_string }
+  end
+end
+
 PKG_FILES = FileList[
     "lib/**/*", "spec/**/*", "vendor/**/*",
     "tasks/**/*", "website/**/*",
@@ -38,11 +66,7 @@ PKG_FILES = FileList[
 ].exclude(/database\.yml/).exclude(/[_\.]git$/)
 
 RCOV_ENABLED = (RUBY_PLATFORM != "java" && RUBY_VERSION =~ /^1\.8/)
-if RCOV_ENABLED
-  task :default => "spec:verify"
-else
-  task :default => "spec"
-end
+task :default => "spec"
 
 WINDOWS = (RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/) rescue false
 SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])

data/lib/addressable/idna.rb

@@ -4855,15 +4855,15 @@ module Addressable
       delta = firsttime ? delta / PUNYCODE_DAMP : delta >> 1
       # delta >> 1 is a faster way of doing delta / 2
       delta += delta / numpoints
+      difference = PUNYCODE_BASE - PUNYCODE_TMIN
 
       k = 0
-      while delta > ((PUNYCODE_BASE - PUNYCODE_TMIN) * PUNYCODE_TMAX) / 2
-        delta /= PUNYCODE_BASE - PUNYCODE_TMIN
+      while delta > (difference * PUNYCODE_TMAX) / 2
+        delta /= difference
         k += PUNYCODE_BASE
       end
 
-      k + (PUNYCODE_BASE - PUNYCODE_TMIN + 1) *
-        delta / (delta + PUNYCODE_SKEW)
+      k + (difference + 1) * delta / (delta + PUNYCODE_SKEW)
     end
     (class <<self; private :punycode_adapt; end)
   end

data/lib/addressable/template.rb

@@ -22,9 +22,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '/..')))
-$:.uniq!
-
 require "addressable/version"
 require "addressable/uri"
 
@@ -39,7 +36,7 @@ module Addressable
       Addressable::URI::CharacterClasses::UNRESERVED
     OPERATOR_EXPANSION =
       /\{-([a-zA-Z]+)\|([#{anything}]+)\|([#{anything}]+)\}/
-    VARIABLE_EXPANSION = /\{([#{anything}]+?)(=([#{anything}]+))?\}/
+    VARIABLE_EXPANSION = /\{([#{anything}]+?)(?:=([#{anything}]+))?\}/
 
     ##
     # Raised if an invalid template value is supplied.
@@ -154,21 +151,23 @@ module Addressable
     #
     # @param [Addressable::URI, #to_str] uri
     #   The URI to extract from.
+    #
     # @param [#restore, #match] processor
     #   A template processor object may optionally be supplied.
-    #   The object should respond to either the <tt>restore</tt> or
-    #   <tt>match</tt> messages or both.  The <tt>restore</tt> method should
-    #   take two parameters: [String] name and [String] value.  The
-    #   <tt>restore</tt> method should reverse any transformations that have
-    #   been performed on the value to ensure a valid URI.  The
-    #   <tt>match</tt> method should take a single parameter: [String] name.
-    #   The <tt>match</tt> method should return a <tt>String</tt> containing
-    #   a regular expression capture group for matching on that particular
-    #   variable.  The default value is ".*?".  The <tt>match</tt> method has
-    #   no effect on multivariate operator expansions.
+    #
+    # The object should respond to either the <tt>restore</tt> or
+    # <tt>match</tt> messages or both.  The <tt>restore</tt> method should take
+    # two parameters: [String] name and [String] value.  The <tt>restore</tt>
+    # method should reverse any transformations that have been performed on the
+    # value to ensure a valid URI.  The <tt>match</tt> method should take a
+    # single parameter: [String] name.  The <tt>match</tt> method should return
+    # a <tt>String</tt> containing a regular expression capture group for
+    # matching on that particular variable.  The default value is ".*?".  The
+    # <tt>match</tt> method has no effect on multivariate operator expansions.
+    #
     # @return [Hash, NilClass]
-    #   The <tt>Hash</tt> mapping that was extracted from the URI, or
-    #   <tt>nil</tt> if the URI didn't match the template.
+    # The <tt>Hash</tt> mapping that was extracted from the URI, or
+    # <tt>nil</tt> if the URI didn't match the template.
     #
     # @example
     #   class ExampleProcessor
@@ -212,21 +211,23 @@ module Addressable
     #
     # @param [Addressable::URI, #to_str] uri
     #   The URI to extract from.
+    #
     # @param [#restore, #match] processor
     #   A template processor object may optionally be supplied.
-    #   The object should respond to either the <tt>restore</tt> or
-    #   <tt>match</tt> messages or both.  The <tt>restore</tt> method should
-    #   take two parameters: [String] name and [String] value.  The
-    #   <tt>restore</tt> method should reverse any transformations that have
-    #   been performed on the value to ensure a valid URI.  The
-    #   <tt>match</tt> method should take a single parameter: [String] name.
-    #   The <tt>match</tt> method should return a <tt>String</tt> containing
-    #   a regular expression capture group for matching on that particular
-    #   variable.  The default value is ".*?".  The <tt>match</tt> method has
-    #   no effect on multivariate operator expansions.
+    #
+    # The object should respond to either the <tt>restore</tt> or
+    # <tt>match</tt> messages or both. The <tt>restore</tt> method should take
+    # two parameters: [String] name and [String] value. The <tt>restore</tt>
+    # method should reverse any transformations that have been performed on the
+    # value to ensure a valid URI. The <tt>match</tt> method should take a
+    # single parameter: [String] name. The <tt>match</tt> method should return
+    # a <tt>String</tt> containing a regular expression capture group for
+    # matching on that particular variable. The default value is ".*?". The
+    # <tt>match</tt> method has no effect on multivariate operator expansions.
+    #
     # @return [Hash, NilClass]
-    #   The <tt>Hash</tt> mapping that was extracted from the URI, or
-    #   <tt>nil</tt> if the URI didn't match the template.
+    # The <tt>Hash</tt> mapping that was extracted from the URI, or
+    # <tt>nil</tt> if the URI didn't match the template.
     #
     # @example
     #   class ExampleProcessor
@@ -325,19 +326,19 @@ module Addressable
     #
     # @param [Hash] mapping The mapping that corresponds to the pattern.
     # @param [#validate, #transform] processor
-    #   An optional processor object may be supplied.  The object should
-    #   respond to either the <tt>validate</tt> or <tt>transform</tt> messages
-    #   or both.  Both the <tt>validate</tt> and <tt>transform</tt> methods
-    #   should take two parameters: <tt>name</tt> and <tt>value</tt>.  The
-    #   <tt>validate</tt> method should return <tt>true</tt> or
-    #   <tt>false</tt>; <tt>true</tt> if the value of the variable is valid,
-    #   <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>.  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.
+    #   An optional processor object may be supplied. 
+    #
+    # The object should respond to either the <tt>validate</tt> or
+    # <tt>transform</tt> messages or both. Both the <tt>validate</tt> and
+    # <tt>transform</tt> methods should take two parameters: <tt>name</tt> and
+    # <tt>value</tt>. The <tt>validate</tt> method should return <tt>true</tt>
+    # or <tt>false</tt>; <tt>true</tt> if the value of the variable is valid,
+    # <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>.
+    # 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::Template] The partially expanded URI template.
     #
@@ -401,19 +402,19 @@ module Addressable
     #
     # @param [Hash] mapping The mapping that corresponds to the pattern.
     # @param [#validate, #transform] processor
-    #   An optional processor object may be supplied.  The object should
-    #   respond to either the <tt>validate</tt> or <tt>transform</tt> messages
-    #   or both.  Both the <tt>validate</tt> and <tt>transform</tt> methods
-    #   should take two parameters: <tt>name</tt> and <tt>value</tt>.  The
-    #   <tt>validate</tt> method should return <tt>true</tt> or
-    #   <tt>false</tt>; <tt>true</tt> if the value of the variable is valid,
-    #   <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>.  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.
+    #   An optional processor object may be supplied.
+    #
+    # The object should respond to either the <tt>validate</tt> or
+    # <tt>transform</tt> messages or both. Both the <tt>validate</tt> and
+    # <tt>transform</tt> methods should take two parameters: <tt>name</tt> and
+    # <tt>value</tt>. The <tt>validate</tt> method should return <tt>true</tt>
+    # or <tt>false</tt>; <tt>true</tt> if the value of the variable is valid,
+    # <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>.
+    # 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.
     #
@@ -484,55 +485,79 @@ module Addressable
     #
     # @return [Array] The variables present in the template's pattern.
     def variables
-      @variables ||= (begin
-        result = []
+      @variables ||= ordered_variable_defaults.map { |var, val| var }.uniq
+    end
+    alias_method :keys, :variables
+
+    ##
+    # Returns a mapping of variables to their default values specified
+    # in the template. Variables without defaults are not returned.
+    #
+    # @return [Hash] Mapping of template variables to their defaults
+    def variable_defaults
+      @variable_defaults ||= Hash[*ordered_variable_defaults.reject { |k,v| v.nil? }.flatten]
+    end
 
+  private
+
+    def ordered_variable_defaults
+      @ordered_variable_defaults ||= begin
         expansions, expansion_regexp = parse_template_pattern(pattern)
-        expansions.each do |expansion|
-          if expansion =~ OPERATOR_EXPANSION
-            _, _, variables, _ = parse_template_expansion(expansion)
-            result.concat(variables)
-          else
-            result << expansion[VARIABLE_EXPANSION, 1]
+
+        expansions.inject([]) do |result, expansion|
+          case expansion
+          when OPERATOR_EXPANSION
+            _, _, variables, mapping = parse_template_expansion(expansion)
+            result.concat variables.map { |var| [var, mapping[var]] }
+          when VARIABLE_EXPANSION
+            result << [$1, $2]
           end
+          result
         end
-        result.uniq
-      end)
+      end
     end
-    alias_method :keys, :variables
 
-  private
     ##
     # Transforms a mapping so that values can be substituted into the
     # template.
     #
     # @param [Hash] mapping The mapping of variables to values.
     # @param [#validate, #transform] processor
-    #   An optional processor object may be supplied.  The object should
-    #   respond to either the <tt>validate</tt> or <tt>transform</tt> messages
-    #   or both.  Both the <tt>validate</tt> and <tt>transform</tt> methods
-    #   should take two parameters: <tt>name</tt> and <tt>value</tt>.  The
-    #   <tt>validate</tt> method should return <tt>true</tt> or
-    #   <tt>false</tt>; <tt>true</tt> if the value of the variable is valid,
-    #   <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>.  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.
+    #   An optional processor object may be supplied.
+    #
+    # The object should respond to either the <tt>validate</tt> or
+    # <tt>transform</tt> messages or both. Both the <tt>validate</tt> and
+    # <tt>transform</tt> methods should take two parameters: <tt>name</tt> and
+    # <tt>value</tt>. The <tt>validate</tt> method should return <tt>true</tt>
+    # or <tt>false</tt>; <tt>true</tt> if the value of the variable is valid,
+    # <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>. 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 [Hash] The transformed mapping.
     def transform_mapping(mapping, processor=nil)
       return mapping.inject({}) do |accu, pair|
         name, value = pair
+        value = value.to_s if Numeric === value || Symbol === value
+
         unless value.respond_to?(:to_ary) || value.respond_to?(:to_str)
           raise TypeError,
             "Can't convert #{value.class} into String or Array."
         end
 
-        value =
-          value.respond_to?(:to_ary) ? value.to_ary : value.to_str
+        if Symbol === name
+          name = name.to_s
+        elsif name.respond_to?(:to_str)
+          name = name.to_str
+        else
+          raise TypeError,
+            "Can't convert #{name.class} into String."
+        end
+        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) }
@@ -796,8 +821,8 @@ module Addressable
     # @return [Regexp]
     #   A regular expression which may be used to parse a template pattern.
     def parse_template_pattern(pattern, processor=nil)
-      # Escape the pattern.  The two gsubs restore the escaped curly braces
-      # back to their original form.  Basically, escape everything that isn't
+      # Escape the pattern. The two gsubs restore the escaped curly braces
+      # back to their original form. Basically, escape everything that isn't
       # within an expansion.
       escaped_pattern = Regexp.escape(
         pattern
@@ -819,7 +844,7 @@ module Addressable
             parse_template_expansion(expansion)
           if processor != nil && processor.respond_to?(:match)
             # We can only lookup the match values for single variable
-            # operator expansions.  Besides, ".*" is usually the only
+            # operator expansions. Besides, ".*" is usually the only
             # reasonable value for multivariate operators anyways.
             if ["prefix", "suffix", "list"].include?(operator)
               capture_group = "(#{processor.match(names.first)})"

data/lib/addressable/uri.rb

@@ -22,9 +22,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), '/..')))
-$:.uniq!
-
 require "addressable/version"
 require "addressable/idna"
 
@@ -66,8 +63,9 @@ module Addressable
     # Returns a URI object based on the parsed string.
     #
     # @param [String, Addressable::URI, #to_str] uri
-    #   The URI string to parse.  No parsing is performed if the object is
-    #   already an <tt>Addressable::URI</tt>.
+    #   The URI string to parse. 
+    # No parsing is performed if the object is already an
+    # <tt>Addressable::URI</tt>.
     #
     # @return [Addressable::URI] The parsed URI.
     def self.parse(uri)
@@ -131,16 +129,17 @@ module Addressable
     end
 
     ##
-    # Converts an input to a URI.  The input does not have to be a valid
+    # Converts an input to a URI. The input does not have to be a valid
     # URI — the method will use heuristics to guess what URI was intended.
     # This is not standards-compliant, merely user-friendly.
     #
     # @param [String, Addressable::URI, #to_str] uri
-    #   The URI string to parse.  No parsing is performed if the object is
-    #   already an <tt>Addressable::URI</tt>.
+    #   The URI string to parse.
+    # No parsing is performed if the object is already an
+    # <tt>Addressable::URI</tt>.
     # @param [Hash] hints
-    #   A <tt>Hash</tt> of hints to the heuristic parser.  Defaults to
-    #   <tt>{:scheme => "http"}</tt>.
+    #   A <tt>Hash</tt> of hints to the heuristic parser. 
+    # Defaults to <tt>{:scheme => "http"}</tt>.
     #
     # @return [Addressable::URI] The parsed URI.
     def self.heuristic_parse(uri, hints={})
@@ -184,16 +183,16 @@ module Addressable
     end
 
     ##
-    # Converts a path to a file scheme URI.  If the path supplied is
-    # relative, it will be returned as a relative URI.  If the path supplied
+    # Converts a path to a file scheme URI. If the path supplied is
+    # relative, it will be returned as a relative URI. If the path supplied
     # is actually a non-file URI, it will parse the URI as if it had been
-    # parsed with <tt>Addressable::URI.parse</tt>.  Handles all of the
+    # parsed with <tt>Addressable::URI.parse</tt>. Handles all of the
     # various Microsoft-specific formats for specifying paths.
     #
     # @param [String, Addressable::URI, #to_str] path
-    #   Typically a <tt>String</tt> path to a file or directory, but
-    #   will return a sensible return value if an absolute URI is supplied
-    #   instead.
+    #
+    # Typically a <tt>String</tt> path to a file or directory, but will return
+    # a sensible return value if an absolute URI is supplied instead.
     #
     # @return [Addressable::URI]
     #   The parsed file scheme URI or the original URI if some other URI
@@ -281,17 +280,17 @@ module Addressable
     # @param [String, #to_str] component The URI component to encode.
     #
     # @param [String, Regexp] character_class
-    #   The characters which are not percent encoded.  If a <tt>String</tt>
-    #   is passed, the <tt>String</tt> must be formatted as a regular
-    #   expression character class.  (Do not include the surrounding square
-    #   brackets.)  For example, <tt>"b-zB-Z0-9"</tt> would cause everything
-    #   but the letters 'b' through 'z' and the numbers '0' through '9' to be
-    #   percent encoded.  If a <tt>Regexp</tt> is passed, the value
-    #   <tt>/[^b-zB-Z0-9]/</tt> would have the same effect.
-    #   A set of useful <tt>String</tt> values may be found in the
-    #   <tt>Addressable::URI::CharacterClasses</tt> module.  The default value
-    #   is the reserved plus unreserved character classes specified in
-    #   <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>.
+    #
+    # The characters which are not percent encoded. If a <tt>String</tt> is
+    # passed, the <tt>String</tt> must be formatted as a regular expression
+    # character class. (Do not include the surrounding square brackets.)  For
+    # example, <tt>"b-zB-Z0-9"</tt> would cause everything but the letters 'b'
+    # through 'z' and the numbers '0' through '9' to be percent encoded. If a
+    # <tt>Regexp</tt> is passed, the value <tt>/[^b-zB-Z0-9]/</tt> would have
+    # the same effect. A set of useful <tt>String</tt> values may be found in
+    # the <tt>Addressable::URI::CharacterClasses</tt> module. The default
+    # value is the reserved plus unreserved character classes specified in <a
+    # href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>.
     #
     # @return [String] The encoded component.
     #
@@ -343,13 +342,14 @@ module Addressable
     #   The URI or component to unencode.
     #
     # @param [Class] returning
-    #   The type of object to return.  This value may only be set to
-    #   <tt>String</tt> or <tt>Addressable::URI</tt>.  All other values
-    #   are invalid.  Defaults to <tt>String</tt>.
+    #   The type of object to return.
+    # This value may only be set to <tt>String</tt> or
+    # <tt>Addressable::URI</tt>. All other values are invalid. Defaults to
+    # <tt>String</tt>.
     #
     # @return [String, Addressable::URI]
-    #   The unencoded component or URI.  The return type is determined by
-    #   the <tt>returning</tt> parameter.
+    #   The unencoded component or URI.
+    # The return type is determined by the <tt>returning</tt> parameter.
     def self.unencode(uri, returning=String)
       return nil if uri.nil?
       if !uri.respond_to?(:to_str)
@@ -384,13 +384,14 @@ module Addressable
     #   The URI to encode.
     #
     # @param [Class] returning
-    #   The type of object to return.  This value may only be set to
-    #   <tt>String</tt> or <tt>Addressable::URI</tt>.  All other values
-    #   are invalid.  Defaults to <tt>String</tt>.
+    #   The type of object to return.
+    # This value may only be set to <tt>String</tt> or
+    # <tt>Addressable::URI</tt>. All other values are invalid. Defaults to
+    # <tt>String</tt>.
     #
     # @return [String, Addressable::URI]
-    #   The encoded URI.  The return type is determined by
-    #   the <tt>returning</tt> parameter.
+    #   The encoded URI.
+    # The return type is determined by the <tt>returning</tt> parameter.
     def self.encode(uri, returning=String)
       return nil if uri.nil?
       if !uri.respond_to?(:to_str)
@@ -426,20 +427,21 @@ module Addressable
     end
 
     ##
-    # Normalizes the encoding of a URI.  Characters within a hostname are
+    # Normalizes the encoding of a URI. Characters within a hostname are
     # not percent encoded to allow for internationalized domain names.
     #
     # @param [String, Addressable::URI, #to_str] uri
     #   The URI to encode.
     #
     # @param [Class] returning
-    #   The type of object to return.  This value may only be set to
-    #   <tt>String</tt> or <tt>Addressable::URI</tt>.  All other values
-    #   are invalid.  Defaults to <tt>String</tt>.
+    #   The type of object to return.
+    # This value may only be set to <tt>String</tt> or
+    # <tt>Addressable::URI</tt>. All other values are invalid. Defaults to
+    # <tt>String</tt>.
     #
     # @return [String, Addressable::URI]
-    #   The encoded URI.  The return type is determined by
-    #   the <tt>returning</tt> parameter.
+    #   The encoded URI. 
+    # The return type is determined by the <tt>returning</tt> parameter.
     def self.normalized_encode(uri, returning=String)
       if !uri.respond_to?(:to_str)
         raise TypeError, "Can't convert #{uri.class} into String."
@@ -501,12 +503,12 @@ module Addressable
     # @option [String, #to_str] user The user component.
     # @option [String, #to_str] password The password component.
     # @option [String, #to_str] userinfo
-    #   The userinfo component.  If this is supplied, the user and password
+    #   The userinfo component. If this is supplied, the user and password
     #   components must be omitted.
     # @option [String, #to_str] host The host component.
     # @option [String, #to_str] port The port component.
     # @option [String, #to_str] authority
-    #   The authority component.  If this is supplied, the user, password,
+    #   The authority component. If this is supplied, the user, password,
     #   userinfo, host, and port components must be omitted.
     # @option [String, #to_str] path The path component.
     # @option [String, #to_str] query The query component.
@@ -581,6 +583,9 @@ module Addressable
       # Check for frozenness
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
+      if new_scheme && !new_scheme.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_scheme.class} into String."
+      end
       @scheme = new_scheme ? new_scheme.to_str : nil
       @scheme = nil if @scheme.to_s.strip == ""
 
@@ -631,6 +636,9 @@ module Addressable
       # Check for frozenness
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
+      if new_user && !new_user.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_user.class} into String."
+      end
       @user = new_user ? new_user.to_str : nil
 
       # You can't have a nil user with a non-nil password
@@ -689,6 +697,9 @@ module Addressable
       # Check for frozenness
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
+      if new_password && !new_password.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_password.class} into String."
+      end
       @password = new_password ? new_password.to_str : nil
 
       # You can't have a nil user with a non-nil password
@@ -754,6 +765,9 @@ module Addressable
       # Check for frozenness
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
+      if new_userinfo && !new_userinfo.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_userinfo.class} into String."
+      end
       new_user, new_password = if new_userinfo
         [
           new_userinfo.to_str.strip[/^(.*):/, 1],
@@ -816,6 +830,9 @@ module Addressable
       # Check for frozenness
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
+      if new_host && !new_host.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_host.class} into String."
+      end
       @host = new_host ? new_host.to_str : nil
 
       # Reset dependant values
@@ -881,6 +898,9 @@ module Addressable
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
       if new_authority
+        if !new_authority.respond_to?(:to_str)
+          raise TypeError, "Can't convert #{new_authority.class} into String."
+        end
         new_authority = new_authority.to_str
         new_userinfo = new_authority[/^([^\[\]]*)@/, 1]
         if new_userinfo
@@ -894,10 +914,10 @@ module Addressable
       end
 
       # Password assigned first to ensure validity in case of nil
-      self.password = new_password
-      self.user = new_user
-      self.host = new_host
-      self.port = new_port
+      self.password = defined?(new_password) ? new_password : nil
+      self.user = defined?(new_user) ? new_user : nil
+      self.host = defined?(new_host) ? new_host : nil
+      self.port = defined?(new_port) ? new_port : nil
 
       # Reset dependant values
       @inferred_port = nil
@@ -909,7 +929,7 @@ module Addressable
       validate()
     end
 
-    # Returns an array of known ip-based schemes.  These schemes typically
+    # Returns an array of known ip-based schemes. These schemes typically
     # use a similar URI form:
     # //<user>:<password>@<host>:<port>/<url-path>
     def self.ip_based_schemes
@@ -917,7 +937,7 @@ module Addressable
     end
 
     # Returns a hash of common IP-based schemes and their default port
-    # numbers.  Adding new schemes to this hash, as necessary, will allow
+    # numbers. Adding new schemes to this hash, as necessary, will allow
     # for better URI normalization.
     def self.port_mapping
       @port_mapping ||= {
@@ -939,7 +959,7 @@ module Addressable
 
     ##
     # The port component for this URI.
-    # This is the port number actually given in the URI.  This does not
+    # This is the port number actually given in the URI. This does not
     # infer port numbers from default values.
     #
     # @return [Integer] The port component.
@@ -1054,6 +1074,9 @@ module Addressable
       # Check for frozenness
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
+      if new_path && !new_path.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_path.class} into String."
+      end
       @path = (new_path || "").to_str
       if @path != "" && @path[0..0] != "/" && host != nil
         @path = "/#{@path}"
@@ -1098,11 +1121,19 @@ module Addressable
     def normalized_query
       @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
-          )
+          begin
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(self.query.strip)),
+              Addressable::URI::CharacterClasses::QUERY
+            )
+          rescue ArgumentError
+            # Likely a malformed UTF-8 character, skip unicode normalization
+            Addressable::URI.encode_component(
+              Addressable::URI.unencode_component(self.query.strip),
+              Addressable::URI::CharacterClasses::QUERY
+            )
+          end
         else
           nil
         end
@@ -1117,6 +1148,9 @@ module Addressable
       # Check for frozenness
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
+      if new_query && !new_query.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_query.class} into String."
+      end
       @query = new_query ? new_query.to_str : nil
 
       # Reset dependant values
@@ -1129,8 +1163,8 @@ module Addressable
     #
     # @option [Symbol] notation
     #   May be one of <tt>:flat</tt>, <tt>:dot</tt>, or <tt>:subscript</tt>.
-    #   The <tt>:dot</tt> notation is not supported for assignment.
-    #   Default value is <tt>:subscript</tt>.
+    # The <tt>:dot</tt> notation is not supported for assignment. Default
+    # value is <tt>:subscript</tt>.
     #
     # @return [Hash] The query string parsed as a Hash object.
     #
@@ -1285,11 +1319,19 @@ module Addressable
     def normalized_fragment
       @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
-          )
+          begin
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(self.fragment.strip)),
+              Addressable::URI::CharacterClasses::FRAGMENT
+            )
+          rescue ArgumentError
+            # Likely a malformed UTF-8 character, skip unicode normalization
+            Addressable::URI.encode_component(
+              Addressable::URI.unencode_component(self.fragment.strip),
+              Addressable::URI::CharacterClasses::FRAGMENT
+            )
+          end
         else
           nil
         end
@@ -1304,6 +1346,9 @@ module Addressable
       # Check for frozenness
       raise TypeError, "Can't modify frozen URI." if self.frozen?
 
+      if new_fragment && !new_fragment.respond_to?(:to_str)
+        raise TypeError, "Can't convert #{new_fragment.class} into String."
+      end
       @fragment = new_fragment ? new_fragment.to_str : nil
 
       # Reset dependant values
@@ -1318,8 +1363,8 @@ module Addressable
     # Determines if the scheme indicates an IP-based protocol.
     #
     # @return [TrueClass, FalseClass]
-    #   <tt>true</tt> if the scheme indicates an IP-based protocol.
-    #   <tt>false</tt> otherwise.
+    # <tt>true</tt> if the scheme indicates an IP-based protocol.
+    # <tt>false</tt> otherwise.
     def ip_based?
       if self.scheme
         return self.class.ip_based_schemes.include?(
@@ -1332,8 +1377,7 @@ module Addressable
     # Determines if the URI is relative.
     #
     # @return [TrueClass, FalseClass]
-    #   <tt>true</tt> if the URI is relative.
-    #   <tt>false</tt> otherwise.
+    # <tt>true</tt> if the URI is relative. <tt>false</tt> otherwise.
     def relative?
       return self.scheme.nil?
     end
@@ -1342,8 +1386,7 @@ module Addressable
     # Determines if the URI is absolute.
     #
     # @return [TrueClass, FalseClass]
-    #   <tt>true</tt> if the URI is absolute.
-    #   <tt>false</tt> otherwise.
+    # <tt>true</tt> if the URI is absolute. <tt>false</tt> otherwise.
     def absolute?
       return !relative?
     end
@@ -1463,9 +1506,9 @@ module Addressable
 
     ##
     # Merges a URI with a <tt>Hash</tt> of components.
-    # This method has different behavior from <tt>join</tt>.  Any components
+    # This method has different behavior from <tt>join</tt>. Any components
     # present in the <tt>hash</tt> parameter will override the original
-    # components.  The path component is not treated specially.
+    # components. The path component is not treated specially.
     #
     # @param [Hash, Addressable::URI, #to_hash] The components to merge with.
     #
@@ -1541,8 +1584,8 @@ module Addressable
 
     ##
     # Returns the shortest normalized relative form of this URI that uses the
-    # supplied URI as a base for resolution.  Returns an absolute URI if
-    # necessary.  This is effectively the opposite of <tt>route_to</tt>.
+    # supplied URI as a base for resolution. Returns an absolute URI if
+    # necessary. This is effectively the opposite of <tt>route_to</tt>.
     #
     # @param [String, Addressable::URI, #to_str] uri The URI to route from.
     #
@@ -1599,8 +1642,8 @@ module Addressable
 
     ##
     # Returns the shortest normalized relative form of the supplied URI that
-    # uses this URI as a base for resolution.  Returns an absolute URI if
-    # necessary.  This is effectively the opposite of <tt>route_from</tt>.
+    # uses this URI as a base for resolution. Returns an absolute URI if
+    # necessary. This is effectively the opposite of <tt>route_from</tt>.
     #
     # @param [String, Addressable::URI, #to_str] uri The URI to route to.
     #
@@ -1651,7 +1694,7 @@ module Addressable
     end
 
     ##
-    # Creates a URI suitable for display to users.  If semantic attacks are
+    # Creates a URI suitable for display to users. If semantic attacks are
     # likely, the application should try to detect these and warn the user.
     # See <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>,
     # section 7.6 for more information.
@@ -1664,7 +1707,7 @@ module Addressable
     end
 
     ##
-    # Returns <tt>true</tt> if the URI objects are equal.  This method
+    # Returns <tt>true</tt> if the URI objects are equal. This method
     # normalizes both URIs before doing the comparison, and allows comparison
     # against <tt>Strings</tt>.
     #
@@ -1686,7 +1729,7 @@ module Addressable
     end
 
     ##
-    # Returns <tt>true</tt> if the URI objects are equal.  This method
+    # Returns <tt>true</tt> if the URI objects are equal. This method
     # normalizes both URIs before doing the comparison.
     #
     # @param [Object] uri The URI to compare.
@@ -1699,7 +1742,7 @@ module Addressable
     end
 
     ##
-    # Returns <tt>true</tt> if the URI objects are equal.  This method
+    # Returns <tt>true</tt> if the URI objects are equal. This method
     # does NOT normalize either URI before doing the comparison.
     #
     # @param [Object] uri The URI to compare.
@@ -1746,7 +1789,7 @@ module Addressable
       # Unfortunately, because of the memoized implementation of many of the
       # URI methods, the default freeze method will cause unexpected errors.
       # As an alternative, we freeze the string representation of the URI
-      # instead.  This should generally produce the desired effect.
+      # instead. This should generally produce the desired effect.
       self.to_s.freeze
       return self
     end
@@ -1823,7 +1866,7 @@ module Addressable
     end
 
     ##
-    # URI's are glorified <tt>Strings</tt>.  Allow implicit conversion.
+    # URI's are glorified <tt>Strings</tt>. Allow implicit conversion.
     alias_method :to_str, :to_s
 
     ##

data/lib/addressable/version.rb

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

data/spec/addressable/idna_spec.rb

@@ -22,9 +22,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
-$:.uniq!
-
 require "addressable/idna"
 
 describe Addressable::IDNA, "when converting from unicode to ASCII" do

data/spec/addressable/template_spec.rb

@@ -22,10 +22,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
-$:.uniq!
-
-require "addressable/uri"
 require "addressable/template"
 
 if !"".respond_to?("force_encoding")
@@ -1341,6 +1337,54 @@ describe Addressable::URI, "when given a simple mapping" do
   end
 end
 
+describe Addressable::URI, "extracting defaults from a pattern" do
+  before do
+    @template = Addressable::Template.new("{foo}{bar=baz}{-opt|found|cond}")
+  end
+
+  it "should extract default value" do
+    @template.variable_defaults.should == {"bar" => "baz"}
+  end
+end
+
+describe Addressable::URI, "when given a mapping with symbol keys" do
+  before do
+    @mapping = { :name => "fred" }
+  end
+
+  it "should result in 'fred' when used to expand '{foo}'" do
+    Addressable::Template.new(
+      "{name}"
+    ).expand(@mapping).to_s.should == "fred"
+  end
+end
+
+describe Addressable::URI, "when given a mapping with bogus keys" do
+  before do
+    @mapping = { Object.new => "fred" }
+  end
+
+  it "should raise an error" do
+    (lambda do
+      Addressable::Template.new(
+        "{name}"
+      ).expand(@mapping)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when given a mapping with numeric values" do
+  before do
+    @mapping = { :id => 123 }
+  end
+
+  it "should result in 'fred' when used to expand '{foo}'" do
+    Addressable::Template.new(
+      "{id}"
+    ).expand(@mapping).to_s.should == "123"
+  end
+end
+
 describe Addressable::URI, "when given a mapping containing values " +
     "that are already percent-encoded" do
   before do
@@ -1357,18 +1401,6 @@ describe Addressable::URI, "when given a mapping containing values " +
   end
 end
 
-describe Addressable::URI, "when given a mapping containing bogus values" do
-  it "should raise a TypeError" do
-    (lambda do
-      Addressable::Template.new(
-        "http://example.com/{bogus}/"
-      ).expand({
-        "bogus" => 42
-      })
-    end).should raise_error(TypeError)
-  end
-end
-
 describe Addressable::URI, "when given a pattern with bogus operators" do
   it "should raise an InvalidTemplateOperatorError" do
     (lambda do

data/spec/addressable/uri_spec.rb

@@ -22,9 +22,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../lib'))
-$:.uniq!
-
 require "addressable/uri"
 
 if !"".respond_to?("force_encoding")
@@ -72,6 +69,86 @@ describe Addressable::URI, "when created with a non-numeric port number" do
   end
 end
 
+describe Addressable::URI, "when created with a non-string scheme" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:scheme => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string user" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:user => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string password" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:password => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string userinfo" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:userinfo => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string host" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:host => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string authority" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:authority => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string authority" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:authority => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string path" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:path => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string query" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:query => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
+describe Addressable::URI, "when created with a non-string fragment" do
+  it "should raise an error" do
+    (lambda do
+      Addressable::URI.new(:fragment => :bogus)
+    end).should raise_error(TypeError)
+  end
+end
+
 describe Addressable::URI, "when created with a scheme but no hierarchical " +
     "segment" do
   it "should raise an error" do
@@ -944,6 +1021,54 @@ describe Addressable::URI, "when parsed from " +
   end
 end
 
+describe Addressable::URI, "when parsed from " +
+    "'http://example.com/?%F6'" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com/?%F6")
+  end
+
+  it "should not raise an exception when normalized" do
+    (lambda do
+      @uri.normalize
+    end).should_not raise_error(ArgumentError)
+  end
+
+  it "should be considered to be in normal form" do
+    @uri.normalize.should be_eql(@uri)
+  end
+
+  it "should not change if encoded with the normalizing algorithm" do
+    Addressable::URI.normalized_encode(@uri).to_s.should ==
+      "http://example.com/?%F6"
+    Addressable::URI.normalized_encode(@uri, Addressable::URI).to_s.should ===
+      "http://example.com/?%F6"
+  end
+end
+
+describe Addressable::URI, "when parsed from " +
+    "'http://example.com/#%F6'" do
+  before do
+    @uri = Addressable::URI.parse("http://example.com/#%F6")
+  end
+
+  it "should not raise an exception when normalized" do
+    (lambda do
+      @uri.normalize
+    end).should_not raise_error(ArgumentError)
+  end
+
+  it "should be considered to be in normal form" do
+    @uri.normalize.should be_eql(@uri)
+  end
+
+  it "should not change if encoded with the normalizing algorithm" do
+    Addressable::URI.normalized_encode(@uri).to_s.should ==
+      "http://example.com/#%F6"
+    Addressable::URI.normalized_encode(@uri, Addressable::URI).to_s.should ===
+      "http://example.com/#%F6"
+  end
+end
+
 describe Addressable::URI, "when parsed from " +
     "'http://example.com/%C3%87'" do
   before do

data/tasks/spec.rake

@@ -1,14 +1,10 @@
-require 'spec/rake/verify_rcov'
-
 namespace :spec do
   Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.libs = %w[lib spec]
     t.spec_files = FileList['spec/**/*_spec.rb']
     t.spec_opts = ['--color', '--format', 'specdoc']
-    if RCOV_ENABLED
-      t.rcov = true
-    else
-      t.rcov = false
-    end
+    
+    t.rcov = RCOV_ENABLED
     t.rcov_opts = [
       '--exclude', 'spec',
       '--exclude', '1\\.8\\/gems',
@@ -18,27 +14,19 @@ namespace :spec do
   end
 
   Spec::Rake::SpecTask.new(:normal) do |t|
+    t.libs = %w[lib spec]
     t.spec_files = FileList['spec/**/*_spec.rb']
     t.spec_opts = ['--color', '--format', 'specdoc']
     t.rcov = false
   end
 
-  if RCOV_ENABLED
-    RCov::VerifyTask.new(:verify) do |t|
-      t.threshold = 100.0
-      t.index_html = 'coverage/index.html'
-    end
-
-    task :verify => :rcov
-  end
-
   desc "Generate HTML Specdocs for all specs"
   Spec::Rake::SpecTask.new(:specdoc) do |t|
-    specdoc_path = File.expand_path(
-      File.join(File.dirname(__FILE__), '../specdoc/'))
+    specdoc_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'specdoc'))
     Dir.mkdir(specdoc_path) if !File.exist?(specdoc_path)
 
     output_file = File.join(specdoc_path, 'index.html')
+    t.libs = %w[lib spec]
     t.spec_files = FileList['spec/**/*_spec.rb']
     t.spec_opts = ["--format", "\"html:#{output_file}\"", "--diff"]
     t.fail_on_error = false
@@ -53,12 +41,7 @@ namespace :spec do
   end
 end
 
-if RCOV_ENABLED
-  desc "Alias to spec:verify"
-  task "spec" => "spec:verify"
-else
-  desc "Alias to spec:normal"
-  task "spec" => "spec:normal"
-end
+desc "Alias to spec:normal"
+task "spec" => "spec:normal"
 
 task "clobber" => ["spec:clobber_rcov"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: addressable
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Bob Aman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-19 00:00:00 -04:00
+date: 2009-10-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.2
     version: 
-description: Addressable is a replacement for the URI implementation that is part of Ruby's standard library. It more closely conforms to the relevant RFCs and adds support for IRIs and URI templates.
+description: |
+  Addressable is a replacement for the URI implementation that is part of
+  Ruby's standard library. It more closely conforms to the relevant RFCs and
+  adds support for IRIs and URI templates.
+
 email: bob@sporkmonger.com
 executables: []
 
@@ -51,16 +55,13 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/addressable
 - lib/addressable/idna.rb
 - lib/addressable/template.rb
 - lib/addressable/uri.rb
 - lib/addressable/version.rb
-- spec/addressable
 - spec/addressable/idna_spec.rb
 - spec/addressable/template_spec.rb
 - spec/addressable/uri_spec.rb
-- spec/data
 - spec/data/rfc3986.txt
 - tasks/clobber.rake
 - tasks/gem.rake
@@ -76,6 +77,8 @@ files:
 - README
 has_rdoc: true
 homepage: http://addressable.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -97,9 +100,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: addressable
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: URI Implementation
 test_files: []