Additional entity querying methods & Paging

Tagging

+++ b/restws.entity.inc
@@ -70,6 +70,19 @@ interface RestWSResourceControllerInterface {
+   * If a format doesn't wants to implement queering, then it should throw an
+   * exception.

queering should be querying. Exception type RestWSException.

+++ b/restws.entity.inc
@@ -70,6 +70,19 @@ interface RestWSResourceControllerInterface {
+   * @param array $parameters

better name: filters?

+++ b/restws.entity.inc
@@ -70,6 +70,19 @@ interface RestWSResourceControllerInterface {
+   * @return

@return array

+++ b/restws.entity.inc
@@ -70,6 +70,19 @@ interface RestWSResourceControllerInterface {
+  public function query($parameters);

additional parameter: "meta_controls" for sorting, paging etc.

+++ b/restws.entity.inc
@@ -156,6 +168,21 @@ class RestWSEntityResourceController implements RestWSResourceControllerInterfac
+    $query_result = $query->execute();

query limit is missing: variable restws_query_max_limit 100

+++ b/restws.entity.inc
@@ -156,6 +168,21 @@ class RestWSEntityResourceController implements RestWSResourceControllerInterfac
+    $query_result = $query_result[$this->resource()];

this should be checked for emptyness

+++ b/restws.entity.inc
@@ -156,6 +168,21 @@ class RestWSEntityResourceController implements RestWSResourceControllerInterfac
+    $result = array();
+    foreach ($query_result as $entity_reference) {
+      $result[] = $entity_reference->$id_key;
+    }

couldn't you use array_keys($query_result)?

+++ b/restws.module
@@ -122,7 +122,7 @@ function restws_handle_request($op, $format, $resource_name, $id = NULL, $payloa
+        if ($op == 'create' || $op == 'query') {

not related to create, use your own if branch.

+++ b/restws.module
@@ -216,6 +216,41 @@ function restws_menu_alter(&$items) {
+        $items[$resource . '.json']['page arguments'] = array();

you need to do that for all formats available

+++ b/restws.module
@@ -224,12 +259,17 @@ function restws_menu_alter(&$items) {
+  else if (($pos = strpos($base_uri, '.')) && $format_name = substr($base_uri, $pos + 1)) {

should be "elseif"

+++ b/restws.module
@@ -276,7 +316,13 @@ function restws_page_callback($resource, $page_callback = NULL) {
+        if (!empty($id))
+        {

"{" should be on the same line as if

Otherwise looks pretty good so far.

Oh, and simpletests please!

+++ b/restws.entity.inc
@@ -71,16 +71,16 @@ interface RestWSResourceControllerInterface {
+  public function query($filters, $meta_controls);

@param docs for meta_controls is missing. both parameters should have array() as default.

+++ b/restws.entity.inc
@@ -168,18 +168,19 @@ class RestWSEntityResourceController implements RestWSResourceControllerInterfac
+  public function query($filters, $meta_controls) {

same array() defaults here

+++ b/restws.formats.inc
@@ -60,6 +60,8 @@ interface RestWSFormatInterface {
+   * If a format doesn't wants to implement querying, then it should throw an

should be "want"

+++ b/restws.formats.inc
@@ -129,7 +131,7 @@ abstract class RestWSBaseFormat implements RestWSFormatInterface {
+    $values = $resourceController->query($parameters, NULL);

use array() instead of NULL

+++ b/restws.module
@@ -122,12 +122,16 @@ function restws_handle_request($op, $format, $resource_name, $id = NULL, $payloa
+          drupal_add_http_header('Status', '201 Created');

WTF?

+++ b/restws.module
@@ -216,40 +220,27 @@ function restws_menu_alter(&$items) {
+      $format = drupal_strtolower($format['label']);

do not use the label, use the array keys as identifier for formats

+++ b/restws.module
@@ -216,40 +220,27 @@ function restws_menu_alter(&$items) {
+          'access callback' => TRUE,

That is fine, but we need to check for the query operation in restws_handle_request() and use view instead.

+++ b/restws.test
@@ -166,6 +166,30 @@ class RestWSTestCase extends DrupalWebTestCase {
+    for($i=0; $i<5; $i++) {

100000 white space issues.

+++ b/restws.test
@@ -166,6 +166,30 @@ class RestWSTestCase extends DrupalWebTestCase {
+    $result = $this->httpRequest('node.json', 'GET', $account);

same test for XML please

+++ b/README.txt
@@ -60,7 +60,8 @@ Design goals and concept
+ * The module supports full CRUD (Create, Read, Update, Delete) and quering for

should be querying

+++ b/restws.entity.inc
@@ -70,6 +70,21 @@ interface RestWSResourceControllerInterface {
+   * If a resource doesn't wants to implement querying, then it should throw an
+   * RestWSException with the 501 HTTP status code.

should be "throw a RestWSException"

+++ b/restws.entity.inc
@@ -70,6 +70,21 @@ interface RestWSResourceControllerInterface {
+   * @param array $parameters

should be "filters"

+++ b/restws.entity.inc
@@ -70,6 +70,21 @@ interface RestWSResourceControllerInterface {
+   *   An array containing the ids of the resources;

should end with a simple dot.

+++ b/restws.entity.inc
@@ -86,7 +101,6 @@ interface RestWSResourceControllerInterface {
 }
-
 /**

unrelated change

+++ b/restws.entity.inc
@@ -156,6 +170,22 @@ class RestWSEntityResourceController implements RestWSResourceControllerInterfac
+    $id_key = $entity_info['entity keys']['id'];

unused?

+++ b/restws.formats.inc
@@ -58,6 +58,19 @@ interface RestWSFormatInterface {
+   * @param RestWSResourceControllerInterface $resourceController
+   *   The controller used to update the resource.

description is wrong

+++ b/restws.formats.inc
@@ -58,6 +58,19 @@ interface RestWSFormatInterface {
+   * @param array $parameters
+   *   The parameters for the query or NULL all existing resources should be
+   *   returned.

I think the default should be an array() not NULL.

+++ b/restws.module
@@ -119,13 +119,20 @@ function restws_handle_request($op, $format, $resource_name, $id = NULL, $payloa
+    // Since there is now access callback for query we need to use view.

should eb "no" instead of "now"

+++ b/restws.module
@@ -119,13 +119,20 @@ function restws_handle_request($op, $format, $resource_name, $id = NULL, $payloa
+        else if ($op == 'query') {

should be "elseif"

+++ b/restws.module
@@ -224,12 +252,17 @@ function restws_menu_alter(&$items) {
+  $base_uri = arg(0);

better name: resource_arg to match id_arg

+++ b/restws.test
@@ -166,6 +166,37 @@ class RestWSTestCase extends DrupalWebTestCase {
+    for($i = 0; $i < 5; $i++) {
+      $this->assertRaw("<title>node$i</title>", 'XML has been generated.');
+    }

you could also assert if the outer list element is present.

+1 for going with next/previous links.

In particular for XML, pls try to avoid coming up with something new, but better follow the atompub specs: http://tools.ietf.org/html/rfc5023#section-10.1

I don't think there is something as widespread for json, but at least google has a direct json port from atompub, so just going with a similar structure in json is probably a good idea as well.

Improved some comments and details and committed it, thanks!

@fago: paging will be a separate issue, this one is just about very basic querying without any filters and pagers.

@sepgil: please open follow-up issues for filtering, paging and sorting. And link them here.