0
@@ -1,3 +1,10 @@
0
+=== 0.2.0 / 2008-3-18
0
+* Changed lib directory structure to reflect the name of the gem.
0
+  use "require 'uri/templates'" instead of "require 'uri_template'"
0
+
0
+=== 0.1.1 / 2008-03-17
0
+* Changed git source URL
0
+
0
 === 0.1.0 / 2008-03-10
0
 
0
 * Initial release. Implements version 0.2 (draft-gregorio-uritemplate-02).

0
@@ -2,10 +2,10 @@
0
 Manifest.txt
0
 README.txt
0
 Rakefile
0
-lib/uri_template.rb
0
-lib/uri_template/core_ext.rb
0
-lib/uri_template/grammar.rb
0
-lib/uri_template/version.rb
0
+lib/uri/templates.rb
0
+lib/uri/core_ext.rb
0
+lib/uri/grammar.rb
0
+lib/uri/version.rb
0
 test/test_helper.rb
0
 test/test_uri_template.rb
0
 test/test_uri_template_grammar.rb

0
@@ -20,7 +20,7 @@
0
 
0
 == SYNOPSIS:
0
   require 'rubygems'
0
-  require 'uri_templates'
0
+  require 'uri/templates'
0
   uri = UriTemplate::URI.new("http://example.org/{userid}").replace("userid" => "stefan")
0
   print uri # => http://example.org/stefan
0
   

0
@@ -4,7 +4,7 @@
0
 require 'hoe'
0
 require 'rcov/rcovtask'
0
 require 'rake/clean'
0
-require File.join(File.dirname(__FILE__), 'lib', 'uri_template', 'version')
0
+require File.join(File.dirname(__FILE__), 'lib', 'uri', 'version')
0
 
0
 class Hoe
0
   def extra_deps 

0
@@ -1 +1,19 @@
0
+#  Created by Stefan Saasen.
0
+#  Copyright (c) 2008. All rights reserved.
0
+
0
+class NilClass #:nodoc:
0
+  def blank?
0
+    true
0
+  end
0
+end
0
+
0
+class String #:nodoc:
0
+  def ord
0
+    self[0]
0
+  end
0
+  
0
+  def blank?
0
+    nil? || size < 1
0
+  end
0
+end

0
@@ -1 +1,1221 @@
0
+module UriTemplate
0
+  include Treetop::Runtime
0
+
0
+  def root
0
+    @root ||= :uri_template
0
+  end
0
+
0
+  module UriTemplate0
0
+    def uri_element
0
+      elements[0]
0
+    end
0
+
0
+    def more_elements
0
+      elements[1]
0
+    end
0
+  end
0
+
0
+  module UriTemplate1
0
+    def value(env={})
0
+      uri_element.value(env) << more_elements.elements.map{|el| el.value(env)}.join
0
+    end
0
+  end
0
+
0
+  def _nt_uri_template
0
+    start_index = index
0
+    if node_cache[:uri_template].has_key?(index)
0
+      cached = node_cache[:uri_template][index]
0
+      @index = cached.interval.end if cached
0
+      return cached
0
+    end
0
+
0
+    i0, s0 = index, []
0
+    r1 = _nt_uri_element
0
+    s0 << r1
0
+    if r1
0
+      s2, i2 = [], index
0
+      loop do
0
+        r3 = _nt_uri_element
0
+        if r3
0
+          s2 << r3
0
+        else
0
+          break
0
+        end
0
+      end
0
+      r2 = SyntaxNode.new(input, i2...index, s2)
0
+      s0 << r2
0
+    end
0
+    if s0.last
0
+      r0 = (SyntaxNode).new(input, i0...index, s0)
0
+      r0.extend(UriTemplate0)
0
+      r0.extend(UriTemplate1)
0
+    else
0
+      self.index = i0
0
+      r0 = nil
0
+    end
0
+
0
+    node_cache[:uri_template][start_index] = r0
0
+
0
+    return r0
0
+  end
0
+
0
+  def _nt_uri_element
0
+    start_index = index
0
+    if node_cache[:uri_element].has_key?(index)
0
+      cached = node_cache[:uri_element][index]
0
+      @index = cached.interval.end if cached
0
+      return cached
0
+    end
0
+
0
+    i0 = index
0
+    r1 = _nt_expansion
0
+    if r1
0
+      r0 = r1
0
+    else
0
+      r2 = _nt_uri_part
0
+      if r2
0
+        r0 = r2
0
+      else
0
+        self.index = i0
0
+        r0 = nil
0
+      end
0
+    end
0
+
0
+    node_cache[:uri_element][start_index] = r0
0
+
0
+    return r0
0
+  end
0
+
0
+  module Expansion0
0
+    def c
0
+      elements[1]
0
+    end
0
+
0
+  end
0
+
0
+  module Expansion1
0
+    def value(env = {})
0
+ if c.respond_to? :value
0
+   c.value(env)
0
+ else
0
+   c.interval.to_s + "<>"
0
+ end
0
+    end
0
+  end
0
+
0
+  def _nt_expansion
0
+    start_index = index
0
+    if node_cache[:expansion].has_key?(index)
0
+      cached = node_cache[:expansion][index]
0
+      @index = cached.interval.end if cached
0
+      return cached
0
+    end
0
+
0
+    i0, s0 = index, []
0
+    if input.index('{', index) == index
0
+      r1 = (SyntaxNode).new(input, index...(index + 1))
0
+      @index += 1
0
+    else
0
+      terminal_parse_failure('{')
0
+      r1 = nil
0
+    end
0
+    s0 << r1
0
+    if r1
0
+      i2 = index
0
+      r3 = _nt_var
0
+      if r3
0
+        r2 = r3
0
+      else
0
+        r4 = _nt_operator
0
+        if r4
0
+          r2 = r4
0
+        else
0
+          self.index = i2
0
+          r2 = nil
0
+        end
0
+      end
0
+      s0 << r2
0
+      if r2
0
+        if input.index('}', index) == index
0
+          r5 = (SyntaxNode).new(input, index...(index + 1))
0
+          @index += 1
0
+        else
0
+          terminal_parse_failure('}')
0
+          r5 = nil
0
+        end
0
+        s0 << r5
0
+      end
0
+    end
0
+    if s0.last
0
+      r0 = (SyntaxNode).new(input, i0...index, s0)
0
+      r0.extend(Expansion0)
0
+      r0.extend(Expansion1)
0
+    else
0
+      self.index = i0
0
+      r0 = nil
0
+    end
0
+
0
+    node_cache[:expansion][start_index] = r0
0
+
0
+    return r0
0
+  end
0
+
0
+  module UriPart0
0
+    def value(env = {})
0
+      text_value
0
+    end
0
+  end
0
+
0
+  def _nt_uri_part
0
+    start_index = index
0
+    if node_cache[:uri_part].has_key?(index)
0
+      cached = node_cache[:uri_part][index]
0
+      @index = cached.interval.end if cached
0
+      return cached
0
+    end
0
+
0
+    i0 = index
0
+    r1 = _nt_unreserved
0
+    if r1
0
+      r0 = r1
0
+      r0.extend(UriPart0)
0
+    else
0
+      r2 = _nt_reserved
0
+      if r2
0
+        r0 = r2
0
+        r0.extend(UriPart0)
0
+      else
0
+        r3 = _nt_pct_encoded
0
+        if r3
0
+          r0 = r3
0
+          r0.extend(UriPart0)
0
+        else
0
+          self.index = i0
0
+          r0 = nil
0
+        end
0
+      end
0
+    end
0
+
0
+    node_cache[:uri_part][start_index] = r0
0
+
0
+    return r0
0
+  end
0
+
0
+  def _nt_arg
0
+    start_index = index
0
+    if node_cache[:arg].has_key?(index)
0
+      cached = node_cache[:arg][index]
0
+      @index = cached.interval.end if cached
0
+      return cached
0
+    end
0
+
0
+    s0, i0 = [], index
0
+    loop do
0
+      i1 = index
0
+      r2 = _nt_reserved
0
+      if r2
0
+        r1 = r2
0
+      else
0
+        r3 = _nt_unreserved
0
+        if r3
0
+          r1 = r3
0
+        else
0
+          r4 = _nt_pct_encoded
0
+          if r4
0
+            r1 = r4
0
+          else
0
+            self.index = i1
0
+            r1 = nil
0
+          end
0
+        end
0
+      end
0
+      if r1
0
+        s0 << r1
0
+      else
0
+        break
0
+      end
0
+    end
0
+    r0 = SyntaxNode.new(input, i0...index, s0)
0
+
0
+    node_cache[:arg][start_index] = r0
0
+
0
+    return r0
0
+  end
0
+
0
+  module Op0
0
+    # If one or more of the variables are defined and non-empty then
0
+      # substitute the value of 'arg', otherwise substitute the empty string.
0
+    def exec
0
+      lambda do |env, arg, vars|
0
+        ret = ''
0
+        vars.split(',').each do |var| 
0
+          if !env[var.to_s].to_s.blank?
0
+            ret = "#{arg}"
0
+            break
0
+          end
0
+        end
0
+        ret
0
+      end
0
+    end
0
+  end
0
+
0
+  module Op1
0
+    # If all of the variables are un-defined or empty then substitute the
0
+    # value of arg, otherwise substitute the empty string.
0
+     def exec
0
+       lambda do |env, arg, vars| 
0
+         ret = "#{arg}"
0
+         vars.split(',').each do |var|
0
+           if !env[var.to_s].to_s.blank?
0
+             ret = ""
0
+             break
0
+           end
0
+         end
0
+         ret
0
+       end
0
+     end
0
+  end
0
+
0
+  module Op2
0
+    # The prefix operator MUST only have one variable in its expansion.  If
0
+    # the variable is defined and non-empty then substitute the value of
0
+    # arg followed by the value of the variable, otherwise substitute the
0
+    # empty string.
0
+     def exec
0
+       lambda do |env, prefix, vars| 
0
+         v = env[vars]
0
+         if vars =~ /([^=]+)=([^=]+)/
0
+           var, default = $1.dup, $2.dup
0
+           v = env[var.to_s]
0
+           v = default if v.to_s.blank?
0
+         end
0
+         !v.blank? ? "#{prefix}#{UriTemplate::Encoder.encode(v)}" : ""
0
+       end
0
+     end
0
+  end
0
+
0
+  module Op3
0
+    # The append operator MUST only have one variable in its expansion.  If
0
+    # the variable is defined and non-empty then substitute the value of
0
+    # the variable followed by the value of arg, otherwise substitute the
0
+    # empty string.
0
+     def exec
0
+       lambda do |env, append, vars|
0
+         v = env[vars]
0
+         if vars =~ /([^=]+)=([^=]+)/
0
+           var, default = $1.dup, $2.dup
0
+           v = env[var.to_s]
0
+           v = default if v.to_s.blank?
0
+         end  
0
+         if v
0
+           val = UriTemplate::Encoder.encode(v)
0
+           !val.blank? ? "#{val}#{append}" : ""
0
+         else
0
+           ''
0
+         end
0
+       end
0
+     end
0
+  end
0
+
0
+  module Op4
0
+    # For each variable that is defined and non-empty create a keyvalue
0
+    # string that is the concatenation of the variable name, "=", and the
0
+    # variable value.  Concatenate more than one keyvalue string with
0
+    # intervening values of arg to create the substitution value.
0
+    def exec
0
+       lambda do |env, joinop, vars| 
0
+         vars.split(',').map do |var|
0
+         v = env[var.to_s]
0
+         if var =~ /([^=]+)=([^=]+)/
0
+           var, default = $1.dup, $2.dup
0
+           v = env[var.to_s]
0
+           v = default if v.to_s.blank?
0
+         end
0
+         "#{var}=#{UriTemplate::Encoder.encode(v)}" if v
0
+       end.compact.join(joinop)
0
+     end
0
+    end
0
+  end
0
+
0
+  module Op5
0
+    # The listjoin operator MUST have only one variable in its expansion
0
+    # and that variable must be a list.  If the list is non-empty then
0
+    # substitute the concatenation of all the list members with intevening
0
+    # values of arg.
0
+     #
0
+    # The result of substitution MUST match the URI-reference rule and
0
+    # SHOULD also match any known rules for the scheme of the resulting
0
+    # URI.
0
+    def exec
0
+      lambda do |env, joinop, vars|
0
+        return "" unless env[vars.to_s].respond_to? :each
0
+        env[vars.to_s].map do |v|
0
+          "#{UriTemplate::Encoder.encode(v)}" if v
0
+        end.compact.join(joinop)
0
+      end
0
+    end
0
+  end
0
+
0
+  def _nt_op
0
+    start_index = index
0
+    if node_cache[:op].has_key?(index)
0
+      cached = node_cache[:op][index]
0
+      @index = cached.interval.end if cached
0
+      return cached
0
+    end
0
+
0
+    i0 = index
0
+    if input.index('opt', index) == index
0
+      r1 = (SyntaxNode).new(input, index...(index + 3))
0
+      r1.extend(Op0)
0
+      @index += 3
0
+    else
0
+      terminal_parse_failure('opt')
0
+      r1 = nil
0
+    end
0
+    if r1
0
+      r0 = r1
0
+    else
0
+      if input.index('neg', index) == index
0
+        r2 = (SyntaxNode).new(input, index...(index + 3))
0
+        r2.extend(Op1)
0
+        @index += 3
0
+      else
0
+        terminal_parse_failure('neg')
0
+        r2 = nil
0
+      end
0
+      if r2
0
+        r0 = r2
0
+      else
0
+        if input.index('prefix', index) == index
0
+          r3 = (SyntaxNode).new(input, index...(index + 6))
0
+          r3.extend(Op2)
0
+          @index += 6
0
+        else
0
+          terminal_parse_failure('prefix')
0
+          r3 = nil
0
+        end
0
+        if r3