uri_template 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9e795b18afed57cb37be55473035352b72840137
+  data.tar.gz: bc9b6c7926531fa76e6c5d2cbcbade14f5c32832
+SHA512:
+  metadata.gz: 12d4f67c125ae1bb05054765563217ec63438793ea709f554d648f25d1ec30f437fd1854b784023516975c938ebf21263cc271a42c670097e4ba3c46c46f32e4
+  data.tar.gz: 3062ed310d22881fd560d9e8cfcfa7f8bab87c9e72a76adb8f32089d9a04b380f69e5f7b821f6f0799163639351014fa1609344bc840f289c93ff6dc178de7e0

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# 0.6.0 - TBD
+# 0.7.0 - 21.03.2014
+
+* [CHANGE] Licence is now MIT
+* [ENHANCEMENT] partial expansion has now more features
+
+# 0.6.0 - 09.08.2013
 
 * [FEATURE] partial expansion
 * [FEATURE] You can now pass variables as an Array to URITemplate#expand ( thanks to @bmaland )

data/README.md

@@ -1,5 +1,4 @@
-URITemplate - a uri template library
-========================
+# URITemplate - a uri template library
 
 [![Build Status](https://secure.travis-ci.org/hannesg/uri_template.png)](http://travis-ci.org/hannesg/uri_template)
 [![Dependency Status](https://gemnasium.com/hannesg/uri_template.png)](https://gemnasium.com/hannesg/uri_template)
@@ -10,50 +9,54 @@ With URITemplate you can generate URIs based on simple templates and extract var
 
 From version 0.2.0, it will use escape_utils if available. This will significantly boost uri-escape/unescape performance if more characters need to be escaped ( may be slightly slower in trivial cases. working on that ... ), but does not run everywhere. To enable this, do the following:
 
-    # escape_utils has to be loaded when uri_templates is loaded
-    gem 'escape_utils'
-    require 'escape_utils'
-    
-    gem 'uri_template'
-    require 'uri_template'
-    
-    UriTemplate::Utils.using_escape_utils? #=> true
-
-
-Examples
--------------------
-
-    require 'uri_template'
-    
-    tpl = URITemplate.new('http://{host}{/segments*}/{file}{.extensions*}')
-    
-    # This will give: http://www.host.com/path/to/a/file.x.y
-    tpl.expand('host'=>'www.host.com','segments'=>['path','to','a'],'file'=>'file','extensions'=>['x','y'])
-    
-    # This will give: { 'host'=>'www.host.com','segments'=>['path','to','a'],'file'=>'file','extensions'=>['x','y']}
-    tpl.extract('http://www.host.com/path/to/a/file.x.y')
-    
-    # If you like colon templates more:
-    tpl2 = URITemplate.new(:colon, '/:x/y')
-    
-    # This will give: {'x' => 'z'}
-    tpl2.extract('/z/y')
-    
-    # This will give a new uri template with just the host expanded:
-    tpl.expand_partial(host: "www.host.com")
-
-RFC 6570 Syntax
---------------------
+```ruby
+# escape_utils has to be loaded when uri_templates is loaded
+gem 'escape_utils'
+require 'escape_utils'
+
+gem 'uri_template'
+require 'uri_template'
+
+URITemplate::Utils.using_escape_utils? #=> true
+```
+
+## Examples
+
+```ruby
+require 'uri_template'
+
+tpl = URITemplate.new('http://{host}{/segments*}/{file}{.extensions*}')
+
+# This will give: http://www.host.com/path/to/a/file.x.y
+tpl.expand('host'=>'www.host.com','segments'=>['path','to','a'],'file'=>'file','extensions'=>['x','y'])
+
+# This will give: { 'host'=>'www.host.com','segments'=>['path','to','a'],'file'=>'file','extensions'=>['x','y']}
+tpl.extract('http://www.host.com/path/to/a/file.x.y')
+
+# If you like colon templates more:
+tpl2 = URITemplate.new(:colon, '/:x/y')
+
+# This will give: {'x' => 'z'}
+tpl2.extract('/z/y')
+
+# This will give a new uri template with just the host expanded:
+tpl.expand_partial(host: "www.host.com")
+```
+
+## RFC 6570 Syntax
 
 The syntax defined by [RFC 6570]( http://tools.ietf.org/html/rfc6570 ) is pretty straight forward. Basically anything surrounded by curly brackets is interpreted as variable.
 
-    URITemplate.new('{variable}').expand('variable' => 'value') #=> "value"
+```ruby
+URITemplate.new('{variable}').expand('variable' => 'value') #=> "value"
+```
 
 The way variables are inserted can be modified using operators. The operator is the first character between the curly brackets. There are seven operators defined `#`, `+`, `;`, `?`, `&`, `/` and `.`. So if you want to create a form-style query do this:
 
-    URITemplate.new('{?variable}').expand('variable' => 'value') #=> "?variable=value"
+```ruby
+URITemplate.new('{?variable}').expand('variable' => 'value') #=> "?variable=value"
+```
 
-Benchmarks
------------------------
+## Benchmarks
 
 I have assembled one benchmark based on the uritemplate-test examples. You can find them in the "benchmarks" folder. The short result: uri_template is 2-10x faster than addressable on ruby 1.9.3.

data/lib/uri_template.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 # A base module for all implementations of a uri template.
 module URITemplate

data/lib/uri_template/colon.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 require 'forwardable'
 

data/lib/uri_template/expression.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 # A module which all non-literal tokens should include.
 module URITemplate::Expression
@@ -30,4 +36,4 @@ module URITemplate::Expression
     true
   end
 
-end
+end

data/lib/uri_template/literal.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 # A module which all literal tokens should include.
 module URITemplate::Literal

data/lib/uri_template/rfc6570.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 require 'strscan'
 require 'set'
@@ -319,7 +325,7 @@ __REGEXP__
   # @method expand_partial(variables = {})
   # Works like expand but keeps missing variables in place.
   # @example
-  #   URITemplate::RFC6570.new('{foo}').expand_partial('foo'=>'bar') #=> URITemplate::RFC6570.new('bar')
+  #   URITemplate::RFC6570.new('{foo}').expand_partial('foo'=>'bar') #=> URITemplate::RFC6570.new('bar{foo}')
   #   URITemplate::RFC6570.new('{undef}').expand_partial() #=> URITemplate::RFC6570.new('{undef}')
   #
   # @param variables [Hash,Array]

data/lib/uri_template/rfc6570/expression.rb

@@ -1,20 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 require 'uri_template/rfc6570'
 
 class URITemplate::RFC6570
@@ -75,20 +80,33 @@ class URITemplate::RFC6570
 
     def expand_partial( vars )
       result = []
-      defined = false
+      follow_up = self.class::FOLLOW_UP
+      var_specs = []
       @variable_specs.each do | var, expand , max_length |
-        defined ||= vars.key? var
-        if Utils.def? vars[var]
-          result.push(*expand_one(var, vars[var], expand, max_length))
+        if vars.key? var
+          unless var_specs.none?
+            result.push( follow_up.new( var_specs ) )
+            var_specs = []
+          end
+          unless result.none?
+            result.push( Literal.new(self.class::SEPARATOR) )
+          end
+          one = Array(expand_one(var, vars[var], expand, max_length))
+          result.push( Literal.new(one.join(self.class::SEPARATOR)))
         end
+        var_specs << [var,expand,max_length]
       end
-      if result.any?
-        return [ Literal.new(self.class::PREFIX + result.join(self.class::SEPARATOR)) ]
-      elsif defined
-        return []
-      else
+      if result.none?
+        # no literal was emitted so far
         return [ self ]
       end
+      unless self.class::PREFIX.empty? || empty_literals?( result )
+        result.unshift( Literal.new(self.class::PREFIX) )
+      end
+      if var_specs.size != 0
+        result.push( follow_up.new( var_specs ) )
+      end
+      return result
     end
 
     def extract(position,matched)
@@ -261,12 +279,18 @@ class URITemplate::RFC6570
         [ self_pair(name, ary, max_length){|value| escape(value) } ]
       end
     end
+
+    def empty_literals?( list )
+      list.none?{|x| x.kind_of?(Literal) && !x.to_s.empty? }
+    end
   end
 
   require 'uri_template/rfc6570/expression/named'
   require 'uri_template/rfc6570/expression/unnamed'
 
   class Expression::Basic < Expression::Unnamed
+    FOLLOW_UP = self
+    BULK_FOLLOW_UP = self
   end
 
   class Expression::Reserved < Expression::Unnamed
@@ -274,6 +298,8 @@ class URITemplate::RFC6570
     CHARACTER_CLASS = CHARACTER_CLASSES[:unreserved_reserved_pct]
     OPERATOR = '+'.freeze
     BASE_LEVEL = 2
+    FOLLOW_UP = self
+    BULK_FOLLOW_UP = self
 
     def escape(x)
       Utils.escape_uri(Utils.object_to_param(x))
@@ -299,6 +325,8 @@ class URITemplate::RFC6570
     PREFIX = '#'.freeze
     OPERATOR = '#'.freeze
     BASE_LEVEL = 2
+    FOLLOW_UP = Expression::Reserved
+    BULK_FOLLOW_UP = Expression::Reserved
 
     def escape(x)
       Utils.escape_uri(Utils.object_to_param(x))
@@ -316,6 +344,8 @@ class URITemplate::RFC6570
     PREFIX = '.'.freeze
     OPERATOR = '.'.freeze
     BASE_LEVEL = 3
+    FOLLOW_UP = self
+    BULK_FOLLOW_UP = self
 
   end
 
@@ -325,6 +355,8 @@ class URITemplate::RFC6570
     PREFIX = '/'.freeze
     OPERATOR = '/'.freeze
     BASE_LEVEL = 3
+    FOLLOW_UP = self
+    BULK_FOLLOW_UP = self
 
     def starts_with_slash?
       true
@@ -339,27 +371,33 @@ class URITemplate::RFC6570
     PAIR_IF_EMPTY = false
     OPERATOR = ';'.freeze
     BASE_LEVEL = 3
+    FOLLOW_UP = self
+    BULK_FOLLOW_UP = self
 
   end
 
-  class Expression::FormQuery < Expression::Named
+  class Expression::FormQueryContinuation < Expression::Named
 
     SEPARATOR = '&'.freeze
-    PREFIX = '?'.freeze
-    OPERATOR = '?'.freeze
+    PREFIX = '&'.freeze
+    OPERATOR = '&'.freeze
     BASE_LEVEL = 3
-
+    FOLLOW_UP = Expression::Basic
+    BULK_FOLLOW_UP = self
   end
 
-  class Expression::FormQueryContinuation < Expression::Named
+  class Expression::FormQuery < Expression::Named
 
     SEPARATOR = '&'.freeze
-    PREFIX = '&'.freeze
-    OPERATOR = '&'.freeze
+    PREFIX = '?'.freeze
+    OPERATOR = '?'.freeze
     BASE_LEVEL = 3
+    FOLLOW_UP = Expression::Basic
+    BULK_FOLLOW_UP = Expression::FormQueryContinuation
 
   end
 
+
   # @private
   OPERATORS = {
     ''  => Expression::Basic,

data/lib/uri_template/rfc6570/expression/named.rb

@@ -1,23 +1,31 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 require 'uri_template/rfc6570'
 
-class URITemplate::RFC6570::Expression::Named < URITemplate::RFC6570::Expression
+class URITemplate::RFC6570
+
+class Expression::Named < Expression
 
   alias self_pair pair
 
@@ -54,6 +62,39 @@ class URITemplate::RFC6570::Expression::Named < URITemplate::RFC6570::Expression
     return source.join
   end
 
+  def expand_partial( vars )
+    result = []
+    rest   = []
+    defined = false
+    @variable_specs.each do | var, expand , max_length |
+      if vars.key? var
+        if Utils.def? vars[var]
+          if result.any? && !self.class::SEPARATOR.empty?
+            result.push( Literal.new(self.class::SEPARATOR) )
+          end
+          one = expand_one(var, vars[var], expand, max_length)
+          result.push( Literal.new(Array(one).join(self.class::SEPARATOR)) )
+        end
+        if expand
+          rest << [var, expand, max_length]
+        else
+          result.push( self.class::FOLLOW_UP.new([[var,expand,max_length]]) )
+        end
+      else
+        rest.push( [var,expand,max_length] )
+      end
+    end
+    if result.any?
+      unless self.class::PREFIX.empty? || empty_literals?( result )
+        result.unshift( Literal.new(self.class::PREFIX) )
+      end
+      result.push( self.class::BULK_FOLLOW_UP.new(rest) ) if rest.size != 0
+      return result
+    else
+      return [ self ]
+    end
+  end
+
 private
 
   def extracted_nil
@@ -69,4 +110,5 @@ private
     end
   end
 
-end
+end
+end

data/lib/uri_template/rfc6570/expression/unnamed.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 require 'uri_template/rfc6570'
 

data/lib/uri_template/rfc6570/regex_builder.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 require 'uri_template/rfc6570'
 
@@ -114,4 +120,4 @@ class URITemplate::RFC6570
 
   end
 
-end
+end

data/lib/uri_template/token.rb

@@ -1,19 +1,25 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
 # This should make it possible to do basic analysis independently from the concrete type.
 # Usually the submodules {URITemplate::Literal} and {URITemplate::Expression} are used.

data/lib/uri_template/utils.rb

@@ -1,19 +1,26 @@
 # -*- encoding : utf-8 -*-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the Affero GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+# The MIT License (MIT)
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# Copyright (c) 2011-2014 Hannes Georg
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-#    (c) 2011 - 2012 by Hannes Georg
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 module URITemplate
 
   # An awesome little helper which helps iterating over a string.

data/uri_template.gemspec

@@ -1,17 +1,19 @@
 Gem::Specification.new do |s|
   s.name = 'uri_template'
-  s.version = '0.6.0'
+  s.version = '0.7.0'
   s.date = Time.now.strftime('%Y-%m-%d')
   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 RFC6570 and Colon based URITemplates in a clean and straight forward way.'
-  
+
   s.require_paths = ['lib']
-  
+
+  s.license = 'MIT'
+
   s.files = Dir.glob('lib/**/**/*.rb') + ['uri_template.gemspec', 'README.md', 'CHANGELOG.md']
- 
+
   s.add_development_dependency 'multi_json'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: uri_template
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - HannesG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A templating system for URIs, which implements RFC6570 and Colon based
@@ -98,42 +87,43 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/uri_template/utils.rb
+- CHANGELOG.md
+- README.md
+- lib/uri_template.rb
 - lib/uri_template/colon.rb
 - lib/uri_template/expression.rb
-- lib/uri_template/token.rb
-- lib/uri_template/rfc6570.rb
 - lib/uri_template/literal.rb
-- lib/uri_template/rfc6570/regex_builder.rb
-- lib/uri_template/rfc6570/expression/unnamed.rb
-- lib/uri_template/rfc6570/expression/named.rb
+- lib/uri_template/rfc6570.rb
 - lib/uri_template/rfc6570/expression.rb
-- lib/uri_template.rb
+- lib/uri_template/rfc6570/expression/named.rb
+- lib/uri_template/rfc6570/expression/unnamed.rb
+- lib/uri_template/rfc6570/regex_builder.rb
+- lib/uri_template/token.rb
+- lib/uri_template/utils.rb
 - uri_template.gemspec
-- README.md
-- CHANGELOG.md
 homepage: http://github.com/hannesg/uri_template
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A templating system for URIs.
 test_files: []
+has_rdoc: