Added support for an options array

Author: paquettg

src/PHPHtmlParser/Dom.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace PHPHtmlParser;
 
 use PHPHtmlParser\Dom\HtmlNode;
@@ -50,6 +49,13 @@ class Dom {
 	 */
 	protected $size;
 
+	/**
+	 * A global options array to be used by all load calls.
+	 *
+	 * @var array
+	 */
+	protected $globalOptions = [];
+
 	/**
 	 * A list of tags which will always be self closing
 	 *
@@ -92,44 +98,47 @@ public function __get($name)
 	 * Attempts to load the dom from any resource, string, file, or URL.
 	 *
 	 * @param string $str
+	 * @param array $option
 	 * @chainable
 	 */
-	public function load($str)
+	public function load($str, $options = [])
 	{
 		// check if it's a file
 		if (is_file($str))
 		{
-			return $this->loadFromFile($str);
+			return $this->loadFromFile($str, $options);
 		}
 		// check if it's a url
 		if (preg_match("/^https?:\/\//i",$str))
 		{
-			return $this->loadFromUrl($str);
+			return $this->loadFromUrl($str, $options);
 		}
 
-		return $this->loadStr($str);
+		return $this->loadStr($str, $options);
 	}
 
 	/**
 	 * Loads the dom from a document file/url
 	 *
 	 * @param string $file
+	 * @param array $option
 	 * @chainable
 	 */
-	public function loadFromFile($file)
+	public function loadFromFile($file, $options = [])
 	{
-		return $this->loadStr(file_get_contents($file));
+		return $this->loadStr(file_get_contents($file), $options);
 	}
 
 	/**
 	 * Use a curl interface implementation to attempt to load
 	 * the content from a url.
 	 *
 	 * @param string $url
+	 * @param array $option
 	 * @param CurlInterface $curl
 	 * @chainable
 	 */
-	public function loadFromUrl($url, CurlInterface $curl = null)
+	public function loadFromUrl($url, $options = [], CurlInterface $curl = null)
 	{
 		if (is_null($curl))
 		{
@@ -138,7 +147,19 @@ public function loadFromUrl($url, CurlInterface $curl = null)
 		}
 		$content = $curl->get($url);
 
-		return $this->loadStr($content);
+		return $this->loadStr($content, $options);
+	}
+
+	/**
+	 * Sets a global options array to be used by all load calls.
+	 *
+	 * @param array $options
+	 * @chainable
+	 */
+	public function setOptions(array $options)
+	{
+		$this->globalOptions = $options;
+		return $this;
 	}
 
 	/**
@@ -264,11 +285,16 @@ public function getElementsByClass($class)
 	 * Parsers the html of the given string. Used for load(), loadFromFile(),
 	 * and loadFromUrl().
 	 *
-	 * @param string
+	 * @param string $str
+	 * @param array $option
 	 * @chainable
 	 */
-	protected function loadStr($str)
+	protected function loadStr($str, $option)
 	{
+		$this->options = new Options;
+		$this->options->setOptions($this->globalOptions)
+		              ->setOptions($option);
+
 		$this->rawSize = strlen($str);
 		$this->raw     = $str;
 
@@ -397,9 +423,10 @@ protected function parse()
 					$activeNode = $node;
 				}
 			}
-			else
+			else if ($this->options->whitespaceTextNode or
+				     trim($str) != '')
 			{
-				// we found text
+				// we found text we care about
 				$textNode = new TextNode($str);
 				$activeNode->addChild($textNode);
 			}

src/PHPHtmlParser/Options.php

@@ -0,0 +1,73 @@
+<?php
+namespace PHPHtmlParser;
+
+class Options {
+
+	/**
+	 * The default options array
+	 * 
+	 * @param array
+	 */
+	protected $defaults = [
+		'whitespaceTextNode' => true,
+	];
+
+	/**
+	 * The list of all current options set.
+	 *
+	 * @param array
+	 */
+	protected $options = [];
+
+	/**
+	 * Sets the default options in the options array
+	 */
+	public function __construct()
+	{
+		$this->options = $this->defaults;
+	}
+
+	/**
+	 * A magic get to call the get() method.
+	 *
+	 * @param string $key
+	 * @return mixed
+	 * @uses $this->get()
+	 */
+	public function __get($key)
+	{
+		return $this->get($key);
+	}
+
+	/**
+	 * Sets a new options param to override the current option array.
+	 *
+	 * @param array $options
+	 * @chainable
+	 */
+	public function setOptions(array $options)
+	{
+		foreach ($options as $key => $option)
+		{
+			$this->options[$key] = $option;
+		}
+		return $this;
+	}
+
+	/**
+	 * Gets the value associated to the key, or null if the key is not
+	 * found.
+	 *
+	 * @param string
+	 * @return mixed
+	 */
+	public function get($key)
+	{
+		if (isset($this->options[$key]))
+		{
+			return $this->options[$key];
+		}
+		
+		return null;
+	}
+}