[SCM] librdf-ns-perl Debian packaging branch, master, updated. debian/20130208-1-22-g47de138

[Jakob Voss]

The following commit has been merged in the master branch:
commit 6867d3e175d64809bebf8484ab04929e83110644
Merge: be178b21662fbc05e1bb939e9e7ae8535c21a49d ad98732201dc6744c78c74d46dda6810691d125a
Author: Jakob Voss <jakob at nichtich.de>
Date:   Wed Nov 2 21:43:56 2011 +0100

    Merge branch 'master' of github.com:nichtich/RDF-NS

diff --combined lib/RDF/NS.pm
index 97a5399,d5205dd..433788b
--- a/lib/RDF/NS.pm
+++ b/lib/RDF/NS.pm
@@@ -5,12 -5,13 +5,13 @@@ package RDF::NS
  
  use Scalar::Util qw(blessed);
  use File::ShareDir;
+ use 5.10.0;
  
  our $AUTOLOAD;
  
  sub new {
      my $class   = shift;
 -    my $version = shift;
 +    my $version = shift || 'undef';
  	$version = $RDF::NS::VERSION if $version eq 'any';
      LOAD( $class, File::ShareDir::dist_file('RDF-NS', "$version.txt" ), @_ );
  }
@@@ -30,8 -31,8 +31,8 @@@ sub LOAD 
          if ( $prefix =~ /^(isa|can|new)$/ ) {
              warn "Cannot support prefix $prefix!" if $warn;
              next;
-         } elsif ( $prefix =~ /^[a-z][a-z0-9]+$/ ) {
-             if ( $namespace =~ /^[a-z][a-z0-9]+:[^"<>]*$/ ) {
+         } elsif ( $prefix =~ /^[a-z][a-z0-9]*$/ ) {
+             if ( $namespace =~ /^[a-z][a-z0-9]*:[^"<>]*$/ ) {
                  $ns->{$prefix} = $namespace;
              } elsif( $warn ) {
                  warn "Skipping invalid $prefix namespace $namespace";
@@@ -44,16 -45,6 +45,16 @@@
      bless $ns, $class;
  }
  
 +sub FORMAT {
 +    my $self = shift;
 +	my $format = shift;
 +    $format = 'TTL' if $format =~ /^n(otation)?3$/i;
 +    if ($format =~ /^(ttl|n3|sparql|txt)$/i) {
 +	    $format = uc($format);
 +	    $self->$format( @_ );
 +	}
 +}
 +
  sub TTL {
      my $self = shift;
      $self->MAP( sub { "\@prefix $_: <".$self->{$_}."> ." } , @_ );
@@@ -69,12 -60,6 +70,12 @@@ sub XMLNS 
      $self->MAP( sub { "xmlns:$_=\"".$self->{$_}."\"" } , @_ );
  }
  
 +sub TXT {
 +    my $self = shift;
 +    $self->MAP( sub { "$_\t".$self->{$_} } , @_ );
 +}
 +
 +
  sub SELECT {
      my $self = shift;
      $self->MAP( sub { $_ => $self->{$_} } , @_ );
@@@ -100,17 -85,18 +101,18 @@@ sub GET 
  
  sub URI {
      my $self = shift;
-     return unless shift =~ /^([a-z][a-z0-9]+)([:_]([^:]+))?$/;
-     my $ns = $self->{$1} or return;
+     return unless shift =~ /^([a-z][a-z0-9]*)?([:_]([^:]+))?$/;
+     my $ns = $self->{$1 // ''};
+     return unless defined $ns;
      return $self->GET($ns) unless $3;
      return $self->GET($ns.$3);
  }
  
  sub AUTOLOAD {
      my $self = shift;
-     return unless $AUTOLOAD =~ /:([a-z][a-z0-9]+)(_([^:]+))?$/;
+     return unless $AUTOLOAD =~ /:([a-z][a-z0-9]*)(_([^:]+))?$/;
      my $ns = $self->{$1} or return;
-     my $local = defined $3 ? $3 : shift;
+     my $local = $3 // shift;
      return $self->GET($ns) unless defined $local;
      return $self->GET($ns.$local);
  }

-- 
librdf-ns-perl Debian packaging