uri_template 0.0.1 → 0.0.2

data/CHANGELOG

@@ -0,0 +1,6 @@
+# 0.0.2 -  1.11.2011
+* BUGFIX: Concatenating empty sections no more leads to catch-all templates, when an emtpy template was appreciated.
++ The extracted variables now contains the keys :suffix and :prefix if the match didn't consume the whole uri.
+
+# 0.0.1 - 30.10.2011
+Initial version

data/lib/uri_template/draft7.rb

@@ -130,19 +130,22 @@ __REGEXP__
   end
   
   # @private
-  class LeftBound
-    
+  class Terminal
     def expand(*_)
       ''
     end
     
-    def to_r_source(*_)
-      '^'
-    end
-    
     def size
       0
     end
+  end
+  
+  # @private
+  class LeftBound < Terminal
+    
+    def to_r_source(*_)
+      '^'
+    end
     
     def to_s
       ''
@@ -151,20 +154,12 @@ __REGEXP__
   end
   
   # @private
-  class RightBound
-    
-    def expand(*_)
-      ''
-    end
+  class RightBound < Terminal
     
     def to_r_source(*_)
       '$'
     end
     
-    def size
-      0
-    end
-    
     def to_s
       ''
     end
@@ -172,16 +167,12 @@ __REGEXP__
   end
   
   # @private
-  class Open
-    def expand(*_)
-      ''
-    end
+  class Open < Terminal
+    
     def to_r_source(*_)
       ''
     end
-    def size
-      0
-    end
+    
     def to_s
       "\u2026"
     end
@@ -712,6 +703,12 @@ __REGEXP__
       return nil
     else
       result = extract_matchdata(m)
+      if m.pre_match and m.pre_match.size > 0
+        result.unshift( [:prefix, m.pre_match] )
+      end
+      if m.post_match and m.post_match.size > 0
+        result.push( [:suffix, m.post_match] )
+      end
       if post_processing.include? :convert_values
         result.map!{|k,v| [k, Utils.pair_array_to_hash(v)] }
       end
@@ -775,8 +772,8 @@ __REGEXP__
   #     end
   #     return "not found"
   #   end
-  #   route( 'app_a/do_something' ) #=> "app_a: do_something with {}"
-  #   route( 'app_b/1337/something_else' ) #=> "app_b: something_else with {\"x\"=>\"1337\"}"
+  #   route( 'app_a/do_something' ) #=> "app_a: do_something with {:suffix=>\"do_something\"}"
+  #   route( 'app_b/1337/something_else' ) #=> "app_b: something_else with {\"x\"=>\"1337\", :suffix=>\"something_else\"}"
   #   route( 'bla' ) #=> 'not found'
   # 
   class Section < self
@@ -800,16 +797,40 @@ __REGEXP__
     # 
     # @example
     #   sect = URITemplate::Draft7::Section.new('/prefix…')
-    #   sect >> '…/mid…' >> '…/end' # URITemplate::Draft7::Section.new('/prefix/mid/end')
+    #   sect >> '…/mid…' >> '…/end' #=> URITemplate::Draft7::Section.new('/prefix/mid/end')
+    #
+    # @example
+    #   sect = URITemplate::Draft7::Section.new('/prefix…')
+    #   sect >> '……' #=> sect
+    #
+    # @example Just ellipsis has a special syntax to allow empty matches.
+    #   sect = URITemplate::Draft7::Section.new('…')
+    #   combo = sect >> '…'
+    #   combo.pattern #=> ""
+    #   combo === "" #=> true
+    #   combo === "/foo" #=> false
     # 
     # @return Section
     def >>(other)
       o = self.class.try_convert(other)
       if o.kind_of? Section
-        if !self.right_bound? and !o.left_bound?
-          return self.class.new(self.tokens[0..-2] + o.tokens[1..-1], o.options)
+        if !self.right_bound?
+          if o.pattern == ELLIPSIS
+            return self.class.new("", o.options)
+          elsif !o.left_bound?
+            #if self.tokens.size == 1
+            #  return o
+            #end
+            tkns = self.tokens[0..-2] + o.tokens[1..-1]
+            unless tkns.first.kind_of? Terminal
+              tkns.unshift(LeftBound.new)
+            end
+            unless tkns.last.kind_of? Terminal
+              tkns.push(RightBound.new)
+            end
+            return self.class.new(tkns, o.options)
+          end
         end
-      else
         raise ArgumentError, "Expected something that could be converted to a URITemplate section, but got #{other.inspect}"
       end
     end
@@ -818,11 +839,12 @@ __REGEXP__
     # @private
     def tokenize!
       pat = pattern
-      if pat == ELLIPSIS
-        return [Open.new]
+      if pat == ELLIPSIS # just ellipsis
+        return [LeftBound.new, Open.new]
+      else
+        lb = (pat[0] != ELLIPSIS)
+        rb = (pat[-1] != ELLIPSIS)
       end
-      lb = (pat[0] != ELLIPSIS)
-      rb = (pat[-1] != ELLIPSIS)
       pat = pat[ (lb ? 0 : 1)..(rb ? -1 : -2) ]
       [lb ? LeftBound.new : Open.new] + Tokenizer.new(pat).to_a + [rb ? RightBound.new : Open.new]
     end

data/uri_template.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'uri_template'
-  s.version = '0.0.1'
-  s.date = '2011-10-30'
+  s.version = '0.0.2'
+  s.date = '2011-11-01'
   s.authors = ["HannesG"]
   s.email = %q{hannes.georg@googlemail.com}
   s.summary = 'A templating system for URIs.'
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   
   s.require_paths = ['lib']
   
-  s.files = Dir.glob('lib/**/**/*.rb') + ['uri_template.gemspec', 'README']
+  s.files = Dir.glob('lib/**/**/*.rb') + ['uri_template.gemspec', 'README', 'CHANGELOG']
   
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'yard'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_template
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-30 00:00:00.000000000Z
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14233820 !ruby/object:Gem::Requirement
+  requirement: &22417520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14233820
+  version_requirements: *22417520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &14636440 !ruby/object:Gem::Requirement
+  requirement: &22415680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14636440
+  version_requirements: *22415680
 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
   system however is intended to be extended when newer specs evolve. For now only
@@ -48,6 +48,7 @@ files:
 - lib/uri_template/utils.rb
 - uri_template.gemspec
 - README
+- CHANGELOG
 homepage: http://github.com/hannesg/uri_template
 licenses: []
 post_install_message: