uri_template 0.1.0 → 0.1.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+# 0.1.1 -  4.11.2011
++ added a bunch of useful helper methods
+
 # 0.1.0 -  2.11.2011
 - Removed Sections. They made too many headaches.
 + Made draft7 template concatenateable. This should replace sections.

data/lib/uri_template.rb

@@ -64,6 +64,78 @@ module URITemplate
     return klass.new(*rest)
   end
   
+  # Tries to convert the given argument into an {URITemplate}.
+  # Returns nil if this fails.
+  #
+  # @return [nil|{URITemplate}]
+  def self.try_convert(x)
+    if x.kind_of? URITemplate
+      return x
+    elsif x.kind_of? String
+      return URITemplate.new(x)
+    else
+      return nil
+    end
+  end
+  
+  # Same as {.try_convert} but raises an ArgumentError when the given argument could not be converted.
+  # 
+  # @raise ArgumentError if the argument is unconvertable
+  # @return {URITemplate}
+  def self.convert(x)
+    o = self.try_convert(x)
+    if o.nil?
+      raise ArgumentError, "Expected to receive something that can be converted to an URITemplate, but got #{x.inspect}"
+    end
+    return o
+  end
+  
+  # Tries to coerce two URITemplates into a common representation.
+  # Returns an array with two {URITemplate}s and two booleans indicating which of the two were converted or raises an {ArgumentError}.
+  #
+  # @example
+  #   URITemplate.coerce( URITemplate.new(:draft7,'{x}'), '{y}' ) #=> [URITemplate.new(:draft7,'{x}'), URITemplate.new(:draft7,'{y}'), false, true]
+  def self.coerce(a,b)
+    if a.kind_of? URITemplate
+      if a.class == b.class
+        return [a,b,false,false]
+      end
+      b_as_a = a.class.try_convert(b)
+      if b_as_a
+        return [a,b_as_a,false,true]
+      end
+    end
+    if b.kind_of? URITemplate
+      a_as_b = b.class.try_convert(a)
+      if a_as_b
+        return [a_as_b, b, true, false]
+      end
+    end
+    bc = self.try_convert(b)
+    if bc.kind_of? URITemplate
+      a_as_b = bc.class.try_convert(a)
+      if a_as_b
+        return [a_as_b, bc, true, true]
+      end
+    end
+    raise ArgumentError, "Expected at least on URITemplate, but got #{a.inspect} and #{b.inspect}" unless a.kind_of? URITemplate or b.kind_of? URITemplate
+    raise ArgumentError, "Cannot coerce #{a.inspect} and #{b.inspect} into a common representation."
+  end
+  
+  # Applies a method to a URITemplate with another URITemplate as argument.
+  # This is a useful shorthand since both URITemplates are automatically coerced.
+  #
+  # @example
+  #   tpl = URITemplate.new('foo')
+  #   URITemplate.apply( tpl, :/, 'bar' ).pattern #=> 'foo/bar'
+  #   URITemplate.apply( 'baz', :/, tpl ).pattern #=> 'baz/foo'
+  #   URITemplate.apply( 'bla', :/, 'blub' ).pattern #=> 'bla/blub'
+  # 
+  def self.apply(a, method, b, *args)
+    a,b,_,_ = self.coerce(a,b)
+    a.send(method,b,*args)
+  end
+  
   # A base class for all errors which will be raised upon invalid syntax.
   module Invalid
   end

data/lib/uri_template/draft7.rb

@@ -749,9 +749,12 @@ __REGEXP__
   alias to_s pattern
   
   # Compares two template patterns.
-  def ==(tpl)
-    return false if self.class != tpl.class
-    return self.pattern == tpl.pattern
+  def ==(o)
+    this, other, this_converted, other_converted = URITemplate.coerce( self, o )
+    if this_converted
+      return this == other
+    end
+    return this.pattern == other.pattern
   end
   
   # @method ===(uri)
@@ -811,7 +814,10 @@ __REGEXP__
   #   (tpl / 'a' / 'b' ).pattern #=> '/xy/a/b'
   #
   def /(o)
-    other = self.class.convert(o)
+    this, other, this_converted, other_converted = URITemplate.coerce( self, o )
+    if this_converted
+      return this / other
+    end
     
     if other.absolute?
       raise ArgumentError, "Expected to receive a relative template but got an absoulte one: #{other.inspect}. If you think this is a bug, please report it."

data/uri_template.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'uri_template'
-  s.version = '0.1.0'
-  s.date = '2011-11-02'
+  s.version = '0.1.1'
+  s.date = '2011-11-04'
   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.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2011-11-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14484700 !ruby/object:Gem::Requirement
+  requirement: &17225100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14484700
+  version_requirements: *17225100
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &14482080 !ruby/object:Gem::Requirement
+  requirement: &17224520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14482080
+  version_requirements: *17224520
 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
@@ -43,8 +43,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/uri_template.rb
-- lib/uri_template/colon.rb
-- lib/uri_template/draft2.rb
 - lib/uri_template/draft7.rb
 - lib/uri_template/utils.rb
 - uri_template.gemspec