Changeset 1141

Timestamp:

09/23/08 17:12:55 (2 months ago)

Author:

bermiferrer

Message:

Refactored AkHelperLoader? a little to allow helpers on Mailers

Files:

• trunk/lib/AkActionMailer.php (modified) (5 diffs)
• trunk/lib/AkActionView.php (modified) (1 diff)
• trunk/lib/AkActionView/AkHelperLoader.php (modified) (6 diffs)
• trunk/lib/AkActionView/TemplateEngines/AkSintags/AkSintagsParser.php (modified) (1 diff)
• trunk/test/fixtures/app/models/test_mailer.php (modified) (1 diff)
• trunk/test/fixtures/app/views/test_mailer/message_with_helpers.tpl (added)
• trunk/test/unit/lib/AkActionMailer.php (modified) (2 diffs)

trunk/lib/AkActionMailer.php

@@ -275 +275 @@
-    var $default_mime_version = '1.0';
-    var $default_implicit_parts_order = array('multipart/alternative', 'text/html', 'text/enriched', 'text/plain');
-    var $helpers = array('mail');
-    var $Message;
-    var $Composer;
@@ -515 +514 @@
-     *   class MyMailer extends AkActionMailer{
-     *     function receive($Message){
-ie
+ei
-     *       ...
-     *     }
@@ -540 +539 @@
-        $Message->send();
-    }
-
+
-    function getRawMessage()
-    {
@@ -573 +572 @@
-    function deliver($method_name, $parameters = null, $Message = null)
-    {
- 
+
-        (empty($this->Message) || (!empty($this->Message) && get_class($this->Message) != get_class($this)))){
-            $this->create($method_name, $parameters);
@@ -699 +698 @@
-
-    /**
+     * Workarround for limited support of helpers on ActionMailer Views
+     * 
+     * @todo refactor helpers to be controller agnostic
+     */
+    function getControllerName()
+    {
+        return $this->getModelName();
+    }
+
+    /**
+     * This is the url_for version for helpers and emails.
+     * 
+     * As we do not have the context of a host being requested, we need to know
+     * the base_url like http://example.com in oder to add it to the generated URL
+     */
+    function urlFor()
+    {
+        $args = func_get_args();
+        $base_url = '';
+        if(isset($args[0]['base_url'])){
+            $base_url = preg_replace('/^(?!http[s]?:\/\/)(.+)/','http://$1', (isset($args[0]['base_url'])?rtrim($args[0]['base_url'],'/'):Ak::getSetting('mailer', 'base_url', AK_HOST)));
+            unset($args[0]['base_url']);
+        }
+       
+        unset($args[0]['only_path'], $args[0]['base_url']);
+
+        return $base_url.call_user_func_array(array('Ak','toUrl'), $args);
+    }
+
+    /**
-     * Creates an instance of each available helper and links it into into current mailer.
-     * 
-     * Mailer helpers work as Controller helpers but without the Request context
-     */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-

trunk/lib/AkActionView.php

@@ -118 +118 @@
-        }
-    }
-
-    /**
-    * Register a class that knows how to handle template files with the given

trunk/lib/AkActionView/AkHelperLoader.php

@@ -1 +1 @@
-<?php
+
+require_once(AK_LIB_DIR.DS.'AkActionView'.DS.'AkActionViewHelper.php');
-
-/**
@@ -11 +13 @@
-{
-    var $_Controller;
+    var $_HelperInstances;
-    var $_Handler;
-
@@ -37 +40 @@
-     * Creates an instance of each available helper and links it into into current handler.
-     * 
-Pe
+Fo
-     * An instance is created on current controller
-     * at $this->text_helper. This instance is also available on the view by calling $text_helper.
-     * 
-     * Helpers can be found at lib/AkActionView/helpers (this might change in a future)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if(!empty($this->_Controller)){
@@ -54 +130 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    {
-        $handler =& $this->_Handler;
@@ -97 +149 @@
-            $handler->helpers = Ak::toArray($handler->helpers);
-        }
+
-        return $handler->helpers;
-    }
-
-
+Name
-    {
-        $handler =& $this->_Handler;
@@ -121 +174 @@
-    }
-
-
+Name
-    {
-        $handler =& $this->_Handler;

trunk/lib/AkActionView/TemplateEngines/AkSintags/AkSintagsParser.php

@@ -666 +666 @@
-            if(defined('AK_SINTAGS_AVALABLE_HELPERS')){
-                $helpers = unserialize(AK_SINTAGS_AVALABLE_HELPERS);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                            }
-                        }
-                    }
-}
-$helpers['render
-$helpers['render_partial'] = 'controller';
+    $helpers['render'] = 'controller';
+    $helpers['render_partial
+}
-            }
-            $this->available_helpers = $helpers;

trunk/test/fixtures/app/models/test_mailer.php

@@ -331 +331 @@
-                ));
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    function &receive($raw_email)

trunk/test/unit/lib/AkActionMailer.php

@@ -787 +787 @@
-        $this->assertPattern('/==\r\n\r\n--[a-f0-9]{32}\r\nContent-Type: image\/png;/', $rendered_message, 'Two images embeded');
-    }
-
+
-    function test_should_deliver_creating_message()
-    {
@@ -794 +794 @@
-        $this->assertPattern('/Subject: Alternative message from template/', $TestMailer->deliveries[0]);
-    }
+
+    function test_should_allow_using_text_helper_on_mail_views()
+    {
+        $TestMailer =& new TestMailer();
+        $Message = $TestMailer->create('message_with_helpers', $this->recipient);
+        $rendered_message = $TestMailer->getRawMessage();
+        $this->assertPattern('/<a href="http:\/\/example.com\/offers\/">Our offers<\/a>/', $rendered_message);
+        $this->assertNoPattern('/text_helper/', $rendered_message);
+    }
-    /**/
-