uri_template 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+# 0.1.3 - 15.11.2011
+* BUGFIX: Draft7./ now concatenates literals correctly
+* BUGFIX: Draft7.tokens is now public
+
 # 0.1.2 - 10.11.2011
 + added a new template-type: Colon
   this should allow (some day) to  rails-like routing tables

data/lib/uri_template.rb

@@ -245,5 +245,32 @@ module URITemplate
   def static_characters
     @static_characters ||= tokens.select(&:literal?).map{|t| t.string.size }.inject(0,:+)
   end
+  
+  # Returns whether this uri-template is absolute.
+  # This is detected by checking for "://".
+  #
+  def absolute?
+    read_chars = ""
+    
+    tokens.each do |token|
+      if token.expression?
+        read_chars << "x"
+      elsif token.literal?
+        read_chars << token.string
+      end
+      if read_chars =~ /^[a-z]+:\/\//i
+        return true
+      elsif read_chars =~ /(?<!:|\/)\/(?!\/)/
+        return false
+      end
+    end
+    
+    return false
+  end
+  
+  # Opposite of {#absolute?}
+  def relative?
+    !absolute?
+  end
 
 end

data/lib/uri_template/draft7.rb

@@ -832,47 +832,32 @@ __REGEXP__
           # so we can strip one '/'
           return self.class.new( self.tokens[0..-2] + [ Literal.new(self.tokens.last.string[0..-2]) ] + other.tokens )
         end
+      elsif other.tokens.first.kind_of? Literal
+        # okay, this template does not end with /, but the next starts with a literal => merge them!
+        if other.tokens.first.string[0] == '/'
+          return self.class.new( self.tokens[0..-2] + [Literal.new(self.tokens.last.string + other.tokens.first.string)] + other.tokens[1..-1] )
+        else
+          return self.class.new( self.tokens[0..-2] + [Literal.new(self.tokens.last.string + '/' + other.tokens.first.string)] + other.tokens[1..-1] )
+        end
       end
     end
-    if other.tokens.first.kind_of?(Expression::Path) or (other.tokens.first.kind_of?(Literal) and other.tokens.first.string[0] == '/')
+    
+    if other.tokens.first.kind_of?(Literal)
+      if other.tokens.first.string[0] == '/'
+        return self.class.new( self.tokens + other.tokens )
+      else
+        return self.class.new( self.tokens + [Literal.new('/' + other.tokens.first.string)]+ other.tokens[1..-1] )
+      end
+    elsif other.tokens.first.kind_of?(Expression::Path)
       return self.class.new( self.tokens + other.tokens )
     else
       return self.class.new( self.tokens + [Literal.new('/')] + other.tokens )
     end
   end
   
-  
-  #
-  # should be relative:
-  #  xxx ...
-  #  {xxx}x ...
-  # 
-  #  should not be relative:
-  #  {proto}:// ...
-  #  http:// ...
-  #  http{ssl}:// ...
-  #
-  def absolute?
-    read_chars = ""
-    
-    tokens.each do |token|
-      if token.kind_of? Expression
-        if token.class::OPERATOR == ''
-          read_chars << "x"
-        else
-          return false
-        end
-      elsif token.kind_of? Literal
-        read_chars << token.string
-      end
-      if read_chars =~ /^[a-z]+:\/\//i
-        return true
-      elsif read_chars =~ /(?<!:|\/)\/(?!\/)/
-        return false
-      end
-    end
-    
-    return false
+  # Returns an array containing a the template tokens.
+  def tokens
+    @tokens ||= tokenize!
   end
 
 protected
@@ -881,10 +866,6 @@ protected
     Tokenizer.new(pattern).to_a
   end
   
-  def tokens
-    @tokens ||= tokenize!
-  end
-  
   # @private
   def extract_matchdata(matchdata)
     bc = 0

data/uri_template.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'uri_template'
-  s.version = '0.1.2'
-  s.date = '2011-11-10'
+  s.version = '0.1.3'
+  s.date = '2011-11-15'
   s.authors = ["HannesG"]
   s.email = %q{hannes.georg@googlemail.com}
   s.summary = 'A templating system for URIs.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_template
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2011-11-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14750900 !ruby/object:Gem::Requirement
+  requirement: &26050760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14750900
+  version_requirements: *26050760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &14750460 !ruby/object:Gem::Requirement
+  requirement: &26050320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14750460
+  version_requirements: *26050320
 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
   gem however is intended to be extended when newer specs evolve. For now only draft