Changeset 6818

Timestamp:

12/29/07 22:44:41 (6 months ago)

Author:

nicolas

Message:

sfAmazonSimpleDBPlugin:

• Added pagination capabilities
  
• Removed unused files provided with the official Amazon SimpleDB PHP library
  

Files:

• plugins/sfAmazonSimpleDBPlugin/trunk/README (modified) (2 diffs)
• plugins/sfAmazonSimpleDBPlugin/trunk/lib/Amazon/SimpleDB/Mock (deleted)
• plugins/sfAmazonSimpleDBPlugin/trunk/lib/Amazon/SimpleDB/Mock.php (deleted)
• plugins/sfAmazonSimpleDBPlugin/trunk/lib/Amazon/SimpleDB/Samples (deleted)
• plugins/sfAmazonSimpleDBPlugin/trunk/lib/sfAmazonSimpleDBClient.class.php (modified) (7 diffs)
• plugins/sfAmazonSimpleDBPlugin/trunk/test/unit/sfAmazonSimpleDBTest.php (modified) (6 diffs)

plugins/sfAmazonSimpleDBPlugin/trunk/README

@@ -60 +60 @@
-=== Listing domains ===
-
-t accounts
+ AWS account
-
-{{{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}}}
-
@@ -105 +118 @@
-
-{{{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}}}
-

plugins/sfAmazonSimpleDBPlugin/trunk/lib/sfAmazonSimpleDBClient.class.php

@@ -147 +147 @@
-   * Lists available domains
-   *
+   * @param int  $max     Max entries to retrieve (optional)
+   * @param int  $offset  Offset to start with (optional)
-   * @return array of strings
-   * @throws sfAmazonSimpleDBException
-   */
-
+$max = null, $offset = null
-  {
-    try
@@ -156 +158 @@
-      $results = array();
-      $action = new Amazon_SimpleDB_Model_ListDomains();
+      if (!is_null($max) && $max > 0)
+      {
+        $action->setMaxNumberOfDomains($max);
+      }
+      if (!is_null($offset))
+      {
+        $action->setNextToken($offset);
+      }
+      $results = array('results' => array());
-      sfLogger::getInstance()->info('Listing existing domains');
-      $response = self::getClient()->listDomains($action);
@@ -164 +175 @@
-        foreach ($domainNameList as $domainName) 
-        { 
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-      return $results;
@@ -303 +330 @@
-   * Query database with given expression
-   *
-
-
+
+
+
+
-   * @return array
-
-
+
+
+
-  {
-    if (is_null($domain))
@@ -317 +347 @@
-      throw new sfAmazonSimpleDBException('query(): No domain has been selected nor specified');
-    }
-
+'results' => array()
-    $action = new Amazon_SimpleDB_Model_Query();
-    $action->setDomainName($domain);
@@ -324 +354 @@
-      $action->setQueryExpression($expression);
-    }
+    if (!is_null($max) && $max > 0)
+    {
+      $action->setMaxNumberOfItems($max);
+    }
+    if (!is_null($offset))
+    {
+      $action->setNextToken($offset);
+    }
-    sfLogger::getInstance()->info(sprintf('Querying "%s" in domain "%s"', $expression, $domain));
-    $response = self::getClient()->query($action); 
@@ -332 +370 @@
-      foreach ($itemNameList as $itemName)
-      {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-    }

plugins/sfAmazonSimpleDBPlugin/trunk/test/unit/sfAmazonSimpleDBTest.php

@@ -6 +6 @@
-require_once($sf_root.'/lib/symfony/vendor/lime/lime.php');
-
-4
+5
-
-$service = sfAmazonSimpleDBClient::getInstance();
@@ -14 +14 @@
-try
-{
-
-
+
+
+
+
-  $t->pass('createDomain() does not throw an exception');
-}
@@ -26 +28 @@
-try
-{
-
+
+
-  $t->isa_ok($domainsList, 'array', 'listDomains() returns an array');
-  $t->ok(in_array('sfAmazonSimpleDBPluginTestDomain', $domainsList), 'listDomains() lists new created domain');
+  $t->ok(in_array('sfAmazonSimpleDBPluginTestDomain2', $domainsList), 'listDomains() lists new created domain');
+  $t->ok(in_array('sfAmazonSimpleDBPluginTestDomain3', $domainsList), 'listDomains() lists new created domain');
+  
+  $t->diag('Testing limit and offseting for domains list');
+  $domainsResults = $service->listDomains(2);
+  $domainsList = $domainsResults['results'];
+  $t->is(count($domainsList), 2, 'listDomains() retrieves the correct limited number of results');
+  $t->ok(isset($domainsResults['next_token']), 'listDomains() returns a next token');
+  
+  $domainsResultsNext = $service->listDomains(2, $domainsResults['next_token']);
+  $domainsResultsListNext = $domainsResultsNext['results'];
+  $t->is(count($domainsResultsListNext), 1, 'listDomains() retrieves the correct limited number of results with an offset');
+  
-  $t->pass('listDomains() does not throw an exception');
-}
@@ -83 +99 @@
-{
-  $t->diag(' 1. Getting all data');
-
-
-
+
+
+
+
-  
-  $t->diag(' 2. Filtering one attribute');
-
-
-
-
+
+
+
+
+
-  
-  $t->diag(' 3. Filtering multiple attributes');
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  $t->pass('query() does not throw an exception');
-}
@@ -161 +191 @@
-try
-{
-
-
+
+
+
+
-  $t->pass('deleteDomain() does not throw an exception');
-}
@@ -170 +202 @@
-}
-
-
+
+
-$t->ok(!in_array('sfAmazonSimpleDBPluginTestDomain', $domainsList), 'listDomains() no more lists deleted domain');
+$t->ok(!in_array('sfAmazonSimpleDBPluginTestDomain2', $domainsList), 'listDomains() no more lists deleted domain');
+$t->ok(!in_array('sfAmazonSimpleDBPluginTestDomain3', $domainsList), 'listDomains() no more lists deleted domain');
-$t->is($service->getSelectedDomain(), null, 'getSelectedDomain() no more returns a deleted domain as selected');