Streamline API, add tests

Author: sabberworm

lib/Sabberworm/CSS/RuleSet/RuleSet.php

@@ -29,18 +29,18 @@ public function getLineNo() {
 		return $this->iLineNo;
 	}
 
-	public function addRule(Rule $oRule, Rule $oSibling = null, /* boolean */ $bPrepend = false) {
+	public function addRule(Rule $oRule, Rule $oSibling = null) {
 		$sRule = $oRule->getRule();
 		if(!isset($this->aRules[$sRule])) {
 			$this->aRules[$sRule] = array();
 		}
 
-		$iPosition = $bPrepend ? 0 : count($this->aRules[$sRule]);
+		$iPosition = count($this->aRules[$sRule]);
 
 		if ($oSibling !== null) {
 			$iSiblingPos = array_search($oSibling, $this->aRules[$sRule], true);
 			if ($iSiblingPos !== false) {
-				$iPosition = $bPrepend ? $iSiblingPos : $iSiblingPos + 1;
+				$iPosition = $iSiblingPos;
 			}
 		}
 

tests/Sabberworm/CSS/RuleSet/DeclarationBlockTest.php

@@ -4,6 +4,7 @@
 
 use Sabberworm\CSS\Parser;
 use Sabberworm\CSS\Rule\Rule;
+use Sabberworm\CSS\Value\Size;
 
 class DeclarationBlockTest extends \PHPUnit_Framework_TestCase {
 
@@ -223,5 +224,44 @@ public function testOverrideRules() {
 		$this->assertEquals('right', $aRules[0]->getRule());
 		$this->assertEquals('-10px', $aRules[0]->getValue());
 	}
+	
+	public function testRuleInsertion() {
+		$sCss = '.wrapper { left: 10px; text-align: left; }';
+		$oParser = new Parser($sCss);
+		$oDoc = $oParser->parse();
+		$aContents = $oDoc->getContents();
+		$oWrapper = $aContents[0];
+
+		$oFirst = $oWrapper->getRules('left');
+		$this->assertCount(1, $oFirst);
+		$oFirst = $oFirst[0];
+
+		$oSecond = $oWrapper->getRules('text-');
+		$this->assertCount(1, $oSecond);
+		$oSecond = $oSecond[0];
+
+		$oBefore = new Rule('left');
+		$oBefore->setValue(new Size(16, 'em'));
+
+		$oMiddle = new Rule('text-align');
+		$oMiddle->setValue(new Size(1));
+
+		$oAfter = new Rule('border-bottom-width');
+		$oAfter->setValue(new Size(1, 'px'));
+
+		$oWrapper->addRule($oAfter);
+		$oWrapper->addRule($oBefore, $oFirst);
+		$oWrapper->addRule($oMiddle, $oSecond);
+
+		$aRules = $oWrapper->getRules();
+
+		$this->assertSame($oBefore, $aRules[0]);
+		$this->assertSame($oFirst, $aRules[1]);
+		$this->assertSame($oMiddle, $aRules[2]);
+		$this->assertSame($oSecond, $aRules[3]);
+		$this->assertSame($oAfter, $aRules[4]);
+
+		$this->assertSame('.wrapper {left: 16em;left: 10px;text-align: 1;text-align: left;border-bottom-width: 1px;}', $oDoc->render());
+	}
 
 }