✨ better API & structure

Author: kellymears

.gitignore

@@ -0,0 +1 @@
+vendor

Attribute.php

@@ -19,11 +19,18 @@ public function __construct($name, $type)
         $this->name = $name ?? null;
         $this->type = $type ?? null;
 
-        if ($this->isValid()) {
-            return (array) $this->toArray();
-        }
+        return $this->toArray();
+    }
 
-        return null;
+    /**
+     * Enforces attribute as an array
+     *
+     * @param void
+     * @return array attribute
+     */
+    public function toArray()
+    {
+        return [$this->name => ['type' => $this->type]];
     }
 
     /**
@@ -64,28 +71,4 @@ public function setType($type)
 
         return $self;
     }
-
-    /**
-     * Enforces attribute as an array
-     *
-     * @param void
-     * @return array attribute
-     */
-    public function toArray()
-    {
-        return (array) [$this->name => ['type' => $this->type]];
-    }
-
-    /**
-     * Checks if attribute is miniminally valid
-     *
-     * @param void
-     * @return binary validity
-     */
-    public function isValid()
-    {
-        return (isset($this->name) && isset($this->type))
-               ? true
-               : false;
-    }
 }

Builder.php

@@ -2,8 +2,11 @@
 
 namespace Blocks;
 
-use Blocks\Script;
-use Blocks\Attribute;
+use \Blocks\Script;
+use \Blocks\Attribute;
+
+use \Blocks\Traits\Register;
+use \Blocks\Traits\Compose;
 
 use function Roots\view;
 use function Roots\asset;
@@ -13,54 +16,33 @@
  */
 class Builder
 {
+    public $namespace;
+
+    public $name;
+
+    public $designation;
+
+    public $attributes;
+
+    public $type;
+
+    public $editor_script;
+
+    public $style;
+
+    public $handling;
+
     /**
      * Construct
      */
-    public function __construct($namespace)
+    public function __construct()
     {
-        /**
-         * Block namespace
-         */
-        $this->namespace = 'sage';
-
-        /**
-         * Block name
-         */
-        $this->name = 'card';
-
-        /**
-         * Block attributes
-         **/
-        $this->attributes = [];
-
-        /**
-         * Editor script
-         */
-        $this->editor_script = object;
-
-        /**
-         * Style
-         */
-        $this->style = object;
-
-        /**
-         * Handling
-         *
-         * Use in usingScript, etc. to determine
-         * what parameter we are manipulating call-to-call
-         */
-        $this->handling = '';
-
-        /**
-         * Set namespace if passed as param
-         */
-        if (isset($namespace)) {
-            $this->setNamespace($namespace);
-        }
-
+        $this->compose();
         return $this;
     }
 
+    use Compose;
+
     /**
      * Set block namespace
      *
@@ -74,19 +56,6 @@ public function setNamespace($name)
         return $this;
     }
 
-    /**
-     * setNamespace() sugar
-     *
-     * @param string namespace
-     * @return self
-     */
-    public function namespace($name)
-    {
-        $this->setNamespace($name);
-
-        return $this;
-    }
-
     /**
      * Set block name
      *
@@ -100,19 +69,6 @@ public function setName($name)
         return $this;
     }
 
-    /**
-     * setName() sugar
-     *
-     * @param string name
-     * @return self
-     */
-    public function name($name)
-    {
-        $this->setName($name);
-
-        return $this;
-    }
-
     /**
      * Get qualified name
      */
@@ -160,87 +116,4 @@ public function addString($name)
 
         return $this;
     }
-
-    /**
-     * Set Style
-     *
-     * @param  string style reference
-     * @return self
-     * @todo  #todo incomplete
-     */
-    public function style($style_name)
-    {
-        $this->assets->style = "{$this->namespace}-{$style_name}";
-
-        return $this;
-    }
-
-    /**
-     * Add Script
-     */
-    public function addEditorScript($definition = null)
-    {
-        $this->editor_script = $definition
-                               ? new Script($definition)
-                               : new Script([
-                                    'namespace' => $this->namespace,
-                                    'name'      => $this->name,
-                                    'type'      => 'block',
-                               ]);
-
-        $this->handling = 'editor_script';
-
-        return $this->editor_script;
-    }
-
-    /**
-     * Uses existing editor_script
-     *
-     * @param   mixed script
-     * @return  self
-     */
-    public function usesEditorScript($namespace, $name)
-    {
-        if (is_string($script)) {
-            $this->editor_script = new Script([
-                'name' => $name,
-                'namespace' => $namespace,
-            ]);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Register blocktype
-     *
-     * @param  object data
-     * @return void
-     */
-    public function register()
-    {
-        add_action('init', function () {
-            register_block_type($this->getDesignation(), [
-                'attributes'      => $this->attributes,
-                'editor_script'   => $this->editor_script->getDesignation(),
-                'render_callback' => function ($attributes) {
-                    return view(
-                        "blocks.{$this->name}.{$this->name}",
-                        $this->data($attributes)
-                    );
-                }
-            ]);
-        });
-    }
-
-    /**
-     * Data
-     *
-     * @param  array block attributes
-     * @return array view data
-     */
-    public function data($attributes)
-    {
-        return $attributes;
-    }
 }