Added easyer loading of files and urls. Still have a problem with encoding while loading from url.

Author: paquettg

src/PHPHtmlParser/Dom.php

@@ -79,30 +79,25 @@ public function __get($name)
 	}
 
 	/**
-	 * Attempts to load the dom from a string.
+	 * Attempts to load the dom from any resource, string, file, or URL.
 	 *
 	 * @param string $str
 	 * @chainable
 	 */
 	public function load($str)
 	{
-		$this->rawSize = strlen($str);
-		$this->raw     = $str;
-
-		// clean out none-html text
-		if ( ! $this instanceof Dom)
+		// check if it's a file
+		if (is_file($str))
 		{
-			throw new \Exception(get_class($this));
+			return $this->loadFromFile($str);
+		}
+		// check if it's a url
+		if (preg_match("/^https?:\/\//i",$str))
+		{
+			return $this->loadFromUrl($str);
 		}
-		$html = $this->clean($str);
-
-		$this->size    = strlen($str);
-		$this->content = new Content($html);
-
-		$this->parse();
-		$this->detectCharset();
 
-		return $this;
+		return $this->loadStr($str);
 	}
 
 	/**
@@ -113,11 +108,7 @@ public function load($str)
 	 */
 	public function loadFromFile($file)
 	{
-		$fp = fopen($file, 'r');
-		$document = fread($fp, filesize($file));
-		fclose($fp);
-
-		return $this->load($document);
+		return $this->loadStr(file_get_contents($file));
 	}
 
 	/**
@@ -128,11 +119,9 @@ public function loadFromFile($file)
 	 */
 	public function loadFromUrl($url)
 	{
-		$client    = new Client($url);
-		$response = $client->get()->send();
-		$content  = (string) $response;
+		$content = file_get_contents($url);
 
-		return $this->load($content);
+		return $this->loadStr($content);
 	}
 
 	/**
@@ -206,6 +195,34 @@ public function getElementsByClass($class)
 		return $this->find('.'.$class);
 	}
 
+	/**
+	 * Parsers the html of the given string. Used for load(), loadFromFile(),
+	 * and loadFromUrl().
+	 *
+	 * @param string
+	 * @chainable
+	 */
+	protected function loadStr($str)
+	{
+		$this->rawSize = strlen($str);
+		$this->raw     = $str;
+
+		// clean out none-html text
+		if ( ! $this instanceof Dom)
+		{
+			throw new \Exception(get_class($this));
+		}
+		$html = $this->clean($str);
+
+		$this->size    = strlen($str);
+		$this->content = new Content($html);
+
+		$this->parse();
+		$this->detectCharset();
+
+		return $this;
+	}
+
 	/**
 	 * Checks if the load methods have been called.
 	 *