Daniel Kinzler has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200183
Change subject: Moving RdfWriter and friends to a separate component called
Purtle.
......................................................................
Moving RdfWriter and friends to a separate component called Purtle.
"Purtle" stands for "PHP Turtle", since that's what the code for
generating RDF looks like.
This change does not modify any logic in the code, it just moves
files around and adjusts namespaces and test groups.
Change-Id: I23df09da6a8bab4d38d0f26e30575a878e08efd5
---
M build/travis/script.sh
M composer.json
A purtle/Purtle.php
A purtle/README.md
A purtle/init.mw.php
R purtle/src/BNodeLabeler.php
R purtle/src/N3Quoter.php
R purtle/src/N3RdfWriterBase.php
R purtle/src/NTriplesRdfWriter.php
R purtle/src/RdfWriter.php
R purtle/src/RdfWriterBase.php
R purtle/src/RdfWriterFactory.php
R purtle/src/TurtleRdfWriter.php
R purtle/src/UnicodeEscaper.php
R purtle/src/XmlRdfWriter.php
R purtle/tests/data/EricMiller.nt
R purtle/tests/data/EricMiller.rdf
R purtle/tests/data/EricMiller.ttl
R purtle/tests/data/LabeledBlankNode.nt
R purtle/tests/data/LabeledBlankNode.rdf
R purtle/tests/data/LabeledBlankNode.ttl
R purtle/tests/data/NumberedBlankNode.nt
R purtle/tests/data/NumberedBlankNode.rdf
R purtle/tests/data/NumberedBlankNode.ttl
R purtle/tests/data/Numbers.nt
R purtle/tests/data/Numbers.rdf
R purtle/tests/data/Numbers.ttl
R purtle/tests/data/Predicates.nt
R purtle/tests/data/Predicates.rdf
R purtle/tests/data/Predicates.ttl
R purtle/tests/data/Resources.nt
R purtle/tests/data/Resources.rdf
R purtle/tests/data/Resources.ttl
R purtle/tests/data/Texts.nt
R purtle/tests/data/Texts.rdf
R purtle/tests/data/Texts.ttl
R purtle/tests/data/Triples.nt
R purtle/tests/data/Triples.rdf
R purtle/tests/data/Triples.ttl
R purtle/tests/data/Values.nt
R purtle/tests/data/Values.rdf
R purtle/tests/data/Values.ttl
R purtle/tests/phpunit/BNodeLabelerTest.php
R purtle/tests/phpunit/N3QuoterTest.php
A purtle/tests/phpunit/NTriplesRdfWriterTest.php
R purtle/tests/phpunit/RdfWriterFactoryTest.php
R purtle/tests/phpunit/RdfWriterTestBase.php
R purtle/tests/phpunit/TurtleRdfWriterTest.php
R purtle/tests/phpunit/UnicodeEscaperTest.php
R purtle/tests/phpunit/XmlRdfWriterTest.php
M repo/Wikibase.php
M repo/config/Wikibase.default.php
M repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/rdf/RdfBuilder.php
M repo/includes/rdf/RdfSerializer.php
D repo/tests/phpunit/includes/rdf/NTriplesRdfWriterTest.php
M repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
57 files changed, 159 insertions(+), 98 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/200183/1
diff --git a/build/travis/script.sh b/build/travis/script.sh
index cecf5a2..662811d 100755
--- a/build/travis/script.sh
+++ b/build/travis/script.sh
@@ -4,4 +4,4 @@
cd ../phase3/tests/phpunit
-php phpunit.php --group Wikibase
+php phpunit.php --group Wikibase,Purtle
diff --git a/composer.json b/composer.json
index bab24ba..fa4719e 100644
--- a/composer.json
+++ b/composer.json
@@ -67,7 +67,9 @@
],
"psr-4": {
"Wikibase\\Repo\\View\\": "repo/includes/View",
- "Wikibase\\View\\": "view/src"
+ "Wikibase\\View\\": "view/src",
+ "Wikimedia\\Purtle\\": "purtle/src",
+ "Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit"
}
}
}
diff --git a/purtle/Purtle.php b/purtle/Purtle.php
new file mode 100644
index 0000000..ee2262c
--- /dev/null
+++ b/purtle/Purtle.php
@@ -0,0 +1,19 @@
+<?php
+
+if ( defined( 'PURTLE_VERSION' ) ) {
+ // Do not initialize more than once.
+ return 1;
+}
+
+define( 'PURTLE_VERSION', '0.1-dev' );
+
+// Include the composer autoloader if it is present.
+if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
+ include_once __DIR__ . '/vendor/autoload.php';
+}
+
+if ( defined( 'MEDIAWIKI' ) ) {
+ call_user_func( function() {
+ require_once __DIR__ . '/init.mw.php';
+ } );
+}
diff --git a/purtle/README.md b/purtle/README.md
new file mode 100644
index 0000000..247b821
--- /dev/null
+++ b/purtle/README.md
@@ -0,0 +1,24 @@
+# Purtle
+
+**Purtle** is a fast, lightweight RDF generator. It provides a "fluent"
interface for
+generating RDF output in Turtle, XML/RDF or N-Triples. The fluent interface
allows the
+resulting PHP code to be structured just like Turtle notation for RDF, hence
the name: "Purtle"
+is a contraction of "PHP Turtle".
+
+The PHP code would look something like this:
+
+ $writer = new TurtleRdfWriter();
+
+ $writer->prefix( 'acme', 'http://acme.test/terms/' );
+
+ $writer->about( 'http://quux.test/Something' )
+ ->a( 'acme', 'Thing' )
+ ->say( 'acme', 'name' )->text( 'Thingy' )->text( 'Dingsda', 'de' )
+ ->say( 'acme', 'owner' )->is( 'http://quux.test/' );
+
+
+## Release notes
+
+### 0.1 (dev)
+
+Initial release.
diff --git a/purtle/init.mw.php b/purtle/init.mw.php
new file mode 100644
index 0000000..370f6ed
--- /dev/null
+++ b/purtle/init.mw.php
@@ -0,0 +1,23 @@
+<?php
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+ die( 'Not an entry point.' );
+}
+
+$GLOBALS['wgExtensionCredits']['wikibase'][] = array(
+ 'path' => __FILE__,
+ 'name' => 'Purtle',
+ 'version' => WIKIBASE_VIEW_VERSION,
+ 'author' => array(
+ 'Daniel Kinzler',
+ 'Stas Malyshev',
+ ),
+ 'url' =>
'https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FWikibase/master/purtle%2FREADME.md',
+ 'description' => 'A fast, lightweight RDF generator',
+ 'license-name' => 'GPL-2.0+'
+);
+
+
+$GLOBALS['wgHooks']['UnitTestsList'][] = function( array &$paths ) {
+ $paths[] = __DIR__ . '/tests/phpunit';
+};
\ No newline at end of file
diff --git a/repo/includes/rdf/BNodeLabeler.php b/purtle/src/BNodeLabeler.php
similarity index 97%
rename from repo/includes/rdf/BNodeLabeler.php
rename to purtle/src/BNodeLabeler.php
index dfdee00..9ee83bb 100644
--- a/repo/includes/rdf/BNodeLabeler.php
+++ b/purtle/src/BNodeLabeler.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
use InvalidArgumentException;
diff --git a/repo/includes/rdf/N3Quoter.php b/purtle/src/N3Quoter.php
similarity index 96%
rename from repo/includes/rdf/N3Quoter.php
rename to purtle/src/N3Quoter.php
index 407beb9..2a998d0 100644
--- a/repo/includes/rdf/N3Quoter.php
+++ b/purtle/src/N3Quoter.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
/**
* Helper class for quoting literals and URIs in N3 output.
diff --git a/repo/includes/rdf/N3RdfWriterBase.php
b/purtle/src/N3RdfWriterBase.php
similarity index 98%
rename from repo/includes/rdf/N3RdfWriterBase.php
rename to purtle/src/N3RdfWriterBase.php
index a6fb496..3950423 100644
--- a/repo/includes/rdf/N3RdfWriterBase.php
+++ b/purtle/src/N3RdfWriterBase.php
@@ -1,6 +1,7 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
+
use InvalidArgumentException;
/**
diff --git a/repo/includes/rdf/NTriplesRdfWriter.php
b/purtle/src/NTriplesRdfWriter.php
similarity index 98%
rename from repo/includes/rdf/NTriplesRdfWriter.php
rename to purtle/src/NTriplesRdfWriter.php
index d0263a5..4eb9718 100644
--- a/repo/includes/rdf/NTriplesRdfWriter.php
+++ b/purtle/src/NTriplesRdfWriter.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
/**
* NTriplesRdfWriter
diff --git a/repo/includes/rdf/RdfWriter.php b/purtle/src/RdfWriter.php
similarity index 98%
rename from repo/includes/rdf/RdfWriter.php
rename to purtle/src/RdfWriter.php
index 3facc0a..e736d5a 100644
--- a/repo/includes/rdf/RdfWriter.php
+++ b/purtle/src/RdfWriter.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
/**
* Writer interface for RDF output. RdfWriter instances are generally stateful,
@@ -101,7 +101,7 @@
*
* @return RdfWriter $this
*/
- public function say( $base, $local );
+ public function say( $base, $local = null );
/**
* Produce a resource as the object of a statement.
diff --git a/repo/includes/rdf/RdfWriterBase.php b/purtle/src/RdfWriterBase.php
similarity index 99%
rename from repo/includes/rdf/RdfWriterBase.php
rename to purtle/src/RdfWriterBase.php
index eab34a0..e7e21eb 100644
--- a/repo/includes/rdf/RdfWriterBase.php
+++ b/purtle/src/RdfWriterBase.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
use Closure;
use InvalidArgumentException;
diff --git a/repo/includes/rdf/RdfWriterFactory.php
b/purtle/src/RdfWriterFactory.php
similarity index 98%
rename from repo/includes/rdf/RdfWriterFactory.php
rename to purtle/src/RdfWriterFactory.php
index 50de4b2..46a04f0 100644
--- a/repo/includes/rdf/RdfWriterFactory.php
+++ b/purtle/src/RdfWriterFactory.php
@@ -1,6 +1,7 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
+
use InvalidArgumentException;
/**
diff --git a/repo/includes/rdf/TurtleRdfWriter.php
b/purtle/src/TurtleRdfWriter.php
similarity index 98%
rename from repo/includes/rdf/TurtleRdfWriter.php
rename to purtle/src/TurtleRdfWriter.php
index a2a87a9..46abc91 100644
--- a/repo/includes/rdf/TurtleRdfWriter.php
+++ b/purtle/src/TurtleRdfWriter.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
/**
* RdfWriter implementation for generating Turtle output.
diff --git a/repo/includes/rdf/UnicodeEscaper.php
b/purtle/src/UnicodeEscaper.php
similarity index 98%
rename from repo/includes/rdf/UnicodeEscaper.php
rename to purtle/src/UnicodeEscaper.php
index 6c6f90d..777de3a 100644
--- a/repo/includes/rdf/UnicodeEscaper.php
+++ b/purtle/src/UnicodeEscaper.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
/**
* Helper class for turning non-ascii characters into Python-style unicode
escape sequences.
diff --git a/repo/includes/rdf/XmlRdfWriter.php b/purtle/src/XmlRdfWriter.php
similarity index 98%
rename from repo/includes/rdf/XmlRdfWriter.php
rename to purtle/src/XmlRdfWriter.php
index bae2082..a2a61d5 100644
--- a/repo/includes/rdf/XmlRdfWriter.php
+++ b/purtle/src/XmlRdfWriter.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\RDF;
+namespace Wikimedia\Purtle;
use InvalidArgumentException;
diff --git a/repo/tests/phpunit/data/rdf/EricMiller.nt
b/purtle/tests/data/EricMiller.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/EricMiller.nt
rename to purtle/tests/data/EricMiller.nt
diff --git a/repo/tests/phpunit/data/rdf/EricMiller.rdf
b/purtle/tests/data/EricMiller.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/EricMiller.rdf
rename to purtle/tests/data/EricMiller.rdf
diff --git a/repo/tests/phpunit/data/rdf/EricMiller.ttl
b/purtle/tests/data/EricMiller.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/EricMiller.ttl
rename to purtle/tests/data/EricMiller.ttl
diff --git a/repo/tests/phpunit/data/rdf/LabeledBlankNode.nt
b/purtle/tests/data/LabeledBlankNode.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/LabeledBlankNode.nt
rename to purtle/tests/data/LabeledBlankNode.nt
diff --git a/repo/tests/phpunit/data/rdf/LabeledBlankNode.rdf
b/purtle/tests/data/LabeledBlankNode.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/LabeledBlankNode.rdf
rename to purtle/tests/data/LabeledBlankNode.rdf
diff --git a/repo/tests/phpunit/data/rdf/LabeledBlankNode.ttl
b/purtle/tests/data/LabeledBlankNode.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/LabeledBlankNode.ttl
rename to purtle/tests/data/LabeledBlankNode.ttl
diff --git a/repo/tests/phpunit/data/rdf/NumberedBlankNode.nt
b/purtle/tests/data/NumberedBlankNode.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/NumberedBlankNode.nt
rename to purtle/tests/data/NumberedBlankNode.nt
diff --git a/repo/tests/phpunit/data/rdf/NumberedBlankNode.rdf
b/purtle/tests/data/NumberedBlankNode.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/NumberedBlankNode.rdf
rename to purtle/tests/data/NumberedBlankNode.rdf
diff --git a/repo/tests/phpunit/data/rdf/NumberedBlankNode.ttl
b/purtle/tests/data/NumberedBlankNode.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/NumberedBlankNode.ttl
rename to purtle/tests/data/NumberedBlankNode.ttl
diff --git a/repo/tests/phpunit/data/rdf/Numbers.nt
b/purtle/tests/data/Numbers.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Numbers.nt
rename to purtle/tests/data/Numbers.nt
diff --git a/repo/tests/phpunit/data/rdf/Numbers.rdf
b/purtle/tests/data/Numbers.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Numbers.rdf
rename to purtle/tests/data/Numbers.rdf
diff --git a/repo/tests/phpunit/data/rdf/Numbers.ttl
b/purtle/tests/data/Numbers.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Numbers.ttl
rename to purtle/tests/data/Numbers.ttl
diff --git a/repo/tests/phpunit/data/rdf/Predicates.nt
b/purtle/tests/data/Predicates.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Predicates.nt
rename to purtle/tests/data/Predicates.nt
diff --git a/repo/tests/phpunit/data/rdf/Predicates.rdf
b/purtle/tests/data/Predicates.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Predicates.rdf
rename to purtle/tests/data/Predicates.rdf
diff --git a/repo/tests/phpunit/data/rdf/Predicates.ttl
b/purtle/tests/data/Predicates.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Predicates.ttl
rename to purtle/tests/data/Predicates.ttl
diff --git a/repo/tests/phpunit/data/rdf/Resources.nt
b/purtle/tests/data/Resources.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Resources.nt
rename to purtle/tests/data/Resources.nt
diff --git a/repo/tests/phpunit/data/rdf/Resources.rdf
b/purtle/tests/data/Resources.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Resources.rdf
rename to purtle/tests/data/Resources.rdf
diff --git a/repo/tests/phpunit/data/rdf/Resources.ttl
b/purtle/tests/data/Resources.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Resources.ttl
rename to purtle/tests/data/Resources.ttl
diff --git a/repo/tests/phpunit/data/rdf/Texts.nt b/purtle/tests/data/Texts.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Texts.nt
rename to purtle/tests/data/Texts.nt
diff --git a/repo/tests/phpunit/data/rdf/Texts.rdf b/purtle/tests/data/Texts.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Texts.rdf
rename to purtle/tests/data/Texts.rdf
diff --git a/repo/tests/phpunit/data/rdf/Texts.ttl b/purtle/tests/data/Texts.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Texts.ttl
rename to purtle/tests/data/Texts.ttl
diff --git a/repo/tests/phpunit/data/rdf/Triples.nt
b/purtle/tests/data/Triples.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Triples.nt
rename to purtle/tests/data/Triples.nt
diff --git a/repo/tests/phpunit/data/rdf/Triples.rdf
b/purtle/tests/data/Triples.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Triples.rdf
rename to purtle/tests/data/Triples.rdf
diff --git a/repo/tests/phpunit/data/rdf/Triples.ttl
b/purtle/tests/data/Triples.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Triples.ttl
rename to purtle/tests/data/Triples.ttl
diff --git a/repo/tests/phpunit/data/rdf/Values.nt b/purtle/tests/data/Values.nt
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Values.nt
rename to purtle/tests/data/Values.nt
diff --git a/repo/tests/phpunit/data/rdf/Values.rdf
b/purtle/tests/data/Values.rdf
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Values.rdf
rename to purtle/tests/data/Values.rdf
diff --git a/repo/tests/phpunit/data/rdf/Values.ttl
b/purtle/tests/data/Values.ttl
similarity index 100%
rename from repo/tests/phpunit/data/rdf/Values.ttl
rename to purtle/tests/data/Values.ttl
diff --git a/repo/tests/phpunit/includes/rdf/BNodeLabelerTest.php
b/purtle/tests/phpunit/BNodeLabelerTest.php
similarity index 71%
rename from repo/tests/phpunit/includes/rdf/BNodeLabelerTest.php
rename to purtle/tests/phpunit/BNodeLabelerTest.php
index 2efb163..a660d4a 100644
--- a/repo/tests/phpunit/includes/rdf/BNodeLabelerTest.php
+++ b/purtle/tests/phpunit/BNodeLabelerTest.php
@@ -1,16 +1,13 @@
<?php
-namespace Wikibase\Test;
+namespace Wikimedia\Purtle\Tests;
-use Wikibase\RDF\BNodeLabeler;
+use Wikimedia\Purtle\BNodeLabeler;
/**
- * @covers Wikibase\RDF\BNodeLabeler
+ * @covers Wikimedia\Purtle\BNodeLabeler
*
- * @group Wikibase
- * @group WikibaseRepo
- * @group WikibaseRdf
- * @group RdfWriter
+ * @group Purtle
*
* @licence GNU GPL v2+
* @author Daniel Kinzler
diff --git a/repo/tests/phpunit/includes/rdf/N3QuoterTest.php
b/purtle/tests/phpunit/N3QuoterTest.php
similarity index 87%
rename from repo/tests/phpunit/includes/rdf/N3QuoterTest.php
rename to purtle/tests/phpunit/N3QuoterTest.php
index f0ac85e..fe239af 100644
--- a/repo/tests/phpunit/includes/rdf/N3QuoterTest.php
+++ b/purtle/tests/phpunit/N3QuoterTest.php
@@ -1,16 +1,13 @@
<?php
-namespace Wikibase\Test;
+namespace Wikimedia\Purtle\Tests;
-use Wikibase\RDF\N3Quoter;
+use Wikimedia\Purtle\N3Quoter;
/**
- * @covers Wikibase\RDF\N3Quoter
+ * @covers Wikimedia\Purtle\N3Quoter
*
- * @group Wikibase
- * @group WikibaseRepo
- * @group WikibaseRdf
- * @group RdfWriter
+ * @group Purtle
*
* @licence GNU GPL v2+
* @author Daniel Kinzler
diff --git a/purtle/tests/phpunit/NTriplesRdfWriterTest.php
b/purtle/tests/phpunit/NTriplesRdfWriterTest.php
new file mode 100644
index 0000000..b3d5f63
--- /dev/null
+++ b/purtle/tests/phpunit/NTriplesRdfWriterTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Wikimedia\Purtle\Tests;
+
+use Wikimedia\Purtle\NTriplesRdfWriter;
+use Wikimedia\Purtle\RdfWriter;
+
+/**
+ * @covers Wikimedia\Purtle\NTriplesRdfWriter
+ *
+ * @group Purtle
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Kinzler
+ */
+class NTriplesRdfWriterTest extends RdfWriterTestBase {
+
+ protected function getFileSuffix() {
+ return 'nt';
+ }
+
+ /**
+ * @return RdfWriter
+ */
+ protected function newWriter() {
+ return new NTriplesRdfWriter();
+ }
+}
diff --git a/repo/tests/phpunit/includes/rdf/RdfWriterFactoryTest.php
b/purtle/tests/phpunit/RdfWriterFactoryTest.php
similarity index 91%
rename from repo/tests/phpunit/includes/rdf/RdfWriterFactoryTest.php
rename to purtle/tests/phpunit/RdfWriterFactoryTest.php
index 808f1f8..88658a4 100644
--- a/repo/tests/phpunit/includes/rdf/RdfWriterFactoryTest.php
+++ b/purtle/tests/phpunit/RdfWriterFactoryTest.php
@@ -1,15 +1,13 @@
<?php
-namespace Wikibase\Test;
+namespace Wikimedia\Purtle\Tests;
-use Wikibase\RDF\RdfWriterFactory;
+use Wikimedia\Purtle\RdfWriterFactory;
/**
- * @covers Wikibase\RDF\RdfWriterFactory
+ * @covers Wikimedia\Purtle\RdfWriterFactory
*
- * @group Wikibase
- * @group WikibaseRepo
- * @group WikibaseRdf
+ * @group Purtle
*
* @licence GNU GPL v2+
* @author Daniel Kinzler
@@ -31,7 +29,7 @@
foreach ( $factory->getSupportedFormats() as $format ) {
$writer = $factory->getWriter( $format );
- $this->assertInstanceOf( 'Wikibase\RDF\RdfWriter',
$writer );
+ $this->assertInstanceOf( 'Wikimedia\Purtle\RdfWriter',
$writer );
}
}
@@ -86,7 +84,7 @@
$this->assertContains( $expectedMimeType,
$factory->getMimeTypes( $canonicalName ) );
$writer = $factory->getWriter( $canonicalName );
- $this->assertInstanceOf( 'Wikibase\RDF\RdfWriter', $writer );
+ $this->assertInstanceOf( 'Wikimedia\Purtle\RdfWriter', $writer
);
}
public function testGetMimeTypes() {
diff --git a/repo/tests/phpunit/includes/rdf/RdfWriterTestBase.php
b/purtle/tests/phpunit/RdfWriterTestBase.php
similarity index 96%
rename from repo/tests/phpunit/includes/rdf/RdfWriterTestBase.php
rename to purtle/tests/phpunit/RdfWriterTestBase.php
index 8d8f212..91b7e8c 100644
--- a/repo/tests/phpunit/includes/rdf/RdfWriterTestBase.php
+++ b/purtle/tests/phpunit/RdfWriterTestBase.php
@@ -1,8 +1,8 @@
<?php
-namespace Wikibase\Test;
+namespace Wikimedia\Purtle\Tests;
-use Wikibase\RDF\RdfWriter;
+use Wikimedia\Purtle\RdfWriter;
/**
* Base class for tests for RdfWriter implementations.
@@ -16,7 +16,7 @@
abstract protected function getFileSuffix();
protected function getExpectedOutputFile( $datasetName ) {
- $path = __DIR__ . '/../../data/rdf/' . $datasetName . '.' .
$this->getFileSuffix();
+ $path = __DIR__ . '/../data/' . $datasetName . '.' .
$this->getFileSuffix();
return $path;
}
@@ -40,9 +40,9 @@
$path = $this->getExpectedOutputFile( $datasetName );
// Create test data file if it doesn't exist.
- if ( !file_exists( $path ) ) {
- file_put_contents( $path . '.actual', join( "\n",
$actual ) );
- }
+ //if ( !file_exists( $path ) ) {
+ // file_put_contents( $path . '.actual', join( "\n",
$actual ) );
+ //}
$expected = file( $path );
diff --git a/repo/tests/phpunit/includes/rdf/TurtleRdfWriterTest.php
b/purtle/tests/phpunit/TurtleRdfWriterTest.php
similarity index 61%
rename from repo/tests/phpunit/includes/rdf/TurtleRdfWriterTest.php
rename to purtle/tests/phpunit/TurtleRdfWriterTest.php
index 32d6450..404c1f1 100644
--- a/repo/tests/phpunit/includes/rdf/TurtleRdfWriterTest.php
+++ b/purtle/tests/phpunit/TurtleRdfWriterTest.php
@@ -1,16 +1,14 @@
<?php
-namespace Wikibase\Test;
+namespace Wikimedia\Purtle\Tests;
-use Wikibase\RDF\RdfWriter;
-use Wikibase\RDF\TurtleRdfWriter;
+use Wikimedia\Purtle\RdfWriter;
+use Wikimedia\Purtle\TurtleRdfWriter;
/**
- * @covers Wikibase\RDF\TurtleRdfWriter
+ * @covers Wikimedia\Purtle\TurtleRdfWriter
*
- * @group Wikibase
- * @group WikibaseRepo
- * @group WikibaseRdf
+ * @group Purtle
* @group RdfWriter
*
* @licence GNU GPL v2+
diff --git a/repo/tests/phpunit/includes/rdf/UnicodeEscaperTest.php
b/purtle/tests/phpunit/UnicodeEscaperTest.php
similarity index 84%
rename from repo/tests/phpunit/includes/rdf/UnicodeEscaperTest.php
rename to purtle/tests/phpunit/UnicodeEscaperTest.php
index 8a59d67..89a0382 100644
--- a/repo/tests/phpunit/includes/rdf/UnicodeEscaperTest.php
+++ b/purtle/tests/phpunit/UnicodeEscaperTest.php
@@ -1,15 +1,13 @@
<?php
-namespace Wikibase\Test;
+namespace Wikimedia\Purtle\Tests;
-use Wikibase\RDF\UnicodeEscaper;
+use Wikimedia\Purtle\UnicodeEscaper;
/**
- * @covers Wikibase\RDF\UnicodeEscaper
+ * @covers Wikimedia\Purtle\UnicodeEscaper
*
- * @group Wikibase
- * @group WikibaseRepo
- * @group WikibaseRdf
+ * @group Purtle
* @group RdfWriter
*
* @licence GNU GPL v2+
diff --git a/repo/tests/phpunit/includes/rdf/XmlRdfWriterTest.php
b/purtle/tests/phpunit/XmlRdfWriterTest.php
similarity index 61%
rename from repo/tests/phpunit/includes/rdf/XmlRdfWriterTest.php
rename to purtle/tests/phpunit/XmlRdfWriterTest.php
index 132dad3..02cd696 100644
--- a/repo/tests/phpunit/includes/rdf/XmlRdfWriterTest.php
+++ b/purtle/tests/phpunit/XmlRdfWriterTest.php
@@ -1,16 +1,14 @@
<?php
-namespace Wikibase\Test;
+namespace Wikimedia\Purtle\Tests;
-use Wikibase\RDF\XmlRdfWriter;
-use Wikibase\RDF\RdfWriter;
+use Wikimedia\Purtle\XmlRdfWriter;
+use Wikimedia\Purtle\RdfWriter;
/**
- * @covers Wikibase\RDF\XmlRdfWriter
+ * @covers Wikimedia\Purtle\XmlRdfWriter
*
- * @group Wikibase
- * @group WikibaseRepo
- * @group WikibaseRdf
+ * @group Purtle
* @group RdfWriter
*
* @licence GNU GPL v2+
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index a68a1b1..aee8b18 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -70,6 +70,14 @@
throw new Exception( 'Wikibase depends on WikibaseView.' );
}
+if ( !defined( 'PURTLE_VERSION' ) ) {
+ include_once( __DIR__ . '/../purtle/Purtle.php' );
+}
+
+if ( !defined( 'PURTLE_VERSION' ) ) {
+ throw new Exception( 'Wikibase depends on WikibaseView.' );
+}
+
call_user_func( function() {
global $wgExtensionCredits, $wgGroupPermissions,
$wgExtensionMessagesFiles, $wgMessagesDirs;
global $wgAPIModules, $wgSpecialPages, $wgHooks, $wgAvailableRights;
diff --git a/repo/config/Wikibase.default.php b/repo/config/Wikibase.default.php
index 848be40..b484810 100644
--- a/repo/config/Wikibase.default.php
+++ b/repo/config/Wikibase.default.php
@@ -65,7 +65,7 @@
'rdfxml',
'n3',
'turtle',
- 'ntriples',
+ 'n-triples',
// hardcoded internal handling
'html',
diff --git a/repo/includes/LinkedData/EntityDataSerializationService.php
b/repo/includes/LinkedData/EntityDataSerializationService.php
index ff12724..88323f6 100644
--- a/repo/includes/LinkedData/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -17,7 +17,7 @@
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\EntityTitleLookup;
-use Wikibase\RDF\RdfWriterFactory;
+use Wikimedia\Purtle\RdfWriterFactory;
use Wikibase\RdfSerializer;
use Wikibase\RdfProducer;
use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
diff --git a/repo/includes/rdf/RdfBuilder.php b/repo/includes/rdf/RdfBuilder.php
index a12d3d4..fe19ac5 100644
--- a/repo/includes/rdf/RdfBuilder.php
+++ b/repo/includes/rdf/RdfBuilder.php
@@ -27,7 +27,7 @@
use DataValues\GlobeCoordinateValue;
use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use DataValues\DecimalValue;
-use Wikibase\RDF\RdfWriter;
+use Wikimedia\Purtle\RdfWriter;
/**
* RDF mapping for wikibase data model.
diff --git a/repo/includes/rdf/RdfSerializer.php
b/repo/includes/rdf/RdfSerializer.php
index b83397e..9985091 100644
--- a/repo/includes/rdf/RdfSerializer.php
+++ b/repo/includes/rdf/RdfSerializer.php
@@ -6,8 +6,8 @@
use SiteList;
use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\Lib\Store\EntityLookup;
-use Wikibase\RDF\RdfWriter;
-use Wikibase\RDF\RdfWriterFactory;
+use Wikimedia\Purtle\RdfWriter;
+use Wikimedia\Purtle\RdfWriterFactory;
/**
* RDF serialization for wikibase data model.
diff --git a/repo/tests/phpunit/includes/rdf/NTriplesRdfWriterTest.php
b/repo/tests/phpunit/includes/rdf/NTriplesRdfWriterTest.php
deleted file mode 100644
index cf1c716..0000000
--- a/repo/tests/phpunit/includes/rdf/NTriplesRdfWriterTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Wikibase\Test;
-
-use Wikibase\RDF\NTriplesRdfWriter;
-use Wikibase\RDF\RdfWriter;
-
-/**
- * @covers Wikibase\RDF\NTriplesRdfWriter
- *
- * @group Wikibase
- * @group WikibaseRepo
- * @group WikibaseRdf
- * @group RdfWriter
- *
- * @licence GNU GPL v2+
- * @author Daniel Kinzler
- */
-class NTriplesRdfWriterTest extends RdfWriterTestBase {
-
- protected function getFileSuffix() {
- return 'nt';
- }
-
- /**
- * @return RdfWriter
- */
- protected function newWriter() {
- return new NTriplesRdfWriter();
- }
-}
diff --git a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
index e8f65b9..81c11b1 100644
--- a/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
+++ b/repo/tests/phpunit/includes/rdf/RdfBuilderTest.php
@@ -5,7 +5,7 @@
use SiteList;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Term\Fingerprint;
-use Wikibase\RDF\NTriplesRdfWriter;
+use Wikimedia\Purtle\NTriplesRdfWriter;
use Wikibase\RdfBuilder;
use Wikibase\RdfProducer;
use Wikibase\DataModel\Entity\PropertyId;
--
To view, visit https://gerrit.wikimedia.org/r/200183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23df09da6a8bab4d38d0f26e30575a878e08efd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
