[libweasel-perl] 07/07: Merge pull request #2 from ylavoie/master

[Robert James Clay]

This is an automated email from the git hooks/post-receive script.

jame-guest pushed a commit to tag v0.08
in repository libweasel-perl.

commit 2437e8837cb89de842e361d9486cd29d107bfcea
Merge: b267d9e 840df18
Author: Erik Huelsmann <ehuels at gmail.com>
Date:   Fri Sep 2 09:28:50 2016 +0200

    Merge pull request #2 from ylavoie/master
    
    Add the possibility to use an environment variable for base_url

 CHANGES               | 2 ++
 dist.ini              | 2 +-
 lib/Weasel/Session.pm | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --cc lib/Weasel/Session.pm
index ad0a941,8843412..443cfce
--- a/lib/Weasel/Session.pm
+++ b/lib/Weasel/Session.pm
@@@ -260,13 -230,13 +263,16 @@@ after prefixing with C<base_url>
  sub get {
      my ($self, $url) = @_;
  
-     $url = $self->base_url . $url;
+     my $base = $self->base_url =~ /\$\{([a-zA-Z0-9_]+)\}/
+              ? $ENV{$1} // "http://localhost:5000"
+              : $self->base_url;
+     $url = $base . $url;
      ###TODO add logging warning of urls without protocol part
      # which might indicate empty 'base_url' where one is assumed to be set
 -    $self->driver->get($url);
 +    $self->_logged(
 +        sub {
 +            return $self->driver->get($url);
 +        }, 'get', "loading URL: $url");
  }
  
  =item get_attribute($element, $attribute)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libweasel-perl.git