Changeset 908

Timestamp:

09/12/07 00:06:07 (1 year ago)

Author:

schst

Message:

Added the ability to inject session resources in the XML page elements

Files:

• trunk/examples/config/xml/pages/conf/index.xml (modified) (1 diff)
• trunk/examples/config/xml/pages/txt/main_index.xml (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/examples/pageelements/TestElementWithInjectedResource.php (added)
• trunk/src/main/php/net/stubbles/ioc/stubInjector.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/ipo/session/resourcemanager/stubSessionResourceManager.php (modified) (4 diffs)
• trunk/src/main/php/net/stubbles/ipo/session/resourcemanager/stubSessionResourceManagerPreInterceptor.php (modified) (2 diffs)
• trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php (modified) (2 diffs)

trunk/examples/config/xml/pages/conf/index.xml

@@ -17 +17 @@
-    </xmlElementCachingDecorator>
-    <xmlElement type="net.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="uncached" />
+    <xmlElement type="net.stubbles.examples.pageelements.TestElementWithInjectedResource" name="uncached" />
-
-    <xmlPassThru fileName="test.xml" name="passThru">

trunk/examples/config/xml/pages/txt/main_index.xml

@@ -25 +25 @@
-      <!-- This is an include in the same document -->
-      <stub:include part="caching"/>
-
+
+
+
+
-      <!-- This is an include from a different file -->
-      <stub:include part="disclaimer" href="include/parts.xml"/>
@@ -42 +45 @@
-  </part>
-
+  <part name="resources">
+    <h1>Example for resources</h1>
+    <p>
+      This example shows, how a resource can be used, to easily store any kind of
+      data in the session without having to touch the stubSession interface.
+    </p>
+    <p>Current counter value : <ixsl:value-of select="document/resources/counter/count/text()"/></p>
+  </part>
+
-</parts>

trunk/src/main/php/net/stubbles/ioc/stubInjector.php

@@ -122 +122 @@
-        return ($this->getBinding($type, $name) != null);
-    }
+
+    /**
+     * Enter description here...
+     *
+     * @param unknown_type $object
+     */
+    public function handleInjections($instance) {
+        $clazz = new stubReflectionClass(get_class($instance));
+
+        foreach ($clazz->getMethods() as $method) {
+            if (strncmp($method->getName(), '__', 2) === 0) {
+                continue;
+            }
+            if (!$method->isPublic()) {
+                continue;
+            }
+            if (!$method->hasAnnotation('Inject')) {
+                continue;
+            }
+            $paramValues = array();
+            foreach ($method->getParameters() as $param) {
+                $class = $param->getClass();
+                if ($class !== null) {
+                    $type = $class->getName();
+                } else {
+                    $type = stubConstantBinding::TYPE;
+                }
+
+                $name  = null;
+                if ($method->hasAnnotation('Named')) {
+                    $name = $method->getAnnotation('Named')->getName();
+                }
+                if (!$this->hasBinding($type, $name)) {
+                    if ($method->getAnnotation('Inject')->isOptional()) {
+                        continue 2;
+                    }
+                    throw new stubBindingException("Could not create instance of {$this->type}. No binding for type {$type} specified.");
+                }
+                $paramValues[] = $this->getInstance($type, $name);
+            }
+            $method->invokeArgs($instance, $paramValues);
+        }
+    }
-}
-?>

trunk/src/main/php/net/stubbles/ipo/session/resourcemanager/stubSessionResourceManager.php

@@ -11 +11 @@
- * @link        http://pustefix.oss.schlund.de
- */
-
+
+
-
-/**
@@ -23 +24 @@
- * @subpackage  ipo_resourcemanager
- */
-
+implements stubInjectionProvider 
-
-    /**
@@ -61 +62 @@
-            $this->resourceDefinitions[$interface] = $class;
-        }
+    }
+
+    /**
+     * Get a resource for a specifiec type.
+     *
+     * This is required by the stubInjectionProvider interface.
+     *
+     * As PHP has no namespace, this only works, as long as there
+     * are no two interfaces with the same name.
+     *
+     * @param stubReflectionClass $type
+     */
+    public function get(stubReflectionClass $type) {
+        $typeName = $type->getName();
+        foreach ($this->resourceDefinitions as $interface => $implementation) {
+            $localName = substr($interface, strrpos($interface, '.')+1);
+            if ($localName === $typeName) {
+                return $this->getResource($interface);
+            }
+        }
+        return null;
-    }
-
@@ -151 +173 @@
-        return $clazz->newInstance();
-    }
+
+    /**
+     * Register all session resources with the binder.
+     *
+     * @param stubBinder $binder
+     */
+    public function registerBindings(stubBinder $binder) {
+        foreach ($this->resourceDefinitions as $interface => $impl) {
+            $localName = substr($interface, strrpos($interface, '.')+1);
+            $binder->bind($localName)->toProvider($this);
+        }
+    }
-}
-?>

trunk/src/main/php/net/stubbles/ipo/session/resourcemanager/stubSessionResourceManagerPreInterceptor.php

@@ -2 +2 @@
-/**
- * Interceptor to initialize the stubResourceManager.
+ *
+ * If the registry contains a net.stubbles.ioc.stubBinder, the
+ * resource manager will be registered as a provider for
+ * all resources.
- *
- * @author      Stephan Schmidt <schst@stubbles.net>
@@ -43 +47 @@
-        }
-        stubRegistry::set('net.stubbles.ipo.session.resourcemanager.stubSessionResourceManager', $manager);
+
+        $binder = stubRegistry::get('net.stubbles.ioc.stubBinder');
+        if ($binder != null) {
+            $manager->registerBindings($binder);
+        }
-    }
-

trunk/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php

@@ -56 +56 @@
-        $formValues    = array();
-
+        if (stubRegistry::has('net.stubbles.ioc.stubBinder')) {
+            $injector = stubRegistry::get('net.stubbles.ioc.stubBinder')->getInjector();
+        } else {
+            $injector = null;
+        }
+
-        foreach ($elements as $name => $element) {
-            $prefixRequest->setPrefix($name);
@@ -61 +67 @@
-                continue;
-            }
-
+
+
+
-            $data = $element->process($prefixRequest, $this->session, $this->response);
-            $xmlSerializer->serialize($data, $xmlStreamWriter, array(stubXMLSerializer::OPT_ROOT_TAG => $name));