Changeset 2904

Timestamp:

09/19/08 16:57:48 (4 months ago)

Author:

david

Message:

merge [2876:2903/branches/0.11]

Location:

branches/1.0

Files:

• CHANGELOG (modified) (1 diff)
• samples/app/config/routing.xml (modified) (2 diffs)
• samples/app/modules/Default/actions/SearchEngineSpamAction.class.php (modified) (1 diff)
• samples/app/modules/Default/cache/SearchEngineSpam.xml (modified) (1 diff)
• samples/app/modules/Default/models/PriceFinderModel.class.php (modified) (1 diff)
• samples/app/modules/Default/templates/MenuSuccess.php (modified) (1 diff)
• samples/app/modules/Default/templates/SearchEngineSpamSuccess.php (modified) (1 diff)
• samples/app/modules/Default/validate/SearchEngineSpam.xml (modified) (1 diff)
• samples/app/modules/Default/views/MenuSuccessView.class.php (modified) (1 diff)
• samples/app/modules/Default/views/SearchEngineSpamErrorView.class.php (modified) (2 diffs)

branches/1.0/CHANGELOG

@@ -73 +73 @@
 0.11.3 RC3 (September ??, 2008)
 -------------------------------
+
+CHG: Improve sample app SearchEngineSpamAction to use ID and optionally name (#859) (David)
 
 FIX: AgaviXmlrpcepiphpResponse::setHttpStatusCode() is not implemented but gets called in sample app Error404SuccessView (#849) (David)

branches/1.0/samples/app/config/routing.xml

@@ -28 +28 @@
       <route name="search_engine_spam" pattern="^/products(/buy-cheap-{name:[\S\s]+}-at-agavi-dot-org)?/(id:\d+)" module="Default" action="SearchEngineSpam">
         <defaults>
-          <default for="name">/buy-cheap-{chainsaws}-at-agavi-dot-org</default>
+          <default for="name">/buy-cheap-{}-at-agavi-dot-org</default>
         </defaults>
       </route>
@@ -44 +44 @@
       <route pattern="^getItemPrice$" module="Default" action="SearchEngineSpam" method="read">
         <wsdl:input>
-          <wsdl:part name="name" type="xsd:string" />
+          <wsdl:part name="id" type="xsd:int" />
         </wsdl:input>
         <wsdl:output>

branches/1.0/samples/app/modules/Default/actions/SearchEngineSpamAction.class.php

@@ -5 +5 @@
   public function executeRead(AgaviRequestDataHolder $rd)
   {
-    $this->setAttribute('product_name', $rd->getParameter('name'));
-    $price = $this->getContext()->getModel('PriceFinder', 'Default')->getPriceByProductName($rd->getParameter('name'));
+    $pfm = $this->getContext()->getModel('PriceFinder', 'Default');
+    $id = $rd->getParameter('id');
+    
+    // was the name in the url? then validate that, too
+    if($rd->hasParameter('product_name')) {
+      $name = $rd->getParameter('name');
+      $price = $pfm->getPriceByProductInfo($id, $name);
+    } else {
+      $name = $pfm->getNameByProductId($id);
+      $price = $pfm->getPriceByProductId($id);
+    }
     if($price !== null) {
+      $this->setAttribute('product_id', $id);
+      $this->setAttribute('product_name', $name);
       $this->setAttribute('product_price', $price);
       return 'Success';

branches/1.0/samples/app/modules/Default/cache/SearchEngineSpam.xml

@@ -7 +7 @@
       <caching method="read" lifetime="2 hours">
         
-        <group>asdf</group>
+        <group>products</group>
+        <!-- we need to vary by both id and name, as they can both be valid -->
+        <group source="request_parameter">id</group>
         <group source="request_parameter">name</group>
         <group source="locale" />

branches/1.0/samples/app/modules/Default/models/PriceFinderModel.class.php

@@ -3 +3 @@
 class Default_PriceFinderModel extends AgaviSampleAppDefaultBaseModel implements AgaviISingletonModel
 {
+  // imagine this stuff is in a database :)
+  protected static $products = array(
+    array(
+      'id'    => 8172401,
+      'name'  => 'brains',
+      'price' => 0.89,
+    ),
+    array(
+      'id'    => 917246,
+      'name'  => 'chainsaws',
+      'price' => 129.99,
+    ),
+    array(
+      'id'    => 7856122,
+      'name'  => 'mad coding skills',
+      'price' => 14599,
+    ),
+    array(
+      'id'    => 123456,
+      'name'  => 'nonsense',
+      'price' => 3.14,
+    ),
+    array(
+      'id'    => 3165463,
+      'name'  => 'viagra',
+      'price' => 14.69,
+    ),
+  );
+  
+  public function getProducts()
+  {
+    return self::$products;
+  }
+  
   public function getPriceByProductName($productName)
   {
-    switch(strtolower($productName)) {
-      case 'brains':
-        return 0.89;
-      case 'chainsaws':
-        return 129.99;
-      case 'mad coding skills':
-        return 14599;
-      case 'nonsense':
-        return 3.14;
-      case 'viagra':
-        return 14.69;
-      default:
-        return null;
+    foreach(self::$products as $product) {
+      if($product['name'] == $productName) {
+        return $product['price'];
+      }
+    }
+  }
+  
+  public function getPriceByProductId($productId)
+  {
+    foreach(self::$products as $product) {
+      if($product['id'] == $productId) {
+        return $product['price'];
+      }
+    }
+  }
+  
+  public function getNameByProductId($productId)
+  {
+    foreach(self::$products as $product) {
+      if($product['id'] == $productId) {
+        return $product['name'];
+      }
+    }
+  }
+  
+  public function getPriceByProductInfo($productId, $productName)
+  {
+    foreach(self::$products as $product) {
+      if($product['id'] == $productId && $product['name'] == $productName) {
+        return $product['price'];
+      }
     }
   }

branches/1.0/samples/app/modules/Default/templates/MenuSuccess.php

@@ -9 +9 @@
   <li><a href="<?php echo $ro->gen('asdjashdasd'); ?>" onclick="return alert('<?php echo $tm->_('You will now be redirected to an invalid URL. If no rewrite rules are in place, this means you will see a standard 404 page of your web server, unless you configured an ErrorDocument 404 or some similar setting. If rewrite rules are in place (i.e. no index.php part in the URL), you will be shown the Agavi 404 document. This is correct and expected behavior.', 'default.menu'); ?>');"><?php echo $tm->_('Call invalid URL', 'default.menu'); ?></a></li>
   <li><a href="<?php echo $ro->gen('disabled'); ?>"><?php echo $tm->_('Try Disabled Module', 'default.menu'); ?></a></li>
-  <li><a href="<?php echo $ro->gen('search_engine_spam', array('name' => $products[array_rand($products = array('nonsense', 'chainsaws', 'brains', 'viagra', 'mad coding skills'))], 'id' => 4815162342)); ?>"><?php echo $tm->_('Search Engine Spam', 'default.menu'); ?></a></li>
+  <li><a href="<?php echo $ro->gen('search_engine_spam', array('name' => $template['product']['name'], 'id' => $template['product']['id'])); ?>"><?php echo $tm->_('Search Engine Spam', 'default.menu'); ?></a></li>
 </ul>

branches/1.0/samples/app/modules/Default/templates/SearchEngineSpamSuccess.php

@@ -10 +10 @@
   </tr>
 </table>
+<p><a href="<?php echo $ro->gen(null, array('name' => null)); ?>">Product ShortLink</a></p>

branches/1.0/samples/app/modules/Default/validate/SearchEngineSpam.xml

@@ -14 +14 @@
 
       <!-- just a simple example. no error message here, since the error view redirects to the 404 page anyway. usually, you'd have a ProductValidator that looks into the database, and then also exports the record into the request data so you don't have to fetch it again in the action -->
-      <validator class="isnotempty">
+      <validator class="string" required="false">
         <argument>name</argument>
-        <parameter name="min">5</parameter>
+        <parameter name="min">1</parameter>
+      </validator>
+
+      <validator class="number">
+        <argument>id</argument>
       </validator>
 

branches/1.0/samples/app/modules/Default/views/MenuSuccessView.class.php

@@ -22 +22 @@
     $this->setupHtml($rd);
 
-    // set the title
-    $this->setAttribute('title', $this->getContext()->getTranslationManager()->_('Welcome to the Agavi Sample Application', 'default.layout'));
+    // pick a random product and set it as a template var
+    $products = $this->getContext()->getModel('PriceFinder', 'Default')->getProducts();
+    $this->setAttribute('product', $products[array_rand($products)]);
   }
 

branches/1.0/samples/app/modules/Default/views/SearchEngineSpamErrorView.class.php

@@ -31 +31 @@
     // fault code must be "Server", check the SOAP spec
     // do not throw the exception please. it can be done with some fiddling, but returning it is a much better idea
-    return new SoapFault('Server', 'Unknown Product "' . $this->getAttribute('product_name') . '"');
+    return new SoapFault('Server', 'Unknown Product ' . $rd->getParameter('id'));
   }
 
@@ -39 +39 @@
   public function executeXmlrpc(AgaviRequestDataHolder $rd)
   {
-    return array('faultCode' => 101, 'faultString' => 'Unknown Product "' . $this->getAttribute('product_name') . '"');
+    return array('faultCode' => 101, 'faultString' => 'Unknown Product ' . $rd->getParameter('id'));
   }
 }