uri_template 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+# 0.2.1 - 30.12.2011
+* Compatibility: Works now with MRI 1.8.7 and REE
+
 # 0.2.0 - 03.12.2011
 * Reworked the escaping mechanism
 + escape_utils can now be used to boost escape/unescape performance

data/lib/uri_template.rb

@@ -18,66 +18,74 @@
 # A base module for all implementations of a uri template.
 module URITemplate
 
+  # @private
+  # Should we use \u.... or \x.. in regexps?
+  SUPPORTS_UNICODE_CHARS = begin
+                             rx = eval('/\u0020/')
+                             !!(rx =~ " ")
+                           rescue SyntaxError
+                             false
+                           end
+
   # This should make it possible to do basic analysis independently from the concrete type.
   module Token
-  
+
     def size
       variables.size
     end
-  
+
   end
-  
+
   # A module which all literal tokens should include.
   module Literal
-    
+
     include Token
-    
+
     attr_reader :string
-    
+
     def literal?
       true
     end
-    
+
     def expression?
       false
     end
-    
+
     def variables
       []
     end
-    
+
     def size
       0
     end
-    
+
     def expand(*_)
       return string
     end
-    
+
   end
-  
-  
+
   # A module which all non-literal tokens should include.
   module Expression
-  
+
     include Token
-    
+
     attr_reader :variables
-    
+
     def literal?
       false
     end
-    
+
     def expression?
       true
     end
-  
+
   end
 
   autoload :Utils, 'uri_template/utils'
   autoload :Draft7, 'uri_template/draft7'
   autoload :Colon, 'uri_template/colon'
-  
+
   # A hash with all available implementations.
   # Currently the only implementation is :draft7. But there also aliases :default and :latest available. This should make it possible to add newer specs later.
   # @see resolve_class
@@ -87,7 +95,7 @@ module URITemplate
     :colon => :Colon,
     :latest => :Draft7
   }
-  
+
   # Looks up which implementation to use.
   # Extracts all symbols from args and looks up the first in {VERSIONS}.
   #
@@ -105,7 +113,7 @@ module URITemplate
     raise ArgumentError, "Unknown template version #{version.inspect}, defined versions: #{VERSIONS.keys.inspect}" unless VERSIONS.key?(version)
     return self.const_get(VERSIONS[version]), rest
   end
-  
+
   # Creates an uri template using an implementation.
   # The args should at least contain a pattern string.
   # Symbols in the args are used to determine the actual implementation.
@@ -121,7 +129,7 @@ module URITemplate
     klass, rest = resolve_class(*args)
     return klass.new(*rest)
   end
-  
+
   # Tries to convert the given argument into an {URITemplate}.
   # Returns nil if this fails.
   #
@@ -135,7 +143,7 @@ module URITemplate
       return nil
     end
   end
-  
+
   # Same as {.try_convert} but raises an ArgumentError when the given argument could not be converted.
   # 
   # @raise ArgumentError if the argument is unconvertable
@@ -147,7 +155,7 @@ module URITemplate
     end
     return o
   end
-  
+
   # Tries to coerce two URITemplates into a common representation.
   # Returns an array with two {URITemplate}s and two booleans indicating which of the two were converted or raises an ArgumentError.
   #
@@ -180,7 +188,7 @@ module URITemplate
     raise ArgumentError, "Expected at least on URITemplate, but got #{a.inspect} and #{b.inspect}" unless a.kind_of? URITemplate or b.kind_of? URITemplate
     raise ArgumentError, "Cannot coerce #{a.inspect} and #{b.inspect} into a common representation."
   end
-  
+
   # Applies a method to a URITemplate with another URITemplate as argument.
   # This is a useful shorthand since both URITemplates are automatically coerced.
   #
@@ -194,11 +202,11 @@ module URITemplate
     a,b,_,_ = self.coerce(a,b)
     a.send(method,b,*args)
   end
-  
+
   # A base class for all errors which will be raised upon invalid syntax.
   module Invalid
   end
-  
+
   # Expands this uri template with the given variables.
   # The variables should be converted to strings using {Utils#object_to_param}.
   # @raise {Unconvertable} if a variable could not be converted to a string.
@@ -209,19 +217,19 @@ module URITemplate
       part.expand(variables)
     }.join
   end
-  
+
   # @abstract
   # Returns the type of this template. The type is a symbol which can be used in {.resolve_class} to resolve the type of this template.
   def type
     raise "Please implement #type on #{self.class.inspect}."
   end
-  
+
   # @abstract
   # Returns the tokens of this templates. Tokens should include either {Literal} or {Expression}.
   def tokens
     raise "Please implement #tokens on #{self.class.inspect}."
   end
-  
+
   # Returns an array containing all variables. Repeated variables are ignored. The concrete order of the variables may change.
   # @example
   #   URITemplate.new('{foo}{bar}{baz}').variables #=> ['foo','bar','baz']
@@ -231,7 +239,7 @@ module URITemplate
   def variables
     @variables ||= tokens.select(&:expression?).map(&:variables).flatten.uniq
   end
-  
+
   # Returns the number of static characters in this template.
   # This method is useful for routing, since it's often pointful to use the url with fewer variable characters.
   # For example 'static' and 'sta\\{var\\}' both match 'static', but in most cases 'static' should be prefered over 'sta\\{var\\}' since it's more specific.
@@ -245,7 +253,7 @@ module URITemplate
   def static_characters
     @static_characters ||= tokens.select(&:literal?).map{|t| t.string.size }.inject(0,:+)
   end
-  
+
   # Returns whether this uri-template is absolute.
   # This is detected by checking for "://".
   #
@@ -260,14 +268,14 @@ module URITemplate
       end
       if read_chars =~ /^[a-z]+:\/\//i
         return @absolute = true
-      elsif read_chars =~ /(?<!:|\/)\/(?!\/)/
+      elsif read_chars =~ /(^|[^:\/])\/(?!\/)/
         return @absolute = false
       end
     end
-    
+
     return @absolute = false
   end
-  
+
   # Opposite of {#absolute?}
   def relative?
     !absolute?

data/lib/uri_template/colon.rb

@@ -23,7 +23,7 @@ require 'uri_template/utils'
 # A colon based template denotes variables with a colon.
 # This template type is realy basic but having just on template type was a bit weird.
 module URITemplate
-  
+
 class Colon
 
   include URITemplate
@@ -31,46 +31,46 @@ class Colon
   VAR = /(?:\{:([a-z]+)\}|:([a-z]+)(?![a-z]))/u
 
   class Token
-    
+
     class Variable < self
-      
+
       include URITemplate::Expression
-      
+
       attr_reader :name
-      
+
       def initialize(name)
         @name = name
         @variables = [name]
       end
-      
+
       def expand(vars)
         return Utils.escape_url(Utils.object_to_param(vars[@name]))
       end
-      
+
       def to_r
         return ['([^/]*?)'].join
       end
-      
+
     end
-    
+
     class Static < self
-    
+
       include URITemplate::Literal
-      
+
       def initialize(str)
         @string = str
       end
-      
+
       def expand(_)
         return @string
       end
-      
+
       def to_r
         return Regexp.escape(@string)
       end
-    
+
     end
-    
+
   end
 
   attr_reader :pattern
@@ -94,7 +94,7 @@ class Colon
   def initialize(pattern)
     @pattern = pattern
   end
-  
+
   # Extracts variables from an uri.
   #
   # @param String uri
@@ -106,19 +106,19 @@ class Colon
       [v, Utils.unescape_url(md[i+1])]
     }.flatten(1) ]
   end
-  
+
   def type
     :colon
   end
-  
+
   def to_r
     @regexp ||= Regexp.new('\A' + tokens.map(&:to_r).join + '\z', Utils::KCODE_UTF8)
   end
-  
+
   def tokens
     @tokens ||= tokenize!
   end
-  
+
   # Tries to concatenate two templates, as if they were path segments.
   # Removes double slashes or inserts one if they are missing.
   #
@@ -136,7 +136,7 @@ class Colon
     end
     return self.class.new( File.join( this.pattern, other.pattern ) )
   end
-  
+
 protected
 
   def tokenize!

data/lib/uri_template/draft7.rb

@@ -29,127 +29,127 @@ class URITemplate::Draft7
 
   include URITemplate
   extend Forwardable
-  
+
   # @private
   Utils = URITemplate::Utils
-  
-  # @private
-  #                           \/ - unicode ctrl-chars ( \p{Cc} doen't work with rbx
-  LITERAL = /^([^"'%<>\\^`{|}\s\p{Cntrl}]|%\h\h)+/u
-  
+
+  if SUPPORTS_UNICODE_CHARS
+    # @private
+    #                           \/ - unicode ctrl-chars
+    LITERAL = /([^"'%<>\\^`{|}\u0000-\u001F\u007F-\u009F\s]|%[0-9a-fA-F]{2})+/u
+  else
+    # @private
+    LITERAL = Regexp.compile('([^"\'%<>\\\\^`{|}\x00-\x1F\x7F-\x9F\s]|%[0-9a-fA-F]{2})+',Utils::KCODE_UTF8)
+  end
+
   # @private
   CHARACTER_CLASSES = {
-  
+
     :unreserved => {
-      :unencoded => /([^A-Za-z0-9\-\._])/u,
-      :class => '(?:[A-Za-z0-9\-\._]|%\h\h)',
-      
-      :class_name => 'c_u_',
+      :class => '(?:[A-Za-z0-9\-\._]|%[0-9a-fA-F]{2})', 
       :grabs_comma => false
     },
     :unreserved_reserved_pct => {
-      :unencoded => /([^A-Za-z0-9\-\._:\/?#\[\]@!\$%'\(\)*+,;=]|%(?!\h\h))/u,
-      :class => '(?:[A-Za-z0-9\-\._:\/?#\[\]@!\$%\'\(\)*+,;=]|%\h\h)',
-      :class_name => 'c_urp_',
+      :class => '(?:[A-Za-z0-9\-\._:\/?#\[\]@!\$%\'\(\)*+,;=]|%[0-9a-fA-F]{2})',
       :grabs_comma => true
     },
-    
+
     :varname => {
       :class => '(?:[a-zA-Z_]|%[0-9a-fA-F]{2})(?:[a-zA-Z_\.]|%[0-9a-fA-F]{2})*?',
       :class_name => 'c_vn_'
     }
-  
+
   }
-  
+
   # Specifies that no processing should be done upon extraction.
   # @see #extract
   NO_PROCESSING = []
-  
+
   # Specifies that the extracted values should be processed.
   # @see #extract
   CONVERT_VALUES = [:convert_values]
-  
+
   # Specifies that the extracted variable list should be processed.
   # @see #extract
   CONVERT_RESULT = [:convert_result]
-  
+
   # Default processing. Means: convert values and the list itself.
   # @see #extract
   DEFAULT_PROCESSING = CONVERT_VALUES + CONVERT_RESULT
-  
+
   # @private
   VAR = Regexp.compile(<<'__REGEXP__'.strip, Utils::KCODE_UTF8)
 ((?:[a-zA-Z_]|%[0-9a-fA-F]{2})(?:[a-zA-Z_\.]|%[0-9a-fA-F]{2})*)(\*)?(?::(\d+))?
 __REGEXP__
-  
+
   # @private
   EXPRESSION = Regexp.compile(<<'__REGEXP__'.strip, Utils::KCODE_UTF8)
 \{([+#\./;?&]?)((?:[a-zA-Z_]|%[0-9a-fA-F]{2})(?:[a-zA-Z_\.]|%[0-9a-fA-F]{2})*\*?(?::\d+)?(?:,(?:[a-zA-Z_]|%[0-9a-fA-F]{2})(?:[a-zA-Z_\.]|%[0-9a-fA-F]{2})*\*?(?::\d+)?)*)\}
 __REGEXP__
 
   # @private
-  URI = Regexp.compile(<<'__REGEXP__'.strip, Utils::KCODE_UTF8)
-\A(([^"'%<>^`{|}\s\p{Cntrl}]|%\h\h)+|\{([+#\./;?&]?)((?:[a-zA-Z_]|%[0-9a-fA-F]{2})(?:[a-zA-Z_\.]|%[0-9a-fA-F]{2})*\*?(?::\d+)?(?:,(?:[a-zA-Z_]|%[0-9a-fA-F]{2})(?:[a-zA-Z_\.]|%[0-9a-fA-F]{2})*\*?(?::\d+)?)*)\})*\z
+  URI = Regexp.compile(<<__REGEXP__.strip, Utils::KCODE_UTF8)
+\\A(#{LITERAL.source}|#{EXPRESSION.source})*\\z
 __REGEXP__
 
   SLASH = ?/
-  
+
   # @private
   class Token
   end
-  
+
   # @private
   class Literal < Token
-  
+
     include URITemplate::Literal
-    
+
     def initialize(string)
       @string = string
     end
-    
+
     def level
       1
     end
-    
+
     def arity
       0
     end
-    
+
     def to_r_source(*_)
       Regexp.escape(@string)
     end
-    
+
     def to_s
       @string
     end
-    
+
   end
 
   # @private
   class Expression < Token
-  
+
     include URITemplate::Expression
-    
+
     attr_reader :variables, :max_length
-    
+
     def initialize(vars)
       @variable_specs = vars
       @variables = vars.map(&:first)
       @variables.uniq!
     end
-    
+
     PREFIX = ''.freeze
     SEPARATOR = ','.freeze
     PAIR_CONNECTOR = '='.freeze
     PAIR_IF_EMPTY = true
     LIST_CONNECTOR = ','.freeze
     BASE_LEVEL = 1
-    
+
     CHARACTER_CLASS = CHARACTER_CLASSES[:unreserved]
-    
+
     NAMED = false
     OPERATOR = ''
-    
+
     def level
       if @variable_specs.none?{|_,expand,ml| expand || (ml > 0) }
         if @variable_specs.size == 1
@@ -161,16 +161,16 @@ __REGEXP__
         return 4
       end
     end
-    
+
     def arity
       @variable_specs.size
     end
-    
+
     def expand( vars )
       result = []
       @variable_specs.each{| var, expand , max_length |
         unless vars[var].nil?
-          if vars[var].kind_of? Hash
+          if vars[var].kind_of?(Hash) or Utils.pair_array?(vars[var])
             result.push( *transform_hash(var, vars[var], expand, max_length) )
           elsif vars[var].kind_of? Array
             result.push( *transform_array(var, vars[var], expand, max_length) )
@@ -189,11 +189,11 @@ __REGEXP__
         return ''
       end
     end
-    
+
     def to_s
       return '{' + self.class::OPERATOR + @variable_specs.map{|name,expand,max_length| name + (expand ? '*': '') + (max_length > 0 ? (':' + max_length.to_s) : '') }.join(',') + '}'
     end
-    
+
     #TODO: certain things after a slurpy variable will never get matched. therefore, it's pointless to add expressions for them
     #TODO: variables, which appear twice could be compacted, don't they?
     def to_r_source
@@ -203,11 +203,11 @@ __REGEXP__
       i = 0
       if self.class::NAMED
         @variable_specs.each{| var, expand , max_length |
-          value = "(?:#{self.class::CHARACTER_CLASS[:class]}|,)#{(max_length > 0)?'{,'+max_length.to_s+'}':'*'}"
+          value = "(?:#{self.class::CHARACTER_CLASS[:class]}|,)#{(max_length > 0)?'{0,'+max_length.to_s+'}':'*'}"
           if expand
             #if self.class::PAIR_IF_EMPTY
             pair = "(?:#{CHARACTER_CLASSES[:varname][:class]}#{Regexp.escape(self.class::PAIR_CONNECTOR)})?#{value}"
-            
+
             if first
               source << "((?:#{pair})(?:#{Regexp.escape(self.class::SEPARATOR)}#{pair})*)"
             else
@@ -219,14 +219,14 @@ __REGEXP__
             else
               pair = "#{Regexp.escape(var)}(#{Regexp.escape(self.class::PAIR_CONNECTOR)}#{value}|)"
             end
-            
+
             if first
             source << "(?:#{pair})"
             else
               source << "(?:#{Regexp.escape(self.class::SEPARATOR)}#{pair})?"
             end
           end
-          
+
           first = false
           i = i+1
         }
@@ -235,20 +235,20 @@ __REGEXP__
           last = (vs == i)
           if expand
             # could be list or map, too
-            value = "#{self.class::CHARACTER_CLASS[:class]}#{(max_length > 0)?'{,'+max_length.to_s+'}':'*'}"
-            
+            value = "#{self.class::CHARACTER_CLASS[:class]}#{(max_length > 0)?'{0,'+max_length.to_s+'}':'*'}"
+
             pair = "(?:#{CHARACTER_CLASSES[:varname][:class]}#{Regexp.escape(self.class::PAIR_CONNECTOR)})?#{value}"
-            
+
             value = "#{pair}(?:#{Regexp.escape(self.class::SEPARATOR)}#{pair})*"
           elsif last
             # the last will slurp lists
             if self.class::CHARACTER_CLASS[:grabs_comma]
-              value = "#{self.class::CHARACTER_CLASS[:class]}#{(max_length > 0)?'{,'+max_length.to_s+'}':'*?'}"
+              value = "#{self.class::CHARACTER_CLASS[:class]}#{(max_length > 0)?'{0,'+max_length.to_s+'}':'*?'}"
             else
-              value = "(?:#{self.class::CHARACTER_CLASS[:class]}|,)#{(max_length > 0)?'{,'+max_length.to_s+'}':'*?'}"
+              value = "(?:#{self.class::CHARACTER_CLASS[:class]}|,)#{(max_length > 0)?'{0,'+max_length.to_s+'}':'*?'}"
             end
           else
-            value = "#{self.class::CHARACTER_CLASS[:class]}#{(max_length > 0)?'{,'+max_length.to_s+'}':'*?'}"
+            value = "#{self.class::CHARACTER_CLASS[:class]}#{(max_length > 0)?'{0,'+max_length.to_s+'}':'*?'}"
           end
           if first
             source << "(#{value})"
@@ -261,7 +261,7 @@ __REGEXP__
       end
       return '(?:' + Regexp.escape(self.class::PREFIX) + source.join + ')?'
     end
-    
+
     def extract(position,matched)
       name, expand, max_length = @variable_specs[position]
       if matched.nil?
@@ -302,38 +302,38 @@ __REGEXP__
       elsif self.class::NAMED
         return [ [ name, decode( matched[1..-1] ) ] ]
       end
-      
+
       return [ [ name,  decode( matched ) ] ]
     end
-     
+
   protected
-    
+
     module ClassMethods
-      
+
       def hash_extractor(max_length)
         @hash_extractors ||= {}
         @hash_extractors[max_length] ||= begin
-          value = "#{self::CHARACTER_CLASS[:class]}#{(max_length > 0)?'{,'+max_length.to_s+'}':'*?'}"
+          value = "#{self::CHARACTER_CLASS[:class]}#{(max_length > 0)?'{0,'+max_length.to_s+'}':'*?'}"
           pair = "(#{CHARACTER_CLASSES[:varname][:class]}#{Regexp.escape(self::PAIR_CONNECTOR)})?(#{value})"
           source = "\\A#{Regexp.escape(self::SEPARATOR)}?" + pair + "(\\z|#{Regexp.escape(self::SEPARATOR)}(?!#{Regexp.escape(self::SEPARATOR)}))"
           Regexp.new( source , Utils::KCODE_UTF8)
         end
       end
-      
+
     end
-    
+
     extend ClassMethods
-    
+
     def escape(x)
       Utils.escape_url(Utils.object_to_param(x))
     end
-    
+
     def unescape(x)
       Utils.unescape_url(x)
     end
-    
+
     SPLITTER = /^(?:,(,*)|([^,]+))/
-    
+
     def decode(x, split = true)
       if x.nil?
         if self.class::PAIR_IF_EMPTY
@@ -362,17 +362,17 @@ __REGEXP__
         unescape(x)
       end
     end
-    
+
     def cut(str,chars)
       if chars > 0
-        md = Regexp.compile("\\A#{self.class::CHARACTER_CLASS[:class]}{,#{chars.to_s}}", Utils::KCODE_UTF8).match(str)
+        md = Regexp.compile("\\A#{self.class::CHARACTER_CLASS[:class]}{0,#{chars.to_s}}", Utils::KCODE_UTF8).match(str)
         #TODO: handle invalid matches
         return md[0]
       else
         return str
       end
     end
-    
+
     def pair(key, value, max_length = 0)
       ek = escape(key)
       ev = escape(value)
@@ -382,7 +382,7 @@ __REGEXP__
         return ek + self.class::PAIR_CONNECTOR + cut( ev, max_length )
       end
     end
-    
+
     def transform_hash(name, hsh, expand , max_length)
       if expand
         hsh.map{|key,value| pair(key,value) }
@@ -392,7 +392,7 @@ __REGEXP__
         [ (self.class::NAMED ? escape(name)+self.class::PAIR_CONNECTOR : '' ) + hsh.map{|key,value| escape(key)+self.class::LIST_CONNECTOR+escape(value) }.join(self.class::LIST_CONNECTOR) ]
       end
     end
-    
+
     def transform_array(name, ary, expand , max_length)
       if expand
         ary.map{|value| escape(value) }
@@ -402,91 +402,91 @@ __REGEXP__
         [ (self.class::NAMED ? escape(name)+self.class::PAIR_CONNECTOR : '' ) + ary.map{|value| escape(value) }.join(self.class::LIST_CONNECTOR) ]
       end
     end
-    
+
     class Reserved < self
-    
+
       CHARACTER_CLASS = CHARACTER_CLASSES[:unreserved_reserved_pct]
       OPERATOR = '+'.freeze
       BASE_LEVEL = 2
-      
+
       def escape(x)
         Utils.escape_uri(Utils.object_to_param(x))
       end
-      
+
       def unescape(x)
         Utils.unescape_uri(x)
       end
-    
+
     end
-    
+
     class Fragment < self
-    
+
       CHARACTER_CLASS = CHARACTER_CLASSES[:unreserved_reserved_pct]
       PREFIX = '#'.freeze
       OPERATOR = '#'.freeze
       BASE_LEVEL = 2
-      
+
       def escape(x)
         Utils.escape_uri(Utils.object_to_param(x))
       end
-      
+
       def unescape(x)
         Utils.unescape_uri(x)
       end
-    
+
     end
-    
+
     class Label < self
-    
+
       SEPARATOR = '.'.freeze
       PREFIX = '.'.freeze
       OPERATOR = '.'.freeze
       BASE_LEVEL = 3
-    
+
     end
-    
+
     class Path < self
-    
+
       SEPARATOR = '/'.freeze
       PREFIX = '/'.freeze
       OPERATOR = '/'.freeze
       BASE_LEVEL = 3
-    
+
     end
-    
+
     class PathParameters < self
-    
+
       SEPARATOR = ';'.freeze
       PREFIX = ';'.freeze
       NAMED = true
       PAIR_IF_EMPTY = false
       OPERATOR = ';'.freeze
       BASE_LEVEL = 3
-    
+
     end
-    
+
     class FormQuery < self
-    
+
       SEPARATOR = '&'.freeze
       PREFIX = '?'.freeze
       NAMED = true
       OPERATOR = '?'.freeze
       BASE_LEVEL = 3
-    
+
     end
-    
+
     class FormQueryContinuation < self
-    
+
       SEPARATOR = '&'.freeze
       PREFIX = '&'.freeze
       NAMED = true
       OPERATOR = '&'.freeze
       BASE_LEVEL = 3
-    
+
     end
-    
+
   end
-  
+
   # @private
   OPERATORS = {
     ''  => Expression,
@@ -498,33 +498,33 @@ __REGEXP__
     '?' => Expression::FormQuery,
     '&' => Expression::FormQueryContinuation
   }
-  
+
   # This error is raised when an invalid pattern was given.
   class Invalid < StandardError
-    
+
     include URITemplate::Invalid
-  
+
     attr_reader :pattern, :position
-    
+
     def initialize(source, position)
       @pattern = pattern
       @position = position
       super("Invalid expression found in #{source.inspect} at #{position}: '#{source[position..-1]}'")
     end
-    
+
   end
-  
+
   # @private
   class Tokenizer
-  
+
     include Enumerable
-    
+
     attr_reader :source
-    
+
     def initialize(source)
       @source = source
     end
-  
+
     def each
       if !block_given?
         return Enumerator.new(self)
@@ -551,12 +551,12 @@ __REGEXP__
         end
       end
     end
-  
+
   end
-  
+
   # The class methods for all draft7 templates.
   module ClassMethods
-  
+
     # Tries to convert the given param in to a instance of {Draft7}
     # It basically passes thru instances of that class, parses strings and return nil on everything else.
     #
@@ -586,8 +586,7 @@ __REGEXP__
         return nil
       end
     end
-    
-    
+
     # Like {.try_convert}, but raises an ArgumentError, when the conversion failed.
     # 
     # @raise ArgumentError
@@ -599,7 +598,7 @@ __REGEXP__
         return o
       end
     end
-    
+
     # Tests whether a given pattern is a valid template pattern.
     # @example
     #   URITemplate::Draft7.valid? 'foo' #=> true
@@ -608,13 +607,13 @@ __REGEXP__
     def valid?(pattern)
       URI === pattern
     end
-  
+
   end
-  
+
   extend ClassMethods
-  
+
   attr_reader :options
-  
+
   # @param String,Array either a pattern as String or an Array of tokens
   # @param Hash some options
   # @option :lazy If true the pattern will be parsed on first access, this also means that syntax errors will not be detected unless accessed.
@@ -633,7 +632,7 @@ __REGEXP__
       raise ArgumentError, "Expected to receive a pattern string, but got #{pattern_or_tokens.inspect}"
     end
   end
-  
+
   # @method expand(variables = {})
   # Expands the template with the given variables.
   # The expansion should be compatible to uritemplate spec draft 7 ( http://tools.ietf.org/html/draft-gregorio-uritemplate-07 ).
@@ -648,7 +647,7 @@ __REGEXP__
   #
   # @param variables Hash
   # @return String
-  
+
   # Compiles this template into a regular expression which can be used to test whether a given uri matches this template. This template is also used for {#===}.
   #
   # @example
@@ -666,8 +665,7 @@ __REGEXP__
       Regexp.new( source.join, Utils::KCODE_UTF8)
     end
   end
-  
-  
+
   # Extracts variables from a uri ( given as string ) or an instance of MatchData ( which was matched by the regexp of this template.
   # The actual result depends on the value of post_processing.
   # This argument specifies whether pair arrays should be converted to hashes.
@@ -724,25 +722,25 @@ __REGEXP__
       if block_given?
         return yield result
       end
-      
+
       return result
     end
   end
-  
+
   # Extracts variables without any proccessing.
   # This is equivalent to {#extract} with options {NO_PROCESSING}.
   # @see #extract
   def extract_simple(uri_or_match)
     extract( uri_or_match, NO_PROCESSING )
   end
-  
+
   # Returns the pattern for this template.
   def pattern
     @pattern ||= tokens.map(&:to_s).join
   end
-  
+
   alias to_s pattern
-  
+
   # Compares two template patterns.
   def ==(o)
     this, other, this_converted, _ = URITemplate.coerce( self, o )
@@ -751,12 +749,12 @@ __REGEXP__
     end
     return this.pattern == other.pattern
   end
-  
+
   # @method ===(uri)
   # Alias for to_r.=== . Tests whether this template matches a given uri.
   # @return TrueClass, FalseClass
   def_delegators :to_r, :===
-  
+
   # @method match(uri)
   # Alias for to_r.match . Matches this template against the given uri.
   # @yield MatchData
@@ -774,7 +772,7 @@ __REGEXP__
   def type
     :draft7
   end
-  
+
   # Returns the level of this template according to the draft ( http://tools.ietf.org/html/draft-gregorio-uritemplate-07#section-1.2 ). Higher level means higher complexity.
   # Basically this is defined as:
   # 
@@ -797,7 +795,7 @@ __REGEXP__
   def level
     tokens.map(&:level).max
   end
-  
+
   # Tries to concatenate two templates, as if they were path segments.
   # Removes double slashes or insert one if they are missing.
   #
@@ -813,11 +811,11 @@ __REGEXP__
     if this_converted
       return this / other
     end
-    
+
     if other.absolute?
       raise ArgumentError, "Expected to receive a relative template but got an absoulte one: #{other.inspect}. If you think this is a bug, please report it."
     end
-    
+
     if other.pattern == ''
       return self
     end
@@ -848,7 +846,7 @@ __REGEXP__
         end
       end
     end
-    
+
     if other.tokens.first.kind_of?(Literal)
       if other.tokens.first.string[0] == SLASH
         return self.class.new( self.tokens + other.tokens )
@@ -861,7 +859,7 @@ __REGEXP__
       return self.class.new( self.tokens + [Literal.new('/')] + other.tokens )
     end
   end
-  
+
   # Returns an array containing a the template tokens.
   def tokens
     @tokens ||= tokenize!
@@ -872,11 +870,11 @@ protected
   def tokenize!
     Tokenizer.new(pattern).to_a
   end
-  
+
   def arity
     @arity ||= tokens.inject(0){|a,t| a + t.arity }
   end
-  
+
   # @private
   def extract_matchdata(matchdata, post_processing)
     bc = 1
@@ -908,7 +906,5 @@ protected
       end
     end
   end
-  
-end
-
 
+end