Merge branch 'master' into working

jamiehannaford · jamiehannaford · commit cac82282085a · 2013-10-31T16:24:32.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ branches:
     - working
 
 before_script:
-- composer install
+- composer install --no-dev
 
 notifications:
   email:
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -2,5 +2,5 @@ Contributors
 ============
 
 - Glen Campbell <glen.campbell@rackspace.com>
-- Jamie Hannaford <jamie@limetree.org>
-- Stephen Sugden <openstack@stephensugden.com>
+- Jamie Hannaford <jamie.hannaford@rackspace.com>
+- Stephen Sugden <openstack@stephensugden.com>
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 =============
 PHP SDK for OpenStack/Rackspace APIs
 
-[![Travis CI](https://secure.travis-ci.org/rackspace/php-opencloud.png)](https://travis-ci.org/rackspace/php-opencloud) [![Total Downloads](https://poser.pugx.org/rackspace/php-opencloud/downloads.png)](https://packagist.org/packages/rackspace/php-opencloud)
+[![Latest Stable Version](https://poser.pugx.org/rackspace/php-opencloud/v/stable.png)](https://packagist.org/packages/rackspace/php-opencloud) [![Travis CI](https://secure.travis-ci.org/rackspace/php-opencloud.png)](https://travis-ci.org/rackspace/php-opencloud) [![Total Downloads](https://poser.pugx.org/rackspace/php-opencloud/downloads.png)](https://packagist.org/packages/rackspace/php-opencloud)
 
 > **IMPORTANT NOTE**: With release 1.3, all of the file extensions have been
   changed from `.inc` to `.php`. This means that any existing code must be
diff --git a/lib/OpenCloud/Common/Identity/Role.php b/lib/OpenCloud/Common/Identity/Role.php
@@ -1,20 +1,15 @@
 <?php
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
+ * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
 
-/**
- * Description of Role
- * 
- * @link 
- * 
- * @codeCoverageIgnore
- */
+namespace OpenCloud\Common\Identity;
+
 class Role
 {
 }
diff --git a/lib/OpenCloud/Common/Identity/Tenant.php b/lib/OpenCloud/Common/Identity/Tenant.php
@@ -1,21 +1,15 @@
 <?php
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
+ * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
 
-/**
- * Description of Tenant
- * 
- * @link 
- * 
- * @codeCoverageIgnore
- */
+namespace OpenCloud\Common\Identity;
+
 class Tenant
 {
-    
 }
diff --git a/lib/OpenCloud/Common/Identity/User.php b/lib/OpenCloud/Common/Identity/User.php
@@ -1,73 +1,15 @@
 <?php
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
+ * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
 
-/**
- * Represents a sub-user in Keystone.
- *
- * @link http://docs.rackspace.com/auth/api/v2.0/auth-client-devguide/content/User_Calls.html
- * 
- * @codeCoverageIgnore
- */
-class User extends PersistentObject
+namespace OpenCloud\Common\Identity;
+
+class User
 {
-    
-    public static function factory($info)
-    {
-        $user = new self;
-    }
-    
-    /**
-     * Return detailed information about a specific user, by either user name or user ID.
-     * @param int|string $info
-     */
-    public function get($info)
-    {
-        if (is_integer($info)) {
-            
-        } elseif (is_string($info)) {
-            
-        } else {
-            throw new Exception\IdentityException(sprintf(
-                'A string-based username or an integer-based user ID is valid'
-            ));
-        }
-    }
-    
-    public function create()
-    {
-        
-    }
-    
-    public function update()
-    {
-        
-    }
-    
-    public function delete()
-    {
-        
-    }
-    
-    public function listAllCredentials()
-    {
-        
-    }
-    
-    public function getCredentials()
-    {
-        
-    }
-    
-    public function resetApiKey()
-    {
-        
-    }
-    
 }
diff --git a/lib/OpenCloud/ObjectStore/Constants/Header.php b/lib/OpenCloud/ObjectStore/Constants/Header.php
@@ -1,11 +1,10 @@
 <?php
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
 
 namespace OpenCloud\ObjectStore\Constants;
diff --git a/lib/OpenCloud/ObjectStore/Resource/AbstractContainer.php b/lib/OpenCloud/ObjectStore/Resource/AbstractContainer.php
@@ -1,12 +1,10 @@
 <?php
-
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
 
 namespace OpenCloud\ObjectStore\Resource;
diff --git a/lib/OpenCloud/ObjectStore/Resource/AbstractResource.php b/lib/OpenCloud/ObjectStore/Resource/AbstractResource.php
@@ -4,7 +4,6 @@
  * 
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
  */
 
diff --git a/lib/OpenCloud/ObjectStore/Resource/Account.php b/lib/OpenCloud/ObjectStore/Resource/Account.php
@@ -1,13 +1,12 @@
 <?php
-
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
+
 namespace OpenCloud\ObjectStore\Resource;
 
 /**
diff --git a/lib/OpenCloud/ObjectStore/Resource/CDNContainer.php b/lib/OpenCloud/ObjectStore/Resource/CDNContainer.php
@@ -4,8 +4,8 @@
  * 
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
+ * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
 
 namespace OpenCloud\ObjectStore\Resource;
diff --git a/lib/OpenCloud/ObjectStore/Resource/Container.php b/lib/OpenCloud/ObjectStore/Resource/Container.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
diff --git a/lib/OpenCloud/ObjectStore/Resource/ContainerMetadata.php b/lib/OpenCloud/ObjectStore/Resource/ContainerMetadata.php
@@ -1,10 +1,11 @@
 <?php
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
+ * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
 
 namespace OpenCloud\ObjectStore\Resource;
diff --git a/lib/OpenCloud/ObjectStore/Resource/DataObject.php b/lib/OpenCloud/ObjectStore/Resource/DataObject.php
@@ -1,11 +1,11 @@
 <?php
 /**
  * PHP OpenCloud library.
- * 
+ *
  * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
  * @license   https://www.apache.org/licenses/LICENSE-2.0
- * @author    Glen Campbell <glen.campbell@rackspace.com>
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
+ * @author    Glen Campbell <glen.campbell@rackspace.com>
  */
 
 namespace OpenCloud\ObjectStore\Resource;
diff --git a/lib/OpenCloud/ObjectStore/Upload/AbstractTransfer.php b/lib/OpenCloud/ObjectStore/Upload/AbstractTransfer.php
@@ -58,6 +58,11 @@ class AbstractTransfer
      */
     protected $options;
 
+    /**
+     * @var int
+     */
+    protected $partSize;
+
     /**
      * @var array Defaults that will always override user-defined options
      */
@@ -135,6 +140,11 @@ public function setOption($option, $value)
         return $this;
     }
 
+    public function getPartSize()
+    {
+        return $this->partSize;
+    }
+
     /**
      * @return $this
      */
diff --git a/tests/OpenCloud/Smoke/Unit/ObjectStore.php b/tests/OpenCloud/Smoke/Unit/ObjectStore.php
@@ -1,11 +1,9 @@
 <?php
-
 /**
- * @copyright Copyright 2012-2013 Rackspace US, Inc. 
-  See COPYING for licensing information.
- * @license   https://www.apache.org/licenses/LICENSE-2.0 Apache 2.0
- * @version   1.5.9
- * @author    Glen Campbell <glen.campbell@rackspace.com>
+ * PHP OpenCloud library.
+ *
+ * @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.
+ * @license   https://www.apache.org/licenses/LICENSE-2.0
  * @author    Jamie Hannaford <jamie.hannaford@rackspace.com>
  */
 
@@ -128,9 +126,8 @@ public function main()
         
         // Copy
         $this->step('Copy Object');
-        $target = $container->dataObject();
-        $target->setName($this->prepend(self::OBJECT_NAME . '_COPY'));
-        $object->copy($target);
+        $destination = sprintf('/%s/%s', $container->getName(), $this->prepend(self::OBJECT_NAME . '_COPY'));
+        $object->copy($destination);
         
         // List containers
         $this->step('List all containers');

-Original file line number
+Diff line change
 ============
 - Glen Campbell <[email protected]>
 -- Jamie Hannaford <jamie@limetree.org>
 -- Stephen Sugden <[email protected]>
 +- Jamie Hannaford <jamie[email protected]>
 +- Stephen Sugden <[email protected]>
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`*`
`5`	`5`	`* @copyright 2013 Rackspace Hosting, Inc. See LICENSE for information.`
`6`	`6`	`* @license https://www.apache.org/licenses/LICENSE-2.0`
`7`		`- * @author Glen Campbell <[email protected]>`
`8`	`7`	`* @author Jamie Hannaford <[email protected]>`
`9`	`8`	`*/`
`10`	`9`