From 7468beb8752d9ee489d7e28ddc55606cfdc42216 Mon Sep 17 00:00:00 2001
From: Greg Bowler <greg.bowler@g105b.com>
Date: Wed, 27 Nov 2019 13:58:58 +0000
Subject: [PATCH] Simplify the mechanisms behind bind* functions. (#111)

* Fix return type for getElementById, closes #65

* Update PHPDoc to include inherited changes

* Rename function for removing template attributes

* Set value for certain input fields differently

* Bind list to document fragment for efficiency
for #77

* Remove unbindable check

* Allow returning any iterable, not just array - fixes #88

* Test that multiple kvps can be bound within the same parameter

* Isolate bug for #105 - use README example

* Rename BindDataGetter -> BindObject

* Tidy up bindData function

* Test incompatible bindData types

* Remove bindNestedList function

* Testing bindValue

* Test bindObjectValue

* Test bindValue within lists

* Bindable type checking

* Simplify bind functions, closes #110

* Skip empty lists
---
 README.md                                     |   3 +-
 example/01-example-groceries.html             |   6 +
 example/01-example-groceries.php              |  20 +
 example/_component/shopping-list.html         |   3 +
 src/BindDataGetter.php                        |  16 -
 src/BindDataMapper.php                        |   2 +-
 src/BindObject.php                            |  15 +
 src/Bindable.php                              | 307 +++++++++++----
 src/HTMLDocument.php                          |  20 +
 src/IncompatibleBindDataException.php         |   4 +
 src/TemplateElementNotFoundFoundException.php |   4 +
 test/unit/BindDataGetterTest.php              |   2 +-
 test/unit/BindableTest.php                    | 371 ++++++++++++------
 test/unit/Helper/BindDataGetter/TodoItem.php  |   4 +-
 test/unit/Helper/Helper.php                   | 124 +++++-
 15 files changed, 681 insertions(+), 220 deletions(-)
 create mode 100644 example/01-example-groceries.html
 create mode 100644 example/01-example-groceries.php
 create mode 100644 example/_component/shopping-list.html
 delete mode 100644 src/BindDataGetter.php
 create mode 100644 src/BindObject.php
 create mode 100644 src/IncompatibleBindDataException.php
 create mode 100644 src/TemplateElementNotFoundFoundException.php
diff --git a/README.md b/README.md
index 044a1fb..0fd29a1 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Consider a page with an unordered list (`<ul>`). Within the list there should be
 
 In this example, we will simply use an array to contain the data, but the data can come from a data source such as a database, as long as it is `iterable`.
 
-### Source HTML (`example.html`)
+### Source HTML ([`01-groceries-example.html`][example-groceries-html])
 
 ```html
 <!doctype html>
@@ -94,3 +94,4 @@ Features at a glance
 + Use standards compliant techniques for templates and components.
 
 [dom]: https://www.php.gt/dom
+[example-groceries-html]: https://github.com/PhpGt/DomTemplate/blob/master/example/01-example-groceries.html
\ No newline at end of file
diff --git a/example/01-example-groceries.html b/example/01-example-groceries.html
new file mode 100644
index 0000000..3d23e51
--- /dev/null
+++ b/example/01-example-groceries.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<h1>Shopping list</h1>
+
+<shopping-list id="groceries"></shopping-list>
+
+<p>The use of a custom element is more useful on more complex pages, but is shown above as an example.</p>
\ No newline at end of file
diff --git a/example/01-example-groceries.php b/example/01-example-groceries.php
new file mode 100644
index 0000000..53937d3
--- /dev/null
+++ b/example/01-example-groceries.php
@@ -0,0 +1,20 @@
+<?php
+require __DIR__ . "/../vendor/autoload.php";
+
+use Gt\DomTemplate\HTMLDocument;
+
+$html = file_get_contents("01-example-groceries.html");
+$document = new HTMLDocument($html, "./_component");
+$document->extractTemplates();
+
+$data = [
+	["id" => 1, "title" => "Tomatoes"],
+	["id" => 2, "title" => "Noodles"],
+	["id" => 3, "title" => "Cheese"],
+	["id" => 4, "title" => "Broccoli"],
+];
+
+$outputTo = $document->getElementById("groceries");
+$outputTo->bindList($data);
+
+echo $document;
\ No newline at end of file
diff --git a/example/_component/shopping-list.html b/example/_component/shopping-list.html
new file mode 100644
index 0000000..7fe10dd
--- /dev/null
+++ b/example/_component/shopping-list.html
@@ -0,0 +1,3 @@
+<ul>
+	<li data-template data-bind:text="title" data-bind:data-id="id">Item name</li>
+</ul>
\ No newline at end of file
diff --git a/src/BindDataGetter.php b/src/BindDataGetter.php
deleted file mode 100644
index 3ee00f1..0000000
--- a/src/BindDataGetter.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace Gt\DomTemplate;
-
-/**
- * This interface does not define any functions, but is used to indicate that
- * the implementing class should expose "get*" functions for the key-value data
- * it represents.
- *
- * For example: class Person implements BindDataGetter {
- *      // This function will be called for the "name" key when bound.
- * 	public function getName():string {
- * 		return $this->forename . " " . $this->surname;
- * 	}
- * }
- */
-interface BindDataGetter {}
\ No newline at end of file
diff --git a/src/BindDataMapper.php b/src/BindDataMapper.php
index f4177c7..f42fddc 100644
--- a/src/BindDataMapper.php
+++ b/src/BindDataMapper.php
@@ -11,5 +11,5 @@ interface BindDataMapper {
 	 * 	"age" => date("Y") - $this->dob->format("Y"),
 	 * ]
 	 */
-	public function bindDataMap():iterable;
+	public function bindDataMap():array;
 }
\ No newline at end of file
diff --git a/src/BindObject.php b/src/BindObject.php
new file mode 100644
index 0000000..4a75394
--- /dev/null
+++ b/src/BindObject.php
@@ -0,0 +1,15 @@
+<?php
+namespace Gt\DomTemplate;
+
+/**
+ * This interface does not define any functions, but is used to indicate that
+ * the implementing class should expose "bind*" functions for the key-value data
+ * it represents.
+ *
+ * For example: class Person implements BindObject {
+ * // This function will be called for the "name" key when bound.
+ * public function bindName():string {
+ * 	return $this->forename . " " . $this->surname;
+ * }
+ */
+interface BindObject {}
\ No newline at end of file
diff --git a/src/Bindable.php b/src/Bindable.php
index c45320a..1759c9c 100644
--- a/src/Bindable.php
+++ b/src/Bindable.php
@@ -4,6 +4,7 @@
 use Gt\Dom\Attr as BaseAttr;
 use Gt\Dom\Element as BaseElement;
 use Gt\Dom\HTMLCollection as BaseHTMLCollection;
+use Iterator;
 
 /**
  * In WebEngine, all Elements in the DOM are Bindable by default. A Bindable
@@ -11,13 +12,6 @@
  * bind* functions.
  */
 trait Bindable {
-	/**
-	 * Alias of bindKeyValue.
-	 */
-	public function bind(?string $key, $value):void {
-		$this->bindKeyValue($key, $value);
-	}
-
 	/**
 	 * Bind a single key-value-pair within $this Element.
 	 * Elements state their bindable key using the data-bind HTML attribute.
@@ -32,8 +26,8 @@ public function bindKeyValue(
 			$value = "";
 		}
 
-		$this->injectBoundProperty($key, $value);
-		$this->injectAttributePlaceholder($key, $value);
+		$this->injectBoundData($key, $value);
+		$this->injectBoundAttribute($key, $value);
 	}
 
 	/**
@@ -51,45 +45,23 @@ public function bindValue($value):void {
 	/**
 	 * Bind multiple key-value-pairs within $this Element, calling
 	 * bindKeyValue for each key-value-pair in the iterable $kvp object.
+	 * @param array|object|BindObject|BindDataMapper $kvp
 	 * @see self::bindKeyValue
 	 */
 	public function bindData(
 		$kvp
 	):void {
-		$data = $kvp;
+		$assocArray = null;
 
-		if(!is_iterable($kvp)) {
-			if($kvp instanceof BindDataMapper) {
-				$data = $kvp->bindDataMap();
-			}
-			elseif($kvp instanceof BindDataGetter) {
-				$data = [];
-				$prefixes = ["bind", "get"];
-
-				foreach($prefixes as $prefix) {
-					foreach(get_class_methods($kvp) as $method) {
-						if(strpos($method, $prefix) !== 0) {
-							continue;
-						}
-
-						$key = lcfirst(substr($method, strlen($prefix)));
-						$value = $kvp->$method();
-						$data[$key] = $value;
-					}
-				}
-			}
-			else {
-				$this->bindValue($kvp);
-			}
+		if($this->isIndexedArray($kvp)
+		|| $kvp instanceof Iterator) {
+			throw new IncompatibleBindDataException();
 		}
 
-		if(is_iterable($data) || is_object($data)) {
-			foreach($data as $key => $value) {
-				$this->bindKeyValue($key, $value);
-			}
-		}
-		else {
-			$this->bindValue($data);
+		$assocArray = $this->convertKvpToAssocArray($kvp);
+
+		foreach($assocArray as $key => $value) {
+			$this->bindKeyValue($key, $value);
 		}
 	}
 
@@ -116,9 +88,10 @@ public function bindList(
 		iterable $kvpList,
 		string $templateName = null
 	):int {
-		if(is_array($kvpList) && is_string(key($kvpList))) {
-			return $this->bindNestedList($kvpList);
+		if(empty($kvpList)) {
+			return 0;
 		}
+
 		/** @var BaseElement $element */
 		$element = $this;
 		if($element instanceof HTMLDocument) {
@@ -128,7 +101,6 @@ public function bindList(
 		$document = $element->ownerDocument;
 
 		$fragment = $document->createDocumentFragment();
-		$templateParent = null;
 
 		if(is_null($templateName)) {
 			$templateElement = $document->getUnnamedTemplate(
@@ -138,41 +110,39 @@ public function bindList(
 			);
 		}
 		else {
-			$templateElement = $document->getNamedTemplate($templateName);
+			$templateElement = $document->getNamedTemplate(
+				$templateName
+			);
 		}
 
-		$i = 0;
-		foreach($kvpList as $data) {
-			$i++;
+		$templateParent = $templateElement->templateParentNode;
+		$parentPath = $templateParent->getNodePath();
+
+		$count = 0;
+		foreach($kvpList as $key => $data) {
+			$count ++;
 			$t = $templateElement->cloneNode(true);
+			/** @var Element $insertedT */
+			$insertedT = $fragment->appendChild($t);
 
-			if(!$templateParent) {
-				$templateParent = $templateElement->templateParentNode;
+			if(is_string($key)) {
+				$insertedT->bindValue($key);
 			}
 
-			$t->bindData($data);
-			$fragment->appendChild($t);
-		}
-
-		global $test;
-		if($test) {
-			var_dump($templateParent->getNodePath());die();
-		}
-
-		if(!is_null($templateParent)) {
-			$templateParent->appendChild($fragment);
+			if($this->isBindableValue($data)) {
+				$insertedT->bindValue($data);
+			}
+			else {
+				$insertedT->bindData($data);
+			}
 		}
 
-		return $i;
+		$templateParent->appendChild($fragment);
+		return $count;
 	}
 
-	/**
-	 * When complex data needs binding to a nested DOM structure, a
-	 * BindIterator is necessary to link each child list with the
-	 * correct template.
-	 */
 	public function bindNestedList(
-		iterable $data,
+		iterable $nestedKvpList,
 		bool $requireMatchingTemplatePath = false
 	):int {
 		/** @var BaseElement $element */
@@ -189,29 +159,46 @@ public function bindNestedList(
 		);
 
 		$i = 0;
-		foreach($data as $key => $value) {
+		foreach($nestedKvpList as $key => $value) {
 			$i++;
 			$t = $document->getUnnamedTemplate(
 				$templateParent,
 				false
 			);
 
+			$insertedTemplate = $templateParent->appendChild($t);
+
 			if(is_string($key)) {
-				$t->bindValue($key);
+				$insertedTemplate->bindValue($key);
 			}
 
 			if(is_string($value)) {
-				$t->bindValue($value);
+				$insertedTemplate->bindValue($value);
 			}
-
-			$insertedTemplate = $templateParent->appendChild($t);
-
-			if(is_iterable($value)) {
+			elseif(is_iterable($value)) {
 				$i += $insertedTemplate->bindNestedList(
 					$value,
 					true
 				);
 			}
+			else {
+				$assocArray = $this->convertKvpToAssocArray($value);
+
+				foreach($assocArray as $dataKey => $dataValue) {
+					if($this->isList($dataValue)) {
+						$insertedTemplate->bindNestedList(
+							$dataValue,
+							true
+						);
+					}
+					else {
+						$insertedTemplate->bindKeyValue(
+							$dataKey,
+							$dataValue
+						);
+					}
+				}
+			}
 		}
 
 		return $i;
@@ -222,7 +209,7 @@ public function bindNestedList(
 	 * matching data-bind:* attribute, and inject the provided $value
 	 * into the according property value.
 	 */
-	protected function injectBoundProperty(
+	protected function injectBoundData(
 		?string $key,
 		$value
 	):void {
@@ -307,7 +294,7 @@ protected function shouldIgnoreFalsey(BaseAttr $attr):bool {
 		return $attr->value[0] === "?";
 	}
 
-	protected function injectAttributePlaceholder(
+	protected function injectBoundAttribute(
 		?string $key,
 		$value
 	):void {
@@ -317,9 +304,24 @@ protected function injectAttributePlaceholder(
 			$element = $element->documentElement;
 		}
 
-		foreach($element->xPath(".//*[@data-bind-parameters]") as $elementToBindAttributes) {
+		foreach($element->xPath(".//*[@data-bind-attributes]") as $elementToBindAttributes) {
 			foreach($elementToBindAttributes->attributes as $attr) {
 				/** @var Attr $attr */
+
+				$attrValue = $attr->value;
+				if(is_null($key)) {
+					$attrValue = str_replace(
+						"{}",
+						$value,
+						$attrValue
+					);
+
+					$elementToBindAttributes->setAttribute(
+						$attr->name,
+						$attrValue
+					);
+				}
+
 				preg_match_all(
 					"/{(?P<bindProperties>[^}]+)}/",
 					$attr->value,
@@ -336,7 +338,6 @@ protected function injectAttributePlaceholder(
 					continue;
 				}
 
-				$attrValue = $attr->value;
 				$attrValue = str_replace(
 					"{" . $key . "}",
 					$value,
@@ -403,4 +404,154 @@ protected function getChildrenWithBindAttribute():BaseHTMLCollection {
 			"descendant-or-self::*[@*[starts-with(name(), 'data-bind')]]"
 		);
 	}
+
+	protected function isIndexedArray($array):bool {
+		if(!is_array($array)) {
+			return false;
+		}
+
+		if($array == []) {
+			return false;
+		}
+
+		$keys = array_keys($array);
+		$isIndexed = true;
+
+		foreach($keys as $key) {
+			if(!is_int($key)) {
+				$isIndexed = false;
+			}
+		}
+
+		return $isIndexed;
+	}
+
+	protected function isAssociativeArray($array):bool {
+		if(!is_array($array)) {
+			return false;
+		}
+
+		if($array == []) {
+			return true;
+		}
+
+		$keys = array_keys($array);
+		$isAssociative = true;
+
+		foreach($keys as $key) {
+			if(!is_string($key)) {
+				$isAssociative = false;
+			}
+		}
+
+		return $isAssociative;
+	}
+
+	/**
+	 * Does DomTemplate consider $data to be a data structure that
+	 * represents a single BindableValue? A BindableValue is a single datum
+	 * that does not have a "key-value" structure (just a "value").
+	 */
+	protected function isBindableValue($data):bool {
+		return is_string($data)
+		|| is_numeric($data)
+		|| (is_object($data) && method_exists($data, "__toString"));
+	}
+
+	/**
+	 * Does DomTemplate consider $data to be a BindableData structure that
+	 * represents a "key-value" structure?
+	 */
+	protected function isBindableData($data):bool {
+		if(is_null($data)) {
+			return false;
+		}
+
+		if([] == $data) {
+			return true;
+		}
+
+		if($data instanceof BindObject
+		|| $data instanceof BindDataMapper) {
+			return true;
+		}
+
+		if(is_object($data) && !is_iterable($data)) {
+			return true;
+		}
+
+		if(is_array($data)) {
+			$key = key($data);
+			$firstItem = $data[$key];
+
+			if($this->isBindableValue($firstItem)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Does DomTemplate consider $data to be a List that represents multiple
+	 * BindableData? A List is an iterable data structure that contains
+	 * zero or more "key-value" structure.
+	 */
+	protected function isList($data):bool {
+		$firstItem = null;
+
+		if(is_array($data)) {
+			$key = key($data);
+			$firstItem = $data[$key];
+		}
+		elseif($data instanceof Iterator) {
+			$firstItem = $data->current();
+		}
+
+		if(is_null($firstItem)) {
+			return false;
+		}
+
+		return $this->isBindableData($firstItem)
+			|| $this->isBindableValue($firstItem);
+	}
+
+	protected function convertKvpToAssocArray($kvp):array {
+		if($this->isAssociativeArray($kvp)) {
+			$assocArray = $kvp;
+		}
+		else {
+			if($kvp instanceof BindDataMapper) {
+				$assocArray = $kvp->bindDataMap();
+			}
+			elseif($kvp instanceof BindObject) {
+				$assocArray = [];
+				$prefix = "bind";
+				foreach(get_class_methods($kvp) as $method) {
+					if(strpos($method, $prefix) !== 0) {
+						continue;
+					}
+
+					$key = lcfirst(
+						substr(
+							$method,
+							strlen($prefix)
+						)
+					);
+
+					$value = $kvp->$method();
+					$assocArray[$key] = $value;
+				}
+			}
+			elseif(is_object($kvp)) {
+// Finally, assume the kvp is a Plain Old PHP Object (POPO).
+				$assocArray = get_object_vars($kvp);
+			}
+			else {
+				$assocArray = $kvp;
+			}
+		}
+
+		return $assocArray;
+	}
 }
diff --git a/src/HTMLDocument.php b/src/HTMLDocument.php
index 7e60174..25fb932 100644
--- a/src/HTMLDocument.php
+++ b/src/HTMLDocument.php
@@ -32,6 +32,7 @@ class HTMLDocument extends BaseHTMLDocument {
 
 	protected $componentDirectory;
 	protected $templateFragmentMap;
+	protected $templateParentStack;
 	protected $boundAttributeList;
 
 	public function __construct(string $document = "", string $componentDirectory = "") {
@@ -43,6 +44,7 @@ public function __construct(string $document = "", string $componentDirectory =
 
 		$this->componentDirectory = $componentDirectory;
 		$this->templateFragmentMap = [];
+		$this->templateParentStack = [];
 		$this->boundAttributeList = [];
 	}
 
@@ -110,6 +112,24 @@ public function getUnnamedTemplate(
 		return $clone;
 	}
 
+	public function pushTemplateParentStack(
+		string $name,
+		Element $element
+	):void {
+		if(!isset($this->templateParentStack[$name])) {
+			$this->templateParentStack[$name] = [];
+		}
+
+		$this->templateParentStack[$name] []= $element;
+	}
+
+	public function insertTemplateParentStack():void {
+		ksort($this->templateParentStack);
+		foreach($this->templateParentStack as $name => $elementList) {
+
+		}
+	}
+
 	public function getParentOfUnnamedTemplate(
 		Element $element,
 		bool $requireMatchingPath = false
diff --git a/src/IncompatibleBindDataException.php b/src/IncompatibleBindDataException.php
new file mode 100644
index 0000000..00d6bbf
--- /dev/null
+++ b/src/IncompatibleBindDataException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class IncompatibleBindDataException extends DomTemplateException {}
\ No newline at end of file
diff --git a/src/TemplateElementNotFoundFoundException.php b/src/TemplateElementNotFoundFoundException.php
new file mode 100644
index 0000000..2ebb845
--- /dev/null
+++ b/src/TemplateElementNotFoundFoundException.php
@@ -0,0 +1,4 @@
+<?php
+namespace Gt\DomTemplate;
+
+class TemplateElementNotFoundFoundException extends DomTemplateException {}
\ No newline at end of file
diff --git a/test/unit/BindDataGetterTest.php b/test/unit/BindDataGetterTest.php
index e51dfaf..5d0f520 100644
--- a/test/unit/BindDataGetterTest.php
+++ b/test/unit/BindDataGetterTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Gt\DomTemplate\Test;
 
-use Gt\DomTemplate\BindDataGetter;
+use Gt\DomTemplate\BindObject;
 use Gt\DomTemplate\HTMLDocument;
 use Gt\DomTemplate\Test\Helper\BindDataGetter\TodoItem;
 use Gt\DomTemplate\Test\Helper\Helper;
diff --git a/test/unit/BindableTest.php b/test/unit/BindableTest.php
index 955b985..48b531f 100644
--- a/test/unit/BindableTest.php
+++ b/test/unit/BindableTest.php
@@ -1,6 +1,9 @@
-<?php
+<?php /** @noinspection PhpComposerExtensionStubsInspection */
+
 namespace Gt\DomTemplate\Test;
 
+use EmptyIterator;
+use Gt\DomTemplate\IncompatibleBindDataException;
 use Gt\DomTemplate\BoundAttributeDoesNotExistException;
 use Gt\DomTemplate\BoundDataNotSetException;
 use Gt\DomTemplate\HTMLDocument;
@@ -26,10 +29,6 @@ public function testBindMethodAvailable() {
 			method_exists($document, "bindList"),
 			"HTMLDocument is not bindable"
 		);
-		self::assertTrue(
-			method_exists($document, "bindNestedList"),
-			"HTMLDocument is not bindable"
-		);
 		self::assertTrue(
 			method_exists($outputTo, "bindKeyValue"),
 			"Template container element (dl) is not bindable"
@@ -42,10 +41,6 @@ public function testBindMethodAvailable() {
 			method_exists($outputTo, "bindList"),
 			"Template container element (dl) is not bindable"
 		);
-		self::assertTrue(
-			method_exists($outputTo, "bindNestedList"),
-			"Template container element (dl) is not bindable"
-		);
 	}
 
 	public function testBindMethodOnTemplateElement() {
@@ -65,10 +60,6 @@ public function testBindMethodOnTemplateElement() {
 			method_exists($template, "bindList"),
 			"Template element is not bindable"
 		);
-		self::assertTrue(
-			method_exists($template, "bindNestedList"),
-			"Template element is not bindable"
-		);
 	}
 
 	public function testBindKeyValueExistingElements() {
@@ -84,6 +75,20 @@ public function testBindKeyValueExistingElements() {
 		self::assertEquals($age, $spanChildren[1]->innerText);
 	}
 
+	public function testBindValue() {
+		$document = new HTMLDocument(Helper::HTML_KEYLESS_BIND_ATTRIBUTE);
+		$document->bindValue("PHPUnit");
+		$h1 = $document->querySelector("h1");
+		self::assertStringContainsString("Welcome, PHPUnit", $h1->innerText);
+	}
+
+	public function testBindValueOnActualElement() {
+		$document = new HTMLDocument(Helper::HTML_KEYLESS_BIND_ATTRIBUTE);
+		$h1 = $document->querySelector("h1");
+		$h1->bindValue("PHPUnit");
+		self::assertStringContainsString("Welcome, PHPUnit", $h1->innerText);
+	}
+
 	public function testBindDataExistingElements() {
 		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
 		$name = "Winston Smith";
@@ -183,7 +188,19 @@ public function testBindDataRemoved() {
 		self::assertFalse($spanChildren[1]->hasAttribute("data-bind:text"));
 	}
 
-	public function testInjectAttributePlaceholderNoDataBindParameters() {
+	public function testBindDataIndexedArray() {
+		self::expectException(IncompatibleBindDataException::class);
+		$document = new HTMLDocument();
+		$document->bindData(["one", "two", "three"]);
+	}
+
+	public function testBindDataIterator() {
+		self::expectException(IncompatibleBindDataException::class);
+		$document = new HTMLDocument();
+		$document->bindData(new EmptyIterator());
+	}
+
+	public function testInjectAttributePlaceholderNoDataBindAttributes() {
 		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND);
 		$userId = 101;
 		$username = "thoughtpolice";
@@ -201,14 +218,14 @@ public function testInjectAttributePlaceholderNoDataBindParameters() {
 		self::assertEquals($originalAlt, $img->alt);
 	}
 
-	public function testBindParametersPlaceholder() {
+	public function testBindAttributesPlaceholder() {
 		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND);
 		$userId = 101;
 		$username = "thoughtpolice";
 		$link = $document->querySelector("a");
 		$img = $document->querySelector("img");
-		$link->setAttribute("data-bind-parameters", true);
-		$img->setAttribute("data-bind-parameters", true);
+		$link->setAttribute("data-bind-attributes", true);
+		$img->setAttribute("data-bind-attributes", true);
 
 		$document->bindKeyValue("userId", $userId);
 		$document->bindKeyValue("username", $username);
@@ -218,26 +235,26 @@ public function testBindParametersPlaceholder() {
 		self::assertEquals("thoughtpolice's profile picture", $img->alt);
 	}
 
-	public function testBindParametersMultiple() {
+	public function testBindAttributesMultiple() {
 		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND);
 		$userId = 101;
 		$userType = "thinkpol";
 		$h1 = $document->querySelector("h1");
-		$h1->setAttribute("data-bind-parameters", true);
+		$h1->setAttribute("data-bind-attributes", true);
 		$document->bindKeyValue("userId", $userId);
 		$document->bindKeyValue("userType", $userType);
 
 		self::assertEquals("heading-thinkpol-101", $h1->id);
 	}
 
-	public function testBindParametersMultipleInHref() {
+	public function testBindAttributesMultipleInHref() {
 		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS_NO_BIND);
 		$userId = 101;
 		$userType = "thinkpol";
 		$footer = $document->querySelector("footer");
 
 		$link = $footer->querySelector("a");
-		$link->setAttribute("data-bind-parameters", true);
+		$link->setAttribute("data-bind-attributes", true);
 		$footer->bindKeyValue("userId", $userId);
 		self::assertNotNull($link->href);
 		$footer->bindKeyValue("userType", $userType);
@@ -271,6 +288,38 @@ public function testBindClass() {
 		self::assertFalse($classList->contains("task-complete"));
 	}
 
+	public function testBindObjectValue() {
+		$dataObj = new StdClass();
+		$dataObj->name = "Test name";
+		$dataObj->age = 123;
+
+		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
+		$document->bindData($dataObj);
+
+		$spans = $document->querySelectorAll(".bound-data-test span");
+		self::assertEquals($dataObj->name, $spans[0]->innerText);
+		self::assertEquals($dataObj->age, $spans[1]->innerText);
+	}
+
+	public function testBindObjectValueParameter() {
+		$dataObj = new StdClass();
+		$dataObj->userId = 123;
+		$dataObj->username = "Testname";
+
+		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS);
+		$document->bindData($dataObj);
+
+		$img = $document->querySelector("img");
+		self::assertStringContainsString(
+			"{$dataObj->userId}.jpg",
+			$img->src
+		);
+		self::assertEquals(
+			"{$dataObj->username}'s profile picture",
+			$img->alt
+		);
+	}
+
 	public function testBindListMultipleDataTemplateElementsNoName() {
 		$document = new HTMLDocument(Helper::HTML_DOUBLE_NAMELESS_BIND_LIST);
 		$document->extractTemplates();
@@ -287,15 +336,15 @@ public function testBindListMultipleDataTemplateElementsWithName() {
 		$document = new HTMLDocument(Helper::HTML_DOUBLE_NAMES_BIND_LIST);
 		$document->extractTemplates();
 		$stateList = [
-			["state-name" => "Oceania", "ideology" => "Ingsoc", "main-territory" => "Western Hemisphere"],
-			["state-name" => "Eurasia", "ideology" => "Neo-Bolshevism", "main-territory" => "Continental Europe"],
-			["state-name" => "Eastasia", "ideology" => "Death Worship", "main-territory" => "China"],
+			(object)["state-name" => "Oceania", "ideology" => "Ingsoc", "main-territory" => "Western Hemisphere"],
+			(object)["state-name" => "Eurasia", "ideology" => "Neo-Bolshevism", "main-territory" => "Continental Europe"],
+			(object)["state-name" => "Eastasia", "ideology" => "Death Worship", "main-territory" => "China"],
 		];
 		$ministryList = [
-			["ministry-name" => "Peace", "ministry-id" => 123],
-			["ministry-name" => "Plenty", "ministry-id" => 511],
-			["ministry-name" => "Truth", "ministry-id" => 141],
-			["ministry-name" => "Love", "ministry-id" => 610],
+			(object)["ministry-name" => "Peace", "ministry-id" => 123],
+			(object)["ministry-name" => "Plenty", "ministry-id" => 511],
+			(object)["ministry-name" => "Truth", "ministry-id" => 141],
+			(object)["ministry-name" => "Love", "ministry-id" => 610],
 		];
 
 		$firstList = $document->getElementById("list-1");
@@ -310,23 +359,29 @@ public function testBindListMultipleDataTemplateElementsWithName() {
 		self::assertCount(count($stateList), $firstList->children);
 		self::assertCount(count($ministryList), $secondList->children);
 
-		self::assertEquals($stateList[1]["state-name"], $firstList->querySelectorAll("li")[1]->innerText);
-		self::assertEquals($ministryList[2]["ministry-name"], $secondList->querySelectorAll("li")[2]->innerText);
+		self::assertEquals(
+			$stateList[1]->{"state-name"},
+			$firstList->querySelectorAll("li")[1]->innerText
+		);
+		self::assertEquals(
+			$ministryList[2]->{"ministry-name"},
+			$secondList->querySelectorAll("li")[2]->innerText
+		);
 	}
 
 	public function testBindListMultipleDataTemplateElements() {
 		$document = new HTMLDocument(Helper::HTML_DOUBLE_NAMELESS_BIND_LIST);
 		$document->extractTemplates();
 		$stateList = [
-			["state-name" => "Oceania", "ideology" => "Ingsoc", "main-territory" => "Western Hemisphere"],
-			["state-name" => "Eurasia", "ideology" => "Neo-Bolshevism", "main-territory" => "Continental Europe"],
-			["state-name" => "Eastasia", "ideology" => "Death Worship", "main-territory" => "China"],
+			(object)["state-name" => "Oceania", "ideology" => "Ingsoc", "main-territory" => "Western Hemisphere"],
+			(object)["state-name" => "Eurasia", "ideology" => "Neo-Bolshevism", "main-territory" => "Continental Europe"],
+			(object)["state-name" => "Eastasia", "ideology" => "Death Worship", "main-territory" => "China"],
 		];
 		$ministryList = [
-			["ministry-name" => "Peace", "ministry-id" => 123],
-			["ministry-name" => "Plenty", "ministry-id" => 511],
-			["ministry-name" => "Truth", "ministry-id" => 141],
-			["ministry-name" => "Love", "ministry-id" => 610],
+			(object)["ministry-name" => "Peace", "ministry-id" => 123],
+			(object)["ministry-name" => "Plenty", "ministry-id" => 511],
+			(object)["ministry-name" => "Truth", "ministry-id" => 141],
+			(object)["ministry-name" => "Love", "ministry-id" => 610],
 		];
 
 		$firstList = $document->getElementById("list-1");
@@ -338,62 +393,14 @@ public function testBindListMultipleDataTemplateElements() {
 		self::assertCount(count($stateList), $firstList->children);
 		self::assertCount(count($ministryList), $secondList->children);
 
-		self::assertEquals($stateList[1]["state-name"], $firstList->querySelectorAll("li")[1]->innerText);
-		self::assertEquals($ministryList[2]["ministry-name"], $secondList->querySelectorAll("li")[2]->innerText);
-	}
-
-	public function testBindNestedList() {
-		$document = new HTMLDocument(Helper::HTML_MUSIC);
-		$document->extractTemplates();
-		$document->bindList(Helper::LIST_MUSIC);
-
-		foreach(Helper::LIST_MUSIC as $artistName => $albumList) {
-			$domArtist = $document->querySelector("[data-artist-name='$artistName']");
-			$h2 = $domArtist->querySelector("h2");
-			self::assertEquals($artistName, $h2->innerText);
-
-			foreach($albumList as $albumName => $trackList) {
-				$domAlbum = $domArtist->querySelector("[data-album-name='$albumName']");
-				$h3 = $domAlbum->querySelector("h3");
-				self::assertEquals($albumName, $h3->innerText);
-
-				foreach($trackList as $i => $trackName) {
-					$domTrack = $domAlbum->querySelector("[data-track-name='$trackName']");
-					self::assertStringContainsString($trackName, $domTrack->innerText);
-					$child = $domAlbum->querySelector("ol")->children[$i];
-					self::assertSame($domTrack, $child);
-				}
-			}
-		}
-	}
-
-	public function testBindNestedListWithBadData() {
-		$document = new HTMLDocument(Helper::HTML_MUSIC);
-		$document->extractTemplates();
-		$data = Helper::LIST_MUSIC;
-		$data["Bongo and The Bronks"] = 123;
-		$document->bindList($data);
-
-		unset($data["Bongo and The Bronks"]);
-
-		foreach($data as $artistName => $albumList) {
-			$domArtist = $document->querySelector("[data-artist-name='$artistName']");
-			$h2 = $domArtist->querySelector("h2");
-			self::assertEquals($artistName, $h2->innerText);
-
-			foreach($albumList as $albumName => $trackList) {
-				$domAlbum = $domArtist->querySelector("[data-album-name='$albumName']");
-				$h3 = $domAlbum->querySelector("h3");
-				self::assertEquals($albumName, $h3->innerText);
-
-				foreach($trackList as $i => $trackName) {
-					$domTrack = $domAlbum->querySelector("[data-track-name='$trackName']");
-					self::assertStringContainsString($trackName, $domTrack->innerText);
-					$child = $domAlbum->querySelector("ol")->children[$i];
-					self::assertSame($domTrack, $child);
-				}
-			}
-		}
+		self::assertEquals(
+			$stateList[1]->{"state-name"},
+			$firstList->querySelectorAll("li")[1]->innerText
+		);
+		self::assertEquals(
+			$ministryList[2]->{"ministry-name"},
+			$secondList->querySelectorAll("li")[2]->innerText
+		);
 	}
 
 	public function testBindListAttributeWithNoValue() {
@@ -408,14 +415,14 @@ public function testBindListAttributeWithNoValue() {
 		);
 
 		for($i = 0; $i < 10; $i++) {
-			$row = [
+			$row = (object)[
 				"text" => $formatter->format($i),
 				"value" => $i,
 				"isDisabled" => (bool)($i % 2),
 			];
 
 			if($i === 5) {
-				$row["isDisabled"] = true;
+				$row->{"isDisabled"} = true;
 			}
 
 			$data []= $row;
@@ -451,36 +458,166 @@ public function testBindListAttributeWithNoValue() {
 		}
 	}
 
-	public function testBindObjectValue() {
-		$dataObj = new StdClass();
-		$dataObj->name = "Test name";
-		$dataObj->age = 123;
+	public function testBindValueManualTemplate() {
+		$employeeData = [
+			"Alan Statham" => (object)[
+				"id" => 1742,
+				"title" => "Consultant Radiologist",
+			],
+			"Caroline Todd" => (object)[
+				"id" => 3010,
+				"title" => "Surgical Registrar",
+			],
+			"Guy Secretan" => (object)[
+				"id" => 2019,
+				"title" => "Anaesthetist",
+			],
+			"Karen Ball" => (object)[
+				"id" => 836,
+				"title" => "Human Resources",
+			],
+		];
 
-		$document = new HTMLDocument(Helper::HTML_NO_TEMPLATES);
-		$document->bindData($dataObj);
+		$document = new HTMLDocument(Helper::HTML_KEYLESS_BIND_ATTRIBUTE_TEMPLATE_NAMED);
+		$document->extractTemplates();
 
-		$spans = $document->querySelectorAll(".bound-data-test span");
-		self::assertEquals($dataObj->name, $spans[0]->innerText);
-		self::assertEquals($dataObj->age, $spans[1]->innerText);
+		foreach($employeeData as $name => $data) {
+			$t = $document->getTemplate("employee-template");
+			$t->bindValue($name);
+			$t->insertTemplate();
+		}
+
+		self::assertCount(
+			count($employeeData),
+			$document->querySelector("ul")->children
+		);
+
+		$i = 0;
+		foreach($employeeData as $name => $data) {
+			$element = $document->querySelector("ul")->children[$i];
+			self::assertEquals($name, $element->querySelector("h1")->innerText);
+			$i++;
+		}
 	}
 
-	public function testBindObjectValueParameter() {
-		$dataObj = new StdClass();
-		$dataObj->userId = 123;
-		$dataObj->username = "Testname";
+	public function testBindListStringKeys() {
+		$employeeData = [
+			"Alan Statham" => (object)[
+				"id" => 1742,
+				"title" => "Consultant Radiologist",
+			],
+			"Caroline Todd" => (object)[
+				"id" => 3010,
+				"title" => "Surgical Registrar",
+			],
+			"Guy Secretan" => (object)[
+				"id" => 2019,
+				"title" => "Anaesthetist",
+			],
+			"Karen Ball" => (object)[
+				"id" => 836,
+				"title" => "Human Resources",
+			],
+		];
 
-		$document = new HTMLDocument(Helper::HTML_ATTRIBUTE_PLACEHOLDERS);
-		$document->bindData($dataObj);
+		$document = new HTMLDocument(Helper::HTML_KEYLESS_BIND_ATTRIBUTE_TEMPLATE);
+		$document->extractTemplates();
+		$document->bindList($employeeData);
 
-		$img = $document->querySelector("img");
-		self::assertStringContainsString(
-			"{$dataObj->userId}.jpg",
-			$img->src
+		$empListElement = $document->getElementById("emp-list");
+		self::assertCount(count($employeeData), $empListElement->children);
+
+		$i = 0;
+		foreach($employeeData as $name => $data) {
+			$empElement = $empListElement->children[$i];
+			$h1 = $empElement->querySelector("h1");
+			self::assertEquals($name, $h1->textContent);
+			$i++;
+		}
+	}
+
+	public function testBindNestedList() {
+		$document = new HTMLDocument(Helper::HTML_MUSIC);
+		$document->extractTemplates();
+		$document->bindNestedList(Helper::LIST_MUSIC);
+
+		$ulArtists = $document->querySelector(".artist-list");
+
+		self::assertCount(
+			count(Helper::LIST_MUSIC),
+			$ulArtists->children
 		);
-		self::assertEquals(
-			"{$dataObj->username}'s profile picture",
-			$img->alt
+
+		foreach(Helper::LIST_MUSIC as $artistName => $albumList) {
+			$liArtist = $ulArtists->querySelector("li[data-artist-name=$artistName]");
+			$h2ArtistName = $liArtist->querySelector("h2");
+			self::assertEquals($artistName, trim($h2ArtistName->innerText));
+
+			$ulAlbums = $liArtist->querySelector(".album-list");
+			foreach($albumList as $albumName => $trackList) {
+				$liAlbum = $ulAlbums->querySelector("li[data-album-name=$albumName]");
+				$h3AlbumName = $liAlbum->querySelector("h3");
+				self::assertEquals($albumName, trim($h3AlbumName->innerText));
+
+				$olTracks = $liAlbum->querySelector(".track-list");
+				foreach($trackList as $i => $trackName) {
+					$trackLi = $olTracks->children[$i];
+					self::assertEquals($trackName, trim($trackLi->innerText));
+				}
+			}
+		}
+	}
+
+	public function testBindNestedListWithinObject() {
+		$document = new HTMLDocument(Helper::HTML_SHOP);
+		$document->extractTemplates();
+		$data = Helper::LIST_SHOP;
+		foreach($data as $key => $value) {
+			$data[$key] = (object)$value;
+		}
+		$document->bindNestedList($data);
+
+		$ulProductList = $document->querySelector(".product-list");
+		self::assertCount(
+			count($data),
+			$ulProductList->children
 		);
+
+		$index = 0;
+		foreach($data as $itemName => $itemData) {
+			$liProduct = $ulProductList->children[$index];
+
+			self::assertEquals(
+				$itemName,
+				$liProduct->querySelector("h2")->innerText
+			);
+			self::assertEquals(
+				$itemData->{"description"},
+				$liProduct->querySelector("p")->innerText
+			);
+			self::assertEquals(
+				$itemData->{"price"},
+				$liProduct->querySelector(".price")->innerText
+			);
+
+			$ulCategories = $liProduct->querySelector("ul.categories");
+			self::assertCount(
+				count($itemData->{"categories"}),
+				$ulCategories->children
+			);
+
+			foreach($itemData->{"categories"}
+			as $categoryIndex => $categoryName) {
+				$liCategory = $ulCategories->children[$categoryIndex];
+				self::assertEquals($categoryName, trim($liCategory->innerText));
+
+				$link = $liCategory->querySelector("a");
+				self::assertEquals($categoryName, trim($link->innerText));
+				self::assertEquals("/shop/category/$categoryName", $link->href);
+			}
+
+			$index++;
+		}
 	}
 
 	public function testTemplateNameIsAddedWhenNamed() {
diff --git a/test/unit/Helper/BindDataGetter/TodoItem.php b/test/unit/Helper/BindDataGetter/TodoItem.php
index 7919ab1..0332e6d 100644
--- a/test/unit/Helper/BindDataGetter/TodoItem.php
+++ b/test/unit/Helper/BindDataGetter/TodoItem.php
@@ -1,9 +1,9 @@
 <?php
 namespace Gt\DomTemplate\Test\Helper\BindDataGetter;
 
-use Gt\DomTemplate\BindDataGetter;
+use Gt\DomTemplate\BindObject;
 
-class TodoItem implements BindDataGetter {
+class TodoItem implements BindObject {
 	private $id;
 	private $title;
 
diff --git a/test/unit/Helper/Helper.php b/test/unit/Helper/Helper.php
index f3e8534..baa54eb 100644
--- a/test/unit/Helper/Helper.php
+++ b/test/unit/Helper/Helper.php
@@ -442,16 +442,16 @@ class Helper {
 <meta charset="utf-8" />
 <title>This document has some elements with attribute placeholders</title>
 <main>
-	<h1 id="heading-{userType}-{userId}" data-bind-parameters>This is a test!</h1>
-	<p><a id="userType-{userType}" href="/user/{userId}" data-bind-parameters>View your account</a></p>
+	<h1 id="heading-{userType}-{userId}" data-bind-attributes>This is a test!</h1>
+	<p><a id="userType-{userType}" href="/user/{userId}" data-bind-attributes>View your account</a></p>
 	
 	<p>You are logged in.</p>
 	<p>This is your profile picture:</p>
 	
-	<img src="/img/profile/{userId}.jpg" alt="{username}'s profile picture" data-bind-parameters />
+	<img src="/img/profile/{userId}.jpg" alt="{username}'s profile picture" data-bind-attributes />
 </main>
 <footer>
-	<a href="/user.php?id={userId}&type={userType}" data-bind-parameters>Another link in the footer</a>
+	<a href="/user.php?id={userId}&type={userType}" data-bind-attributes>Another link in the footer</a>
 </footer>
 HTML;
 
@@ -531,6 +531,62 @@ class Helper {
 		]
 	];
 
+	const HTML_SHOP = <<<HTML
+<!doctype html>
+<meta charset="utf-8" />
+<title>Online shop</title>
+<main>
+	<h1>Online shop!</h1>
+	
+	<ul class="product-list">
+		<li data-template>
+			<h2 data-bind:text>Product Name</h2>
+			<p data-bind:text="description">Description of product</p>
+			£<span data-bind:text="price" class="price">0.00</span>
+			
+			<h3>Categories:</h3>
+			<ul class="categories">
+				<li data-template>
+					<a href="/shop/category/{}" data-bind:text data-bind-attributes>Category name</a>
+				</li>
+			</ul>
+		</li>
+	</ul>
+HTML;
+
+	const LIST_SHOP = [
+// IMPORTANT: Within the unit test, the outer associative array needs to be
+// converted into an Object, but this can't be done as a CONST.
+		"Handblown Glass Carafe" => [
+			"description" => "The most important part of any brewing system",
+			"price" => 44.95,
+			"categories" => [
+				"coffee",
+				"brew",
+				"glass",
+				"filter",
+			]
+		],
+		"Pre-folded filter papers" => [
+			"description" => "Cone shaped filters to ensure the purest flavour",
+			"price" => 9.00,
+			"categories" => [
+				"coffee",
+				"refill",
+				"filter",
+			]
+		],
+		"Bean Grinder" => [
+			"description" => "Italian-made burr grinder, offering unparallelled performance",
+			"price" => 250,
+			"categories" => [
+				"coffee",
+				"grinding",
+				"accessory",
+			]
+		]
+	];
+
 	const HTML_SELECT = <<<HTML
 <!doctype html>
 <meta charset="utf-8" />
@@ -543,5 +599,65 @@ class Helper {
 </body>
 HTML;
 
+	const HTML_KEYLESS_BIND_ATTRIBUTE = <<<HTML
+<!doctype html>
+<meta charset="utf-8" />
+<title>Keyless data-bind attributes</title>
+
+<body>
+	<h1>Welcome, <span data-bind:text>name</span>!</h1>
+</body>
+
+HTML;
+
+	const HTML_KEYLESS_BIND_ATTRIBUTE_TEMPLATE = <<<HTML
+<!doctype html>
+<meta charset="utf-8" />
+<title>Keyless data-bind attributes</title>
+
+<body>
+	Employee list:
+	
+	<ul id="emp-list">
+		<li data-template>
+			<h1 data-bind:text>Employee name</h1>
+			
+			Details:
+			<dl>
+				<dt>ID</dt>
+				<dd data-bind:text="id">000</dd>
+				
+				<dt>Department</dt>
+				<dd data-bind:text="title">JOBTITLE</dd>
+			</dl>
+		</li>
+	</ul>
+</body>
+HTML;
+
+	const HTML_KEYLESS_BIND_ATTRIBUTE_TEMPLATE_NAMED = <<<HTML
+<!doctype html>
+<meta charset="utf-8" />
+<title>Keyless data-bind attributes</title>
+
+<body>
+	Employee list:
+	
+	<ul id="emp-list">
+		<li data-template="employee-template">
+			<h1 data-bind:text>Employee name</h1>
+			
+			Details:
+			<dl>
+				<dt>ID</dt>
+				<dd data-bind:text="id">000</dd>
+				
+				<dt>Department</dt>
+				<dd data-bind:text="title">JOBTITLE</dd>
+			</dl>
+		</li>
+	</ul>
+</body>
+HTML;
 
 }
\ No newline at end of file
