uri_template 0.2.1 → 0.3.0

data/lib/uri_template/utils.rb

@@ -12,7 +12,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-#    (c) 2011 by Hannes Georg
+#    (c) 2011 - 2012 by Hannes Georg
 #
 
 module URITemplate
@@ -79,7 +79,7 @@ module URITemplate
       # converts a string to ascii
       # 
       # This method checks which encoding method is available.
-      # @param String
+      # @param str [String]
       # @return String
       # @visibility public
       def to_ascii_encode(str)
@@ -90,7 +90,7 @@ module URITemplate
       # converts a string to utf8
       # 
       # This method checks which encoding method is available.
-      # @param String
+      # @param str [String]
       # @return String
       # @visibility public
       def to_utf8_encode(str)
@@ -266,7 +266,7 @@ module URITemplate
     # @param x the value to convert
     # @param careful [true,false] wheter to check every array item. Use this when you expect array with subarrays which are not pairs. Setting this to false however improves runtime by ~30% even with comparetivly short arrays.
     def pair_array_to_hash(x, careful = false )
-      if careful ? pair_array?(x) : (x.kind_of?(Array) and x.first.kind_of?(Array))
+      if careful ? pair_array?(x) : (x.kind_of?(Array) and ( x.empty? or x.first.kind_of?(Array) ) )
         return Hash[ *x.flatten(1) ]
       else
         return x
@@ -275,6 +275,24 @@ module URITemplate
 
     extend self
 
+    # @api privat
+    def pair_array_to_hash2(x)
+      c = {}
+      result = []
+
+      x.each do | (k,v) |
+        e = c[k]
+        if !e
+          result << c[k] = [k,v]
+        else
+          e[1] = [e[1]] unless e[1].kind_of? Array
+          e[1] << v
+        end
+      end
+
+      return result
+    end
+
   end
 
 end

data/uri_template.gemspec

@@ -1,17 +1,18 @@
 Gem::Specification.new do |s|
   s.name = 'uri_template'
-  s.version = '0.2.1'
-  s.date = '2011-12-30'
+  s.version = '0.3.0'
+  s.date = '2012-05-24'
   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 and a simple colon based format are supported.'
+  s.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 7 and a simple colon based format are supported.'
   
   s.require_paths = ['lib']
   
   s.files = Dir.glob('lib/**/**/*.rb') + ['uri_template.gemspec', 'README', 'CHANGELOG']
-  
+ 
+  s.add_development_dependency 'multi_json'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_template
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &18775000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18775000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7325660 !ruby/object:Gem::Requirement
+  requirement: &18773940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7325660
+  version_requirements: *18773940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &7325220 !ruby/object:Gem::Requirement
+  requirement: &18773480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7325220
+  version_requirements: *18773480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7324800 !ruby/object:Gem::Requirement
+  requirement: &18773060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7324800
+  version_requirements: *18773060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7324380 !ruby/object:Gem::Requirement
+  requirement: &18772600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,20 +65,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  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
+  version_requirements: *18772600
+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
-  7 and a simple colon based format are supported.
+  7 and a simple colon based format are supported.'
 email: hannes.georg@googlemail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/uri_template.rb
-- lib/uri_template/colon.rb
-- lib/uri_template/draft7.rb
 - lib/uri_template/utils.rb
+- lib/uri_template/draft7.rb
+- lib/uri_template/colon.rb
+- lib/uri_template/rfc6570.rb
+- lib/uri_template.rb
 - uri_template.gemspec
 - README
 - CHANGELOG
@@ -91,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A templating system for URIs.