Imported upstream version 0.13

[liburi-template-perl.git] / lib / URI / Template.pm

diff --git a/lib/URI/Template.pm b/lib/URI/Template.pm
index f31f973..b3c1231 100644 (file)
--- a/lib/URI/Template.pm
+++ b/lib/URI/Template.pm
@@ -3,7 +3,7 @@ package URI::Template;
 use strict;
 use warnings;
 
-our $VERSION = '0.09';
+our $VERSION = '0.13';
 
 use URI;
 use URI::Escape ();
@@ -114,7 +114,7 @@ inflate the result to a URI object.
 sub process_to_string {
     my $self = shift;
 
-    if( ref $_[ 0 ] ) {
+    if ( ref $_[ 0 ] ) {
         return $self->_process_by_position( @_ );
     }
     else {
@@ -130,7 +130,8 @@ sub _process_by_key {
 
     # fix undef vals
     for my $var ( @vars ) {
-        $params{ $var } = defined $params{ $var }
+        $params{ $var }
+            = defined $params{ $var }
             ? URI::Escape::uri_escape( $params{ $var }, $unsafe )
             : '';
     }
@@ -167,11 +168,11 @@ sub deparse {
     my $self = shift;
     my $uri  = shift;
 
-    if( !$self->{ deparse_re } ) {
-       my $templ = $self->as_string;
-       $self->{ vars_list } = [ $templ =~ /{(.+?)}/g ];
-       $templ =~ s/{.+?}/(.+?)/g;
-       $self->{ deparse_re } = qr/$templ/;
+    if ( !$self->{ deparse_re } ) {
+        my $templ = $self->as_string;
+        $self->{ vars_list } = [ $templ =~ /{(.+?)}/g ];
+        $templ =~ s/{.+?}/(.+?)/g;
+        $self->{ deparse_re } = qr/^${templ}$/;
     }
 
     my @matches = $uri =~ $self->{ deparse_re };
@@ -187,7 +188,7 @@ Brian Cassidy E<lt>bricas@cpan.orgE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007 by Brian Cassidy
+Copyright 2008 by Brian Cassidy
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.