Fixing conflict with region in catalog

Author: Jamie Hannaford

composer.json

@@ -22,11 +22,11 @@
     },
     "require": {
         "php" : ">=5.3.3",
-        "guzzle/http" : "3.8.*@dev"
+        "guzzle/http" : "~3.8"
     },
     "require-dev" : {
-        "guzzle/guzzle": "dev-master",
-        "psr/log": "1.0.*",
+        "guzzle/guzzle": "~3.8",
+        "psr/log": "~1.0",
         "satooshi/php-coveralls": "0.6.*@dev"
     }
-}
+}

doc/.gitignore

@@ -0,0 +1 @@
+_build/

docs/userguide/ObjectStore/README.md

@@ -16,8 +16,8 @@ Choose one of the following two options:
     use OpenCloud\OpenStack;
 
      $client = new OpenStack('<OPENSTACK CLOUD IDENTITY ENDPOINT URL>', array(
-         'username' => '<YOUR RACKSPACE CLOUD ACCOUNT USERNAME>',
-         'apiKey'   => '<YOUR RACKSPACE CLOUD ACCOUNT API KEY>'
+         'username' => '<YOUR OPENSTACK USERNAME>',
+         'password' => '<YOUR OPENSTACK PASSWORD>'
      ));
     ```
 
@@ -60,4 +60,4 @@ $container->uploadObject($remoteFileName, $fileData);
 ## Next steps
 
 There is a lot more you can do with containers and objects. See 
-the [complete user guide to the Object Store service](USERGUIDE.md).
+the [complete user guide to the Object Store service](USERGUIDE.md).

lib/OpenCloud/Common/Service/CatalogService.php

@@ -75,7 +75,8 @@ public function __construct(ClientInterface $client, $type = null, $name = null,
         $this->name = $name ? : static::DEFAULT_NAME;
         $this->region = $region;
 
-        if ($this->regionless !== true && !$region) {
+        $this->region = $region;
+        if ($this->regionless !== true && !$this->region) {
             throw new Exceptions\ServiceException(sprintf(
                 'The %s service must have a region set. You can either pass in a region string as an argument param, or'
                 . ' set a default region for your user account by executing User::setDefaultRegion and ::update().',

samples/Compute/upload_existing_keypair.php

@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * Copyright 2014 Rackspace US, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Pre-requisites
+// Prior to running this script, you must setup the following environment variables:
+//   * RAX_USERNAME: Your Rackspace Cloud Account Username, and
+//   * RAX_API_KEY:  Your Rackspace Cloud Account API Key
+
+require dirname(__DIR__) . '/../../vendor/autoload.php';
+
+use OpenCloud\Rackspace;
+
+// 1. Instantiate a Rackspace client.
+$client = new Rackspace(Rackspace::US_IDENTITY_ENDPOINT, array(
+    'username' => getenv('RAX_USERNAME'),
+    'apiKey'   => getenv('RAX_API_KEY')
+));
+
+// 2. Create Compute service object
+$region = 'ORD';
+$service = $client->computeService(null, $region);
+
+// 3. Get empty keypair
+$keypair = $service->keypair();
+
+$payload = <<<EOT
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGgB4rMYmIf+6A4l6Rr+o/6lHBQdW5aYd44bd8JttDCE/F/pNRr0lRE+PiqSPO8nDPHw0010JeMH9gYgnnFlyY3/OcJ02RhIPyyxYpv9FhY+2YiUkpwFOcLImyrxEsYXpD/0d3ac30bNH6Sw9JD9UZHYcpSxsIbECHw== Example public key
+EOT;
+
+// 4. Create
+$keypair->create(array(
+    'name'      => 'new_public_key',
+    'publicKey' => $payload
+));