uri_template 0.3.0 → 0.4.0

data/CHANGELOG

@@ -1,5 +1,10 @@
+# 0.4.0 - 06.07.2012
++ expand now accepts symbols as keys
++ expand now accepts arrays of pairs
+* fixed some testing bugs
+
 # 0.3.0 - 24.05.2012
-* Implemented the final version. Default implementation is now RFC 6570
++ Implemented the final version. Default implementation is now RFC 6570
 * BUGFIX: variables with terminal dots were allowed
 * BUGFIX: lists of commas were parsed incorrectly
 

data/README

@@ -1,5 +1,7 @@
 = URITemplate - a uri template library
 
+{<img src="https://secure.travis-ci.org/hannesg/uri_template.png" />}[http://travis-ci.org/hannesg/uri_template] {<img src="https://gemnasium.com/hannesg/uri_template.png" />}[https://gemnasium.com/hannesg/uri_template]
+
 With URITemplate you can generate URI based on simple templates. The syntax if defined by RFC 6570 ( http://tools.ietf.org/html/rfc6570 ).
 
 For backward compatibility, there is an implementation based on draft 7 of the uri template spec ( http://tools.ietf.org/html/draft-gregorio-uritemplate-07 ), too. For the syntax read that spec. Draft 2 of that specification is implemented as addressable gem.

data/lib/uri_template.rb

@@ -221,11 +221,19 @@ module URITemplate
 
   # Expands this uri template with the given variables.
   # The variables should be converted to strings using {Utils#object_to_param}.
+  #
+  # The keys in the variables hash are converted to
+  # strings in order to support the Ruby 1.9 hash syntax.
+  #
   # @raise {Unconvertable} if a variable could not be converted to a string.
   # @param variables Hash
   # @return String
   def expand(variables = {})
-    raise ArgumentError, "Expected something that returns to :[], but got: #{variables.inspect}" unless variables.respond_to? :[]
+    raise ArgumentError, "Expected something that returns to :map, but got: #{variables.inspect}" unless variables.respond_to? :map
+
+    # Stringify variables
+    variables = Hash[variables.map{ |k, v| [k.to_s, v] }]
+
     tokens.map{|part|
       part.expand(variables)
     }.join

data/lib/uri_template/utils.rb

@@ -78,7 +78,6 @@ module URITemplate
       # @method to_ascii(string)
       # converts a string to ascii
       # 
-      # This method checks which encoding method is available.
       # @param str [String]
       # @return String
       # @visibility public
@@ -89,7 +88,6 @@ module URITemplate
       # @method to_utf8(string)
       # converts a string to utf8
       # 
-      # This method checks which encoding method is available.
       # @param str [String]
       # @return String
       # @visibility public
@@ -106,15 +104,15 @@ module URITemplate
       end
 
       if "".respond_to?(:encode)
-        # @private
-        alias_method :to_ascii, :to_ascii_encode
-        # @private
-        alias_method :to_utf8, :to_utf8_encode
+        # @api private
+        send(:alias_method, :to_ascii, :to_ascii_encode)
+        # @api private
+        send(:alias_method, :to_utf8, :to_utf8_encode)
       else
-        # @private
-        alias_method :to_ascii, :to_ascii_fallback
-        # @private
-        alias_method :to_utf8, :to_utf8_fallback
+        # @api private
+        send(:alias_method, :to_ascii, :to_ascii_fallback)
+        # @api private
+        send(:alias_method, :to_utf8, :to_utf8_fallback)
       end
 
       public :to_ascii

data/uri_template.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'uri_template'
-  s.version = '0.3.0'
-  s.date = '2012-05-24'
+  s.version = '0.4.0'
+  s.date = '2012-07-06'
   s.authors = ["HannesG"]
   s.email = %q{hannes.georg@googlemail.com}
   s.summary = 'A templating system for URIs.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_template
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &18775000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18775000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18773940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18773940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &18773480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18773480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18773060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18773060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18772600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18772600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'A templating system for URIs, which implements RFC 6570: http://tools.ietf.org/html/rfc6570.
   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
@@ -76,9 +101,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/uri_template/utils.rb
-- lib/uri_template/draft7.rb
 - lib/uri_template/colon.rb
 - lib/uri_template/rfc6570.rb
+- lib/uri_template/draft7.rb
 - lib/uri_template.rb
 - uri_template.gemspec
 - README
@@ -103,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A templating system for URIs.