diff -Nru libtest-rdf-perl-1.20/Changes libtest-rdf-perl-1.22/Changes --- libtest-rdf-perl-1.20/Changes 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/Changes 2017-09-01 21:50:40.000000000 +0000 @@ -6,6 +6,11 @@ Bug tracker: Maintainer: Kjetil Kjernsmo +1.22 2017-08-31 Add has_type function. + + - Added: Add has_type function. + - Minor cosmetic changes. + 1.20 2014-10-16 Fix packaging. - Added: Skip README.pod for CPAN. diff -Nru libtest-rdf-perl-1.20/COPYRIGHT libtest-rdf-perl-1.22/COPYRIGHT --- libtest-rdf-perl-1.20/COPYRIGHT 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/COPYRIGHT 2017-09-01 21:50:41.000000000 +0000 @@ -6,9 +6,9 @@ Files: Changes META.json META.yml - dist.ini doap.ttl -Copyright: Copyright 2014 Kjetil Kjernsmo. + t/has_uri.t +Copyright: Copyright 2017 Kjetil Kjernsmo. License: GPL-1.0+ or Artistic-1.0 Files: t/are_subgraphs.t @@ -19,7 +19,6 @@ License: GPL-1.0+ or Artistic-1.0 Files: t/00-load.t - t/has_uri.t t/hasnt_literal.t t/is_valid_rdf.t Copyright: Copyright 2013 Kjetil Kjernsmo. @@ -31,6 +30,11 @@ Copyright: None License: public-domain +Files: INSTALL + LICENSE +Copyright: Unknown +License: Unknown + Files: t/pattern_fail.t t/pattern_ok.t Copyright: Copyright 2012 Kjetil Kjernsmo. @@ -39,27 +43,26 @@ Files: README lib/Test/RDF.pm Copyright: Copyright 2010 ABC Startsiden AS. - Copyright 2010, 2011, 2012, 2013, 2014 Kjetil Kjernsmo. + Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2017 Kjetil Kjernsmo. License: GPL-1.0 -Files: INSTALL - LICENSE -Copyright: Unknown -License: Unknown +Files: dist.ini +Copyright: Copyright 2014 Kjetil Kjernsmo. +License: GPL-1.0+ or Artistic-1.0 Files: Makefile.PL Copyright: Copyright 2013 Toby Inkster. License: GPL-1.0+ or Artistic-1.0 License: Artistic-1.0 - This software is Copyright (c) 2014 by the copyright holder(s). + This software is Copyright (c) 2017 by the copyright holder(s). This is free software, licensed under: The Artistic License 1.0 License: GPL-1.0 - This software is Copyright (c) 2014 by the copyright holder(s). + This software is Copyright (c) 2017 by the copyright holder(s). This is free software, licensed under: diff -Nru libtest-rdf-perl-1.20/debian/changelog libtest-rdf-perl-1.22/debian/changelog --- libtest-rdf-perl-1.20/debian/changelog 2014-10-16 22:12:11.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/changelog 2017-09-11 12:10:30.000000000 +0000 @@ -1,3 +1,45 @@ +libtest-rdf-perl (1.22-1) unstable; urgency=medium + + [ upstream ] + * New release. + + Add has_type function. + + Minor cosmetic changes. + + [ gregor herrmann ] + * Update package relations: + + Update to build-depend on recent libtest-simple-perl, favored over + libtest-tester-perl. + + [ Jonas Smedegaard ] + * Use debhelper compatibility level 9 (not 8). + * Modernize Vcs-* fields: + + Use https protocol. + + Use git (not cgit) in path. + + Add .git suffix for Vcs-Git URL. + * Declare compliance with Debian Policy 4.1.0. + * Update watch file: + + Use format version 4. + + Watch only MetaCPAN URL. + + Mention gbp --uscan in usage comment. + + Tighten version regex. + * Modernize cdbs: + + Drop upstream-tarball hints: Use gbp import-orig --uscan. + + Do copyright-check in maintainer script (not during build). + Stop build-depend on devscripts. + * Update copyright info: + + Use https protocol in file format URL. + + Use License-Grant and License-Reference fields. + Thanks to Ben Finney. + + Extend coverage for main upstream author. + + Extend coverage for myself. + * Update git-buildpackage config: Filter any .git* files. + * Add lintian overrides regarding License-Reference. + * Update package relations: + + Update to build-depend on recent perl, favored over recent + libtest-simple-perl and libtest-tester-perl. + + -- Jonas Smedegaard Mon, 11 Sep 2017 14:10:30 +0200 + libtest-rdf-perl (1.20-1) unstable; urgency=medium [ upstream ] diff -Nru libtest-rdf-perl-1.20/debian/compat libtest-rdf-perl-1.22/debian/compat --- libtest-rdf-perl-1.20/debian/compat 2014-10-15 11:15:51.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/compat 2017-09-11 11:39:36.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -Nru libtest-rdf-perl-1.20/debian/control libtest-rdf-perl-1.22/debian/control --- libtest-rdf-perl-1.20/debian/control 2014-10-16 22:10:35.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/control 2017-09-11 12:06:14.000000000 +0000 @@ -2,19 +2,18 @@ Section: perl Priority: optional Build-Depends: cdbs, - devscripts, perl, debhelper, dh-buildinfo, librdf-trine-perl, perl (>= 5.16.1) | libscalar-list-utils-perl (>= 1:1.24), - libtest-tester-perl + perl (>= 5.21.6) | libtest-simple-perl (>= 1.001010) | libtest-tester-perl Maintainer: Debian Perl Group Uploaders: Jonas Smedegaard , Florian Schlichting -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libtest-rdf-perl -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libtest-rdf-perl.git +Standards-Version: 4.1.0 +Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libtest-rdf-perl.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-perl/packages/libtest-rdf-perl.git Homepage: http://search.cpan.org/dist/Test-RDF/ Package: libtest-rdf-perl diff -Nru libtest-rdf-perl-1.20/debian/control.in libtest-rdf-perl-1.22/debian/control.in --- libtest-rdf-perl-1.20/debian/control.in 2014-10-15 11:15:51.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/control.in 2017-09-11 11:40:47.000000000 +0000 @@ -5,9 +5,9 @@ Maintainer: Debian Perl Group Uploaders: Jonas Smedegaard , Florian Schlichting -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libtest-rdf-perl -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libtest-rdf-perl.git +Standards-Version: 4.1.0 +Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libtest-rdf-perl.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-perl/packages/libtest-rdf-perl.git Homepage: http://search.cpan.org/dist/Test-RDF/ Package: libtest-rdf-perl diff -Nru libtest-rdf-perl-1.20/debian/copyright libtest-rdf-perl-1.22/debian/copyright --- libtest-rdf-perl-1.20/debian/copyright 2014-10-16 14:56:38.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/copyright 2017-09-11 11:48:14.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Test::RDF Upstream-Contact: https://github.com/kjetilk/Test-RDF/issues Source: http://search.cpan.org/dist/Test-RDF/ @@ -6,47 +6,28 @@ Files: * Copyright: 2010, ABC Startsiden AS - 2010-2014, Kjetil Kjernsmo -License: Artistic or GPL-1+ -Comment: - License: - . + 2010-2015,2017, Kjetil Kjernsmo +License-Grant: This program is free software; you can redistribute it and/or modify it under the terms of either: the GNU General Public License as published by the Free Software Foundation; or the Artistic License. +License: Artistic or GPL-1+ Files: debian/* -Copyright: 2011-2013, Jonas Smedegaard +Copyright: 2011-2014,2016-2017, Jonas Smedegaard 2011, Florian Schlichting +License-Grant: + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 3, or (at your option) any + later version. License: GPL-3+ License: Artistic - Comment: - . - On Debian systems the 'Artistic License' is located in - '/usr/share/common-licenses/Artistic'. +License-Reference: /usr/share/common-licenses/Artistic License: GPL-1+ - Comment: - . - On Debian systems the 'GNU General Public License' version 1 is located - in '/usr/share/common-licenses/GPL-1'. +License-Reference: /usr/share/common-licenses/GPL-1 License: GPL-3+ - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 3, or (at your option) any - later version. - . - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - . - Comment: - . - On Debian systems the 'GNU General Public License' version 3 is located - in '/usr/share/common-licenses/GPL-3'. - . - You should have received a copy of the GNU General Public License along - with this program. If not, see . +License-Reference: /usr/share/common-licenses/GPL-3 diff -Nru libtest-rdf-perl-1.20/debian/copyright-check libtest-rdf-perl-1.22/debian/copyright-check --- libtest-rdf-perl-1.20/debian/copyright-check 1970-01-01 00:00:00.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/copyright-check 2017-09-11 11:42:58.000000000 +0000 @@ -0,0 +1,24 @@ +#!/bin/sh +# Copyright © 2016-2017 Jonas Smedegaard +# Description: helper script to update copyright_hints +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set -eu + +make -f /usr/share/cdbs/1/rules/utils.mk pre-build || true +make -f /usr/share/cdbs/1/rules/utils.mk clean DEB_COPYRIGHT_CHECK_STRICT=1 + +# unconditionally merge changes - safe to do with git-tracked package +[ ! -f debian/copyright_newhints ] || mv -f debian/copyright_newhints debian/copyright_hints diff -Nru libtest-rdf-perl-1.20/debian/copyright_hints libtest-rdf-perl-1.22/debian/copyright_hints --- libtest-rdf-perl-1.20/debian/copyright_hints 2014-10-16 22:10:33.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/copyright_hints 2017-09-11 11:49:19.000000000 +0000 @@ -7,11 +7,9 @@ Files: CREDITS Changes INSTALL - MANIFEST META.json META.yml Makefile.PL - SIGNATURE debian/README.source debian/compat debian/control @@ -31,49 +29,79 @@ t/isomorph_graphs.t t/pattern_fail.t t/pattern_ok.t -Copyright: *No copyright* +Copyright: NONE License: UNKNOWN FIXME -Files: debian/rules -Copyright: 2011, Florian Schlichting - 2011-2013, Jonas Smedegaard -License: GPL-3+ +Files: lib/Test/RDF.pm +Copyright: 2010-2015, 2017, Kjetil Kjernsmo. / + Copyright 2010 ABC Startsiden AS. +License: Artistic + FIXME + +Files: README +Copyright: Copyright 2010 ABC Startsiden AS. Copyright 2010, 2011, 2012, 2013, 2014, +License: Artistic FIXME Files: LICENSE -Copyright: 1989, Free Software Foundation, Inc +Copyright: 1989, Free Software Foundation, Inc. 19xx name of author 19yy - 2014, Kjetil Kjernsmo + 2017, Kjetil Kjernsmo. disclaimer" for the program, if + ed by the Free interest in the + of this Package, but belong to whomever generated them, and may be sold the software, and -License: GPL-ever - FIXME - -Files: lib/Test/RDF.pm -Copyright: 2010, ABC Startsiden AS - 2010-2014, Kjetil Kjernsmo -License: UNKNOWN +License: Artistic or GPL-1+ FIXME Files: COPYRIGHT -Copyright: 2010, ABC Startsiden AS - 2010-2014, Kjetil Kjernsmo - 2011, Kjetil Kjernsmo - 2012, Kjetil Kjernsmo - 2013, Kjetil Kjernsmo - 2013, Toby Inkster - 2014, Kjetil Kjernsmo - 2014, the holder(s) +Copyright: -format/1.0/ + 2010-2015, 2017, Kjetil Kjernsmo. + 2017, the copyright holder(s). + CREDITS + Copyright 2010 ABC Startsiden AS. + Copyright 2011 Kjetil Kjernsmo. + Copyright 2012 Kjetil Kjernsmo. + Copyright 2013 Kjetil Kjernsmo. + Copyright 2013 Toby Inkster. + Copyright 2014 Kjetil Kjernsmo. + Copyright 2017 Kjetil Kjernsmo. None Unknown +License: Artistic-1.0 and/or GPL-1 + FIXME + +Files: debian/rules +Copyright: 2011, Florian Schlichting + 2011-2014, 2017, Jonas Smedegaard +License: GPL-3+ + FIXME + +Files: debian/copyright-check +Copyright: 2016-2017, Jonas Smedegaard +License: GPL-3+ + FIXME + +Files: debian/source/lintian-overrides +Copyright: Artistic + GPL-1+ + GPL-3+ + artistic + gpl-1+ + gpl-3+ License: UNKNOWN FIXME -Files: README -Copyright: 2010, ABC Startsiden AS. 2010-2014 +Files: MANIFEST +Copyright: CREDITS +License: UNKNOWN + FIXME + +Files: SIGNATURE +Copyright: SHA1 df8cccf2efb0ae1a3b5b67cbad3da01e5d5d2087 CREDITS License: UNKNOWN FIXME diff -Nru libtest-rdf-perl-1.20/debian/gbp.conf libtest-rdf-perl-1.22/debian/gbp.conf --- libtest-rdf-perl-1.20/debian/gbp.conf 2014-10-15 11:15:51.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/gbp.conf 2017-09-11 11:48:54.000000000 +0000 @@ -3,3 +3,4 @@ [DEFAULT] pristine-tar = True sign-tags = True +filter = */.git* diff -Nru libtest-rdf-perl-1.20/debian/rules libtest-rdf-perl-1.22/debian/rules --- libtest-rdf-perl-1.20/debian/rules 2014-10-16 22:05:31.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/rules 2017-09-11 12:03:27.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- mode: makefile; coding: utf-8 -*- -# Copyright © 2011, 2012, 2013 Jonas Smedegaard -# Copyright © 2011 Florian Schlichting +# Copyright 2011-2014, 2017 Jonas Smedegaard +# Copyright 2011 Florian Schlichting # Description: Main Debian packaging script for Test::RDF # # This program is free software; you can redistribute it and/or modify @@ -17,22 +17,17 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -include /usr/share/cdbs/1/rules/upstream-tarball.mk -include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/perl-makemaker.mk include /usr/share/cdbs/1/rules/debhelper.mk pkg = $(DEB_SOURCE_PACKAGE) -DEB_UPSTREAM_PACKAGE = Test-RDF -DEB_UPSTREAM_URL = http://search.cpan.org/CPAN/authors/id/K/KJ/KJETILK - # Needed both by upstream build process and at runtime deps = librdf-trine-perl deps +=, perl (>= 5.16.1) | libscalar-list-utils-perl (>= 1:1.24) # Needed by upstream tests -deps-test = libtest-tester-perl +deps-test = perl (>= 5.21.6) | libtest-simple-perl (>= 1.001010) | libtest-tester-perl CDBS_BUILD_DEPENDS += , $(deps), $(deps-test) CDBS_DEPENDS_$(pkg) = $(deps) diff -Nru libtest-rdf-perl-1.20/debian/source/lintian-overrides libtest-rdf-perl-1.22/debian/source/lintian-overrides --- libtest-rdf-perl-1.20/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/source/lintian-overrides 2017-09-09 19:58:06.000000000 +0000 @@ -0,0 +1,7 @@ +# License is in License-Reference field (see bug#786450) +missing-license-paragraph-in-dep5-copyright artistic * +missing-license-paragraph-in-dep5-copyright gpl-1\+ * +missing-license-paragraph-in-dep5-copyright gpl-3\+ * +missing-license-text-in-dep5-copyright Artistic * +missing-license-text-in-dep5-copyright GPL-1\+ * +missing-license-text-in-dep5-copyright GPL-3\+ * diff -Nru libtest-rdf-perl-1.20/debian/watch libtest-rdf-perl-1.22/debian/watch --- libtest-rdf-perl-1.20/debian/watch 2014-10-16 22:06:58.000000000 +0000 +++ libtest-rdf-perl-1.22/debian/watch 2017-09-11 11:41:43.000000000 +0000 @@ -1,4 +1,3 @@ -# Run the "uscan" command to check for upstream updates and more. -version=3 -http://search.cpan.org/CPAN/authors/id/K/KJ/KJETILK/Test-RDF-([\d.]+)\.tar\.gz -https://metacpan.org/release/Test-RDF/ .*/Test-RDF-([\d.]+)\.tar\.gz +# run "uscan --report" to check or "gpb import-orig --uscan" to update +version=4 +https://metacpan.org/release/Test-RDF/ .*/Test-RDF-(\d[\d.]*)\.tar\.gz diff -Nru libtest-rdf-perl-1.20/doap.ttl libtest-rdf-perl-1.22/doap.ttl --- libtest-rdf-perl-1.20/doap.ttl 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/doap.ttl 2017-09-01 21:50:41.000000000 +0000 @@ -1,4 +1,3 @@ -@prefix cpan-uri: . @prefix dc: . @prefix doap: . @prefix doap-changeset: . @@ -7,19 +6,19 @@ @prefix owl: . @prefix prov: . @prefix rdfs: . +@prefix types: . @prefix xsd: . - + dc:creator ; dc:subject ; dc:title "DOAP for Test-RDF"@en. a doap:Project; - cpan-uri:x_IRC ; doap-deps:runtime-requirement [ doap-deps:on "Scalar::Util 1.24"^^doap-deps:CpanId ], [ doap-deps:on "Test::More"^^doap-deps:CpanId ], [ doap-deps:on "Test::Builder::Module"^^doap-deps:CpanId; - ], [ doap-deps:on "RDF::Trine 0.134"^^doap-deps:CpanId ]; + ], [ doap-deps:on "RDF::Trine 0.134"^^doap-deps:CpanId ], [ doap-deps:on "perl 5.006"^^doap-deps:CpanId ]; doap-deps:test-requirement [ doap-deps:on "Test::Tester"^^doap-deps:CpanId ]; doap:bug-database ; doap:created "2010-09-03"^^xsd:date; @@ -28,13 +27,14 @@ doap:maintainer ; doap:name "Test-RDF"; doap:programming-language "Perl"; - doap:release , , , , , , , , , , , , , , ; + doap:release , , , , , , , , , , , , , , , ; doap:repository [ a doap:GitRepository; doap:browse ; prov:has_provenance ; ]; doap:shortdesc "Test RDF data for validity and equality."@en; + doap:support-forum ; owl:sameAs . @@ -238,6 +238,22 @@ doap:revision "1.20"^^xsd:string; owl:sameAs . + + a doap:Version; + rdfs:label "Add has_type function."@en; + dc:issued "2017-08-31"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Addition; + rdfs:label "Add has_type function."@en; + ], [ + a doap-changeset:Change; + rdfs:label "Minor cosmetic changes."@en; + ]; + ]; + doap:revision "1.22"^^xsd:string; + owl:sameAs . + a doap:Version; rdfs:label "Stable release."@en; @@ -304,3 +320,6 @@ foaf:name "Kjetil Kjernsmo"; owl:sameAs , . + + a types:ChatChannel. + diff -Nru libtest-rdf-perl-1.20/lib/Test/RDF.pm libtest-rdf-perl-1.22/lib/Test/RDF.pm --- libtest-rdf-perl-1.20/lib/Test/RDF.pm 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/lib/Test/RDF.pm 2017-09-01 21:50:39.000000000 +0000 @@ -1,5 +1,6 @@ package Test::RDF; +use 5.006; use warnings; use strict; @@ -11,7 +12,7 @@ use Scalar::Util qw/blessed/; use base 'Test::Builder::Module'; -our @EXPORT = qw/are_subgraphs is_rdf is_valid_rdf isomorph_graphs has_subject has_predicate has_object_uri has_uri hasnt_uri has_literal hasnt_literal pattern_target pattern_ok pattern_fail/; +our @EXPORT = qw/are_subgraphs is_rdf is_valid_rdf isomorph_graphs has_subject has_predicate has_object_uri has_type has_uri hasnt_uri has_literal hasnt_literal pattern_target pattern_ok pattern_fail/; =head1 NAME @@ -20,11 +21,11 @@ =head1 VERSION -Version 1.20 +Version 1.22 =cut -our $VERSION = '1.20'; +our $VERSION = '1.22'; =head1 SYNOPSIS @@ -40,6 +41,7 @@ has_subject($uri_string, $model, 'Subject URI is found'); has_predicate($uri_string, $model, 'Predicate URI is found'); has_object_uri($uri_string, $model, 'Object URI is found'); + has_type($uri_string, $model, 'Class URI is found'); has_literal($string, $language, $datatype, $model, 'Literal is found'); hasnt_literal($string, $language, $datatype, $model, 'Literal is not found'); pattern_target($model); @@ -225,6 +227,26 @@ return _single_uri_tests($count, $name); } + +=head2 has_type + +Check if the string URI passed as first argument is an RDF class +instance in any of the statements given in the model given as second +argument. + +=cut + +sub has_type { + my ($uri, $model, $name) = @_; + confess 'No valid model given in test' unless (blessed($model) && $model->isa('RDF::Trine::Model')); + my $resource = _resource_uri_checked($uri, $name); + return $resource unless ($resource); + my $count = $model->count_statements(undef, + RDF::Trine::Node::Resource->new('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), + $resource); + return _single_uri_tests($count, $name); +} + =head2 has_literal Check if the string passed as first argument, with corresponding @@ -591,7 +613,7 @@ =head1 LICENSE AND COPYRIGHT Copyright 2010 ABC Startsiden AS. -Copyright 2010, 2011, 2012, 2013, 2014 Kjetil Kjernsmo. +Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2017 Kjetil Kjernsmo. This program is free software; you can redistribute it and/or modify it under the terms of either: the GNU General Public License as published diff -Nru libtest-rdf-perl-1.20/LICENSE libtest-rdf-perl-1.22/LICENSE --- libtest-rdf-perl-1.20/LICENSE 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/LICENSE 2017-09-01 21:50:40.000000000 +0000 @@ -1,4 +1,4 @@ -This software is copyright (c) 2014 by Kjetil Kjernsmo. +This software is copyright (c) 2017 by Kjetil Kjernsmo. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,7 +12,7 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2014 by Kjetil Kjernsmo. +This software is Copyright (c) 2017 by Kjetil Kjernsmo. This is free software, licensed under: @@ -22,7 +22,7 @@ Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -272,7 +272,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2014 by Kjetil Kjernsmo. +This software is Copyright (c) 2017 by Kjetil Kjernsmo. This is free software, licensed under: diff -Nru libtest-rdf-perl-1.20/Makefile.PL libtest-rdf-perl-1.22/Makefile.PL --- libtest-rdf-perl-1.20/Makefile.PL 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/Makefile.PL 2017-09-01 21:50:41.000000000 +0000 @@ -4,42 +4,44 @@ my $EUMM = eval( $ExtUtils::MakeMaker::VERSION ); my $meta = { - "abstract" => "Test RDF data for validity and equality.", - "author" => ["Kjetil Kjernsmo "], - "dynamic_config" => 0, - "generated_by" => "Dist::Inkt::Profile::TOBYINK version 0.023, CPAN::Meta::Converter version 2.142060", - "keywords" => [], - "license" => ["perl_5"], - "meta-spec" => { - url => "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - version => 2, - }, - "name" => "Test-RDF", - "no_index" => { directory => ["eg", "examples", "inc", "t", "xt"] }, - "prereqs" => { - configure => { requires => { "ExtUtils::MakeMaker" => 6.17 } }, - runtime => { - requires => { - "RDF::Trine" => 0.134, - "Scalar::Util" => 1.24, - "Test::Builder::Module" => 0, - "Test::More" => 0, + "abstract" => "Test RDF data for validity and equality.", + "author" => ["Kjetil Kjernsmo "], + "dynamic_config" => 0, + "generated_by" => "Dist::Inkt::Profile::TOBYINK version 0.024, CPAN::Meta::Converter version 2.150005", + "keywords" => [], + "license" => ["perl_5"], + "meta-spec" => { + url => "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + version => 2, + }, + "name" => "Test-RDF", + "no_index" => { directory => ["eg", "examples", "inc", "t", "xt"] }, + "prereqs" => { + configure => { requires => { "ExtUtils::MakeMaker" => 6.17 } }, + runtime => { + requires => { + "perl" => 5.006, + "RDF::Trine" => 0.134, + "Scalar::Util" => 1.24, + "Test::Builder::Module" => 0, + "Test::More" => 0, + }, }, + test => { requires => { "Test::Tester" => 0 } }, + }, + "provides" => { "Test::RDF" => { file => "lib/Test/RDF.pm", version => 1.22 } }, + "release_status" => "stable", + "resources" => { + bugtracker => { web => "https://github.com/kjetilk/Test-RDF/issues" }, + homepage => "https://metacpan.org/module/Test::RDF", + license => ["http://dev.perl.org/licenses/"], + repository => { type => "git", web => "https://github.com/kjetilk/Test-RDF/" }, + x_identifier => "http://purl.org/NET/cpan-uri/dist/Test-RDF/project", + x_IRC => "irc://irc.perl.org/#perlrdf", }, - test => { requires => { "Test::Tester" => 0 } }, - }, - "provides" => { "Test::RDF" => { file => "lib/Test/RDF.pm", version => "1.20" } }, - "release_status" => "stable", - "resources" => { - bugtracker => { web => "https://github.com/kjetilk/Test-RDF/issues" }, - homepage => "https://metacpan.org/module/Test::RDF", - license => ["http://dev.perl.org/licenses/"], - repository => { type => "git", web => "https://github.com/kjetilk/Test-RDF/" }, - x_identifier => "http://purl.org/NET/cpan-uri/dist/Test-RDF/project", - x_IRC => "irc://irc.perl.org/#perlrdf", - }, - "version" => "1.20", - "x_contributors" => ["Toby Inkster"], + "version" => 1.22, + "x_contributors" => ["Toby Inkster"], + "x_static_install" => 1, }; my %dynamic_config; diff -Nru libtest-rdf-perl-1.20/META.json libtest-rdf-perl-1.22/META.json --- libtest-rdf-perl-1.20/META.json 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/META.json 2017-09-01 21:50:41.000000000 +0000 @@ -4,7 +4,7 @@ "Kjetil Kjernsmo " ], "dynamic_config" : 0, - "generated_by" : "Dist::Inkt::Profile::TOBYINK version 0.023, CPAN::Meta::Converter version 2.142060", + "generated_by" : "Dist::Inkt::Profile::TOBYINK version 0.024, CPAN::Meta::Converter version 2.150005", "keywords" : [], "license" : [ "perl_5" @@ -35,7 +35,8 @@ "RDF::Trine" : "0.134", "Scalar::Util" : "1.24", "Test::Builder::Module" : "0", - "Test::More" : "0" + "Test::More" : "0", + "perl" : "5.006" } }, "test" : { @@ -47,7 +48,7 @@ "provides" : { "Test::RDF" : { "file" : "lib/Test/RDF.pm", - "version" : "1.20" + "version" : "1.22" } }, "release_status" : "stable", @@ -66,8 +67,10 @@ "x_IRC" : "irc://irc.perl.org/#perlrdf", "x_identifier" : "http://purl.org/NET/cpan-uri/dist/Test-RDF/project" }, - "version" : "1.20", + "version" : "1.22", "x_contributors" : [ "Toby Inkster" - ] + ], + "x_serialization_backend" : "JSON::PP version 2.27202", + "x_static_install" : 1 } diff -Nru libtest-rdf-perl-1.20/META.yml libtest-rdf-perl-1.22/META.yml --- libtest-rdf-perl-1.20/META.yml 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/META.yml 2017-09-01 21:50:41.000000000 +0000 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: '6.17' dynamic_config: 0 -generated_by: 'Dist::Inkt::Profile::TOBYINK version 0.023, CPAN::Meta::Converter version 2.142060' +generated_by: 'Dist::Inkt::Profile::TOBYINK version 0.024, CPAN::Meta::Converter version 2.150005' keywords: [] license: perl meta-spec: @@ -25,12 +25,13 @@ provides: Test::RDF: file: lib/Test/RDF.pm - version: '1.20' + version: '1.22' requires: RDF::Trine: '0.134' Scalar::Util: '1.24' Test::Builder::Module: '0' Test::More: '0' + perl: '5.006' resources: IRC: irc://irc.perl.org/#perlrdf Identifier: http://purl.org/NET/cpan-uri/dist/Test-RDF/project @@ -38,6 +39,8 @@ homepage: https://metacpan.org/module/Test::RDF license: http://dev.perl.org/licenses/ repository: https://github.com/kjetilk/Test-RDF/ -version: '1.20' +version: '1.22' x_contributors: - 'Toby Inkster' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' +x_static_install: 1 diff -Nru libtest-rdf-perl-1.20/README libtest-rdf-perl-1.22/README --- libtest-rdf-perl-1.20/README 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/README 2017-09-01 21:50:40.000000000 +0000 @@ -2,7 +2,7 @@ Test::RDF - Test RDF data for content, validity and equality, etc. VERSION - Version 1.20 + Version 1.22 SYNOPSIS use Test::RDF; @@ -16,6 +16,7 @@ has_subject($uri_string, $model, 'Subject URI is found'); has_predicate($uri_string, $model, 'Predicate URI is found'); has_object_uri($uri_string, $model, 'Object URI is found'); + has_type($uri_string, $model, 'Class URI is found'); has_literal($string, $language, $datatype, $model, 'Literal is found'); hasnt_literal($string, $language, $datatype, $model, 'Literal is not found'); pattern_target($model); @@ -54,6 +55,10 @@ Check if the string URI passed as first argument is a object in any of the statements given in the model given as second argument. + has_type + Check if the string URI passed as first argument is an RDF class instance + in any of the statements given in the model given as second argument. + has_literal Check if the string passed as first argument, with corresponding optional language and datatype as second and third respectively, is a literal in @@ -170,8 +175,8 @@ Toby Inkster has submitted the pattern_* functions. LICENSE AND COPYRIGHT - Copyright 2010 ABC Startsiden AS. Copyright 2010, 2011, 2012, 2013, 2014 - Kjetil Kjernsmo. + Copyright 2010 ABC Startsiden AS. Copyright 2010, 2011, 2012, 2013, 2014, + 2015, 2017 Kjetil Kjernsmo. This program is free software; you can redistribute it and/or modify it under the terms of either: the GNU General Public License as published by diff -Nru libtest-rdf-perl-1.20/SIGNATURE libtest-rdf-perl-1.22/SIGNATURE --- libtest-rdf-perl-1.20/SIGNATURE 2014-10-16 21:39:21.000000000 +0000 +++ libtest-rdf-perl-1.22/SIGNATURE 2017-09-01 21:51:13.000000000 +0000 @@ -1,5 +1,5 @@ This file contains message digests of all files listed in MANIFEST, -signed via the Module::Signature module, version 0.68. +signed via the Module::Signature module, version 0.73. To verify the content in this distribution, first make sure you have Module::Signature installed, then type: @@ -14,23 +14,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -SHA1 255eb417fbac0cb498d99ce4c6aa871229b68c3a COPYRIGHT +SHA1 7b8698284f806c96847625dc75736c5e29854505 COPYRIGHT SHA1 df8cccf2efb0ae1a3b5b67cbad3da01e5d5d2087 CREDITS -SHA1 f36320275a0714ba0c22753a04df09c1429304aa Changes +SHA1 06ebe8bbc8998728202959f31912cd7e8d14c93b Changes SHA1 9304476a656062aebc7ec99dda542e277d3affc8 INSTALL -SHA1 3b3d4e058223e91ddf5bb7fba2a77d084ae60a4a LICENSE +SHA1 7afae05d67ecea9c5e9328c4c29442c9d343da86 LICENSE SHA1 d428227379cef1641f0ef849eaaccedcfb3676f9 MANIFEST -SHA1 147cdf111a3c4a02b285c5bd1f45ca49609904fd META.json -SHA1 2e5b40dc3220d2b8b35c883e1ef46350ab86f232 META.yml -SHA1 5e0e66207c85ec6c02acc07416410c67897fe013 Makefile.PL -SHA1 2d12d8f3cea92df4e0b5dd098d3d2ad5edb3a45c README +SHA1 8503b931f720fa3292ab8194d93dc4912b85a3f1 META.json +SHA1 48355d6bb3c71775c7fc026cba0b359a05fdb067 META.yml +SHA1 8b39eb6c22e32d973396fbd96cbb746d96949463 Makefile.PL +SHA1 c6ede1116bb15f7f89c791e851a940aa286171ba README SHA1 923010d9edd00c16c601951dcecf3ec2ec83fdd6 dist.ini -SHA1 330b2a5e94d406985d4cb05cd8f78f11b651a002 doap.ttl -SHA1 b841c097cabe90cad1051e74bf66adacffd0282f lib/Test/RDF.pm +SHA1 d0bf478b6cfee20a337defe04a0c66fc866d3051 doap.ttl +SHA1 bca065c925490bab637c7ab41b2ee41522ff52f1 lib/Test/RDF.pm SHA1 8c1510eabbc3a16dad03804bb61bd1b1ed44ebb9 t/00-load.t SHA1 45b601013f2b4a6f2f80b95a7708ff21f9212568 t/are_subgraphs.t SHA1 cf96f178cca61688f8ab8266f2d9964fb0c50984 t/has_literal.t -SHA1 12ec3f77e3d86666c665e3c62fb5514b299c73be t/has_uri.t +SHA1 7ce603fa473dd1bb5e741ef628d3d6b0bdbb6193 t/has_uri.t SHA1 4bceb9ac21385b04dc126913078ce35657d29713 t/hasnt_literal.t SHA1 e94673346e7b3d4b948eacd680570f54235a449b t/is_rdf.t SHA1 37cec96fe4bd6e1930b32a4bcac468de7c133f22 t/is_valid_rdf.t @@ -38,19 +38,19 @@ SHA1 7768914589944c8c07140cc3bd0f5c82fd585a2e t/pattern_fail.t SHA1 80d80f06401ba7ccea49158e59a410680a676a81 t/pattern_ok.t -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) +Version: GnuPG v1 -iQIVAwUBVEA64X++6N86nkqlAQi4zQ/9EoBexHgsAj4KFyAJkGFsdujYuoRLW+d1 -/kIn5IcbGVH7F/744awEgRY6uNWNuzahBUn5mPBa9GCKu1fNGP9jDF4v/o7FvupV -T/ydVOw9DZbKn/HAzGiVyjHhN9lGhWTf2KUsbjGxujQbZR3RIE0eV9oyhtHBSG3i -wXfKbzxkksakU5B9pjBeVvTbyRMvKxrDWUmeVAz6IQIihpyPI5tei8S+YfxPSvoK -5raSMdbRTDDAsocyNrDUyCBDC2Gmz/lbamtRGDJP/yOjjxOgoYyIwYfQcKEAUq/b -rHeQYHrOxCu+wX2QkKCw5ZQufl8rVzrELCB9zS2IViVcCh6P3RNDieTunfvyD6pC -QtS2pxvpd/dxIN44u6lqcLQljdW66IEhVIYWkU4/HQKsMKmblLa2v1SUVsHI0vhH -LjTYV3tUFBLZ65XhlOO2zXzr/GcEfCncy3GVFLfOSt+fI22oKU76KnKJAG3ZG8xO -NXVHAap3dapH6eyR/Lo/9rnVbUJ2HGb3L9FA3maMC7cQt4UWlXkdGpZVGCK6ayfK -hLMDvaUk4ru6f80DUKExhhk3Ps0FM5QNDIOWYwuS3VAqNVrtizDhThHLBPpsZHlk -kaqrJiS/Tkacquiubz1cu1K5xmqFYEjpYqoDlBh+bZy/cybDa6gcAD/zC1Opmgop -2Tk0T+OHgSg= -=Z1Xv +iQIVAwUBWanWMX++6N86nkqlAQi/tw//ZIaM2ETv58q7Kgs/szC7qF6Knt4Mw50L +zwn6o11CM3KvuE6G/eyU+yr4YNsF0t4W4GMQAjq59KobodZeYr0gaefpXWifVAlQ +EsfkN4XMnZ5oQtyYQe4CP6NorEvcNnCtymS+7OvsJKorQNoSX76Eo4bzEzJkXsAt +isPbdof3phat2zMvnZAhfTEdaixz4Nc+Rq80tx8tczBKsEOBKJt7lgBDUiBYsXlF +TNMixbVvV4RtSQVZHraaGrBKVYbIoqMyX+3hmyQCAKEwdqSCrfIb2j7H7pNT/KQd +ZVZQyIRQnCfMLBIISaPavE2yTO/I/XCp3z9mC9/1pOuKkmuF5ugkqcjOHoO5UFiH +lb3Gb21mRmaoamrnOl/jXnIfyU4Sp0XSkk8oDgC3wynfkS3Qm6QohqwM3X+SF9zt +azjI7UFrkW4vVHOTSnSIgqhfFBfhoFbdfF/mtPNvfkoWD9S8xt1rsBDgCdBlCPC1 +rzoxsMRYSwQ4cRuXSwgaRc4JoH7PdNn1x0BTXH5llLm1G+XY/Yuvwe0G5fnBP0DA +SF6PFGSBFrFfwijkG6EoLL6CJ6oxmxsJRK0pzGeHwurh61xbbwnnlHCYv1DwDVAT +hqICSPdzQLRWGLAbHUMeAhAyjIMsILHieV5bR0YUWEsh3sHcRSMshAsQLtJRuT4y +ba5h2iO/RvY= +=3HX2 -----END PGP SIGNATURE----- diff -Nru libtest-rdf-perl-1.20/t/has_uri.t libtest-rdf-perl-1.22/t/has_uri.t --- libtest-rdf-perl-1.20/t/has_uri.t 2014-10-16 21:38:40.000000000 +0000 +++ libtest-rdf-perl-1.22/t/has_uri.t 2017-09-01 21:50:39.000000000 +0000 @@ -1,4 +1,4 @@ -use Test::Tester tests => 118; +use Test::Tester tests => 125; use Test::RDF; @@ -84,6 +84,17 @@ diag => 'No matching URIs found in model' } ); + +check_test( + sub { + has_type('http://example.com/Bar', $model, 'Has not correct type URI'); + }, + { + ok => 0, + name => 'Has not correct type URI', + diag => 'No matching URIs found in model' + } +); check_test( sub {