uri_template 0.2.0 → 0.2.1

data/lib/uri_template/utils.rb

@@ -21,13 +21,13 @@ module URITemplate
   # Initialize with a regexp and pass a string to :each.
   # It will yield a string or a MatchData
   class RegexpEnumerator
-  
+
     include Enumerable
-    
+
     def initialize(regexp)
       @regexp = regexp
     end
-    
+
     def each(str)
       return Enumerator.new(self,:each,str) unless block_given?
       rest = str
@@ -49,19 +49,19 @@ module URITemplate
       end
       return self
     end
-  
+
   end
 
   # This error will be raised whenever an object could not be converted to a param string.
   class Unconvertable < StandardError
-  
+
     attr_reader :object
-  
+
     def initialize(object)
       @object = object
       super("Could not convert the given object (#{Object.instance_method(:inspect).bind(@object).call() rescue '<????>'}) to a param since it doesn't respond to :to_param or :to_s.")
     end
-  
+
   end
 
   # A collection of some utility methods.
@@ -69,12 +69,12 @@ module URITemplate
   # I will use the escape_utils library if available, but runs happily without.
   #
   module Utils
-  
+
     KCODE_UTF8 = (Regexp::KCODE_UTF8 rescue 0)
-    
+
     # Bundles some string encoding methods.
     module StringEncoding
-      
+
       # @method to_ascii(string)
       # converts a string to ascii
       # 
@@ -85,7 +85,7 @@ module URITemplate
       def to_ascii_encode(str)
         str.encode(Encoding::ASCII)
       end
-      
+
       # @method to_utf8(string)
       # converts a string to utf8
       # 
@@ -96,15 +96,15 @@ module URITemplate
       def to_utf8_encode(str)
         str.encode(Encoding::UTF_8)
       end
-      
+
       def to_ascii_fallback(str)
         str
       end
-      
+
       def to_utf8_fallback(str)
         str
       end
-      
+
       if "".respond_to?(:encode)
         # @private
         alias_method :to_ascii, :to_ascii_encode
@@ -116,98 +116,97 @@ module URITemplate
         # @private
         alias_method :to_utf8, :to_utf8_fallback
       end
-      
+
       public :to_ascii
       public :to_utf8
-      
+
     end
-    
+
     module Escaping
-    
+
       # A pure escaping module, which implements escaping methods in pure ruby.
       # The performance is acceptable, but could be better with escape_utils.
       module Pure
-    
+
         include StringEncoding
-    
+
         # @private
         URL_ESCAPED = /([^A-Za-z0-9\-\._])/.freeze
-        
+
         # @private
         URI_ESCAPED = /([^A-Za-z0-9!$&'()*+,.\/:;=?@\[\]_~])/.freeze
-        
+
         # @private
-        PCT = /%(\h\h)/.freeze
-        
+        PCT = /%([0-9a-fA-F]{2})/.freeze
+
         def escape_url(s)
           to_utf8(s.to_s).gsub(URL_ESCAPED){
             '%'+$1.unpack('H2'*$1.bytesize).join('%').upcase
           }
         end
-        
+
         def escape_uri(s)
           to_utf8(s.to_s).gsub(URI_ESCAPED){
             '%'+$1.unpack('H2'*$1.bytesize).join('%').upcase
           }
         end
-        
+
         def unescape_url(s)
           to_utf8( s.to_s.gsub('+',' ').gsub(PCT){
             $1.to_i(16).chr
           } )
         end
-        
+
         def unescape_uri(s)
           to_utf8( s.to_s.gsub(PCT){
             $1.to_i(16).chr
           })
         end
-        
+
         def using_escape_utils?
           false
         end
-        
+
       end
-      
+
     if defined? EscapeUtils
-      
+
       # A escaping module, which is backed by escape_utils.
       # The performance is good, espacially for strings with many escaped characters.
       module EscapeUtils
-      
+
         include StringEncoding
-      
+
         include ::EscapeUtils
-    
+
         def using_escape_utils?
           true
         end
-        
+
         def escape_url(s)
           super(to_utf8(s)).gsub('+','%20')
         end
-        
+
         def escape_uri(s)
           super(to_utf8(s))
         end
-        
+
         def unescape_url(s)
           super(to_ascii(s))
         end
-        
+
         def unescape_uri(s)
           super(to_ascii(s))
         end
-      
+
       end
-    
+
     end
-    
-    
+
     end
-    
+
     include StringEncoding
-    
+
     if Escaping.const_defined? :EscapeUtils
       include Escaping::EscapeUtils
       puts "Using escape_utils." if $VERBOSE
@@ -215,7 +214,7 @@ module URITemplate
       include Escaping::Pure
       puts "Not using escape_utils." if $VERBOSE
     end
-    
+
     # Converts an object to a param value.
     # Tries to call :to_param and then :to_s on that object.
     # @raise Unconvertable if the object could not be converted.
@@ -237,8 +236,7 @@ module URITemplate
     rescue NoMethodError
       raise Unconvertable.new(object)
     end
-    
-    
+
     # Returns true when the given value is an array and it only consists of arrays with two items.
     # This useful when using a hash is not ideal, since it doesn't allow duplicate keys.
     # @example
@@ -274,9 +272,9 @@ module URITemplate
         return x
       end
     end
-    
+
     extend self
-  
+
   end
 
 end

data/uri_template.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = 'uri_template'
-  s.version = '0.2.0'
-  s.date = '2011-12-03'
+  s.version = '0.2.1'
+  s.date = '2011-12-30'
   s.authors = ["HannesG"]
   s.email = %q{hannes.georg@googlemail.com}
   s.summary = 'A templating system for URIs.'
   s.homepage = 'http://github.com/hannesg/uri_template'
-  s.description = 'A templating system for URIs, which implements http://tools.ietf.org/html/draft-gregorio-uritemplate-07 . An implementation of an older version of that spec is known as addressable. This gem however is intended to be extended when newer specs evolve. For now only draft 7 is supported. Downside: not for 1.8.7.'
+  s.description = 'A templating system for URIs, which implements http://tools.ietf.org/html/draft-gregorio-uritemplate-07 . An implementation of an older version of that spec is known as addressable. This gem however is intended to be extended when newer specs evolve. For now only draft 7 and a simple colon based format are supported.'
   
   s.require_paths = ['lib']
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_template
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000 Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17186480 !ruby/object:Gem::Requirement
+  requirement: &7325660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17186480
+  version_requirements: *7325660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &17185740 !ruby/object:Gem::Requirement
+  requirement: &7325220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17185740
+  version_requirements: *7325220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17184760 !ruby/object:Gem::Requirement
+  requirement: &7324800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17184760
+  version_requirements: *7324800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17195720 !ruby/object:Gem::Requirement
+  requirement: &7324380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,11 +54,11 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17195720
-description: ! 'A templating system for URIs, which implements http://tools.ietf.org/html/draft-gregorio-uritemplate-07
+  version_requirements: *7324380
+description: A templating system for URIs, which implements http://tools.ietf.org/html/draft-gregorio-uritemplate-07
   . An implementation of an older version of that spec is known as addressable. This
   gem however is intended to be extended when newer specs evolve. For now only draft
-  7 is supported. Downside: not for 1.8.7.'
+  7 and a simple colon based format are supported.
 email: hannes.georg@googlemail.com
 executables: []
 extensions: []