[Fixes #5][Fixes #6]

northys · northys · commit 5891920ce0d7 · 2014-07-24T19:45:49.000+02:00
diff --git a/examples/example.html b/examples/example.html
@@ -5,6 +5,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Northys\Inliner Example</title>
+    <style type="text/css">
+      body {
+        background: #000;
+      }
+    </style>
   </head>
   <body>
     <h1 id="heading">Hello, world!</h1>
diff --git a/src/Northys/CssInliner/CssInliner.php b/src/Northys/CssInliner/CssInliner.php
@@ -18,29 +18,54 @@ class CSSInliner
 	 */
 	private $css;
 
+	/**
+	 * @var DOMDocument
+	 */
+	private $dom;
+
+	/**
+	 * @var DOMXPath
+	 */
+	private $finder;
+
 
 
 	public function addCSS($filename)
 	{
 		if ( ! $css = @file_get_contents($filename)) {
 			throw new \Exception("Failed on loading CSS file. Check the file path you have provided!", 1);
 		}
+		// merge all CSS content into $this-css variable
+		$this->css .= $css;
+	}
+
+
+
+	public function parseCSS() {
+		// get styles inside <style> tags in provided HTML
+		foreach ($this->dom->getElementsByTagName('style') as $style) {
+			$this->css .= $style->textContent;
+		}
+		$parser = new CSS\Parser($this->css);
 
-		$parser = new CSS\Parser($css);
-		$this->css = $parser->parse();
+		$css = $parser->parse();
+		if (!$css) {
+			throw new \Exception("You haven't provided any styles by addCSS() method. There is also no styles inside HTML.", 1);			
+		}
+		return $css;
 	}
 
 
 
 	public function render($html)
 	{
-		$dom = new \DOMDocument;
-		$dom->loadHTML($html);
-		$finder = new \DOMXPath($dom);
-
+		$this->dom = new \DOMDocument;
+		$this->dom->loadHTML($html);
+		$this->finder = new \DOMXPath($this->dom);
+		$this->css = $this->parseCSS();
 		foreach ($this->css->getAllRuleSets() as $ruleSet) {
 			$selector = $ruleSet->getSelector();
-			foreach ($finder->evaluate(CssSelector::toXPath($selector[0])) as $node) {
+			foreach ($this->finder->evaluate(CssSelector::toXPath($selector[0])) as $node) {
 				if ($node->getAttribute('style')) {
 					$node->setAttribute('style', $node->getAttribute('style') . implode(' ', $ruleSet->getRules()));
 				} else {
@@ -49,6 +74,7 @@ public function render($html)
 			}
 		}
 
-		return $dom->saveHTML();
+		return $this->dom->saveHTML();
 	}
+
 }
