Removed extract and expand template methods from URI.

CHANGELOG

@@ -1,16 +1,16 @@
 === Addressable 2.1.0
+  * refactored URI template support out into its own class
   * removed extract method due to being useless and unreliable
+  * removed Addressable::URI.expand_template
+  * removed Addressable::URI#extract_mapping
+  * added partial template expansion
   * fixed minor bugs in the parse and heuristic_parse methods
   * fixed incompatibility with Ruby 1.9.1
   * fixed bottleneck in Addressable::URI#hash and Addressable::URI#to_s
   * fixed unicode normalization exception
-  * improved specs
-  * refactored URI template support out into its own class
   * updated query_values methods to better handle subscript notation
-  * added partial template expansion
-  * deprecated Addressable::URI.expand_template
-  * deprecated Addressable::URI#extract_mapping
   * worked around issue with freezing URIs
+  * improved specs
 
 === Addressable 2.0.2
   * fixed issue with URI template expansion

lib/addressable/uri.rb

@@ -248,30 +248,6 @@ def self.convert_path(path)
       return uri
     end
 
-    ##
-    # @deprecated Use Addressable::Template#expand instead.
-    # @see Addressable::Template#expand
-    def self.expand_template(pattern, mapping, processor=nil)
-      warn("Addressable::URI.expand_template is deprecated.")
-      require "addressable/template" unless defined?(Addressable::Template)
-      unless pattern.kind_of?(Addressable::Template)
-        pattern = Addressable::Template.new(pattern)
-      end
-      return pattern.expand(mapping, processor)
-    end
-
-    ##
-    # @deprecated Use Addressable::Template#extract instead.
-    # @see Addressable::Template#extract
-    def extract_mapping(pattern, processor=nil)
-      warn("Addressable::URI#extract_mapping is deprecated.")
-      require "addressable/template" unless defined?(Addressable::Template)
-      unless pattern.kind_of?(Addressable::Template)
-        pattern = Addressable::Template.new(pattern)
-      end
-      return pattern.extract(self, processor)
-    end
-
     ##
     # Joins several URIs together.
     #