0
@@ -1 +1,2 @@
0
+nbproject

0
@@ -3,7 +3,6 @@
0
   rule uri_template
0
     uri_element more_elements:(uri_element)* {
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
     }
0
0
0
@@ -14,32 +13,28 @@
0
   end
0
 
0
   rule expansion
0
-    '{' 
0
-  c:(
0
-    var
0
-    /
0
-    operator
0
-  ) 
0
-  '}'
0
-   {
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
+    '{'
0
+   c:(
0
+      var
0
+      /
0
+      operator
0
+   ) 
0
+   '}'
0
+    {
0
+      def value(env = {})
0
+        c.value(env)
0
+      end
0
       } 
0
   end
0
 
0
   rule uri_part
0
     (unreserved / reserved / pct_encoded) {
0
-          def value(env = {})
0
-            text_value
0
-          end
0
-        }
0
+      def value(env = {})
0
+        text_value
0
+      end
0
+    }
0
   end
0
- 
0
+
0
   rule arg
0
     (reserved / unreserved / pct_encoded)*
0
   end
0
0
@@ -47,25 +42,25 @@
0
   rule op
0
     (
0
     'opt' {
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
-      }
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
+       }
0
     / 
0
     'neg' {
0
-    # If all of the variables are un-defined or empty then substitute the
0
-    # value of arg, otherwise substitute the empty string.
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
0
0
0
0
0
0
0
@@ -81,85 +76,84 @@
0
     }
0
     / 
0
     'prefix' {
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
+     # 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
+          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
+          !v.blank? ? "#{prefix}#{UriTemplate::Encoder.encode(v)}" : ""
0
+        end
0
       end
0
     } 
0
     / 
0
     'append' {
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
+     # 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]
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
+          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
+          if v
0
+            val = UriTemplate::Encoder.encode(v)
0
+            !val.blank? ? "#{val}#{append}" : ""
0
+          else
0
+            ''
0
+          end
0
+        end
0
       end
0
     } 
0
     / 
0
     'join' {
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
+     # 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]
0
-                    if var =~ /([^=]+)=([^=]+)/
0
-                      var, default = $1.dup, $2.dup
0
-                      v = env[var]
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
-  }
0
+          vars.split(',').map do |var|
0
+          v = env[var]
0
+          if var =~ /([^=]+)=([^=]+)/
0
+            var, default = $1.dup, $2.dup
0
+            v = env[var]
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
+   }
0
     / 
0
     'listjoin' {
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
+     # 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].respond_to? :each
0
-        env[vars].map do |v|
0
-                "#{UriTemplate::Encoder.encode(v)}" if v
0
-              end.compact.join(joinop)
0
-      end
0
-    end
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].respond_to? :each
0
+         env[vars].map do |v|
0
+           "#{UriTemplate::Encoder.encode(v)}" if v
0
+         end.compact.join(joinop)
0
+       end
0
+     end
0
+   }
0
     )
0
   end
0
 
0
0
@@ -167,48 +161,20 @@
0
     var ("," var)*
0
   end
0
   
0
-  # see http://www.ietf.org/rfc/rfc3986.txt
0
-  rule unreserved
0
-    alphanumeric / "-" / "." / "_" / "~"
0
-  end
0
-
0
-  # see http://www.ietf.org/rfc/rfc3986.txt
0
-  rule pct_encoded
0
-    '%' hexdig hexdig
0
-  end
0
-
0
-  rule hexdig
0
-    [a-fA-F0-9]
0
-  end
0
-  
0
-  # see http://www.ietf.org/rfc/rfc3986.txt
0
-  rule reserved
0
-    gen_delims / sub_delims
0
-  end
0
-
0
-  rule gen_delims
0
-    ":" / "/" / "?" / "#" / "[" / "]" / "@"
0
-  end
0
-
0
-  rule sub_delims
0
-    "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
0
-  end
0
-
0
-
0
   rule vardefault
0
     (unreserved / pct_encoded)*  
0
   end
0
 
0
   rule var
0
     varname defaults:('=' vardefault)* {
0
-        def value(env={} )
0
-      return UriTemplate::Encoder.encode(env[name]) if env[name] # UriTemplate::Encoder.encode(env[name])
0
-      #defaults.elements[0].text_value if defaults.elements.size > 0
0
-      defaults.text_value.gsub(/=/, '')
0
-        end
0
-        def name
0
-      varname.text_value
0
-        end
0
+      def value(env={} )
0
+        return UriTemplate::Encoder.encode(env[name]) if env[name]
0
+        defaults.text_value.gsub(/=/, '')
0
+      end
0
+        
0
+      def name
0
+        varname.text_value
0
+      end
0
     }
0
   end
0
 
0
@@ -230,6 +196,33 @@
0
 
0
   rule alphanumeric
0
     alpha / [0-9]
0
+  end
0
+
0
+  # see http://www.ietf.org/rfc/rfc3986.txt
0
+  rule unreserved
0
+    alphanumeric / "-" / "." / "_" / "~"
0
+  end
0
+
0
+  # see http://www.ietf.org/rfc/rfc3986.txt
0
+  rule pct_encoded
0
+    '%' hexdig hexdig
0
+  end
0
+
0
+  rule hexdig
0
+    [a-fA-F0-9]
0
+  end
0
+  
0
+  # see http://www.ietf.org/rfc/rfc3986.txt
0
+  rule reserved
0
+    gen_delims / sub_delims
0
+  end
0
+
0
+  rule gen_delims
0
+    ":" / "/" / "?" / "#" / "[" / "]" / "@"
0
+  end
0
+
0
+  rule sub_delims
0
+    "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
0
   end
0
 
0
 end

0
@@ -47,5 +47,28 @@
0
       end
0
     end
0
   end
0
+  
0
+  class URI
0
+    
0
+    def initialize(tmpl)
0
+      @tmpl, @parser = tmpl, UriTemplateParser.new
0
+      yield self if block_given?
0
+    end
0
+    
0
+    def replace(vars = {})
0
+      puts @parser.parse(@tmpl).value(vars)
0
+    end
0
+    
0
+  end
0
+  
0
 end
0
+
0
+if __FILE__ == $0
0
+  UriTemplate::URI.new(DATA.read) do |u|
0
+    u.replace(:userID => "stefan")
0
+  end
0
+end
0
+
0
+__END__
0
+http://www.google.com/notebook/feeds/{userID}{-prefix|/notebooks/|notebookID}{-opt|/-/|categories}{-listjoin|/|categories}?{-join|&|updated-min,updated-max,alt,start-index,max-results,entryID,orderby}

0
@@ -1,7 +1,3 @@
0
-#  Created by Stefan Saasen.
0
-#  Copyright (c) 2008. All rights reserved.
0
-#
0
-# ! This file is generated from 
0
 module UriTemplate
0
   include Treetop::Runtime
0
 
0
@@ -21,7 +17,6 @@
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
@@ -100,11 +95,11 @@
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
+ if c.respond_to? :value
0
+   c.value(env)
0
+ else
0
+   c.interval.to_s + "<>"
0
+ end
0
     end
0
   end
0
 
0
0
@@ -248,31 +243,14 @@
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
-