Merge pull request #21 from 8fold/8fold-sites

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.json

@@ -1,36 +1,36 @@
 {
-    "name": "8fold/php-markup",
-    "description": "8fold Markup seeks to make writing semi-structured data easier while allowing for more dynamism.",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Josh Bruce",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": ">=7.0",
-        "8fold/php-shoop": "0.3.*",
-        "nesbot/carbon": "2.35.*",
-        "league/commonmark": "1.4.*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "9.1.*",
-        "phpunit/php-code-coverage": "8.0.*"
-    },
-    "autoload": {
-        "psr-4": {
-            "Eightfold\\Markup\\": "./src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Eightfold\\Markup\\Tests\\": "./tests/"
-        }
-    },
-    "config": {
-        "preferred-install": "dist"
-    },
+  "name": "8fold/php-markup",
+  "description": "8fold Markup seeks to make writing semi-structured data easier while allowing for more dynamism.",
+  "type": "library",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Josh Bruce",
+      "email": "[email protected]"
+    }
+  ],
+  "require": {
+    "php": ">=7.0",
+    "8fold/php-shoop": "0.4.*",
+    "nesbot/carbon": "2.35.*",
+    "league/commonmark": "1.4.*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "9.1.*",
+    "phpunit/php-code-coverage": "8.0.*"
+  },
+  "autoload": {
+    "psr-4": {
+      "Eightfold\\Markup\\": "./src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Eightfold\\Markup\\Tests\\": "./tests/"
+    }
+  },
+  "config": {
+    "preferred-install": "dist"
+  },
 	"prefer-stable": true
 }

composer.lock

@@ -16,11 +16,11 @@ class Element
 
     protected $content;
 
-    protected $extends;
+    // protected $extends;
 
-    protected $omitEndTag = false;
+    protected $attributes;
 
-    protected $attributes = [];
+    protected $omitEndTag = false;
 
     static public function fold($element, ...$content)
     {
@@ -32,47 +32,53 @@ 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()
     {
-        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();
+        return Shoop::string($this->element)
+            ->start("<")->plus($this->compiledAttributes())->end(">")
+            ->plus($this->compiledContent())->plus(
+                ($this->omitEndTag)
+                    ? ""
+                    : Shoop::string($this->element)->start("</")->end(">")
+            )->unfold();
     }
 
     public function attr(string ...$attributes): Element
     {
         if ($this->attributes === null) {
-            $this->attributes = Shoop::array($attributes)->unfold();
+            $this->attributes = Shoop::dictionary([]);
+        }
 
-        } 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($attr, $value) = Shoop::string($string)
+                    ->divide(" ", false, 2);
+                $this->attributes = $this->attributes->plus($value, $attr);
+            });
 
-        }
         return $this;
     }
 
+    protected function attributes(): ESArray
+    {
+        if ($this->attributes === null) {
+            return Shoop::array([]);
+        }
+        return $this->attributes->each(function($value, $attr) {
+            return "{$attr} {$value}";
+        });
+    }
+
     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;
     }
 
@@ -84,26 +90,32 @@ public function omitEndTag(bool $omit = true): Element
 
     protected function compiledElement()
     {
-        $elem = $this->element;
-        if (strlen($this->extends) > 0) {
-            $elem = $this->extends;
-            $this->attributes[] = "is {$this->element}";
-        }
-        return $elem;
+        return $this->element;
     }
 
     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}\"";
-        });
+        return $this->attributes->each(function($value, $attribute) {
+                return ($attribute === $value && strlen($attribute) > 0)
+                    ? $attribute : "{$attribute}=\"{$value}\"";
 
-        if ($compiled->int()->isGreaterThanUnfolded(0)) {
-            return $compiled->join(" ")->start(" ");
-        }
-        return "";
+            })->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

@@ -2,11 +2,6 @@
 
 namespace Eightfold\Markup\Html\Data\Attributes;
 
-/**
- * @version 1.0.0
- *
- * Aria attributes
- */
 abstract class Aria
 {
     static public function globals()

src/Html/Data/Attributes/Aria.php

@@ -11,13 +11,6 @@
 
 use Eightfold\Markup\Html\Data\Attributes\Content;
 
-/**
- * @version 1.0.0
- *
- * Button
- *
- *
- */
 class Button extends HtmlElement implements HtmlElementInterface
 {
     static public function elementName(): string