From 8483df5fbec91e07b817ceef54a3347ef9117647 Mon Sep 17 00:00:00 2001
From: Max <max@datarepublic.com>
Date: Mon, 30 Jul 2018 08:42:31 +1000
Subject: [PATCH 1/4] crud and related entities complete

---
 ckan_connect.info.yml                         |   0
 ckan_connect.links.menu.yml                   |   0
 ckan_connect.module                           |   0
 ckan_connect.permissions.yml                  |   0
 ckan_connect.routing.yml                      |   0
 ckan_connect.services.yml                     |   0
 src/Ckan/CkanApiBase.php                      |  80 +++++++++++
 src/Ckan/CkanApiInterface.php                 |  38 +++++
 src/Ckan/Crud/CkanCrudBase.php                | 135 ++++++++++++++++++
 src/Ckan/Crud/CkanCrudInterface.php           |  18 +++
 src/Ckan/Crud/PackageRelationship.php         |  48 +++++++
 src/Ckan/Crud/ResourceView.php                |  38 +++++
 src/Ckan/Crud/Tag.php                         |  33 +++++
 src/Ckan/Crud/User.php                        |  55 +++++++
 src/Ckan/Crud/Vocabulary.php                  |  33 +++++
 src/Ckan/Member/CkanMemberBase.php            |  23 +++
 src/Ckan/Member/GroupMember.php               |  35 +++++
 src/Ckan/Member/Member.php                    |  37 +++++
 src/Ckan/Member/OrganizationMember.php        |  35 +++++
 src/Ckan/Patchable/CkanPatchableBase.php      |  28 ++++
 src/Ckan/Patchable/Group.php                  |  43 ++++++
 src/Ckan/Patchable/Organization.php           |  40 ++++++
 src/Ckan/Patchable/Package.php                |  42 ++++++
 src/Ckan/Patchable/Resource.php               |  48 +++++++
 src/Ckan/Service/AAA.php                      |  39 +++++
 src/Ckan/Service/CkanServiceBase.php          |  29 ++++
 .../CurrentPackageListWithResources.php       |  24 ++++
 src/Ckan/Service/FormatAutocomplete.php       |  30 ++++
 src/Ckan/Service/GroupAutocomplete.php        |  30 ++++
 src/Ckan/Service/GroupListAuthz.php           |  23 +++
 src/Ckan/Service/GroupRevisionList.php        |  29 ++++
 src/Ckan/Service/LicenseList.php              |  15 ++
 src/Ckan/Service/OrganizationListForUser.php  |  24 ++++
 src/Ckan/Service/OrganizationRevisionList.php |  29 ++++
 src/Ckan/Service/PackageAutocomplete.php      |  30 ++++
 src/Ckan/Service/PackageRevisionList.php      |  29 ++++
 src/Ckan/Service/PackageSearch.php            |  40 ++++++
 src/Ckan/Service/ResourceSearch.php           |  33 +++++
 src/Ckan/Service/RevisionList.php             |  32 +++++
 src/Ckan/Service/RevisionShow.php             |  29 ++++
 src/Ckan/Service/SiteRead.php                 |  15 ++
 src/Ckan/Service/UserAutocomplete.php         |  30 ++++
 src/Client/CkanClient.php                     |  53 ++++++-
 src/Client/CkanClientInterface.php            |  19 ++-
 src/Form/CkanConnectSettingsForm.php          |   0
 src/Parser/CkanResourceUrlParser.php          |   0
 src/Parser/CkanResourceUrlParserInterface.php |   0
 47 files changed, 1385 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 ckan_connect.info.yml
 mode change 100644 => 100755 ckan_connect.links.menu.yml
 mode change 100644 => 100755 ckan_connect.module
 mode change 100644 => 100755 ckan_connect.permissions.yml
 mode change 100644 => 100755 ckan_connect.routing.yml
 mode change 100644 => 100755 ckan_connect.services.yml
 create mode 100755 src/Ckan/CkanApiBase.php
 create mode 100755 src/Ckan/CkanApiInterface.php
 create mode 100755 src/Ckan/Crud/CkanCrudBase.php
 create mode 100755 src/Ckan/Crud/CkanCrudInterface.php
 create mode 100755 src/Ckan/Crud/PackageRelationship.php
 create mode 100755 src/Ckan/Crud/ResourceView.php
 create mode 100755 src/Ckan/Crud/Tag.php
 create mode 100755 src/Ckan/Crud/User.php
 create mode 100755 src/Ckan/Crud/Vocabulary.php
 create mode 100755 src/Ckan/Member/CkanMemberBase.php
 create mode 100755 src/Ckan/Member/GroupMember.php
 create mode 100755 src/Ckan/Member/Member.php
 create mode 100755 src/Ckan/Member/OrganizationMember.php
 create mode 100755 src/Ckan/Patchable/CkanPatchableBase.php
 create mode 100755 src/Ckan/Patchable/Group.php
 create mode 100755 src/Ckan/Patchable/Organization.php
 create mode 100755 src/Ckan/Patchable/Package.php
 create mode 100755 src/Ckan/Patchable/Resource.php
 create mode 100644 src/Ckan/Service/AAA.php
 create mode 100755 src/Ckan/Service/CkanServiceBase.php
 create mode 100644 src/Ckan/Service/CurrentPackageListWithResources.php
 create mode 100644 src/Ckan/Service/FormatAutocomplete.php
 create mode 100644 src/Ckan/Service/GroupAutocomplete.php
 create mode 100644 src/Ckan/Service/GroupListAuthz.php
 create mode 100644 src/Ckan/Service/GroupRevisionList.php
 create mode 100644 src/Ckan/Service/LicenseList.php
 create mode 100644 src/Ckan/Service/OrganizationListForUser.php
 create mode 100644 src/Ckan/Service/OrganizationRevisionList.php
 create mode 100644 src/Ckan/Service/PackageAutocomplete.php
 create mode 100644 src/Ckan/Service/PackageRevisionList.php
 create mode 100644 src/Ckan/Service/PackageSearch.php
 create mode 100644 src/Ckan/Service/ResourceSearch.php
 create mode 100644 src/Ckan/Service/RevisionList.php
 create mode 100644 src/Ckan/Service/RevisionShow.php
 create mode 100644 src/Ckan/Service/SiteRead.php
 create mode 100644 src/Ckan/Service/UserAutocomplete.php
 mode change 100644 => 100755 src/Client/CkanClient.php
 mode change 100644 => 100755 src/Client/CkanClientInterface.php
 mode change 100644 => 100755 src/Form/CkanConnectSettingsForm.php
 mode change 100644 => 100755 src/Parser/CkanResourceUrlParser.php
 mode change 100644 => 100755 src/Parser/CkanResourceUrlParserInterface.php

diff --git a/ckan_connect.info.yml b/ckan_connect.info.yml
old mode 100644
new mode 100755
diff --git a/ckan_connect.links.menu.yml b/ckan_connect.links.menu.yml
old mode 100644
new mode 100755
diff --git a/ckan_connect.module b/ckan_connect.module
old mode 100644
new mode 100755
diff --git a/ckan_connect.permissions.yml b/ckan_connect.permissions.yml
old mode 100644
new mode 100755
diff --git a/ckan_connect.routing.yml b/ckan_connect.routing.yml
old mode 100644
new mode 100755
diff --git a/ckan_connect.services.yml b/ckan_connect.services.yml
old mode 100644
new mode 100755
diff --git a/src/Ckan/CkanApiBase.php b/src/Ckan/CkanApiBase.php
new file mode 100755
index 0000000..fe0f5ab
--- /dev/null
+++ b/src/Ckan/CkanApiBase.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan;
+
+use Drupal\ckan_connect\Client\CkanClient;
+
+/**
+ * Class CkanApiBase
+ */
+abstract class CkanApiBase implements CkanApiInterface {
+
+  /**
+   * @var string $machineName
+   *   The machine name for this CKAN object e.g. 'resource' or 'package'.
+   */
+  protected $machineName = NULL;
+
+  /**
+   * @var array $parameters
+   *   Parameters for use in create, patch and update queries as an associative
+   *   array [param_key => param_value].
+   */
+  protected $parameters = [];
+
+  /**
+   * @var array $validParameters
+   *   An array of valid parameter keys e.g. ['name', 'title', 'private', ...]
+   */
+  protected $validParameters = [];
+
+  /**
+   * @var array $requiredParameters
+   *   An array of required parameter keys.
+   */
+  protected $requiredParameters = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setParameters($parameters) {
+    if ($this->validateParameters($parameters)) {
+      $this->parameters = $parameters;
+      return TRUE;
+    }
+    // @todo: throw error instead.
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPath() {
+    return $this->machineName;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getParameters() {
+    return $this->parameters;
+  }
+
+  /**
+   * Ensure the parameters are valid and complete.
+   *
+   * @param string $action
+   *   The action being requested: create|update|patch.
+   */
+  protected function validateParameters($parameters) {
+    $keys = array_keys($parameters);
+
+    // Check for invalid parameter keys.
+    if (!empty(array_diff_key($keys, $this->validParameters))) {
+      return FALSE;
+    }
+
+    return TRUE;
+  }
+
+}
diff --git a/src/Ckan/CkanApiInterface.php b/src/Ckan/CkanApiInterface.php
new file mode 100755
index 0000000..1aabe31
--- /dev/null
+++ b/src/Ckan/CkanApiInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan;
+
+/**
+ * Interface CkanApiInterface
+ */
+interface CkanApiInterface {
+
+  /**
+   * Set the parameters to be used in create, update or patch queries.
+   *
+   * @param $parameters
+   *   An associative array of parameters: [param_key => param_value].
+   *
+   * @return bool
+   */
+  public function setParameters($parameters);
+
+  /**
+   * Get the last part of the API endpoint specific to this CKAN object.
+   *
+   * @param string $action
+   *
+   * @return string
+   *   The action slug, e.g. package_delete or organisation_create
+   */
+  public function getPath();
+
+  /**
+   * Get the parameters to be used by the API call.
+   *
+   * @return array
+   *   An associative array of parameters: [param_key => param_value].
+   */
+  public function getParameters();
+
+}
diff --git a/src/Ckan/Crud/CkanCrudBase.php b/src/Ckan/Crud/CkanCrudBase.php
new file mode 100755
index 0000000..4fcedcd
--- /dev/null
+++ b/src/Ckan/Crud/CkanCrudBase.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+use Drupal\ckan_connect\Ckan\CkanApiBase;
+use Drupal\ckan_connect\Ckan\CkanCrudInterface;
+use Drupal\ckan_connect\Client\CkanClient;
+
+/**
+ * Class CkanCrudBase
+ *
+ * Any CKAN object that responds to all CRUD requests.
+ */
+abstract class CkanCrudBase extends CkanApiBase implements CkanCrudInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validActions = [
+    CkanClient::CKAN_ACTION_LIST,
+    CkanClient::CKAN_ACTION_SHOW,
+    CkanClient::CKAN_ACTION_CREATE,
+    CkanClient::CKAN_ACTION_UPDATE,
+    CkanClient::CKAN_ACTION_DELETE,
+  ];
+
+  /**
+   * @var string $id
+   *   The uuid formatted ID generated by CKAN for this object.
+   */
+  protected $id;
+
+  /**
+   * @var string $action
+   */
+  protected $action;
+
+  /**
+   * CkanApiBase constructor.
+   *
+   * @param string $id
+   *   The uuid generated by CKAN, may be an empty string for new objects
+   *   intended for create actions.
+   */
+  public function __construct($id = '') {
+    $this->id = $id;
+  }
+
+  /**
+   * Set the action that the API client should perform with this object.
+   *
+   * @param string $action
+   *
+   * @return bool
+   */
+  public function setAction($action) {
+    if (in_array($action, $this->validActions)) {
+      $this->action = $action;
+      return TRUE;
+    }
+    // @todo: throw error instead.
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPath() {
+    if (empty($this->action)){
+      // @todo: throw error instead.
+      return FALSE;
+    }
+    return $this->machineName . '_' . $this->action;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getParameters() {
+    $actionsRequiringParameters = [
+      CkanClient::CKAN_ACTION_CREATE,
+      CkanClient::CKAN_ACTION_UPDATE,
+      CkanClient::CKAN_ACTION_PATCH,
+    ];
+
+    if (in_array($this->action, $actionsRequiringParameters)) {
+      if ($this->prepareParameters()) {
+        return $this->parameters;
+      }
+      else {
+        // @todo: throw error instead.
+        return FALSE;
+      }
+    }
+
+    // Delete and get (list/show) actions only require the ID.
+    return ['id' => $this->id];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getValidActions() {
+    return $this->validActions;
+  }
+
+  /**
+   * @param $action
+   *
+   * @return bool
+   */
+  protected function prepareParameters() {
+    $keys = array_keys($this->parameters);
+
+    // Check for missing required keys (create only).
+    if ($this->action === CkanClient::CKAN_ACTION_CREATE) {
+      if (!empty(array_diff_key($this->requiredParameters, $keys))) {
+        return FALSE;
+      }
+    }
+
+    // Update and patch queries must include an ID.
+    if ($this->action === CkanClient::CKAN_ACTION_UPDATE || $this->action === CkanClient::CKAN_ACTION_PATCH) {
+
+      // This check is the entire reason id is a separate property.
+      if (empty($this->id)) {
+        return FALSE;
+      }
+
+      $this->parameters['id'] = $this->id;
+    }
+    return TRUE;
+  }
+
+}
diff --git a/src/Ckan/Crud/CkanCrudInterface.php b/src/Ckan/Crud/CkanCrudInterface.php
new file mode 100755
index 0000000..9dc9984
--- /dev/null
+++ b/src/Ckan/Crud/CkanCrudInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan;
+
+/**
+ * Interface CkanCrudInterface
+ */
+interface CkanCrudInterface extends CkanApiInterface {
+
+  /**
+   * Get the set of valid actions for this CKAN object.
+   *
+   * @return array
+   *   Array of valid actions as strings.
+   */
+  public function getValidActions();
+
+}
diff --git a/src/Ckan/Crud/PackageRelationship.php b/src/Ckan/Crud/PackageRelationship.php
new file mode 100755
index 0000000..09fbb89
--- /dev/null
+++ b/src/Ckan/Crud/PackageRelationship.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+/**
+ * Class PackageRelationship
+ *
+ * A relationship between two CKAN packages.
+ */
+class PackageRelationship extends CkanCrudBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'package_relationship';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'subject',
+    'object',
+    'type',
+    'comment',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'subject',
+    'object',
+    'type',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPath() {
+    if ($this->action === 'list') {
+      // This object doesn't follow the apparent naming convention in the CKAN
+      // API.
+      return $this->machineName . 's_' . $this->action;
+    }
+    return parent::getPath();
+  }
+
+}
diff --git a/src/Ckan/Crud/ResourceView.php b/src/Ckan/Crud/ResourceView.php
new file mode 100755
index 0000000..a9950d9
--- /dev/null
+++ b/src/Ckan/Crud/ResourceView.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+/**
+ * Class ResourceView
+ *
+ * A resource view in CKAN is a web page that display the resource in various
+ * ways such as in a data explorer or as an image.
+ */
+class ResourceView extends CkanCrudBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'resource_view';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'resource_id',
+    'title',
+    'description',
+    'view_type',
+    'config',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'resource_id',
+    'title',
+    'view_type',
+  ];
+
+}
diff --git a/src/Ckan/Crud/Tag.php b/src/Ckan/Crud/Tag.php
new file mode 100755
index 0000000..634b044
--- /dev/null
+++ b/src/Ckan/Crud/Tag.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+/**
+ * Class Tag
+ *
+ * A CKAN tag (similar to a Drupal taxonomy item).
+ */
+class Tag extends CkanCrudBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'tag';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'name',
+    'vocabulary_id',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'name',
+    'vocabulary_id',
+  ];
+
+}
diff --git a/src/Ckan/Crud/User.php b/src/Ckan/Crud/User.php
new file mode 100755
index 0000000..4357e58
--- /dev/null
+++ b/src/Ckan/Crud/User.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+use Drupal\ckan_connect\Client\CkanClient;
+
+/**
+ * Class User
+ *
+ * Users in CKAN are very much like users in Drupal, they can be added to
+ * Organisations and Groups, and given various permissions.
+ */
+class User extends CkanCrudBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'user';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'name',
+    'email',
+    'password',
+    'id',
+    'fullname',
+    'about',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'name',
+    'email',
+    'password',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function validateParameters($action) {
+    $valid = parent::validateParameters($action);
+
+    // From the docs: "Can not modify existing user's name."
+    if ($valid && $action === CkanClient::CKAN_ACTION_UPDATE && array_key_exists('name', $this->parameters)) {
+      $valid = FALSE;
+    }
+
+    return $valid;
+  }
+
+}
diff --git a/src/Ckan/Crud/Vocabulary.php b/src/Ckan/Crud/Vocabulary.php
new file mode 100755
index 0000000..00fae76
--- /dev/null
+++ b/src/Ckan/Crud/Vocabulary.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+/**
+ * Class Vocabulary
+ *
+ * A CKAN tag vocabulary (similar to a Drupal taxonomy vocabulary).
+ */
+class Vocabulary extends CkanCrudBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'vocabulary';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'name',
+    'tags',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'name',
+    'tags',
+  ];
+
+}
diff --git a/src/Ckan/Member/CkanMemberBase.php b/src/Ckan/Member/CkanMemberBase.php
new file mode 100755
index 0000000..d9ebe83
--- /dev/null
+++ b/src/Ckan/Member/CkanMemberBase.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Member;
+
+use Drupal\ckan_connect\Ckan\Crud\CkanCrudBase;
+use Drupal\ckan_connect\Client\CkanClient;
+
+/**
+ * Class MemberBase
+ *
+ * CKAN member objects can only be created or deleted.
+ */
+abstract class CkanMemberBase extends CkanCrudBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validActions = [
+    CkanClient::CKAN_ACTION_CREATE,
+    CkanClient::CKAN_ACTION_DELETE,
+  ];
+
+}
diff --git a/src/Ckan/Member/GroupMember.php b/src/Ckan/Member/GroupMember.php
new file mode 100755
index 0000000..90e5bb1
--- /dev/null
+++ b/src/Ckan/Member/GroupMember.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+/**
+ * Class GroupMember
+ *
+ * A member of a CKAN group, specifically a user.
+ */
+class GroupMember extends CkanMemberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'group_member';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'id',
+    'username',
+    'role',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'id',
+    'username',
+    'role',
+  ];
+
+}
diff --git a/src/Ckan/Member/Member.php b/src/Ckan/Member/Member.php
new file mode 100755
index 0000000..f0b6aa7
--- /dev/null
+++ b/src/Ckan/Member/Member.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+/**
+ * Class Member
+ *
+ * A member of a CKAN group, could be a user, package, or even another group.
+ */
+class Member extends CkanMemberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'member';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'id',
+    'object',
+    'object_type',
+    'capacity',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'id',
+    'object',
+    'object_type',
+    'capacity',
+  ];
+
+}
diff --git a/src/Ckan/Member/OrganizationMember.php b/src/Ckan/Member/OrganizationMember.php
new file mode 100755
index 0000000..f74e990
--- /dev/null
+++ b/src/Ckan/Member/OrganizationMember.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+/**
+ * Class OrganizationMember
+ *
+ * A member of a CKAN organization, specifically a user.
+ */
+class OrganizationMember extends CkanMemberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'organization_member';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'id',
+    'username',
+    'role',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'id',
+    'username',
+    'role',
+  ];
+
+}
diff --git a/src/Ckan/Patchable/CkanPatchableBase.php b/src/Ckan/Patchable/CkanPatchableBase.php
new file mode 100755
index 0000000..eec416e
--- /dev/null
+++ b/src/Ckan/Patchable/CkanPatchableBase.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Patchable;
+
+use Drupal\ckan_connect\Ckan\Crud\CkanCrudBase;
+use Drupal\ckan_connect\Client\CkanClient;
+
+/**
+ * Class CkanPatchableBase
+ *
+ * Any CKAN CRUD object that can also be patched - like update but only changes
+ * the values you provide.
+ */
+abstract class CkanPatchableBase extends CkanCrudBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validActions = [
+    CkanClient::CKAN_ACTION_LIST,
+    CkanClient::CKAN_ACTION_SHOW,
+    CkanClient::CKAN_ACTION_CREATE,
+    CkanClient::CKAN_ACTION_UPDATE,
+    CkanClient::CKAN_ACTION_PATCH,
+    CkanClient::CKAN_ACTION_DELETE,
+  ];
+
+}
diff --git a/src/Ckan/Patchable/Group.php b/src/Ckan/Patchable/Group.php
new file mode 100755
index 0000000..1ddc426
--- /dev/null
+++ b/src/Ckan/Patchable/Group.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Patchable;
+
+/**
+ * Class Group
+ *
+ * Groups are used in CKAN to gather objects (usually packages, users, or other
+ * groups) into logical sets.
+ */
+class Group extends CkanPatchableBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'group';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'name',
+    'id',
+    'title',
+    'description',
+    'image_url',
+    'type',
+    'state',
+    'approval_status',
+    'extras',
+    'packages',
+    'groups',
+    'users',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'name',
+  ];
+
+}
diff --git a/src/Ckan/Patchable/Organization.php b/src/Ckan/Patchable/Organization.php
new file mode 100755
index 0000000..1aba4c4
--- /dev/null
+++ b/src/Ckan/Patchable/Organization.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Patchable;
+
+/**
+ * Class Organization
+ *
+ * CKAN Organisations are normally the owners of datasets.
+ */
+class Organization extends CkanPatchableBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'organization';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'name',
+    'id',
+    'title',
+    'description',
+    'image_url',
+    'state',
+    'approval_status',
+    'extras',
+    'packages',
+    'users',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'name',
+  ];
+
+}
diff --git a/src/Ckan/Patchable/Package.php b/src/Ckan/Patchable/Package.php
new file mode 100755
index 0000000..452d4e8
--- /dev/null
+++ b/src/Ckan/Patchable/Package.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Patchable;
+
+/**
+ * Class Package
+ *
+ * A package is the primary object for a CKAN dataset.
+ */
+class Package extends CkanPatchableBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'package';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'name',
+    'id',
+    'title',
+    'description',
+    'image_url',
+    'type',
+    'state',
+    'approval_status',
+    'extras',
+    'packages',
+    'groups',
+    'users',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'name',
+  ];
+
+}
diff --git a/src/Ckan/Patchable/Resource.php b/src/Ckan/Patchable/Resource.php
new file mode 100755
index 0000000..0c8a935
--- /dev/null
+++ b/src/Ckan/Patchable/Resource.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Patchable;
+
+/**
+ * Class Resource
+ *
+ * A resource contains information about a single data file or endpoint.
+ * Resources are gathered together in packages.
+ */
+class Resource extends CkanPatchableBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'resource';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'package_id',
+    'url',
+    'revision_id',
+    'description',
+    'format',
+    'hash',
+    'name',
+    'resource_type',
+    'mimetype',
+    'mimetype_inner',
+    'cache_url',
+    'size',
+    'created',
+    'last_modified',
+    'cache_last_updated',
+    'upload',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'package_id',
+    'url',
+  ];
+
+}
diff --git a/src/Ckan/Service/AAA.php b/src/Ckan/Service/AAA.php
new file mode 100644
index 0000000..dfc6a74
--- /dev/null
+++ b/src/Ckan/Service/AAA.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class CurrentPackageListWithResources
+ */
+class CurrentPackageListWithResources extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'current_package_list_with_resources';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    '',
+    '',
+    '',
+    '',
+    '',
+    '',
+    '',
+    '',
+    '',
+    '',
+    '',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+
+  ];
+
+}
diff --git a/src/Ckan/Service/CkanServiceBase.php b/src/Ckan/Service/CkanServiceBase.php
new file mode 100755
index 0000000..1fa3b2b
--- /dev/null
+++ b/src/Ckan/Service/CkanServiceBase.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+use Drupal\ckan_connect\Ckan\CkanApiBase;
+
+/**
+ * Class CkanServiceBase
+ *
+ * CKAN has a large number of service endpoints.
+ */
+abstract class CkanServiceBase extends CkanApiBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getParameters() {
+    $keys = array_keys($this->parameters);
+
+    // Test for any required parameters.
+    if (!empty(array_diff_key($this->requiredParameters, $keys))) {
+      // @todo: throw error instead.
+      return FALSE;
+    }
+
+    return $this->parameters;
+  }
+
+}
diff --git a/src/Ckan/Service/CurrentPackageListWithResources.php b/src/Ckan/Service/CurrentPackageListWithResources.php
new file mode 100644
index 0000000..c466588
--- /dev/null
+++ b/src/Ckan/Service/CurrentPackageListWithResources.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class CurrentPackageListWithResources
+ */
+class CurrentPackageListWithResources extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'current_package_list_with_resources';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'limit',
+    'offset',
+    'page',
+  ];
+
+}
diff --git a/src/Ckan/Service/FormatAutocomplete.php b/src/Ckan/Service/FormatAutocomplete.php
new file mode 100644
index 0000000..353530b
--- /dev/null
+++ b/src/Ckan/Service/FormatAutocomplete.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class FormatAutocomplete
+ */
+class FormatAutocomplete extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'format_autocomplete';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'q',
+    'limit',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'q',
+  ];
+
+}
diff --git a/src/Ckan/Service/GroupAutocomplete.php b/src/Ckan/Service/GroupAutocomplete.php
new file mode 100644
index 0000000..30f43bd
--- /dev/null
+++ b/src/Ckan/Service/GroupAutocomplete.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class GroupAutocomplete
+ */
+class GroupAutocomplete extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'group_autocomplete';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'q',
+    'limit',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'q',
+  ];
+
+}
diff --git a/src/Ckan/Service/GroupListAuthz.php b/src/Ckan/Service/GroupListAuthz.php
new file mode 100644
index 0000000..e3e0e70
--- /dev/null
+++ b/src/Ckan/Service/GroupListAuthz.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class GroupListAuthz
+ */
+class GroupListAuthz extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'group_list_authz';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'available_only',
+    'am_member',
+  ];
+
+}
diff --git a/src/Ckan/Service/GroupRevisionList.php b/src/Ckan/Service/GroupRevisionList.php
new file mode 100644
index 0000000..914a68c
--- /dev/null
+++ b/src/Ckan/Service/GroupRevisionList.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class GroupRevisionList
+ */
+class GroupRevisionList extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'group_revision_list';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'id',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'id',
+  ];
+
+}
diff --git a/src/Ckan/Service/LicenseList.php b/src/Ckan/Service/LicenseList.php
new file mode 100644
index 0000000..f5fc65b
--- /dev/null
+++ b/src/Ckan/Service/LicenseList.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class LicenseList
+ */
+class LicenseList extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'license_list';
+
+}
diff --git a/src/Ckan/Service/OrganizationListForUser.php b/src/Ckan/Service/OrganizationListForUser.php
new file mode 100644
index 0000000..900e4f6
--- /dev/null
+++ b/src/Ckan/Service/OrganizationListForUser.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class OrganizationListForUser
+ */
+class OrganizationListForUser extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'organization_list_for_user';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'id',
+    'permission',
+    'include_dataset_count',
+  ];
+
+}
diff --git a/src/Ckan/Service/OrganizationRevisionList.php b/src/Ckan/Service/OrganizationRevisionList.php
new file mode 100644
index 0000000..52aecd0
--- /dev/null
+++ b/src/Ckan/Service/OrganizationRevisionList.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class OrganizationRevisionList
+ */
+class OrganizationRevisionList extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'organization_revision_list';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'id',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'id',
+  ];
+
+}
diff --git a/src/Ckan/Service/PackageAutocomplete.php b/src/Ckan/Service/PackageAutocomplete.php
new file mode 100644
index 0000000..a22262c
--- /dev/null
+++ b/src/Ckan/Service/PackageAutocomplete.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class PackageAutocomplete
+ */
+class PackageAutocomplete extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'package_autocomplete';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'q',
+    'limit',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'q',
+  ];
+
+}
diff --git a/src/Ckan/Service/PackageRevisionList.php b/src/Ckan/Service/PackageRevisionList.php
new file mode 100644
index 0000000..d7742bd
--- /dev/null
+++ b/src/Ckan/Service/PackageRevisionList.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class PackageRevisionList
+ */
+class PackageRevisionList extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'package_revision_list';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'id',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'id',
+  ];
+
+}
diff --git a/src/Ckan/Service/PackageSearch.php b/src/Ckan/Service/PackageSearch.php
new file mode 100644
index 0000000..692a590
--- /dev/null
+++ b/src/Ckan/Service/PackageSearch.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class PackageSearch
+ */
+class PackageSearch extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'package_search';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'q',
+    'fq',
+    'sort',
+    'rows',
+    'start',
+    'facet',
+    'facet.mincount',
+    'facet.limit',
+    'facet.field',
+    'include_drafts',
+    'include_private',
+    'use_default_schema',
+    'qf',
+    'wt',
+    'bf',
+    'boost',
+    'tie',
+    'defType',
+    'mm',
+  ];
+
+}
diff --git a/src/Ckan/Service/ResourceSearch.php b/src/Ckan/Service/ResourceSearch.php
new file mode 100644
index 0000000..645f919
--- /dev/null
+++ b/src/Ckan/Service/ResourceSearch.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class ResourceSearch
+ */
+class ResourceSearch extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'resource_search';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'query',
+    'fields',
+    'order_by',
+    'offset',
+    'limit',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'query',
+  ];
+
+}
diff --git a/src/Ckan/Service/RevisionList.php b/src/Ckan/Service/RevisionList.php
new file mode 100644
index 0000000..14dd5e7
--- /dev/null
+++ b/src/Ckan/Service/RevisionList.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class RevisionList
+ */
+class RevisionList extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'revision_list';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'since_id',
+    'since_time',
+    'sort',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'since_id',
+    'since_time',
+  ];
+
+}
diff --git a/src/Ckan/Service/RevisionShow.php b/src/Ckan/Service/RevisionShow.php
new file mode 100644
index 0000000..be1a99f
--- /dev/null
+++ b/src/Ckan/Service/RevisionShow.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class RevisionShow
+ */
+class RevisionShow extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'revision_show';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'id',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'id',
+  ];
+
+}
diff --git a/src/Ckan/Service/SiteRead.php b/src/Ckan/Service/SiteRead.php
new file mode 100644
index 0000000..ae06c98
--- /dev/null
+++ b/src/Ckan/Service/SiteRead.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class SiteRead
+ */
+class SiteRead extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'site_read';
+
+}
diff --git a/src/Ckan/Service/UserAutocomplete.php b/src/Ckan/Service/UserAutocomplete.php
new file mode 100644
index 0000000..5808998
--- /dev/null
+++ b/src/Ckan/Service/UserAutocomplete.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+/**
+ * Class UserAutocomplete
+ */
+class UserAutocomplete extends CkanServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $machineName = 'user_autocomplete';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $validParameters = [
+    'q',
+    'limit',
+  ];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $requiredParameters = [
+    'q',
+  ];
+
+}
diff --git a/src/Client/CkanClient.php b/src/Client/CkanClient.php
old mode 100644
new mode 100755
index d91e5e3..288ba18
--- a/src/Client/CkanClient.php
+++ b/src/Client/CkanClient.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\ckan_connect\Client;
 
+use Drupal\ckan_connect\Ckan\CkanApiInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use GuzzleHttp\Client;
 
@@ -10,6 +11,15 @@
  */
 class CkanClient implements CkanClientInterface {
 
+  const CKAN_ACTION_LIST   = 'list';
+  const CKAN_ACTION_SHOW   = 'show';
+  const CKAN_ACTION_CREATE = 'create';
+  const CKAN_ACTION_UPDATE = 'update';
+  const CKAN_ACTION_PATCH  = 'patch';
+  const CKAN_ACTION_DELETE = 'delete';
+  const CKAN_ACTION_CLEAR  = 'clear';
+  const CKAN_ACTION_PURGE  = 'purge';
+
   /**
    * The HTTP client.
    *
@@ -89,18 +99,55 @@ public function setApiKey($api_key) {
   /**
    * {@inheritdoc}
    */
-  public function get($path, array $query = []) {
+  public function get($path, array $parameters = []) {
+    $uri = $this->getApiUrl() . '/' . $path;
+    $options = ['query' => $parameters];
+
+    if ($this->getApiKey()) {
+      $options['headers']['Authorization'] = $this->getApiKey();
+    }
+
+    $response = $this->httpClient->get($uri, $options)
+      ->getBody()
+      ->getContents();
+    $response = json_decode($response);
+
+    return $response;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function post($path, array $parameters) {
     $uri = $this->getApiUrl() . '/' . $path;
-    $options = ['query' => $query];
+    $options = ['form_params' => $parameters];
 
     if ($this->getApiKey()) {
       $options['headers']['Authorization'] = $this->getApiKey();
     }
 
-    $response = $this->httpClient->get($uri, $options)->getBody()->getContents();
+    $response = $this->httpClient->post($uri, $options)
+      ->getBody()
+      ->getContents();
     $response = json_decode($response);
 
     return $response;
   }
 
+  /**
+   * Send an action query to the API.
+   *
+   * @param string $action
+   * @param \Drupal\ckan_connect\Ckan\CkanApiInterface $ckanObject
+   *
+   * @return mixed|\stdClass|string
+   */
+  public function action(CkanApiInterface $ckanObject, $action = NULL) {
+    $path = 'action/' . $ckanObject->getActionSlug($action);
+    $parameters = $ckanObject->getParameters($action);
+
+    // Every action API endpoint on CKAN may be used with a POST request.
+    return $this->post($path, $parameters);
+  }
+
 }
diff --git a/src/Client/CkanClientInterface.php b/src/Client/CkanClientInterface.php
old mode 100644
new mode 100755
index f91255d..0dc1eb3
--- a/src/Client/CkanClientInterface.php
+++ b/src/Client/CkanClientInterface.php
@@ -46,16 +46,29 @@ public function getApiKey();
   public function setApiKey($api_key);
 
   /**
-   * Get data from the CKAN endpoint.
+   * Get data from a CKAN endpoint.
    *
    * @param string $path
    *   The path of the action.
-   * @param array $query
+   * @param array $parameters
    *   The key pair parameters.
    *
    * @return \stdClass
    *   A response object.
    */
-  public function get($path, array $query = []);
+  public function get($path, array $parameters = []);
+
+  /**
+   * Post data to a CKAN endpoint.
+   *
+   * @param string $path
+   *   The path of the action.
+   * @param array $parameters
+   *   The key pair parameters.
+   *
+   * @return \stdClass
+   *   A response object.
+   */
+  public function post($path, array $parameters);
 
 }
diff --git a/src/Form/CkanConnectSettingsForm.php b/src/Form/CkanConnectSettingsForm.php
old mode 100644
new mode 100755
diff --git a/src/Parser/CkanResourceUrlParser.php b/src/Parser/CkanResourceUrlParser.php
old mode 100644
new mode 100755
diff --git a/src/Parser/CkanResourceUrlParserInterface.php b/src/Parser/CkanResourceUrlParserInterface.php
old mode 100644
new mode 100755

From 90b3e7d7fb8de24c15fcecc8652f0f7a2a1f3b90 Mon Sep 17 00:00:00 2001
From: Max <max@datarepublic.com>
Date: Mon, 30 Jul 2018 11:38:40 +1000
Subject: [PATCH 2/4] decided on how to handle services

---
 src/Ckan/CkanRequest.php                      | 33 +++++++++++++++
 src/Ckan/Service/AAA.php                      | 39 ------------------
 src/Ckan/Service/CkanServiceBase.php          | 29 --------------
 .../CurrentPackageListWithResources.php       | 24 -----------
 src/Ckan/Service/FormatAutocomplete.php       | 30 --------------
 src/Ckan/Service/GroupAutocomplete.php        | 30 --------------
 src/Ckan/Service/GroupListAuthz.php           | 23 -----------
 src/Ckan/Service/GroupRevisionList.php        | 29 --------------
 src/Ckan/Service/LicenseList.php              | 15 -------
 src/Ckan/Service/OrganizationListForUser.php  | 24 -----------
 src/Ckan/Service/OrganizationRevisionList.php | 29 --------------
 src/Ckan/Service/PackageAutocomplete.php      | 30 --------------
 src/Ckan/Service/PackageRevisionList.php      | 29 --------------
 src/Ckan/Service/PackageSearch.php            | 40 -------------------
 src/Ckan/Service/ResourceSearch.php           | 33 ---------------
 src/Ckan/Service/RevisionList.php             | 32 ---------------
 src/Ckan/Service/RevisionShow.php             | 29 --------------
 src/Ckan/Service/SiteRead.php                 | 15 -------
 src/Ckan/Service/UserAutocomplete.php         | 30 --------------
 src/Client/CkanClient.php                     |  2 -
 20 files changed, 33 insertions(+), 512 deletions(-)
 create mode 100644 src/Ckan/CkanRequest.php
 delete mode 100644 src/Ckan/Service/AAA.php
 delete mode 100755 src/Ckan/Service/CkanServiceBase.php
 delete mode 100644 src/Ckan/Service/CurrentPackageListWithResources.php
 delete mode 100644 src/Ckan/Service/FormatAutocomplete.php
 delete mode 100644 src/Ckan/Service/GroupAutocomplete.php
 delete mode 100644 src/Ckan/Service/GroupListAuthz.php
 delete mode 100644 src/Ckan/Service/GroupRevisionList.php
 delete mode 100644 src/Ckan/Service/LicenseList.php
 delete mode 100644 src/Ckan/Service/OrganizationListForUser.php
 delete mode 100644 src/Ckan/Service/OrganizationRevisionList.php
 delete mode 100644 src/Ckan/Service/PackageAutocomplete.php
 delete mode 100644 src/Ckan/Service/PackageRevisionList.php
 delete mode 100644 src/Ckan/Service/PackageSearch.php
 delete mode 100644 src/Ckan/Service/ResourceSearch.php
 delete mode 100644 src/Ckan/Service/RevisionList.php
 delete mode 100644 src/Ckan/Service/RevisionShow.php
 delete mode 100644 src/Ckan/Service/SiteRead.php
 delete mode 100644 src/Ckan/Service/UserAutocomplete.php

diff --git a/src/Ckan/CkanRequest.php b/src/Ckan/CkanRequest.php
new file mode 100644
index 0000000..0ba6be6
--- /dev/null
+++ b/src/Ckan/CkanRequest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\ckan_connect\Ckan\Service;
+
+use Drupal\ckan_connect\Ckan\CkanApiBase;
+
+/**
+ * Class CkanServiceBase
+ *
+ * CKAN has a large number of service endpoints.
+ */
+class CkanRequest extends CkanApiBase {
+
+  /**
+   * CkanRequest constructor.
+   *
+   * @param $action
+   * @param array $parameters
+   */
+  public function __construct($action, $parameters = []) {
+    $this->machineName = $action;
+    $this->parameters = $parameters;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateParameters($parameters) {
+    // We don't do any error checking for generic service calls.
+    return TRUE;
+  }
+
+}
diff --git a/src/Ckan/Service/AAA.php b/src/Ckan/Service/AAA.php
deleted file mode 100644
index dfc6a74..0000000
--- a/src/Ckan/Service/AAA.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class CurrentPackageListWithResources
- */
-class CurrentPackageListWithResources extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'current_package_list_with_resources';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-
-  ];
-
-}
diff --git a/src/Ckan/Service/CkanServiceBase.php b/src/Ckan/Service/CkanServiceBase.php
deleted file mode 100755
index 1fa3b2b..0000000
--- a/src/Ckan/Service/CkanServiceBase.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-use Drupal\ckan_connect\Ckan\CkanApiBase;
-
-/**
- * Class CkanServiceBase
- *
- * CKAN has a large number of service endpoints.
- */
-abstract class CkanServiceBase extends CkanApiBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getParameters() {
-    $keys = array_keys($this->parameters);
-
-    // Test for any required parameters.
-    if (!empty(array_diff_key($this->requiredParameters, $keys))) {
-      // @todo: throw error instead.
-      return FALSE;
-    }
-
-    return $this->parameters;
-  }
-
-}
diff --git a/src/Ckan/Service/CurrentPackageListWithResources.php b/src/Ckan/Service/CurrentPackageListWithResources.php
deleted file mode 100644
index c466588..0000000
--- a/src/Ckan/Service/CurrentPackageListWithResources.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class CurrentPackageListWithResources
- */
-class CurrentPackageListWithResources extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'current_package_list_with_resources';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'limit',
-    'offset',
-    'page',
-  ];
-
-}
diff --git a/src/Ckan/Service/FormatAutocomplete.php b/src/Ckan/Service/FormatAutocomplete.php
deleted file mode 100644
index 353530b..0000000
--- a/src/Ckan/Service/FormatAutocomplete.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class FormatAutocomplete
- */
-class FormatAutocomplete extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'format_autocomplete';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'q',
-    'limit',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'q',
-  ];
-
-}
diff --git a/src/Ckan/Service/GroupAutocomplete.php b/src/Ckan/Service/GroupAutocomplete.php
deleted file mode 100644
index 30f43bd..0000000
--- a/src/Ckan/Service/GroupAutocomplete.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class GroupAutocomplete
- */
-class GroupAutocomplete extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'group_autocomplete';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'q',
-    'limit',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'q',
-  ];
-
-}
diff --git a/src/Ckan/Service/GroupListAuthz.php b/src/Ckan/Service/GroupListAuthz.php
deleted file mode 100644
index e3e0e70..0000000
--- a/src/Ckan/Service/GroupListAuthz.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class GroupListAuthz
- */
-class GroupListAuthz extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'group_list_authz';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'available_only',
-    'am_member',
-  ];
-
-}
diff --git a/src/Ckan/Service/GroupRevisionList.php b/src/Ckan/Service/GroupRevisionList.php
deleted file mode 100644
index 914a68c..0000000
--- a/src/Ckan/Service/GroupRevisionList.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class GroupRevisionList
- */
-class GroupRevisionList extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'group_revision_list';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'id',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'id',
-  ];
-
-}
diff --git a/src/Ckan/Service/LicenseList.php b/src/Ckan/Service/LicenseList.php
deleted file mode 100644
index f5fc65b..0000000
--- a/src/Ckan/Service/LicenseList.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class LicenseList
- */
-class LicenseList extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'license_list';
-
-}
diff --git a/src/Ckan/Service/OrganizationListForUser.php b/src/Ckan/Service/OrganizationListForUser.php
deleted file mode 100644
index 900e4f6..0000000
--- a/src/Ckan/Service/OrganizationListForUser.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class OrganizationListForUser
- */
-class OrganizationListForUser extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'organization_list_for_user';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'id',
-    'permission',
-    'include_dataset_count',
-  ];
-
-}
diff --git a/src/Ckan/Service/OrganizationRevisionList.php b/src/Ckan/Service/OrganizationRevisionList.php
deleted file mode 100644
index 52aecd0..0000000
--- a/src/Ckan/Service/OrganizationRevisionList.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class OrganizationRevisionList
- */
-class OrganizationRevisionList extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'organization_revision_list';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'id',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'id',
-  ];
-
-}
diff --git a/src/Ckan/Service/PackageAutocomplete.php b/src/Ckan/Service/PackageAutocomplete.php
deleted file mode 100644
index a22262c..0000000
--- a/src/Ckan/Service/PackageAutocomplete.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class PackageAutocomplete
- */
-class PackageAutocomplete extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'package_autocomplete';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'q',
-    'limit',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'q',
-  ];
-
-}
diff --git a/src/Ckan/Service/PackageRevisionList.php b/src/Ckan/Service/PackageRevisionList.php
deleted file mode 100644
index d7742bd..0000000
--- a/src/Ckan/Service/PackageRevisionList.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class PackageRevisionList
- */
-class PackageRevisionList extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'package_revision_list';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'id',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'id',
-  ];
-
-}
diff --git a/src/Ckan/Service/PackageSearch.php b/src/Ckan/Service/PackageSearch.php
deleted file mode 100644
index 692a590..0000000
--- a/src/Ckan/Service/PackageSearch.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class PackageSearch
- */
-class PackageSearch extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'package_search';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'q',
-    'fq',
-    'sort',
-    'rows',
-    'start',
-    'facet',
-    'facet.mincount',
-    'facet.limit',
-    'facet.field',
-    'include_drafts',
-    'include_private',
-    'use_default_schema',
-    'qf',
-    'wt',
-    'bf',
-    'boost',
-    'tie',
-    'defType',
-    'mm',
-  ];
-
-}
diff --git a/src/Ckan/Service/ResourceSearch.php b/src/Ckan/Service/ResourceSearch.php
deleted file mode 100644
index 645f919..0000000
--- a/src/Ckan/Service/ResourceSearch.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class ResourceSearch
- */
-class ResourceSearch extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'resource_search';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'query',
-    'fields',
-    'order_by',
-    'offset',
-    'limit',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'query',
-  ];
-
-}
diff --git a/src/Ckan/Service/RevisionList.php b/src/Ckan/Service/RevisionList.php
deleted file mode 100644
index 14dd5e7..0000000
--- a/src/Ckan/Service/RevisionList.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class RevisionList
- */
-class RevisionList extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'revision_list';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'since_id',
-    'since_time',
-    'sort',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'since_id',
-    'since_time',
-  ];
-
-}
diff --git a/src/Ckan/Service/RevisionShow.php b/src/Ckan/Service/RevisionShow.php
deleted file mode 100644
index be1a99f..0000000
--- a/src/Ckan/Service/RevisionShow.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class RevisionShow
- */
-class RevisionShow extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'revision_show';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'id',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'id',
-  ];
-
-}
diff --git a/src/Ckan/Service/SiteRead.php b/src/Ckan/Service/SiteRead.php
deleted file mode 100644
index ae06c98..0000000
--- a/src/Ckan/Service/SiteRead.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class SiteRead
- */
-class SiteRead extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'site_read';
-
-}
diff --git a/src/Ckan/Service/UserAutocomplete.php b/src/Ckan/Service/UserAutocomplete.php
deleted file mode 100644
index 5808998..0000000
--- a/src/Ckan/Service/UserAutocomplete.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\ckan_connect\Ckan\Service;
-
-/**
- * Class UserAutocomplete
- */
-class UserAutocomplete extends CkanServiceBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $machineName = 'user_autocomplete';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $validParameters = [
-    'q',
-    'limit',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $requiredParameters = [
-    'q',
-  ];
-
-}
diff --git a/src/Client/CkanClient.php b/src/Client/CkanClient.php
index 288ba18..c4eac82 100755
--- a/src/Client/CkanClient.php
+++ b/src/Client/CkanClient.php
@@ -17,8 +17,6 @@ class CkanClient implements CkanClientInterface {
   const CKAN_ACTION_UPDATE = 'update';
   const CKAN_ACTION_PATCH  = 'patch';
   const CKAN_ACTION_DELETE = 'delete';
-  const CKAN_ACTION_CLEAR  = 'clear';
-  const CKAN_ACTION_PURGE  = 'purge';
 
   /**
    * The HTTP client.

From 741e41569d357a729a82f8151e2c3f33ec905158 Mon Sep 17 00:00:00 2001
From: Max <max@datarepublic.com>
Date: Mon, 30 Jul 2018 11:39:03 +1000
Subject: [PATCH 3/4] add readme

---
 readme.md | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 readme.md

diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..03aa32b
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,152 @@
+Drupal CKAN Connect
+===================
+
+This is a developer module that provides a client for the [CKAN action API](http://docs.ckan.org/en/latest/api/index.html#action-api-reference).
+
+Usage
+-----
+
+Every API request has three steps:
+1. Create a new object related to the CKAN entity or service you wish to interact with.
+2. Set any required properties on the object. 
+3. Use the `ckan_connect.client` service to make the API call using your newly created object.
+
+### Service calls
+
+> Technically, service calls can be used for any request to the CKAN API. They do not do any parameter checking and they 
+all work exactly the same way. If you want parameter validation and automatic handling of IDs where required for entity
+actions, use the [CRUD-like objects](#crud-like-objects). 
+
+A service call is easy to use as long as you know exactly what the API is expecting. Just give it the full action name
+such as `package_search` or `organization_autocomplete` and any parameters it requires. Parameters can be given in the
+construction method, or separately via `CkanApiInterface::setParameters($parameters)`.
+
+```php
+<?php
+
+use Drupal\ckan_connect\Ckan\Service\CkanRequest;
+
+//...
+
+$package_search = new CkanRequest('package_search');
+$parameters = [
+  'q' => 'search terms',
+];
+$package_search->setParameters($parameters);
+$client = \Drupal::service('ckan_connect.client');
+$search_result = $client->action($package_search); 
+
+// OR
+
+$package_search = new CkanRequest('package_search', ['q' => 'search terms']);
+$client = \Drupal::service('ckan_connect.client');
+$search_result = $client->action($package_search); 
+
+```
+
+That's it. The client uses the API URL and API key you've stored in settings and handles any errors that are thrown by
+guzzle or the API itself so that your application doesn't crash.
+
+### CRUD-like objects
+
+Where the CKAN endpoints can be grouped together into a set of related functions, they are bunched into one of these
+object types:
+
+- CRUD objects have endpoint actions for Create, Read (`show`), Update and Delete, they are in `\src\Ckan\Crud\*`. They 
+  also allow a `list` action.
+- Patchable objects have an additional `patch` action on top of the ones allowed by CRUD objects and are in 
+  `\src\Ckan\Patchable\*`. The `patch` action is like `update` except that it only updates the values provided in the
+  call, rather than overwriting all values the way `update` does.
+- Member objects are basically entity references and can only created or deleted (a subset of CRUD). These are in 
+  `\src\Ckan\Member\*`.
+  
+When creating a new CRUD-like object, note that the creation call expects an ID as a string. You can leave this string
+empty if the object is going to be used for a `create` or `list` action but it expects a full CKAN ID for any other
+action.
+
+```php
+<?php
+
+use Drupal\ckan_connect\Ckan\Patchable\Organization;
+
+//...
+
+// Create and list calls only:
+$new_organization = new Organization('');
+
+// Show, update, patch and delete calls:
+$existing_organization = new Organization('a107c3bd-dece-4d45-a352-f0e33188de9b');
+
+```
+
+Once you have created your object, if the action requires parameters, add them:
+
+```php
+<?php
+
+// Organizations only require a name property on creation
+$parameters = [
+  'name' => 'my_organization',
+];
+
+$new_organization->setParameters($parameters);
+
+// If we're doing an update or patch call, we only need to provide the new fields
+// Update will assume the required 'name' field stays the same, and will remove the
+// value of any other field we don't provide.
+// Patch will just update the title.
+$parameters = [
+  'title' => 'New Title For This Organisation'
+];
+
+$existing_organization->setParameters($parameters);
+
+```
+
+When you add parameters they will be checked to make sure they are valid for this object, an error will be thrown if 
+validation fails.
+
+Because CRUD-like objects can be used for multiple actions and this affects whether the ID is sent to the endpoint or
+not, you need to set the action on the object:
+
+```php
+<?php
+
+use Drupal\ckan_connect\Client\CkanClient;
+
+//...
+
+$new_organization->setAction(CkanClient::CKAN_ACTION_CREATE);
+
+$existing_organization->setAction(CkanClient::CKAN_ACTION_PATCH);
+```
+
+Now you're ready to make the API call:
+
+```php
+<?php
+
+// You should use dependency injection if you can, this is just the side-load method
+$client = \Drupal::service('ckan_connect.client');
+
+$create_result = $client->action($new_organization);
+
+$patch_result = $client->action($existing_organization);
+```
+
+In summary the code to create a brand new Organization in your CKAN repository could look like this:
+
+```php
+<?php
+
+use Drupal\ckan_connect\Ckan\Patchable\Organization;
+use Drupal\ckan_connect\Client\CkanClient;
+
+//...
+
+$new_organization = new Organization('');
+$new_organization->setParameters(['name' => 'my_organisation']);
+$new_organization->setAction(CkanClient::CKAN_ACTION_CREATE);
+$client = \Drupal::service('ckan_connect.client');
+$create_result = $client->action($new_organization);
+```

From 634f6efabcef8b0b367d247ecc2d59412cf1c101 Mon Sep 17 00:00:00 2001
From: Max <max@datarepublic.com>
Date: Mon, 30 Jul 2018 12:09:08 +1000
Subject: [PATCH 4/4] fix some namespace issues

---
 readme.md                           | 2 +-
 src/Ckan/CkanRequest.php            | 4 +---
 src/Ckan/Crud/CkanCrudBase.php      | 1 -
 src/Ckan/Crud/CkanCrudInterface.php | 4 +++-
 src/Client/CkanClient.php           | 6 +++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/readme.md b/readme.md
index 03aa32b..24b7a2e 100644
--- a/readme.md
+++ b/readme.md
@@ -24,7 +24,7 @@ construction method, or separately via `CkanApiInterface::setParameters($paramet
 ```php
 <?php
 
-use Drupal\ckan_connect\Ckan\Service\CkanRequest;
+use Drupal\ckan_connect\Ckan\CkanRequest;
 
 //...
 
diff --git a/src/Ckan/CkanRequest.php b/src/Ckan/CkanRequest.php
index 0ba6be6..6ed24bf 100644
--- a/src/Ckan/CkanRequest.php
+++ b/src/Ckan/CkanRequest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace Drupal\ckan_connect\Ckan\Service;
-
-use Drupal\ckan_connect\Ckan\CkanApiBase;
+namespace Drupal\ckan_connect\Ckan;
 
 /**
  * Class CkanServiceBase
diff --git a/src/Ckan/Crud/CkanCrudBase.php b/src/Ckan/Crud/CkanCrudBase.php
index 4fcedcd..ef6ce3f 100755
--- a/src/Ckan/Crud/CkanCrudBase.php
+++ b/src/Ckan/Crud/CkanCrudBase.php
@@ -3,7 +3,6 @@
 namespace Drupal\ckan_connect\Ckan\Crud;
 
 use Drupal\ckan_connect\Ckan\CkanApiBase;
-use Drupal\ckan_connect\Ckan\CkanCrudInterface;
 use Drupal\ckan_connect\Client\CkanClient;
 
 /**
diff --git a/src/Ckan/Crud/CkanCrudInterface.php b/src/Ckan/Crud/CkanCrudInterface.php
index 9dc9984..35375f5 100755
--- a/src/Ckan/Crud/CkanCrudInterface.php
+++ b/src/Ckan/Crud/CkanCrudInterface.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Drupal\ckan_connect\Ckan;
+namespace Drupal\ckan_connect\Ckan\Crud;
+
+use Drupal\ckan_connect\Ckan\CkanApiInterface;
 
 /**
  * Interface CkanCrudInterface
diff --git a/src/Client/CkanClient.php b/src/Client/CkanClient.php
index c4eac82..a96d1fa 100755
--- a/src/Client/CkanClient.php
+++ b/src/Client/CkanClient.php
@@ -140,9 +140,9 @@ public function post($path, array $parameters) {
    *
    * @return mixed|\stdClass|string
    */
-  public function action(CkanApiInterface $ckanObject, $action = NULL) {
-    $path = 'action/' . $ckanObject->getActionSlug($action);
-    $parameters = $ckanObject->getParameters($action);
+  public function action(CkanApiInterface $ckanObject) {
+    $path = 'action/' . $ckanObject->getPath();
+    $parameters = $ckanObject->getParameters();
 
     // Every action API endpoint on CKAN may be used with a POST request.
     return $this->post($path, $parameters);