Support at data and yaml (#3)

micahgodbolt · web-flow · commit 833092f52405 · 2016-08-01T11:03:32.000-07:00
* Init feature updates * changed function to more general name, support for JSON data as well * Fixed bug when @DaTa was JSON * Fixed 5.3.3 compatibility issues * fixed var name in if statement * Fixed if statement...again * Fixed bad tick marks * Fixed incorrect quote marks in data_replace function
diff --git a/composer.json b/composer.json
@@ -18,7 +18,8 @@
         "nesbot/Carbon": "~1.6",
         "erusev/parsedown": "^1.6",
         "mnapoli/front-yaml": "^1.5",
-        "symfony/twig-bridge": "^2.3"
+        "symfony/twig-bridge": "^2.3",
+        "symfony/yaml": "=2.6.13"
     },
     "autoload": {
         "psr-0": {
diff --git a/resources/fixtures/cat.jpg b/resources/fixtures/cat.jpg
diff --git a/resources/fixtures/foo.docs.yaml b/resources/fixtures/foo.docs.yaml
@@ -0,0 +1,2 @@
+bar: abc
+baz: def
diff --git a/resources/fixtures/foo2.docs.json b/resources/fixtures/foo2.docs.json
@@ -0,0 +1,4 @@
+{
+  "bar": "123",
+  "baz": "456"
+}
diff --git a/resources/fixtures/image.docs.yaml b/resources/fixtures/image.docs.yaml
@@ -0,0 +1,2 @@
+src: /resources/fixtures/cat.jpg
+alt: This is a photo
diff --git a/resources/fixtures/image.json b/resources/fixtures/image.json
@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Image",
+  "category": "atom",
+  "type": "object",
+  "format": "grid",
+  "properties": {
+    "name": {
+      "type": "string",
+      "default": "image",
+      "options": {
+        "hidden": true
+      }
+    },
+    "src": {
+      "type": "string"
+    },
+    "alt": {
+      "type": "string"
+    }
+  },
+  "required": ["name"],
+  "additionalProperties": false
+}
diff --git a/resources/fixtures/image.twig b/resources/fixtures/image.twig
@@ -0,0 +1 @@
+<img src="{{src}}" alt="{{alt}}" >
diff --git a/resources/fixtures/test.docs.json b/resources/fixtures/test.docs.json
diff --git a/resources/fixtures/test.docs.yaml b/resources/fixtures/test.docs.yaml
@@ -0,0 +1,9 @@
+name: test
+quotation: We think of Red Hat as one of just a handful of superior engineering and support organizations in the United States.
+attribution_name: John Defeo
+attribution_title: President of Infrastructure, CIGNA
+image: @image
+foo:
+  - @foo
+  - @foo2
+
diff --git a/resources/fixtures/test.json b/resources/fixtures/test.json
@@ -26,6 +26,23 @@
       "title": "Attribution Title",
       "description": "What is their job title?",
       "type": "string"
+    },
+    "image": {
+      "$ref": "image.json"
+    },
+    "foo": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "bar": {
+            "type": "string"
+          },
+          "baz": {
+            "type": "string"
+          }
+        }
+      }
     }
   },
   "required": ["name", "quotation", "attribution_name"],
diff --git a/resources/fixtures/test.twig b/resources/fixtures/test.twig
@@ -1,10 +1,15 @@
-
-
 <div>
+    {% include 'image.twig' with image only %}
     <blockquote>
         <p>{{quotation}}</p>
         <footer>
             <span>{{attribution_name}}</span>{% if attribution_title %}, {{attribution_title}}{% endif %}
         </footer>
     </blockquote>
 </div>
+
+
+{% for item in foo %}
+  {{item.bar}} <br>
+  {{item.baz}} <br><br>
+{% endfor %}
diff --git a/src/PatternKit/SchemaControllerProvider.php b/src/PatternKit/SchemaControllerProvider.php
@@ -4,6 +4,8 @@
 
 use Silex\Application;
 use Silex\ControllerProviderInterface;
+use Symfony\Component\Yaml\Yaml;
+
 
 class SchemaControllerProvider implements ControllerProviderInterface
 {
@@ -33,13 +35,20 @@ public function connect(Application $app)
             // end navigation
 
             if ($seed_path) {
-                $seed_file = $retriever->retrieve('file://' . realpath($seed_path));
-                if (!empty($seed_file)) {
-                  $seed_data = $seed_file;
+
+                $seed_file = file_get_contents('file://' . realpath($seed_path));
+                if (($pathinfo = pathinfo($seed_path)) && isset($pathinfo['extension']) && $pathinfo['extension'] == 'yaml') {
+
+                    $seed_data = Yaml::parse($seed_file);
+
+                }
+                elseif (!empty($seed_file)) {
+                    $seed_data = json_decode($seed_file, true);
                 }
                 else {
-                  $seed_data = array();
+                    $seed_data = array();
                 }
+                data_replace($seed_data);
             }
             else $seed_data = array();
 
diff --git a/src/app.php b/src/app.php
@@ -8,6 +8,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Yaml\Yaml;
 use Carbon\Carbon;
 use Mni\FrontYAML\Parser;
 
@@ -89,6 +90,29 @@
 
 // Custom Functions
 
+
+function data_replace(&$data) {
+    if (is_array($data)) {
+      foreach ($data as &$value) {
+          if (is_array($value) ) {
+              data_replace($value);
+          }
+          elseif (is_string($value) && $value[0] == '@') {
+              $file_path = 'file://' . realpath(get_asset_path(substr($value, 1), 'data'));
+              if (($pathinfo = pathinfo($file_path)) && isset($pathinfo['extension']) && $pathinfo['extension'] == 'yaml') {
+                  $data_replace_with = Yaml::parse(file_get_contents($file_path));
+              }
+              else {
+                  $data_replace_with = json_decode(file_get_contents($file_path), true);
+              }
+
+              $value = data_replace($data_replace_with);
+          }
+      }
+    }
+    return $data;
+}
+
 //// Get path to matching asset
 function get_asset_path($name, $type) {
     global $app;
@@ -102,12 +126,18 @@ function get_asset_path($name, $type) {
         if ($paths) {
             foreach ($paths as $path) {
                 $extension = $app['config']['extensions'][$type];
+                $yaml_extension = str_replace('.json', '.yaml', $extension);
                 $dir =  './' . $path;
                 $file_path = "{$dir}/{$name}{$extension}";
+                $yaml_file_path = "{$dir}/{$name}{$yaml_extension}";
                 if (is_dir($dir) && is_readable($file_path)) {
                     $return = $file_path;
                     break;
                 }
+                else if (is_dir($dir) && is_readable($yaml_file_path)) {
+                  $return = $yaml_file_path;
+                  break;
+                }
             }
         }
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "bar": "123",
 +  "baz": "456"
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+src: /resources/fixtures/cat.jpg`
	`2`	`+alt: This is a photo`