Add silex cache for use in TransactionService, also fix isToUri signa… (

#8)

* Add silex cache for use in TransactionService, also fix isToUri signature and headers when adding a member proxy.

* Remove minimum-stability: dev

* Ignore local settings files.

.gitignore

@@ -1,3 +1,5 @@
 vendor/
 composer.phar
 installer
+config/settings.dev.yml
+config/settings.yml

composer.json

@@ -15,7 +15,8 @@
         "twig/twig": "^1.23",
         "symfony/yaml": "^3.0",
         "easyrdf/easyrdf": "^0.9.1",
-        "ml/json-ld": "^1.0"
+        "ml/json-ld": "^1.0",
+        "moust/silex-cache": "1.0.*@dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8",
@@ -24,7 +25,6 @@
     "autoload": {
         "psr-4": {"Islandora\\PDX\\": "src/"}
     },
-    "minimum-stability" : "dev",
     "license": "MIT",
     "authors": [
         {

src/CollectionService/Controller/CollectionController.php

@@ -176,7 +176,7 @@ public function addMember(Application $app, Request $request, $id, $member)
 
         $urlRoute = $request->getUriForPath('/islandora/resource/');
 
-        $members_uri = $app['islandora.idToUri']($member);
+        $members_uri = $app['islandora.idToUri']($member, $request);
         if (is_a($members_uri, 'Symfony\Component\HttpFoundation\Response')) {
             return $members_uri;
         }
@@ -188,7 +188,7 @@ public function addMember(Application $app, Request $request, $id, $member)
             )
         );
 
-        $fullUri = $app['islandora.idToUri']($id);
+        $fullUri = $app['islandora.idToUri']($id, $request);
         if (is_a($fullUri, 'Symfony\Component\HttpFoundation\Response')) {
             return $fullUri;
         }
@@ -206,6 +206,7 @@ public function addMember(Application $app, Request $request, $id, $member)
         );
         $newRequest->headers->set('Content-type', 'application/ld+json');
         $newRequest->headers->set('Content-Length', strlen($members_proxy_rdf));
+        $app['islandora.hostHeaderNormalize']($newRequest);
         $response = $app['islandora.resourcecontroller']->post($app, $newRequest, $fullUri);
         if (201 == $response->getStatusCode()) {
             return new Response($response->getBody(), 201, $response->getHeaders());
@@ -235,12 +236,12 @@ public function removeMember(Application $app, Request $request, $id, $member)
 
         $urlRoute = $request->getUriForPath('/islandora/resource/');
 
-        $collection_uri = $app['islandora.idToUri']($id);
+        $collection_uri = $app['islandora.idToUri']($id, $request);
         if (is_object($collection_uri)) {
             return $collection_uri;
         }
 
-        $member_uri = $app['islandora.idToUri']($member);
+        $member_uri = $app['islandora.idToUri']($member, $request);
         if (is_object($member_uri)) {
             return $member_uri;
         }

src/index.php

@@ -27,6 +27,16 @@
     __DIR__ . '/CollectionService/templates',
   ),
 ));
+// Cache for TransactionService
+$app->register(new \Moust\Silex\Provider\CacheServiceProvider(), array(
+    'caches.options' => array(
+        'filesystem' => array(
+            'driver' => 'file',
+            'cache_dir' => '/tmp',
+        ),
+    ),
+));
+
 
 $islandoraCollectionServiceProvider = new CollectionServiceProvider;
 $islandoraCrayfishProvider = new CrayfishProvider;