re-write fieldset

Author: cjzamora

LICENSE

@@ -139,8 +139,8 @@ public function getFileFieldNames()
                 [
                         'file',
                         'image',
-                        'files',
-                        'images'
+                        'filelist',
+                        'imagelist'
                     ]
             )
             ) {
@@ -170,8 +170,8 @@ public function getJsonFieldNames()
             if (in_array(
                 $field['field']['type'],
                 [
-                        'files',
-                        'images',
+                        'filelist',
+                        'imagelist',
                         'tag',
                         'textlist',
                         'textarealist',

README.md

@@ -256,16 +256,16 @@
     <option
         data-fieldset="attributes"
         data-format="json"
-        value="files"
-        {{#when field.type '===' 'files'}}selected{{/when}}
+        value="filelist"
+        {{#when field.type '===' 'filelist'}}selected{{/when}}
     >
         File List Fieldset
     </option>
     <option
         data-fieldset="attributes"
         data-format="json"
-        value="images"
-        {{#when field.type '===' 'images'}}selected{{/when}}
+        value="imagelist"
+        {{#when field.type '===' 'imagelist'}}selected{{/when}}
     >
         Image List Fieldset
     </option>

composer.json

@@ -0,0 +1,115 @@
+<?php //-->
+/**
+ * This file is part of a package designed for the CradlePHP Project.
+ *
+ * Copyright and license information can be found at LICENSE.txt
+ * distributed with this package.
+ */
+namespace Cradle\Package\System;
+
+use Cradle\Package\System\Fieldset;
+use Cradle\Package\System\Schema;
+
+/**
+ * Model Fieldset Manager. This was made
+ * take advantage of pass-by-ref
+ *
+ * @vendor   Cradle
+ * @package  System
+ * @author   John Doe <[email protected]>
+ * @standard PSR-2
+ */
+class Helpers
+{
+    /**
+     * @var $fieldsets - Caches Fieldsets
+     */
+    protected static $fieldsets = [];
+
+    /**
+     * @var $schemas - Caches Schemas
+     */
+    protected static $schemas = [];
+
+    /**
+     * @var $templates - Caches templates
+     */
+    protected static $templates = [];
+
+    /**
+     * Returns a cached fieldset
+     *
+     * @param *string $name
+     *
+     * @return Fieldset
+     */
+    public static function getFieldset($name) {
+        if (!isset(self::$fieldsets[$name])) {
+            self::$fieldsets[$name] = Fieldset::i($name);
+        }
+
+        return self::$fieldsets[$name];
+    }
+
+    /**
+     * Returns a cached schema
+     *
+     * @param *string $name
+     *
+     * @return Schema
+     */
+    public static function getSchema($name) {
+        if (!isset(self::$schemas[$name])) {
+            self::$schemas[$name] = Schema::i($name);
+        }
+
+        return self::$schemas[$name];
+    }
+
+    /**
+     * Returns a format template
+     *
+     * @param *string $name
+     *
+     * @return Schema
+     */
+    public static function getFormatTemplate($name) {
+        $file = sprintf(
+            '%s/Model/template/format/%s.html',
+            __DIR__,
+            $name
+        );
+
+        if (!file_exists($file)) {
+            return null;
+        }
+
+        if (!isset(self::$templates[$name])) {
+            self::$templates[$name] = file_get_contents($file);
+        }
+
+        return self::$templates[$name];
+    }
+
+    /**
+     * Returns a format template
+     *
+     * @param *string $name
+     *
+     * @return Schema
+     */
+    public static function fieldNameToDotNotation($name) {
+        return trim(
+            str_replace(
+                '..',
+                '.',
+                str_replace(
+                    ['][', ']', '['],
+                    '.',
+                    $name
+                )
+            ),
+            '.'
+        );
+    }
+}

src/Exception.php

@@ -7,6 +7,7 @@
  */
 namespace Cradle\Package\System\Model;
 
+use Cradle\Package\System\Fieldset;
 use Cradle\Package\System\Schema;
 use Cradle\Helper\InstanceTrait;
 
@@ -41,13 +42,20 @@ public function __construct(Schema $schema)
      * Returns formatted data
      *
      * @param *array $data
+     * @param Fieldset $fieldset
      *
      * @return array
      */
-    public function formatData(array $data)
+    public function formatData(array $data, $fieldset = null)
     {
-        $fields = $this->schema->getFields();
-        $table = $this->schema->getName();
+        $schema = $this->schema;
+
+        if (!is_null($fieldset)) {
+            $schema = $fieldset;
+        }
+
+        $fields = $schema->getFields();
+        $table = $schema->getName();
 
         foreach ($fields as $field) {
             $name = $table . '_' . $field['name'];
@@ -63,11 +71,15 @@ public function formatData(array $data)
                     //upload files
                     $data[$name] = $this->upload($data[$name]);
                     break;
-                case 'files':
-                case 'images':
+                case 'filelist':
+                case 'imagelist':
                     //upload files
                     $data[$name] = $this->upload($data[$name]);
-                    $data[$name] = json_encode($data[$name]);
+                    
+                    //we should not encode if fieldset
+                    if (is_null($fieldset)) {
+                        $data[$name] = json_encode($data[$name]);
+                    }
                     break;
                 case 'tag':
                 case 'textlist':
@@ -79,23 +91,44 @@ public function formatData(array $data)
                 case 'multiselect':
                 case 'table':
                 case 'fieldset':
+                    //case for multiple
+                    if (isset($field['field']['attributes']['data-multiple'])
+                        && !$field['field']['attributes']['data-multiple']
+                    ) {
+                        //format single data
+                        $data[$name] = $this->formatData(
+                            $data[$name], 
+                            Fieldset::i($field['field']['parameters']),
+                            false
+                        );
+                    } else {
+                        //format each data
+                        foreach($data[$name] as $index => $row) {
+                            $data[$name][$index] = $this->formatData(
+                                $row,
+                                Fieldset::i($field['field']['parameters']),
+                                false
+                            );
+                        }
+                    }
+
                     //if it's an array already
-                    if(is_array($data[$name]) || is_object($data[$name])) {
+                    if((is_array($data[$name]) || is_object($data[$name])) && is_null($fieldset)) {
                         $data[$name] = json_encode($data[$name]);
-                        break;
-                    }
 
-                    //if it's a json string
-                    if(strpos($data[$name], '{') === 0
-                        || strpos($data[$name], '[') === 0
-                    )
-                    {
-                        break;
+                        //if it's a json string
+                        if(strpos($data[$name], '{') === 0
+                            || strpos($data[$name], '[') === 0
+                        )
+                        {
+                            break;
+                        }
+
+                        //it can only be comma separated
+                        $data[$name] = explode(',', $data[$name]);
+                        $data[$name] = json_encode($data[$name]);
                     }
 
-                    //it can only be comma separated
-                    $data[$name] = explode(',', $data[$name]);
-                    $data[$name] = json_encode($data[$name]);
                     break;
                 case 'created':
                 case 'updated':
@@ -177,8 +210,8 @@ public function expandData(array $data)
                     [
                         'multiselect',
                         'checkboxes',
-                        'files',
-                        'images',
+                        'filelist',
+                        'imagelist',
                         'tag',
                         'textlist',
                         'textarealist',

src/Fieldset.php

@@ -66,6 +66,26 @@ public function getCreateErrors(array $data, array &$errors = [], $fieldset = nu
             $name = $table . '_' . $field['name'];
 
             if ($field['field']['type'] === 'fieldset' && isset($data[$name])) {
+                if (!isset($errors[$name])) {
+                    $errors[$name] = [];
+                }
+
+                if (isset($field['field']['attributes']['data-multiple'])
+                    && !$field['field']['attributes']['data-multiple']
+                ) {
+                    $errors[$name] = $this->getCreateErrors(
+                        $data[$name],
+                        $errors[$name],
+                        Fieldset::i($field['field']['parameters'])
+                    );
+
+                    if (empty($errors[$name])) {
+                        unset($errors[$name]);
+                    }
+
+                    continue;
+                }
+
                 foreach($data[$name] as $index => $row) {
                     if (!isset($errors[$name][$index])) {
                         $errors[$name][$index] = [];
@@ -155,6 +175,26 @@ public function getUpdateErrors(array $data, array &$errors = [], $fieldset = nu
                     continue;
                 }
 
+                if (!isset($errors[$name])) {
+                    $errors[$name] = [];
+                }
+
+                if (isset($field['field']['attributes']['data-multiple'])
+                    && !$field['field']['attributes']['data-multiple']
+                ) {
+                    $errors[$name] = $this->getUpdateErrors(
+                        $data[$name],
+                        $errors[$name],
+                        Fieldset::i($field['field']['parameters'])
+                    );
+
+                    if (empty($errors[$name])) {
+                        unset($errors[$name]);
+                    }
+
+                    continue;
+                }
+
                 foreach($data[$name] as $index => $row) {
                     if (!isset($errors[$name][$index])) {
                         $errors[$name][$index] = [];

src/Fieldset/Validator.php

@@ -304,9 +304,7 @@
             'form',
             $data,
             [
-                'scripts',
-                'form_set',
-                'form_set-template'
+                'form_fieldset'
             ],
             $template,
             $partials
@@ -475,9 +473,7 @@
             'form',
             $data,
             [
-                'scripts',
-                'form_set',
-                'form_set-template'
+                'form_fieldset'
             ],
             $template,
             $partials