ARC2: added CommonNamespaces as constructor parameter (BC break!) ...

* support prefixed URI usage in addStatements and deleteMatchingStatements,
if you registered your namespace in CommonNamespaces instance before usage
* usage of nodeFactory only in StoreAbstractTest
* added two tests to prove support for prefixed URIs
* fixed two assert functions in TestCase

src/Saft/Addition/ARC2/Store/ARC2.php

@@ -2,6 +2,7 @@
 
 namespace Saft\Addition\ARC2\Store;
 
+use Saft\Rdf\CommonNamespaces;
 use Saft\Rdf\NamedNode;
 use Saft\Rdf\NamedNodeImpl;
 use Saft\Rdf\Node;
@@ -35,6 +36,11 @@ class ARC2 extends AbstractSparqlStore
      */
     protected $nodeFactory = null;
 
+    /**
+     * @var CommonNamespaces
+     */
+    protected $commonNamespaces = null;
+
     /**
      * @var RdfHelpers
      */
@@ -80,9 +86,11 @@ public function __construct(
         ResultFactory $resultFactory,
         StatementIteratorFactory $statementIteratorFactory,
         RdfHelpers $rdfHelpers,
+        CommonNamespaces $commonNamespaces,
         array $configuration
     ) {
         $this->configuration = $configuration;
+        $this->commonNamespaces = $commonNamespaces;
 
         // Open connection
         $this->openConnection();
@@ -145,11 +153,29 @@ public function addStatements($statements, Node $graph = null, array $options =
             }
             // else: non-concrete Statement instances not allowed
 
+            // use full URIs, if available
+            $s = $statement->getSubject();
+            if ($s->isNamed()) {
+                $s = $this->nodeFactory->createNamedNode(
+                    $this->commonNamespaces->extendUri($statement->getSubject()->getUri())
+                );
+            }
+            $p = $this->nodeFactory->createNamedNode(
+                $this->commonNamespaces->extendUri($statement->getPredicate()->getUri())
+            );
+            $o = $statement->getObject();
+            if ($o->isNamed()) {
+                $o = $this->nodeFactory->createNamedNode(
+                    $this->commonNamespaces->extendUri($statement->getObject()->getUri())
+                );
+            }
+
+            // execute query
             $this->query(
                 'INSERT INTO <'. $graphUriToUse .'> {'
-                . $this->rdfHelpers->getNodeInSparqlFormat($statement->getSubject()) . ' '
-                . $this->rdfHelpers->getNodeInSparqlFormat($statement->getPredicate()) . ' '
-                . $this->rdfHelpers->getNodeInSparqlFormat($statement->getObject()) . ' . '
+                . $this->rdfHelpers->getNodeInSparqlFormat($s) . ' '
+                . $this->rdfHelpers->getNodeInSparqlFormat($p) . ' '
+                . $this->rdfHelpers->getNodeInSparqlFormat($o) . ' . '
                 . '}',
                 $options
             );
@@ -217,12 +243,28 @@ public function deleteMatchingStatements(
             $graph = $statement->getGraph();
         }
 
+        // use full URIs, if available
+        $s = $statement->getSubject();
+        if ($s->isNamed()) {
+            $s = $this->nodeFactory->createNamedNode(
+                $this->commonNamespaces->extendUri($statement->getSubject()->getUri())
+            );
+        }
+        $p = $statement->getPredicate();
+        if ($p->isNamed()) {
+            $p = $this->nodeFactory->createNamedNode(
+                $this->commonNamespaces->extendUri($statement->getPredicate()->getUri())
+            );
+        }
+        $o = $statement->getObject();
+        if ($o->isNamed()) {
+            $o = $this->nodeFactory->createNamedNode(
+                $this->commonNamespaces->extendUri($statement->getObject()->getUri())
+            );
+        }
+
         // create triple statement, because we have to handle the graph extra
-        $tripleStatement = $this->statementFactory->createStatement(
-            $statement->getSubject(),
-            $statement->getPredicate(),
-            $statement->getObject()
-        );
+        $tripleStatement = $this->statementFactory->createStatement($s, $p, $o);
 
         $statementIterator = $this->statementIteratorFactory->createStatementIteratorFromArray(
             array($tripleStatement)

src/Saft/Addition/ARC2/Test/ARC2Test.php

@@ -5,6 +5,7 @@
 use Saft\Addition\ARC2\Store\ARC2;
 use Saft\Rdf\AnyPatternImpl;
 use Saft\Rdf\ArrayStatementIteratorImpl;
+use Saft\Rdf\CommonNamespaces;
 use Saft\Rdf\LiteralImpl;
 use Saft\Rdf\NamedNode;
 use Saft\Rdf\NamedNodeImpl;
@@ -41,6 +42,7 @@ public function setUp()
                     new ResultFactoryImpl(),
                     new StatementIteratorFactoryImpl(),
                     new RdfHelpers(),
+                    new CommonNamespaces(),
                     $this->configuration['arc2Config']
                 );
             } catch (\Exception $e) {
@@ -90,7 +92,7 @@ protected function countTriples(NamedNode $graph)
     // gets deleted.
     public function testDropGraphEffects()
     {
-        $secondGraph = new NamedNodeImpl(new RdfHelpers(), $this->testGraph->getUri() . '2');
+        $secondGraph = $this->nodeFactory->createNamedNode($this->testGraph->getUri() . '2');
 
         $this->fixture->createGraph($secondGraph);
 
@@ -150,6 +152,7 @@ public function testOpenConnectionCheckDatabase()
             new ResultFactoryImpl(),
             new StatementIteratorFactoryImpl(),
             new RdfHelpers(),
+            new CommonNamespaces(),
             array()
         );
     }
@@ -166,6 +169,7 @@ public function testOpenConnectionCheckHost()
             new ResultFactoryImpl(),
             new StatementIteratorFactoryImpl(),
             new RdfHelpers(),
+            new CommonNamespaces(),
             array('database' => 'saft')
         );
     }
@@ -182,6 +186,7 @@ public function testOpenConnectionCheckUsername()
             new ResultFactoryImpl(),
             new StatementIteratorFactoryImpl(),
             new RdfHelpers(),
+            new CommonNamespaces(),
             array('database' => 'saft', 'host' => 'localhost')
         );
     }
@@ -242,8 +247,8 @@ public function testRemovalOfTriplesAfterDropGraph()
                 ),
                 new StatementImpl(
                     $this->testGraph,
-                    new NamedNodeImpl(new RdfHelpers(), 'http://foobar/1'),
-                    new NamedNodeImpl(new RdfHelpers(), 'http://foobar/2'),
+                    $this->nodeFactory->createNamedNode('http://foobar/1'),
+                    $this->nodeFactory->createNamedNode('http://foobar/2'),
                     $this->testGraph
                 )
             )