0
@@ -14,5 +14,21 @@
0
   p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
0
 end
0
 
0
+desc "Create the UriTemplate parser from the Treetop grammar"
0
+task :generate_parser do
0
+  sh 'tt grammar/uri_template.treetop -o lib/uri_template/grammar.rb'
0
+end
0
+
0
+desc 'Measures test coverage'
0
+task :coverage do
0
+  rm_f "coverage"
0
+  rm_f "coverage.data"
0
+  rcov = "rcov --aggregate coverage.data --text-summary -o coverage -Ilib"
0
+  system("#{rcov} test/test_*.rb")
0
+  system("open coverage/index.html") if PLATFORM['darwin']
0
+  rm_f "coverage"
0
+end
0
+
0
+
0
 # vim: syntax=Ruby

0
@@ -1 +1,19 @@
0
+# use_grammar.rb
0
+require 'rubygems'
0
+require 'treetop'
0
+require 'cgi'
0
+require 'pp'
0
+
0
+Treetop.load 'grammar/uri_template'
0
+
0
+
0
+parser = UriTemplateParser.new
0
+#v = parser.parse('http://{foo}/{bar}')
0
+
0
+
0
+#puts v.value("foo" => "stefan", 'bar' => 'sarah')
0
+
0
+v = parser.parse('http://example.org/{foo=fred}')
0
+pp v
0
+pp v.value("foo3" => "stefan", 'bar' => 'sarah')

0
@@ -1,70 +1 @@
0
-module Aviarc
0
-  include Treetop::Runtime
0
-
0
-  def root
0
-    @root || :variable
0
-  end
0
-
0
-  module Variable0
0
-    def replace!
0
-      "replace #{self}"
0
-    end
0
-  end
0
-
0
-  def _nt_variable
0
-    start_index = index
0
-    if node_cache[:variable].has_key?(index)
0
-      cached = node_cache[:variable][index]
0
-      @index = cached.interval.end if cached
0
-      return cached
0
-    end
0
-
0
-    if input.index('{foo}', index) == index
0
-      r0 = (SyntaxNode).new(input, index...(index + 5))
0
-      r0.extend(Variable0)
0
-      @index += 5
0
-    else
0
-      terminal_parse_failure('{foo}')
0
-      r0 = nil
0
-    end
0
-
0
-    node_cache[:variable][start_index] = r0
0
-
0
-    return r0
0
-  end
0
-
0
-  def _nt_ignore
0
-    start_index = index
0
-    if node_cache[:ignore].has_key?(index)
0
-      cached = node_cache[:ignore][index]
0
-      @index = cached.interval.end if cached
0
-      return cached
0
-    end
0
-
0
-    s0, i0 = [], index
0
-    loop do
0
-      if input.index(Regexp.new('[a-z]'), index) == index
0
-        r1 = (SyntaxNode).new(input, index...(index + 1))
0
-        @index += 1
0
-      else
0
-        r1 = nil
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[:ignore][start_index] = r0
0
-
0
-    return r0
0
-  end
0
-
0
-end
0
-
0
-class AviarcParser < Treetop::Runtime::CompiledParser
0
-  include Aviarc
0
-end

0
@@ -1,5 +1,9 @@
0
 require 'rubygems'
0
 require 'treetop'
0
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), './')))
0
+$:.uniq!
0
+require 'uri_template/version'
0
+require 'uri_template/grammar'
0
 
0
 require 'cgi'
0
 
0
@@ -41,17 +45,6 @@
0
   CGI.escape(s).gsub("%7E", '~').gsub("+", "%20") unless str.blank?
0
       end
0
     end
0
-  end
0
-end
0
-
0
-
0
-
0
-require File.dirname(__FILE__) + '/grammar'
0
-
0
-
0
-class UriPart < Treetop::Runtime::SyntaxNode
0
-  def value
0
-    text_value
0
   end
0
 end

0
@@ -1 +1,1223 @@
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
+		#raise more_elements.elements.inspect
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.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.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]
0
+                  v = default if v.to_s.blank?
0
+                end
0
+
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[va