Improve URI::NamespaceMap guessing

Author: kjetilk

lib/Plack/App/RDF/LinkedData.pm

@@ -133,7 +133,10 @@ is are longer examples in the distribtion, which is used to run
 tests. In the config file, there is a C<store> parameter, which must
 contain the L<RDF::Trine::Store> config hashref. It may also have a
 C<base_uri> URI and a C<namespace> hashref which may contain prefix -
-URI mappings to be used in serializations.
+URI mappings to be used in serializations. Certain namespace, namely
+RDF, VoID, Hydra, DC Terms and XML Schema are added by the module and
+do not need to be declared.
+
 
 Note that this is a server that can only serve URIs of hosts you
 control, it is not a general purpose Linked Data manipulation tool,
@@ -307,6 +310,9 @@ sub prepare_app {
 															 base_uri => $config->{base_uri}
 															);
 	$self->{linkeddata}->namespaces(URI::NamespaceMap->new($config->{namespaces})) if ($config->{namespaces});
+	# Ensure that certain namespaces are always declared
+	$self->{linkeddata}->guess_namespaces('rdf', 'dct', 'xsd', 'void');
+	$self->{linkeddata}->add_namespace_mapping(hydra => 'http://www.w3.org/ns/hydra/core#');
 }
 
 sub call {

lib/RDF/LinkedData.pm

@@ -243,9 +243,7 @@ has last_etag => ( is => 'rw', isa => Str, predicate => 'has_last_etag');
 =item namespaces ( $namespace_map )
 
 Gets or sets the namespaces that some serializers use for
-pretty-printing. Should be handed a L<URI::NamespaceMap> object. RDF,
-VoID, Hydra, DC Terms and XML Schema are added by the module and do
-not need to be declared.
+pretty-printing. Should be handed a L<URI::NamespaceMap> object.
 
 =cut
 
@@ -255,16 +253,14 @@ has 'namespaces' => (is => 'rw',
 							lazy => 1,
 							handles => {
 											'add_namespace_mapping' => 'add_mapping',
+											'guess_namespaces' => 'guess_and_add',
 											'list_namespaces' => 'list_namespaces'
 										  });
 
 
 sub _build_namespaces {
   my $self = shift;
-  my $nsmap = shift || URI::NamespaceMap->new();
-  $nsmap->guess_and_add('rdf', 'void', 'dct', 'xsd');
-  $nsmap->add_mapping(hydra => 'http://www.w3.org/ns/hydra/core#');
-  return $nsmap;
+  return shift || URI::NamespaceMap->new();
 }
 
 # Just a temporary compatibility hack
@@ -352,6 +348,7 @@ sub response {
 			$output_model->add_statement($st);
 		}
 		my $cl = literal($counter, undef, 'http://www.w3.org/2001/XMLSchema#integer');
+		$self->guess_namespaces('void');
 		my $void = $self->namespaces->void;
 		$output_model->add_statement(statement(iri($uri), 
 															iri($void->triples),
@@ -715,7 +712,6 @@ sub _void_content {
 		}
 
 		if ($self->has_fragments) {
-			$self->add_namespace_mapping(hydra => 'http://www.w3.org/ns/hydra/core#');
 			$self->_common_fragments_control($self->_voidmodel);
 		}
 

meta/makefile.pret

@@ -18,7 +18,8 @@
     :runtime-requirement         [ :on "HTTP::Headers"^^:CpanId ];
     :runtime-requirement         [ :on "RDF::Helper::Properties 0.10"^^:CpanId; ];
     :runtime-requirement         [ :on "URI 1.52"^^:CpanId ];
-    :runtime-requirement         [ :on "URI::NamespaceMap"^^:CpanId ];
+    :runtime-requirement         [ :on "URI::NamespaceMap 0.31_06"^^:CpanId ];
+    :runtime-requirement         [ :on "RDF::NS::Curated"^^:CpanId ];
     :runtime-requirement         [ :on "Module::Load::Conditional"^^:CpanId ];
     :runtime-requirement         [ :on "Encode"^^:CpanId ];
     :runtime-requirement         [ :on "RDF::RDFa::Generator 0.102"^^:CpanId; ];