incorporate Shoop more

Author: joshbruce

.editorconfig

@@ -2,6 +2,7 @@ root = true
 
 [*]
 indent_style = tab
+indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
@@ -11,5 +12,6 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
-[*.yml, *.js, *.json]
+[*{.js,.json,.scss}]
+indent_style = space
 indent_size = 2

composer.lock

@@ -18,9 +18,9 @@ class Element
 
     protected $extends;
 
-    protected $omitEndTag = false;
+    protected $attributes;
 
-    protected $attributes = [];
+    protected $omitEndTag = false;
 
     static public function fold($element, ...$content)
     {
@@ -32,47 +32,41 @@ public function __construct($element, ...$content)
         $this->element = Type::sanitizeType($element, ESString::class)
             ->replace(["_" => "-"]);
         $this->content = Type::sanitizeType($content, ESArray::class);
+        $this->attributes = Shoop::dictionary([]);
     }
 
-    public function unfold()
+    public function unfold(string ...$attributes)
     {
-        return Shoop::string($this->compiledElement())->start("<")->plus(
-            $this->compiledAttributes()
-        )->end(">")->plus(
-            $this->content->each(function($value) {
-                if (is_string($value) || is_int($value)) {
-                    return (string) $value;
-
-                } elseif (is_a($value, Element::class) || is_subclass_of($value, Element::class)) {
-                    return $value->unfold();
-
-                }
-            })->join("")
-        )->plus(
-            ($this->omitEndTag) ? "" : Shoop::string($this->compiledElement())->start("</")->end(">")
-        )->unfold();
+        $this->attr(...$attributes);
+        $elem = $this->compiledElement();
+        $attr = $this->compiledAttributes();
+        $cont = $this->compiledContent();
+        return Shoop::string($elem)->start("<")->plus($attr)->end(">")
+            ->plus($cont)->plus(
+                ($this->omitEndTag)
+                    ? ""
+                    : Shoop::string($elem)->start("</")->end(">")
+            )->unfold();
     }
 
     public function attr(string ...$attributes): Element
     {
-        if ($this->attributes === null) {
-            $this->attributes = Shoop::array($attributes)->unfold();
-
-        } else {
-            $current = $this->attributes;
-            $new = $attributes;
-            $merged = array_merge($current, $new);
-            $unique = array_unique($merged);
-            $this->attributes = Shoop::array($unique)->unfold();
-
-        }
+        Shoop::array($attributes)->each(function($string) {
+                list($attribute, $value) = Shoop::string($string)
+                    ->divide(" ", false, 2);
+                $this->attributes = $this->attributes->plus($value, $attribute);
+            });
         return $this;
     }
 
     public function extends($extends): Element
     {
         $extends = Type::sanitizeType($extends, ESString::class);
-        $this->extends = $extends;
+        $elem = $this->element;
+
+        $this->element = $extends;
+        $this->attr("is {$elem}");
+
         return $this;
     }
 
@@ -94,16 +88,27 @@ protected function compiledElement()
 
     protected function compiledAttributes(): string
     {
-        $compiled = Shoop::array($this->attributes)->each(function($attribute) {
-            list($member, $value) = explode(" ", $attribute, 2);
-            return ($member === $value && strlen($member) > 0)
-                ? $member : "{$member}=\"{$value}\"";
-        });
-
-        if ($compiled->int()->isGreaterThanUnfolded(0)) {
-            return $compiled->join(" ")->start(" ");
-        }
-        return "";
+        return $this->attributes->each(function($value, $attribute) {
+                return ($attribute === $value && strlen($attribute) > 0)
+                    ? $attribute : "{$attribute}=\"{$value}\"";
+
+            })->isEmpty(function($result, $array) {
+                return ($result) ? "" : $array->join(" ")->start(" ");
+
+            });
+    }
+
+    protected function compiledContent()
+    {
+        return $this->content->each(function($value) {
+                if (is_string($value) || is_int($value)) {
+                    return (string) $value;
+
+                } elseif (is_a($value, Element::class) || is_subclass_of($value, Element::class)) {
+                    return $value->unfold();
+
+                }
+            })->join("");
     }
 
     public function __toString()

src/Element.php

@@ -15,14 +15,14 @@ public function testHtmlComponent()
         $expected = '<html></html>';
 
         $result = Element::fold("html");
-        $this->assertEquals($expected, $result);
-
-        $result = Element::fold("html")->unfold('id my-component');
-        $this->assertEquals($expected, $result);
+        $this->assertSame($expected, $result->unfold());
 
         $expected = '<html id="my-component"></html>';
+        $result = Element::fold("html")->unfold("id my-component");
+        $this->assertSame($expected, $result);
+
         $result = Element::fold("html")->attr("id my-component")->unfold();
-        $this->assertEquals($expected, $result);
+        $this->assertSame($expected, $result);
     }
 
     public function testParagraphSpanComponent()
@@ -31,15 +31,15 @@ public function testParagraphSpanComponent()
         $result = Element::fold("p",
             Element::fold("span", "Hello, World!")
         )->unfold();
-        $this->assertEquals($expected, $result);
+        $this->assertSame($expected, $result);
     }
 
     public function testButtonWebComponentExtension()
     {
         $expected = '<button is="my-button">Save</button>';
         $result = Element::fold("my_button", "Save")
             ->extends('button')->unfold();
-        $this->assertEquals($expected, $result);
+        $this->assertSame($expected, $result);
     }
 
     public function testPage()
@@ -61,6 +61,21 @@ public function testPage()
                             , '<p>Done!</p>'
                           )
                     )->unfold();
-        $this->assertEquals($expected, $result);
+        $this->assertSame($expected, $result);
+    }
+
+    public function testAttributes()
+    {
+        $expected = '<container id="hello">';
+        $actual = Element::fold("container")->attr("id hello")->omitEndTag();
+        $this->assertSame($expected, $actual->unfold());
+
+        $expected = '<container id="goodbye">';
+        $actual = $actual->attr("id goodbye");
+        $this->assertSame($expected, $actual->unfold());
+
+        $expected = '<container id="hi">';
+        $actual = $actual->unfold("id hi");
+        $this->assertSame($expected, $actual);
     }
 }