Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address https://github.com/Islandora-CLAW/CLAW/issues/302 ; Query Par… #51

Merged
merged 12 commits into from
Jul 22, 2016
Merged

Address https://github.com/Islandora-CLAW/CLAW/issues/302 ; Query Par… #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
de1c49c
Address https://github.com/Islandora-CLAW/CLAW/issues/302 ; Query Par…
ruebot Jun 30, 2016
2e8b0f7
Code review
ruebot Jul 4, 2016
54318bc
Please review. Hopefully this is not a hot mess!!!
ruebot Jul 21, 2016
ec7b848
Code review
ruebot Jul 21, 2016
9171593
Code review
ruebot Jul 21, 2016
3c46ffc
coding standards
ruebot Jul 21, 2016
6fe77e5
Merge branch 'master' of github.com:Islandora-CLAW/chullo into issue-302
ruebot Jul 21, 2016
e672893
code review
ruebot Jul 21, 2016
7ab6b4a
code review
ruebot Jul 21, 2016
88f8c08
More code review from @diegopino and @whikloj
ruebot Jul 21, 2016
15107b9
s/resource/transaction/
ruebot Jul 22, 2016
e9a47c7
stop overthinking tests
ruebot Jul 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions src/Chullo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,27 +153,24 @@ public function getGraph(
/**
* Creates a new resource in Fedora.
*
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
* @param string $checksum SHA-1 checksum
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
*
* @return string Uri of newly created resource or null if failed
*/
public function createResource(
$uri = "",
$content = null,
$headers = [],
$transaction = "",
$checksum = ""
$transaction = ""
) {
$response = $this->api->createResource(
$uri,
$content,
$headers,
$transaction,
$checksum
$transaction
);

if ($response->getStatusCode() != 201) {
Expand All @@ -188,27 +185,24 @@ public function createResource(
/**
* Saves a resource in Fedora.
*
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
* @param string $checksum SHA-1 checksum
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
*
* @return boolean True if successful
*/
public function saveResource(
$uri,
$content = null,
$headers = [],
$transaction = "",
$checksum = ""
$transaction = ""
) {
$response = $this->api->saveResource(
$uri,
$content,
$headers,
$transaction,
$checksum
$transaction
);

return $response->getStatusCode() == 204;
Expand All @@ -232,15 +226,17 @@ public function saveGraph(
$turtle = $graph->serialise('turtle');

// Checksum it.
$checksum = sha1($turtle);
$checksum_value = sha1($turtle);

// Save it.
return $this->saveResource(
$uri,
$turtle,
['Content-Type' => 'text/turtle'],
$transaction,
$checksum
[
'Content-Type' => 'text/turtle',
'digest' => 'sha1='.$checksum_value
],
$transaction
);
}

Expand Down
34 changes: 10 additions & 24 deletions src/FedoraApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,20 +139,18 @@ public function getResourceOptions($uri = "")
/**
* Creates a new resource in Fedora.
*
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
* @param string $checksum SHA-1 checksum
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
*
* @return ResponseInterface
*/
public function createResource(
$uri = "",
$content = null,
$headers = [],
$transaction = "",
$checksum = ""
$transaction = ""
) {
$options = ['http_errors' => false];

Expand All @@ -162,11 +160,6 @@ public function createResource(
// Set headers.
$options['headers'] = $headers;

// Set query string.
if (!empty($checksum)) {
$options['query'] = ['checksum' => $checksum];
}

// Ensure uri takes transaction into account.
$uri = $this->prepareUri($uri, $transaction);

Expand All @@ -180,20 +173,18 @@ public function createResource(
/**
* Saves a resource in Fedora.
*
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
* @param string $checksum SHA-1 checksum
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
*
* @return ResponseInterface
*/
public function saveResource(
$uri,
$content = null,
$headers = [],
$transaction = "",
$checksum = ""
$transaction = ""
) {
$options = ['http_errors' => false];

Expand All @@ -203,11 +194,6 @@ public function saveResource(
// Set headers.
$options['headers'] = $headers;

// Set query string.
if (!empty($checksum)) {
$options['query'] = ['checksum' => $checksum];
}

// Ensure uri takes transaction into account.
$uri = $this->prepareUri($uri, $transaction);

Expand Down
24 changes: 10 additions & 14 deletions src/IFedoraApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,35 +71,31 @@ public function getResourceOptions($uri = "");
/**
* Creates a new resource in Fedora.
*
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
* @param string $checksum SHA-1 checksum
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
*/
public function createResource(
$uri = "",
$content = null,
$headers = [],
$transaction = "",
$checksum = ""
$transaction = ""
);

/**
* Saves a resource in Fedora.
*
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
* @param string $checksum SHA-1 checksum
* @param string $uri Resource URI
* @param string $content String or binary content
* @param array $headers HTTP Headers
* @param string $transaction Transaction id
*/
public function saveResource(
$uri,
$content = null,
$headers = [],
$transaction = "",
$checksum = ""
$transaction = ""
);

/**
Expand Down
4 changes: 2 additions & 2 deletions test/CreateTransactionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ public function testReturnsNullOtherwise()
]);

$handler = HandlerStack::create($mock);
$guzzle = new Client(['handler' => $handler]);
$guzzle = new Client(['handler' => $handler, 'base_uri' => 'http://localhost:8080/fcrepo/rest']);
$api = new FedoraApi($guzzle);
$client = new Chullo($api);

//404
$result = $client->createResource();
$result = $client->createTransaction();
$this->assertNull($result);
}
}